INTEGRATION: CWS adc10 (1.4.96); FILE MERGED

2004/12/14 17:20:20 np 1.4.96.1: #i38230#
This commit is contained in:
Oliver Bolte
2005-01-27 10:23:26 +00:00
parent be7ca935a3
commit be25a28c22
2 changed files with 23 additions and 7 deletions

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_class.cxx,v $ * $RCSfile: pe_class.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: hr $ $Date: 2003-04-15 18:46:06 $ * last change: $Author: obo $ $Date: 2005-01-27 11:23:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -189,7 +189,10 @@ PE_Class::Setup_StatusFunctions()
&PE_Class::On_bodyStd_SwBracket_Right, &PE_Class::On_bodyStd_SwBracket_Right,
&PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
&PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
&PE_Class::On_bodyStd_VarFunc }; &PE_Class::On_bodyStd_VarFunc,
&PE_Class::On_bodyStd_VarFunc, };
static INT16 stateT_bodyStd[] = { Tid_Identifier, static INT16 stateT_bodyStd[] = { Tid_Identifier,
Tid_operator, Tid_operator,
Tid_class, Tid_class,
@@ -218,7 +221,9 @@ PE_Class::Setup_StatusFunctions()
Tid_SwBracket_Right, Tid_SwBracket_Right,
Tid_DoubleColon, Tid_DoubleColon,
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer,
Tid_typename };
static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon }; static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon };
static INT16 stateT_inProtection[] = { Tid_Colon }; static INT16 stateT_inProtection[] = { Tid_Colon };

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_file.cxx,v $ * $RCSfile: pe_file.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: hr $ $Date: 2003-04-15 18:46:16 $ * last change: $Author: obo $ $Date: 2005-01-27 11:23:26 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -146,43 +146,54 @@ PE_File::Setup_StatusFunctions()
&PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey,
&PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey,
&PE_File::On_std_enum, &PE_File::On_std_enum,
&PE_File::On_std_typedef, &PE_File::On_std_typedef,
&PE_File::On_std_template, &PE_File::On_std_template,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_extern, &PE_File::On_std_extern,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_namespace, &PE_File::On_std_namespace,
&PE_File::On_std_using, &PE_File::On_std_using,
&PE_File::On_std_SwBracketRight, &PE_File::On_std_SwBracketRight,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_DefineName, &PE_File::On_std_DefineName,
&PE_File::On_std_MacroName, &PE_File::On_std_MacroName,
&PE_File::On_std_VarFunc,
&PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc,
&PE_File::On_std_VarFunc }; &PE_File::On_std_VarFunc };
static INT16 stateT_std[] = { Tid_Identifier, static INT16 stateT_std[] = { Tid_Identifier,
Tid_class, Tid_class,
Tid_struct, Tid_struct,
Tid_union, Tid_union,
Tid_enum, Tid_enum,
Tid_typedef, Tid_typedef,
Tid_template, Tid_template,
Tid_const, Tid_const,
Tid_volatile, Tid_volatile,
Tid_extern, Tid_extern,
Tid_static, Tid_static,
Tid_register, Tid_register,
Tid_inline, Tid_inline,
Tid_namespace, Tid_namespace,
Tid_using, Tid_using,
Tid_SwBracket_Right, Tid_SwBracket_Right,
Tid_DoubleColon, Tid_DoubleColon,
Tid_DefineName, Tid_DefineName,
Tid_MacroName, Tid_MacroName,
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer };
Tid_TypeSpecializer,
Tid_typename };
static F_Tok stateF_in_extern[] = { &PE_File::On_in_extern_Constant }; static F_Tok stateF_in_extern[] = { &PE_File::On_in_extern_Constant };
static INT16 stateT_in_extern[] = { Tid_Constant }; static INT16 stateT_in_extern[] = { Tid_Constant };