summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-27 10:22:04 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-27 10:22:04 +0000
commit25aed620d582ef0a92e0aa04bd811baea1496817 (patch)
treec61b3558a1039a767629fe17bd50462ff4699ccd
parentINTEGRATION: CWS adc10 (1.2.132); FILE MERGED (diff)
downloadcore-25aed620d582ef0a92e0aa04bd811baea1496817.tar.gz
core-25aed620d582ef0a92e0aa04bd811baea1496817.zip
INTEGRATION: CWS adc10 (1.3.2); FILE MERGED
2004/12/14 17:20:19 np 1.3.2.1: #i38230#
-rw-r--r--autodoc/source/parser/cpp/cx_c_std.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx
index fb69c6a53594..a95d21aac391 100644
--- a/autodoc/source/parser/cpp/cx_c_std.cxx
+++ b/autodoc/source/parser/cpp/cx_c_std.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cx_c_std.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: obo $ $Date: 2004-11-15 13:39:02 $
+ * last change: $Author: obo $ $Date: 2005-01-27 11:22:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -138,6 +138,7 @@ DYN TextToken * TCF_Bigger(const char *) { return new Tok_Greater; }
DYN TextToken * TCF_Stern(const char *) { return new Tok_Asterix; }
DYN TextToken * TCF_Ampersand(const char *) { return new Tok_AmpersAnd; }
DYN TextToken * TCF_Ellipse(const char *) { return new Tok_Ellipse; }
+DYN TextToken * TCF_typename(const char *) { return new Tok_typename; }
// Operators
DYN TextToken * TCF_Operator(const char * text) { return new Tok_Operator(text); }
@@ -477,6 +478,7 @@ Context_CppStd::SetupStateMachine()
aStateMachine.AddToken("*",TCF_Stern,A_nOperatorDefStatus,finKeyword);
aStateMachine.AddToken("&",TCF_Ampersand,A_nOperatorDefStatus,finKeyword);
aStateMachine.AddToken("...",TCF_Ellipse,A_nOperatorDefStatus,finKeyword);
+ aStateMachine.AddToken("typename",TCF_typename,A_nOperatorDefStatus,finKeyword);
// Operators
aStateMachine.AddToken("==",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
@@ -528,7 +530,6 @@ Context_CppStd::SetupStateMachine()
// To ignore
aStateMachine.AddToken("auto", 0, A_nBezDefStatus, finIgnore);
- aStateMachine.AddToken("typename", 0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("_cdecl", 0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("__cdecl", 0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("__stdcall", 0, A_nBezDefStatus, finIgnore);
@@ -559,7 +560,3 @@ Context_CppStd::SetupStateMachine()
} // namespace cpp
-
-
-
-