Kaydet (Commit) c0868d9b authored tarafından Nikolai Pretzell's avatar Nikolai Pretzell

#98177# Some gcc specific probelms fixed.

üst 7401acd3
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: adoc_tok.cxx,v $ * $RCSfile: adoc_tok.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
// NOT FULLY DEFINED SERVICES // NOT FULLY DEFINED SERVICES
#include <adoc/atokdeal.hxx> #include <adoc/atokdeal.hxx>
#include <../cpp/c_dealer.hxx>
namespace adoc { namespace adoc {
...@@ -72,7 +73,7 @@ namespace adoc { ...@@ -72,7 +73,7 @@ namespace adoc {
void void
Token::DealOut( ::TokenDealer & o_rDealer ) Token::DealOut( ::TokenDealer & o_rDealer )
{ {
dynamic_cast< adoc::TokenDealer& >(o_rDealer).Deal_AdcDocu(*this); o_rDealer.AsDistributor()->Deal_AdcDocu(*this);
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: all_toks.cxx,v $ * $RCSfile: all_toks.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
// NOT FULLY DEFINED SERVICES // NOT FULLY DEFINED SERVICES
#include <cpp/ctokdeal.hxx> #include <cpp/ctokdeal.hxx>
#include <c_dealer.hxx>
#include "tokintpr.hxx" #include "tokintpr.hxx"
...@@ -76,7 +77,7 @@ namespace cpp { ...@@ -76,7 +77,7 @@ namespace cpp {
void void
Token::DealOut( ::TokenDealer & o_rDealer ) Token::DealOut( ::TokenDealer & o_rDealer )
{ {
dynamic_cast< cpp::TokenDealer& >(o_rDealer).Deal_CppCode(*this); o_rDealer.AsDistributor()->Deal_CppCode(*this);
} }
...@@ -176,7 +177,7 @@ Tok_UnblockMacro::Text() const ...@@ -176,7 +177,7 @@ Tok_UnblockMacro::Text() const
void void
Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer ) Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer )
{ {
dynamic_cast< cpp::TokenDealer& >(o_rDealer).Deal_Cpp_UnblockMacro(*this); o_rDealer.AsDistributor()->Deal_Cpp_UnblockMacro(*this);
} }
} // namespace cpp } // namespace cpp
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: c_dealer.cxx,v $ * $RCSfile: c_dealer.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:29 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -186,6 +186,11 @@ Distributor::Deal_AdcDocu( adoc::Token & let_drToken ) ...@@ -186,6 +186,11 @@ Distributor::Deal_AdcDocu( adoc::Token & let_drToken )
aDocuExplorer.Process_Token(let_drToken); aDocuExplorer.Process_Token(let_drToken);
} }
Distributor *
Distributor::AsDistributor()
{
return this;
}
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: c_dealer.hxx,v $ * $RCSfile: c_dealer.hxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:29 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -127,6 +127,8 @@ class Distributor : public cpp::TokenDealer, /// Handle C++ code tokens. ...@@ -127,6 +127,8 @@ class Distributor : public cpp::TokenDealer, /// Handle C++ code tokens.
virtual void Deal_AdcDocu( virtual void Deal_AdcDocu(
adoc::Token & let_drToken ); adoc::Token & let_drToken );
virtual Distributor *
AsDistributor();
private: private:
// DATA // DATA
PreProcessor aCppPreProcessor; PreProcessor aCppPreProcessor;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_base.cxx,v $ * $RCSfile: pe_base.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -106,23 +106,23 @@ void ...@@ -106,23 +106,23 @@ void
PE_Base::Setup_StatusFunctions() PE_Base::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Base>::F_Tok F_Tok; typedef CallFunction<PE_Base>::F_Tok F_Tok;
static F_Tok stateF_startOfNext[] = { On_startOfNext_Identifier, static F_Tok stateF_startOfNext[] = { &PE_Base::On_startOfNext_Identifier,
On_startOfNext_public, &PE_Base::On_startOfNext_public,
On_startOfNext_protected, &PE_Base::On_startOfNext_protected,
On_startOfNext_private, &PE_Base::On_startOfNext_private,
On_startOfNext_virtual, &PE_Base::On_startOfNext_virtual,
On_startOfNext_DoubleColon }; &PE_Base::On_startOfNext_DoubleColon };
static INT16 stateT_startOfNext[] = { Tid_Identifier, static INT16 stateT_startOfNext[] = { Tid_Identifier,
Tid_public, Tid_public,
Tid_protected, Tid_protected,
Tid_private, Tid_private,
Tid_virtual, Tid_virtual,
Tid_DoubleColon }; Tid_DoubleColon };
static F_Tok stateF_inName[] = { On_inName_Identifier, static F_Tok stateF_inName[] = { &PE_Base::On_inName_Identifier,
On_inName_virtual, &PE_Base::On_inName_virtual,
On_inName_SwBracket_Left, &PE_Base::On_inName_SwBracket_Left,
On_inName_DoubleColon, &PE_Base::On_inName_DoubleColon,
On_inName_Comma }; &PE_Base::On_inName_Comma };
static INT16 stateT_inName[] = { Tid_Identifier, static INT16 stateT_inName[] = { Tid_Identifier,
Tid_virtual, Tid_virtual,
Tid_SwBracket_Left, Tid_SwBracket_Left,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_class.cxx,v $ * $RCSfile: pe_class.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -138,58 +138,58 @@ PE_Class::Setup_StatusFunctions() ...@@ -138,58 +138,58 @@ PE_Class::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Class>::F_Tok F_Tok; typedef CallFunction<PE_Class>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_class, static F_Tok stateF_start[] = { &PE_Class::On_start_class,
On_start_struct, &PE_Class::On_start_struct,
On_start_union }; &PE_Class::On_start_union };
static INT16 stateT_start[] = { Tid_class, static INT16 stateT_start[] = { Tid_class,
Tid_struct, Tid_struct,
Tid_union }; Tid_union };
static F_Tok stateF_expectName[] = { On_expectName_Identifier, static F_Tok stateF_expectName[] = { &PE_Class::On_expectName_Identifier,
On_expectName_SwBracket_Left, &PE_Class::On_expectName_SwBracket_Left,
On_expectName_Colon &PE_Class::On_expectName_Colon
}; };
static INT16 stateT_expectName[] = { Tid_Identifier, static INT16 stateT_expectName[] = { Tid_Identifier,
Tid_SwBracket_Left, Tid_SwBracket_Left,
Tid_Colon Tid_Colon
}; };
static F_Tok stateF_gotName[] = { On_gotName_SwBracket_Left, static F_Tok stateF_gotName[] = { &PE_Class::On_gotName_SwBracket_Left,
On_gotName_Semicolon, &PE_Class::On_gotName_Semicolon,
On_gotName_Colon }; &PE_Class::On_gotName_Colon };
static INT16 stateT_gotName[] = { Tid_SwBracket_Left, static INT16 stateT_gotName[] = { Tid_SwBracket_Left,
Tid_Semicolon, Tid_Semicolon,
Tid_Colon }; Tid_Colon };
static F_Tok stateF_bodyStd[] = { On_bodyStd_VarFunc, static F_Tok stateF_bodyStd[] = { &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_ClassKey, &PE_Class::On_bodyStd_ClassKey,
On_bodyStd_ClassKey, &PE_Class::On_bodyStd_ClassKey,
On_bodyStd_ClassKey, &PE_Class::On_bodyStd_ClassKey,
On_bodyStd_enum, &PE_Class::On_bodyStd_enum,
On_bodyStd_typedef, &PE_Class::On_bodyStd_typedef,
On_bodyStd_public, &PE_Class::On_bodyStd_public,
On_bodyStd_protected, &PE_Class::On_bodyStd_protected,
On_bodyStd_private, &PE_Class::On_bodyStd_private,
On_bodyStd_template, &PE_Class::On_bodyStd_template,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_friend, &PE_Class::On_bodyStd_friend,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_using, &PE_Class::On_bodyStd_using,
On_bodyStd_SwBracket_Right, &PE_Class::On_bodyStd_SwBracket_Right,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc,
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,
...@@ -220,10 +220,10 @@ PE_Class::Setup_StatusFunctions() ...@@ -220,10 +220,10 @@ PE_Class::Setup_StatusFunctions()
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer };
static F_Tok stateF_inProtection[] = { 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 };
static F_Tok stateF_afterDecl[] = { On_afterDecl_Semicolon }; static F_Tok stateF_afterDecl[] = { &PE_Class::On_afterDecl_Semicolon };
static INT16 stateT_afterDecl[] = { Tid_Semicolon }; static INT16 stateT_afterDecl[] = { Tid_Semicolon };
SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError);
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_defs.cxx,v $ * $RCSfile: pe_defs.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -102,19 +102,19 @@ void ...@@ -102,19 +102,19 @@ void
PE_Defines::Setup_StatusFunctions() PE_Defines::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Defines>::F_Tok F_Tok; typedef CallFunction<PE_Defines>::F_Tok F_Tok;
static F_Tok stateF_expectName[] = { On_expectName_DefineName, static F_Tok stateF_expectName[] = { &PE_Defines::On_expectName_DefineName,
On_expectName_MacroName &PE_Defines::On_expectName_MacroName
}; };
static INT16 stateT_expectName[] = { Tid_DefineName, static INT16 stateT_expectName[] = { Tid_DefineName,
Tid_MacroName Tid_MacroName
}; };
static F_Tok stateF_gotDefineName[] = { On_gotDefineName_PreProDefinition }; static F_Tok stateF_gotDefineName[] = { &PE_Defines::On_gotDefineName_PreProDefinition };
static INT16 stateT_gotDefineName[] = { Tid_PreProDefinition }; static INT16 stateT_gotDefineName[] = { Tid_PreProDefinition };
static F_Tok stateF_expectMacroParameters[] = static F_Tok stateF_expectMacroParameters[] =
{ On_expectMacroParameters_MacroParameter, { &PE_Defines::On_expectMacroParameters_MacroParameter,
On_expectMacroParameters_PreProDefinition &PE_Defines::On_expectMacroParameters_PreProDefinition
}; };
static INT16 stateT_expectMacroParameters[] = static INT16 stateT_expectMacroParameters[] =
{ Tid_MacroParameter, { Tid_MacroParameter,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_enum.cxx,v $ * $RCSfile: pe_enum.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -103,22 +103,22 @@ void ...@@ -103,22 +103,22 @@ void
PE_Enum::Setup_StatusFunctions() PE_Enum::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Enum>::F_Tok F_Tok; typedef CallFunction<PE_Enum>::F_Tok F_Tok;
static F_Tok stateF_expectName[] = { On_expectName_Identifier, static F_Tok stateF_expectName[] = { &PE_Enum::On_expectName_Identifier,
On_expectName_SwBracket_Left &PE_Enum::On_expectName_SwBracket_Left
}; };
static INT16 stateT_expectName[] = { Tid_Identifier, static INT16 stateT_expectName[] = { Tid_Identifier,
Tid_SwBracket_Left Tid_SwBracket_Left
}; };
static F_Tok stateF_gotName[] = { On_gotName_SwBracket_Left }; static F_Tok stateF_gotName[] = { &PE_Enum::On_gotName_SwBracket_Left };
static INT16 stateT_gotName[] = { Tid_SwBracket_Left }; static INT16 stateT_gotName[] = { Tid_SwBracket_Left };
static F_Tok stateF_bodyStd[] = { On_bodyStd_Identifier, static F_Tok stateF_bodyStd[] = { &PE_Enum::On_bodyStd_Identifier,
On_bodyStd_SwBracket_Right }; &PE_Enum::On_bodyStd_SwBracket_Right };
static INT16 stateT_bodyStd[] = { Tid_Identifier, static INT16 stateT_bodyStd[] = { Tid_Identifier,
Tid_SwBracket_Right }; Tid_SwBracket_Right };
static F_Tok stateF_afterBlock[] = { On_afterBlock_Semicolon }; static F_Tok stateF_afterBlock[] = { &PE_Enum::On_afterBlock_Semicolon };
static INT16 stateT_afterBlock[] = { Tid_Semicolon }; static INT16 stateT_afterBlock[] = { Tid_Semicolon };
SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError);
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_enval.cxx,v $ * $RCSfile: pe_enval.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -101,18 +101,18 @@ PE_EnumValue::Setup_StatusFunctions() ...@@ -101,18 +101,18 @@ PE_EnumValue::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_EnumValue>::F_Tok F_Tok; typedef CallFunction<PE_EnumValue>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Identifier }; static F_Tok stateF_start[] = { &PE_EnumValue::On_start_Identifier };
static INT16 stateT_start[] = { Tid_Identifier }; static INT16 stateT_start[] = { Tid_Identifier };
static F_Tok stateF_afterName[] = { On_afterName_SwBracket_Right, static F_Tok stateF_afterName[] = { &PE_EnumValue::On_afterName_SwBracket_Right,
On_afterName_Comma, &PE_EnumValue::On_afterName_Comma,
On_afterName_Assign }; &PE_EnumValue::On_afterName_Assign };
static INT16 stateT_afterName[] = { Tid_SwBracket_Right, static INT16 stateT_afterName[] = { Tid_SwBracket_Right,
Tid_Comma, Tid_Comma,
Tid_Assign }; Tid_Assign };
static F_Tok stateF_expectFinish[] = { On_expectFinish_SwBracket_Right, static F_Tok stateF_expectFinish[] = { &PE_EnumValue::On_expectFinish_SwBracket_Right,
On_expectFinish_Comma }; &PE_EnumValue::On_expectFinish_Comma };
static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right, static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right,
Tid_Comma }; Tid_Comma };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_expr.cxx,v $ * $RCSfile: pe_expr.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -122,14 +122,14 @@ PE_Expression::Setup_StatusFunctions() ...@@ -122,14 +122,14 @@ PE_Expression::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Expression>::F_Tok F_Tok; typedef CallFunction<PE_Expression>::F_Tok F_Tok;
static F_Tok stateF_std[] = { On_std_SwBracket_Left, static F_Tok stateF_std[] = { &PE_Expression::On_std_SwBracket_Left,
On_std_SwBracket_Right, &PE_Expression::On_std_SwBracket_Right,
On_std_ArrayBracket_Left, &PE_Expression::On_std_ArrayBracket_Left,
On_std_ArrayBracket_Right, &PE_Expression::On_std_ArrayBracket_Right,
On_std_Bracket_Left, &PE_Expression::On_std_Bracket_Left,
On_std_Bracket_Right, &PE_Expression::On_std_Bracket_Right,
On_std_Semicolon, &PE_Expression::On_std_Semicolon,
On_std_Comma }; &PE_Expression::On_std_Comma };
static INT16 stateT_std[] = { Tid_SwBracket_Left, static INT16 stateT_std[] = { Tid_SwBracket_Left,
Tid_SwBracket_Right, Tid_SwBracket_Right,
Tid_ArrayBracket_Left, Tid_ArrayBracket_Left,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_file.cxx,v $ * $RCSfile: pe_file.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:30 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -141,27 +141,27 @@ void ...@@ -141,27 +141,27 @@ void
PE_File::Setup_StatusFunctions() PE_File::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_File>::F_Tok F_Tok; typedef CallFunction<PE_File>::F_Tok F_Tok;
static F_Tok stateF_std[] = { On_std_VarFunc, static F_Tok stateF_std[] = { &PE_File::On_std_VarFunc,
On_std_ClassKey, &PE_File::On_std_ClassKey,
On_std_ClassKey, &PE_File::On_std_ClassKey,
On_std_ClassKey, &PE_File::On_std_ClassKey,
On_std_enum, &PE_File::On_std_enum,
On_std_typedef, &PE_File::On_std_typedef,
On_std_template, &PE_File::On_std_template,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_extern, &PE_File::On_std_extern,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_namespace, &PE_File::On_std_namespace,
On_std_using, &PE_File::On_std_using,
On_std_SwBracketRight, &PE_File::On_std_SwBracketRight,
On_std_VarFunc, &PE_File::On_std_VarFunc,
On_std_DefineName, &PE_File::On_std_DefineName,
On_std_MacroName, &PE_File::On_std_MacroName,
On_std_VarFunc, &PE_File::On_std_VarFunc,
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,
...@@ -184,10 +184,10 @@ PE_File::Setup_StatusFunctions() ...@@ -184,10 +184,10 @@ PE_File::Setup_StatusFunctions()
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer };
static F_Tok stateF_in_extern[] = { 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 };
static F_Tok stateF_in_externC[] = { On_in_externC_SwBracket_Left }; static F_Tok stateF_in_externC[] = { &PE_File::On_in_externC_SwBracket_Left };
static INT16 stateT_in_externC[] = { Tid_SwBracket_Left }; static INT16 stateT_in_externC[] = { Tid_SwBracket_Left };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_namsp.cxx,v $ * $RCSfile: pe_namsp.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -89,13 +89,13 @@ void ...@@ -89,13 +89,13 @@ void
PE_Namespace::Setup_StatusFunctions() PE_Namespace::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Namespace>::F_Tok F_Tok; typedef CallFunction<PE_Namespace>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Identifier }; static F_Tok stateF_start[] = { &PE_Namespace::On_start_Identifier };
static INT16 stateT_start[] = { Tid_Identifier }; static INT16 stateT_start[] = { Tid_Identifier };
static F_Tok stateF_gotName[] = { On_gotName_SwBracket_Left, static F_Tok stateF_gotName[] = { &PE_Namespace::On_gotName_SwBracket_Left,
On_gotName_Assign }; &PE_Namespace::On_gotName_Assign };
static INT16 stateT_gotName[] = { Tid_SwBracket_Left, static INT16 stateT_gotName[] = { Tid_SwBracket_Left,
Tid_Assign }; Tid_Assign };
static F_Tok stateF_expectSemicolon[] = { On_expectSemicolon_Semicolon }; static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon };
static INT16 stateT_expectSemicolon[] = { Tid_Semicolon }; static INT16 stateT_expectSemicolon[] = { Tid_Semicolon };
SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError);
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_param.cxx,v $ * $RCSfile: pe_param.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -109,18 +109,18 @@ void ...@@ -109,18 +109,18 @@ void
PE_Parameter::Setup_StatusFunctions() PE_Parameter::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Parameter>::F_Tok F_Tok; typedef CallFunction<PE_Parameter>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Type, static F_Tok stateF_start[] = { &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Bracket_Right, &PE_Parameter::On_start_Bracket_Right,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Ellipse, &PE_Parameter::On_start_Ellipse,
On_start_Type, &PE_Parameter::On_start_Type,
On_start_Type }; &PE_Parameter::On_start_Type };
static INT16 stateT_start[] = { Tid_Identifier, static INT16 stateT_start[] = { Tid_Identifier,
Tid_class, Tid_class,
Tid_struct, Tid_struct,
...@@ -133,26 +133,26 @@ PE_Parameter::Setup_StatusFunctions() ...@@ -133,26 +133,26 @@ PE_Parameter::Setup_StatusFunctions()
Tid_Ellipse, Tid_Ellipse,
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer };
static F_Tok stateF_expectName[] = { On_expectName_Identifier, static F_Tok stateF_expectName[] = { &PE_Parameter::On_expectName_Identifier,
On_expectName_ArrayBracket_Left, &PE_Parameter::On_expectName_ArrayBracket_Left,
On_expectName_Bracket_Right, &PE_Parameter::On_expectName_Bracket_Right,
On_expectName_Comma, &PE_Parameter::On_expectName_Comma,
On_afterName_Assign }; &PE_Parameter::On_afterName_Assign };
static INT16 stateT_expectName[] = { Tid_Identifier, static INT16 stateT_expectName[] = { Tid_Identifier,
Tid_ArrayBracket_Left, Tid_ArrayBracket_Left,
Tid_Bracket_Right, Tid_Bracket_Right,
Tid_Comma, Tid_Comma,
Tid_Assign }; Tid_Assign };
static F_Tok stateF_afterName[] = { On_afterName_ArrayBracket_Left, static F_Tok stateF_afterName[] = { &PE_Parameter::On_afterName_ArrayBracket_Left,
On_afterName_Bracket_Right, &PE_Parameter::On_afterName_Bracket_Right,
On_afterName_Comma, &PE_Parameter::On_afterName_Comma,
On_afterName_Assign }; &PE_Parameter::On_afterName_Assign };
static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left,
Tid_Bracket_Right, Tid_Bracket_Right,
Tid_Comma, Tid_Comma,
Tid_Assign }; Tid_Assign };
static F_Tok stateF_finished[] = { On_finished_Comma, static F_Tok stateF_finished[] = { &PE_Parameter::On_finished_Comma,
On_finished_Bracket_Right }; &PE_Parameter::On_finished_Bracket_Right };
static INT16 stateT_finished[] = { Tid_Bracket_Right, static INT16 stateT_finished[] = { Tid_Bracket_Right,
Tid_Comma }; Tid_Comma };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_tpltp.cxx,v $ * $RCSfile: pe_tpltp.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -97,18 +97,18 @@ PE_TemplateTop::Setup_StatusFunctions() ...@@ -97,18 +97,18 @@ PE_TemplateTop::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok; typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Less }; static F_Tok stateF_start[] = { &PE_TemplateTop::On_start_Less };
static INT16 stateT_start[] = { Tid_Less }; static INT16 stateT_start[] = { Tid_Less };
// KORR_FUTURE : add "typename". // KORR_FUTURE : add "typename".
static F_Tok stateF_expect_qualifier[]= { On_expect_qualifier_class }; static F_Tok stateF_expect_qualifier[]= { &PE_TemplateTop::On_expect_qualifier_class };
static INT16 stateT_expect_qualifier[]= { Tid_class }; static INT16 stateT_expect_qualifier[]= { Tid_class };
static F_Tok stateF_expect_name[] = { On_expect_name_Identifier }; static F_Tok stateF_expect_name[] = { &PE_TemplateTop::On_expect_name_Identifier };
static INT16 stateT_expect_name[] = { Tid_Identifier }; static INT16 stateT_expect_name[] = { Tid_Identifier };
static F_Tok stateF_expect_separator[]= { On_expect_separator_Comma, static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma,
On_expect_separator_Greater }; &PE_TemplateTop::On_expect_separator_Greater };
static INT16 stateT_expect_separator[]= { Tid_Comma, static INT16 stateT_expect_separator[]= { Tid_Comma,
Tid_Greater }; Tid_Greater };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_tydef.cxx,v $ * $RCSfile: pe_tydef.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -101,13 +101,13 @@ void ...@@ -101,13 +101,13 @@ void
PE_Typedef::Setup_StatusFunctions() PE_Typedef::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Typedef>::F_Tok F_Tok; typedef CallFunction<PE_Typedef>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_typedef }; static F_Tok stateF_start[] = { &PE_Typedef::On_start_typedef };
static INT16 stateT_start[] = { Tid_typedef }; static INT16 stateT_start[] = { Tid_typedef };
static F_Tok stateF_expectName[] = { On_expectName_Identifier }; static F_Tok stateF_expectName[] = { &PE_Typedef::On_expectName_Identifier };
static INT16 stateT_expectName[] = { Tid_Identifier }; static INT16 stateT_expectName[] = { Tid_Identifier };
static F_Tok stateF_afterName[] = { On_afterName_Semicolon }; static F_Tok stateF_afterName[] = { &PE_Typedef::On_afterName_Semicolon };
static INT16 stateT_afterName[] = { Tid_Semicolon }; static INT16 stateT_afterName[] = { Tid_Semicolon };
SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError);
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_type.cxx,v $ * $RCSfile: pe_type.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -133,17 +133,17 @@ void ...@@ -133,17 +133,17 @@ void
PE_Type::Setup_StatusFunctions() PE_Type::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Type>::F_Tok F_Tok; typedef CallFunction<PE_Type>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Identifier, static F_Tok stateF_start[] = { &PE_Type::On_start_Identifier,
On_start_class, &PE_Type::On_start_class,
On_start_class, &PE_Type::On_start_class,
On_start_class, &PE_Type::On_start_class,
On_start_enum, &PE_Type::On_start_enum,
On_start_const, &PE_Type::On_start_const,
On_start_volatile, &PE_Type::On_start_volatile,
On_start_Bracket_Right, &PE_Type::On_start_Bracket_Right,
On_start_DoubleColon, &PE_Type::On_start_DoubleColon,
On_start_BuiltInType, &PE_Type::On_start_BuiltInType,
On_start_TypeSpecializer }; &PE_Type::On_start_TypeSpecializer };
static INT16 stateT_start[] = { Tid_Identifier, static INT16 stateT_start[] = { Tid_Identifier,
Tid_class, Tid_class,
Tid_struct, Tid_struct,
...@@ -156,18 +156,18 @@ PE_Type::Setup_StatusFunctions() ...@@ -156,18 +156,18 @@ PE_Type::Setup_StatusFunctions()
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer };
static F_Tok stateF_expect_namesegment[] = { On_expect_namesegment_Identifier, static F_Tok stateF_expect_namesegment[] = { &PE_Type::On_expect_namesegment_Identifier,
On_expect_namesegment_Identifier }; &PE_Type::On_expect_namesegment_Identifier };
static INT16 stateT_expect_namesegment[] = { Tid_Identifier, static INT16 stateT_expect_namesegment[] = { Tid_Identifier,
Tid_BuiltInType }; Tid_BuiltInType };
static F_Tok stateF_after_namesegment[] = { On_after_namesegment_const, static F_Tok stateF_after_namesegment[] = { &PE_Type::On_after_namesegment_const,
On_after_namesegment_volatile, &PE_Type::On_after_namesegment_volatile,
On_after_namesegment_Bracket_Left, &PE_Type::On_after_namesegment_Bracket_Left,
On_after_namesegment_DoubleColon, &PE_Type::On_after_namesegment_DoubleColon,
On_after_namesegment_Less, &PE_Type::On_after_namesegment_Less,
On_after_namesegment_Asterix, &PE_Type::On_after_namesegment_Asterix,
On_after_namesegment_AmpersAnd }; &PE_Type::On_after_namesegment_AmpersAnd };
static INT16 stateT_after_namesegment[] = { Tid_const, static INT16 stateT_after_namesegment[] = { Tid_const,
Tid_volatile, Tid_volatile,
Tid_Bracket_Left, Tid_Bracket_Left,
...@@ -177,21 +177,21 @@ PE_Type::Setup_StatusFunctions() ...@@ -177,21 +177,21 @@ PE_Type::Setup_StatusFunctions()
Tid_AmpersAnd }; Tid_AmpersAnd };
static F_Tok stateF_afterclass_expect_semicolon[] = static F_Tok stateF_afterclass_expect_semicolon[] =
{ On_afterclass_expect_semicolon_Semicolon }; { &PE_Type::On_afterclass_expect_semicolon_Semicolon };
static INT16 stateT_afterclass_expect_semicolon[] = static INT16 stateT_afterclass_expect_semicolon[] =
{ Tid_Semicolon }; { Tid_Semicolon };
static F_Tok stateF_within_template[] = { On_within_template_Comma, static F_Tok stateF_within_template[] = { &PE_Type::On_within_template_Comma,
On_within_template_Greater, &PE_Type::On_within_template_Greater,
On_within_template_Constant }; &PE_Type::On_within_template_Constant };
static INT16 stateT_within_template[] = { Tid_Comma, static INT16 stateT_within_template[] = { Tid_Comma,
Tid_Greater, Tid_Greater,
Tid_Constant }; Tid_Constant };
static F_Tok stateF_within_indirection[] = { On_within_indirection_const, static F_Tok stateF_within_indirection[] = { &PE_Type::On_within_indirection_const,
On_within_indirection_volatile, &PE_Type::On_within_indirection_volatile,
On_within_indirection_Asterix, &PE_Type::On_within_indirection_Asterix,
On_within_indirection_AmpersAnd }; &PE_Type::On_within_indirection_AmpersAnd };
static INT16 stateT_within_indirection[] = { Tid_const, static INT16 stateT_within_indirection[] = { Tid_const,
Tid_volatile, Tid_volatile,
Tid_Asterix, Tid_Asterix,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_vafu.cxx,v $ * $RCSfile: pe_vafu.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:31 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -149,26 +149,26 @@ PE_VarFunc::Setup_StatusFunctions() ...@@ -149,26 +149,26 @@ PE_VarFunc::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_VarFunc>::F_Tok F_Tok; typedef CallFunction<PE_VarFunc>::F_Tok F_Tok;
static F_Tok stateF_start[] = { On_start_Identifier, static F_Tok stateF_start[] = { &PE_VarFunc::On_start_Identifier,
On_start_operator, &PE_VarFunc::On_start_operator,
On_start_TypeKey, &PE_VarFunc::On_start_TypeKey,
On_start_TypeKey, &PE_VarFunc::On_start_TypeKey,
On_start_TypeKey, &PE_VarFunc::On_start_TypeKey,
On_start_TypeKey, &PE_VarFunc::On_start_TypeKey,
On_start_virtual, &PE_VarFunc::On_start_virtual,
On_start_Tilde, &PE_VarFunc::On_start_Tilde,
On_start_const, &PE_VarFunc::On_start_const,
On_start_volatile, &PE_VarFunc::On_start_volatile,
On_start_extern, &PE_VarFunc::On_start_extern,
On_start_static, &PE_VarFunc::On_start_static,
On_start_mutable, &PE_VarFunc::On_start_mutable,
On_start_register, &PE_VarFunc::On_start_register,
On_start_inline, &PE_VarFunc::On_start_inline,
On_start_explicit, &PE_VarFunc::On_start_explicit,
On_start_Bracket_Right, &PE_VarFunc::On_start_Bracket_Right,
On_start_Identifier, &PE_VarFunc::On_start_Identifier,
On_start_Identifier, &PE_VarFunc::On_start_Identifier,
On_start_Identifier }; &PE_VarFunc::On_start_Identifier };
static INT16 stateT_start[] = { Tid_Identifier, static INT16 stateT_start[] = { Tid_Identifier,
Tid_operator, Tid_operator,
Tid_class, Tid_class,
...@@ -190,26 +190,26 @@ PE_VarFunc::Setup_StatusFunctions() ...@@ -190,26 +190,26 @@ PE_VarFunc::Setup_StatusFunctions()
Tid_BuiltInType, Tid_BuiltInType,
Tid_TypeSpecializer }; Tid_TypeSpecializer };
static F_Tok stateF_expectCtor[] = { On_expectCtor_Bracket_Left }; static F_Tok stateF_expectCtor[] = { &PE_VarFunc::On_expectCtor_Bracket_Left };
static INT16 stateT_expectCtor[] = { Tid_Bracket_Left }; static INT16 stateT_expectCtor[] = { Tid_Bracket_Left };
static F_Tok stateF_afterClassDecl[] = { On_afterClassDecl_Semicolon }; static F_Tok stateF_afterClassDecl[] = { &PE_VarFunc::On_afterClassDecl_Semicolon };
static INT16 stateT_afterClassDecl[] = { Tid_Semicolon }; static INT16 stateT_afterClassDecl[] = { Tid_Semicolon };
static F_Tok stateF_expectName[] = { On_expectName_Identifier, static F_Tok stateF_expectName[] = { &PE_VarFunc::On_expectName_Identifier,
On_expectName_operator, &PE_VarFunc::On_expectName_operator,
On_expectName_Bracket_Left }; &PE_VarFunc::On_expectName_Bracket_Left };
static INT16 stateT_expectName[] = { Tid_Identifier, static INT16 stateT_expectName[] = { Tid_Identifier,
Tid_operator, Tid_operator,
Tid_Bracket_Left }; Tid_Bracket_Left };
static F_Tok stateF_afterName[] = { On_afterName_ArrayBracket_Left, static F_Tok stateF_afterName[] = { &PE_VarFunc::On_afterName_ArrayBracket_Left,
On_afterName_Bracket_Left, &PE_VarFunc::On_afterName_Bracket_Left,
On_afterName_DoubleColon, &PE_VarFunc::On_afterName_DoubleColon,
On_afterName_Semicolon, &PE_VarFunc::On_afterName_Semicolon,
On_afterName_Comma, &PE_VarFunc::On_afterName_Comma,
On_afterName_Assign, &PE_VarFunc::On_afterName_Assign,
On_afterName_Less }; &PE_VarFunc::On_afterName_Less };
static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left,
Tid_Bracket_Left, Tid_Bracket_Left,
Tid_DoubleColon, Tid_DoubleColon,
...@@ -219,19 +219,19 @@ PE_VarFunc::Setup_StatusFunctions() ...@@ -219,19 +219,19 @@ PE_VarFunc::Setup_StatusFunctions()
Tid_Less }; Tid_Less };
static F_Tok stateF_afterName_inErraneousTemplate[] = static F_Tok stateF_afterName_inErraneousTemplate[] =
{ On_afterName_inErraneousTemplate_Less, { &PE_VarFunc::On_afterName_inErraneousTemplate_Less,
On_afterName_inErraneousTemplate_Greater }; &PE_VarFunc::On_afterName_inErraneousTemplate_Greater };
static INT16 stateT_afterName_inErraneousTemplate[] = static INT16 stateT_afterName_inErraneousTemplate[] =
{ Tid_Less, { Tid_Less,
Tid_Greater }; Tid_Greater };
static F_Tok stateF_finished[] = { On_finished_Semicolon, static F_Tok stateF_finished[] = { &PE_VarFunc::On_finished_Semicolon,
On_finished_Comma }; &PE_VarFunc::On_finished_Comma };
static INT16 stateT_finished[] = { Tid_Semicolon, static INT16 stateT_finished[] = { Tid_Semicolon,
Tid_Comma }; Tid_Comma };
static F_Tok stateF_finishedIncludingFunctionImplementation[] = static F_Tok stateF_finishedIncludingFunctionImplementation[] =
{ On_finishedIncludingFunctionImplementation_Default { &PE_VarFunc::On_finishedIncludingFunctionImplementation_Default
}; };
static INT16 stateT_finishedIncludingFunctionImplementation[] = static INT16 stateT_finishedIncludingFunctionImplementation[] =
{ Tid_BuiltInType // Just to have one entry, but it is default handled, too. { Tid_BuiltInType // Just to have one entry, but it is default handled, too.
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_vari.cxx,v $ * $RCSfile: pe_vari.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:32 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -106,19 +106,19 @@ PE_Variable::Setup_StatusFunctions() ...@@ -106,19 +106,19 @@ PE_Variable::Setup_StatusFunctions()
{ {
typedef CallFunction<PE_Variable>::F_Tok F_Tok; typedef CallFunction<PE_Variable>::F_Tok F_Tok;
static F_Tok stateF_afterName[] = { On_afterName_ArrayBracket_Left, static F_Tok stateF_afterName[] = { &PE_Variable::On_afterName_ArrayBracket_Left,
On_afterName_Semicolon, &PE_Variable::On_afterName_Semicolon,
On_afterName_Comma, &PE_Variable::On_afterName_Comma,
On_afterName_Assign }; &PE_Variable::On_afterName_Assign };
static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left,
Tid_Semicolon, Tid_Semicolon,
Tid_Comma, Tid_Comma,
Tid_Assign }; Tid_Assign };
static F_Tok stateF_afterSize[] = { On_afterSize_ArrayBracket_Right }; static F_Tok stateF_afterSize[] = { &PE_Variable::On_afterSize_ArrayBracket_Right };
static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right }; static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right };
static F_Tok stateF_expectFinish[] = { On_expectFinish_Bracket_Right, static F_Tok stateF_expectFinish[] = { &PE_Variable::On_expectFinish_Bracket_Right,
On_expectFinish_Semicolon, &PE_Variable::On_expectFinish_Semicolon,
On_expectFinish_Comma }; &PE_Variable::On_expectFinish_Comma };
static INT16 stateT_expectFinish[] = { Tid_Bracket_Right, static INT16 stateT_expectFinish[] = { Tid_Bracket_Right,
Tid_Semicolon, Tid_Semicolon,
Tid_Comma }; Tid_Comma };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: preproc.cxx,v $ * $RCSfile: preproc.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:32 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $
* *
* 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
...@@ -78,9 +78,9 @@ namespace cpp ...@@ -78,9 +78,9 @@ namespace cpp
PreProcessor::F_TOKENPROC PreProcessor::aTokProcs[PreProcessor::state_MAX] = PreProcessor::F_TOKENPROC PreProcessor::aTokProcs[PreProcessor::state_MAX] =
{ {
PreProcessor::On_plain, &PreProcessor::On_plain,
PreProcessor::On_expect_macro_bracket_left, &PreProcessor::On_expect_macro_bracket_left,
PreProcessor::On_expect_macro_param &PreProcessor::On_expect_macro_param
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: tokdeal.hxx,v $ * $RCSfile: tokdeal.hxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:33 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -69,6 +69,11 @@ ...@@ -69,6 +69,11 @@
// COMPONENTS // COMPONENTS
// PARAMETERS // PARAMETERS
namespace cpp
{
class Distributor;
}
class TokenDealer class TokenDealer
...@@ -78,6 +83,8 @@ class TokenDealer ...@@ -78,6 +83,8 @@ class TokenDealer
virtual void Deal_Eol() = 0; virtual void Deal_Eol() = 0;
virtual void Deal_Eof() = 0; virtual void Deal_Eof() = 0;
virtual cpp::Distributor *
AsDistributor() = 0;
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_const.cxx,v $ * $RCSfile: pe_const.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -82,19 +82,19 @@ namespace uidl ...@@ -82,19 +82,19 @@ namespace uidl
#ifdef DF #ifdef DF
#undef DF #undef DF
#endif #endif
#define DF PE_Constant::On_Default #define DF &PE_Constant::On_Default
PE_Constant::F_TOK PE_Constant::F_TOK
PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] = PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] =
{ { DF, DF, DF }, // e_none { { DF, DF, DF }, // e_none
{ DF, On_expect_name_Identifier, { DF, &PE_Constant::On_expect_name_Identifier,
DF }, // expect_name DF }, // expect_name
{ DF, DF, On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open { DF, DF, &PE_Constant::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open
{ On_expect_const_Stereotype, { &PE_Constant::On_expect_const_Stereotype,
DF, On_expect_const_Punctuation }, // expect_const DF, &PE_Constant::On_expect_const_Punctuation }, // expect_const
{ DF, On_expect_value_Identifier, { DF, &PE_Constant::On_expect_value_Identifier,
DF }, // expect_value DF }, // expect_value
{ DF, DF, On_expect_finish_Punctuation } // expect_finish { DF, DF, &PE_Constant::On_expect_finish_Punctuation } // expect_finish
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_enum2.cxx,v $ * $RCSfile: pe_enum2.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -84,17 +84,17 @@ namespace uidl ...@@ -84,17 +84,17 @@ namespace uidl
#ifdef DF #ifdef DF
#undef DF #undef DF
#endif #endif
#define DF PE_Enum::On_Default #define DF &PE_Enum::On_Default
PE_Enum::F_TOK PE_Enum::F_TOK
PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] = PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] =
{ { DF, DF }, // e_none { { DF, DF }, // e_none
{ On_expect_name_Identifier, { &PE_Enum::On_expect_name_Identifier,
DF }, // expect_name DF }, // expect_name
{ DF, On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open { DF, &PE_Enum::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open
{ On_expect_value_Identifier, { &PE_Enum::On_expect_value_Identifier,
On_expect_value_Punctuation }, // expect_value &PE_Enum::On_expect_value_Punctuation }, // expect_value
{ DF, On_expect_finish_Punctuation } // expect_finish { DF, &PE_Enum::On_expect_finish_Punctuation } // expect_finish
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_evalu.cxx,v $ * $RCSfile: pe_evalu.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -78,15 +78,15 @@ namespace uidl ...@@ -78,15 +78,15 @@ namespace uidl
#ifdef DF #ifdef DF
#undef DF #undef DF
#endif #endif
#define DF PE_Value::On_Default #define DF &PE_Value::On_Default
PE_Value::F_TOK PE_Value::F_TOK
PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] = PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] =
{ { DF, DF, DF }, // e_none { { DF, DF, DF }, // e_none
{ On_expect_name_Identifier, { &PE_Value::On_expect_name_Identifier,
DF, DF }, // expect_name DF, DF }, // expect_name
{ DF, On_got_name_Punctuation, { DF, &PE_Value::On_got_name_Punctuation,
On_got_name_Assignment } // got_name &PE_Value::On_got_name_Assignment } // got_name
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_iface.cxx,v $ * $RCSfile: pe_iface.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -86,38 +86,38 @@ namespace uidl ...@@ -86,38 +86,38 @@ namespace uidl
#ifdef DF #ifdef DF
#undef DF #undef DF
#endif #endif
#define DF PE_Interface::On_Default #define DF &PE_Interface::On_Default
PE_Interface::F_TOK PE_Interface::F_TOK
PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] = PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] =
{ { DF, DF, DF, DF, DF }, // e_none { { DF, DF, DF, DF, DF }, // e_none
{ On_need_uik_MetaType, { &PE_Interface::On_need_uik_MetaType,
DF, DF, DF, DF }, // need_uik DF, DF, DF, DF }, // need_uik
{ DF, On_uik_Identifier, { DF, &PE_Interface::On_uik_Identifier,
On_uik_Punctuation, &PE_Interface::On_uik_Punctuation,
DF, DF }, // uik DF, DF }, // uik
{ On_need_ident_MetaType, { &PE_Interface::On_need_ident_MetaType,
DF, DF, DF, DF }, // need_ident DF, DF, DF, DF }, // need_ident
{ DF, On_ident_Identifier, { DF, &PE_Interface::On_ident_Identifier,
On_ident_Punctuation, &PE_Interface::On_ident_Punctuation,
DF, DF }, // ident DF, DF }, // ident
{ On_need_interface_MetaType, { &PE_Interface::On_need_interface_MetaType,
DF, DF, DF, DF }, // need_interface DF, DF, DF, DF }, // need_interface
{ DF, On_need_name_Identifer, { DF, &PE_Interface::On_need_name_Identifer,
DF, DF, DF }, // need_name DF, DF, DF }, // need_name
{ DF, DF, On_wait_for_base_Punctuation, { DF, DF, &PE_Interface::On_wait_for_base_Punctuation,
DF, DF }, // wait_for_base DF, DF }, // wait_for_base
{ DF, DF, DF, DF, DF }, // in_base { DF, DF, DF, DF, DF }, // in_base
{ DF, DF, On_need_curlbr_open_Punctuation, { DF, DF, &PE_Interface::On_need_curlbr_open_Punctuation,
DF, DF }, // need_curlbr_open DF, DF }, // need_curlbr_open
{ On_std_GotoAttribute, { &PE_Interface::On_std_GotoAttribute,
On_std_GotoFunction, &PE_Interface::On_std_GotoFunction,
On_std_Punctuation, &PE_Interface::On_std_Punctuation,
On_std_GotoFunction, &PE_Interface::On_std_GotoFunction,
On_std_Stereotype }, // e_std &PE_Interface::On_std_Stereotype }, // e_std
{ DF, DF, DF, DF, DF }, // in_function { DF, DF, DF, DF, DF }, // in_function
{ DF, DF, DF, DF, DF }, // in_attribute { DF, DF, DF, DF, DF }, // in_attribute
{ DF, DF, On_need_finish_Punctuation, { DF, DF, &PE_Interface::On_need_finish_Punctuation,
DF, DF } // need_finish DF, DF } // need_finish
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: pe_tydf2.cxx,v $ * $RCSfile: pe_tydf2.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -81,17 +81,17 @@ namespace uidl ...@@ -81,17 +81,17 @@ namespace uidl
#ifdef DF #ifdef DF
#undef DF #undef DF
#endif #endif
#define DF PE_Typedef::On_Default #define DF &PE_Typedef::On_Default
PE_Typedef::F_TOK PE_Typedef::F_TOK
PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] = PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] =
{ { DF, DF, DF }, // e_none { { DF, DF, DF }, // e_none
{ On_expect_description_Any, { &PE_Typedef::On_expect_description_Any,
On_expect_description_Any, &PE_Typedef::On_expect_description_Any,
DF }, // expect_description DF }, // expect_description
{ DF, On_expect_name_Identifier, { DF, &PE_Typedef::On_expect_name_Identifier,
DF }, // expect_name DF }, // expect_name
{ DF, DF, On_got_name_Punctuation } // got_name { DF, DF, &PE_Typedef::On_got_name_Punctuation } // got_name
}; };
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: filecoll.cxx,v $ * $RCSfile: filecoll.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: np $ $Date: 2002-03-08 14:45:36 $ * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $
* *
* 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
...@@ -88,8 +88,16 @@ FileCollector::AddFilesFrom( const char * i_sRootDir, ...@@ -88,8 +88,16 @@ FileCollector::AddFilesFrom( const char * i_sRootDir,
return 0; return 0;
} }
GetFiles( aFoundFiles, i_sRootDir, i_sFilter ); csv::ploc::Directory aDir(i_sRootDir);
if (NOT aDir.Exists())
{
Cerr() << "Error: The path for the files to be parsed could not be found."
<< Endl();
return 0;
}
Cout() << "." << Flush();
aDir.GetContainedFiles(aFoundFiles, i_sFilter);
if (i_eSearchMode == recursive) if (i_eSearchMode == recursive)
{ {
...@@ -98,7 +106,8 @@ FileCollector::AddFilesFrom( const char * i_sRootDir, ...@@ -98,7 +106,8 @@ FileCollector::AddFilesFrom( const char * i_sRootDir,
uintt nSubDirStart = aPath.tellp(); uintt nSubDirStart = aPath.tellp();
DirNameList aSubDirs; DirNameList aSubDirs;
GetSubDirectories( aSubDirs, i_sRootDir ); aDir.GetContainedDirectories(aSubDirs);
for ( const_iterator iter = aSubDirs.begin(); for ( const_iterator iter = aSubDirs.begin();
iter != aSubDirs.end(); iter != aSubDirs.end();
++iter ) ++iter )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment