diff options
Diffstat (limited to 'autodoc/source/parser/cpp')
67 files changed, 1006 insertions, 1006 deletions
diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx index 3ea666ee94a9..8934e2e8b9ca 100644 --- a/autodoc/source/parser/cpp/all_toks.cxx +++ b/autodoc/source/parser/cpp/all_toks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx index 4aeae6e1ce0e..e2b7a7f4d9e4 100644 --- a/autodoc/source/parser/cpp/all_toks.hxx +++ b/autodoc/source/parser/cpp/all_toks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ class Tok_Identifier : public cpp::Token { public: Tok_Identifier( - const char * i_sText ) : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; - virtual INT16 TypeId() const; + const char * i_sText ) : sText(i_sText) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; + virtual INT16 TypeId() const; virtual const char * Text() const; private: - String sText; + String sText; }; const INT16 Tid_Identifier = 1; @@ -63,14 +63,14 @@ class Tok_Operator : public cpp::Token { public: Tok_Operator( - const char * i_sText ) : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; - virtual INT16 TypeId() const; + const char * i_sText ) : sText(i_sText) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; + virtual INT16 TypeId() const; virtual const char * Text() const; private: - String sText; + String sText; }; const INT16 Tid_Operator = 2; @@ -79,9 +79,9 @@ const INT16 Tid_Operator = 2; #define DECL_TOKEN_CLASS(name,tid) \ class Tok_##name : public cpp::Token \ { public: \ - virtual void Trigger( \ - TokenInterpreter & io_rInterpreter ) const; \ - virtual INT16 TypeId() const; \ + virtual void Trigger( \ + TokenInterpreter & io_rInterpreter ) const; \ + virtual INT16 TypeId() const; \ virtual const char * \ Text() const; \ }; \ @@ -135,14 +135,14 @@ DECL_TOKEN_CLASS(typename,43); class Tok_##name : public cpp::Token \ { public: \ Tok_##name( \ - const char * i_sText ) : sText(i_sText) {} \ - virtual void Trigger( \ - TokenInterpreter & io_rInterpreter ) const; \ - virtual INT16 TypeId() const; \ + const char * i_sText ) : sText(i_sText) {} \ + virtual void Trigger( \ + TokenInterpreter & io_rInterpreter ) const; \ + virtual INT16 TypeId() const; \ virtual const char * \ Text() const; \ private: \ - String sText; \ + String sText; \ }; \ const INT16 Tid_##name = tid @@ -174,11 +174,11 @@ class Tok_UnblockMacro : public ::TextToken { public: Tok_UnblockMacro( - const char * i_sMacroName ) : sMacroName(i_sMacroName) {} - virtual const char* Text() const; + const char * i_sMacroName ) : sMacroName(i_sMacroName) {} + virtual const char* Text() const; - virtual void DealOut( - ::TokenDealer & o_rDealer ); + virtual void DealOut( + ::TokenDealer & o_rDealer ); private: String sMacroName; }; @@ -192,9 +192,9 @@ class Tok_Namespace : public cpp::Token // file class Tok_Bracket : public cpp::Token // ueberall class Tok_Separator : public cpp::Token // ueberall -class Tok_Identifier : public cpp::Token // ueberall +class Tok_Identifier : public cpp::Token // ueberall class Tok_NameSeparator : public cpp::Token // Type, Name -class Tok_BuiltInType : public cpp::Token // ueberall +class Tok_BuiltInType : public cpp::Token // ueberall class Tok_ConVol : public cpp::Token // class-><FuVa> class Tok_StorageClass : public cpp::Token // file-><type>,<FuVa> class Tok_OperatorFunctionName : public cpp::Token // class diff --git a/autodoc/source/parser/cpp/c_dealer.cxx b/autodoc/source/parser/cpp/c_dealer.cxx index a41d9daeb1d1..75485c886a6e 100644 --- a/autodoc/source/parser/cpp/c_dealer.cxx +++ b/autodoc/source/parser/cpp/c_dealer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/c_dealer.hxx b/autodoc/source/parser/cpp/c_dealer.hxx index 64e833de622f..040bcdabeb66 100644 --- a/autodoc/source/parser/cpp/c_dealer.hxx +++ b/autodoc/source/parser/cpp/c_dealer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,32 +70,32 @@ class Distributor : public cpp::TokenDealer, /// Handle C++ code tokens. // LIFECYCLE Distributor( - ary::cpp::Gate & io_rGate ); + ary::cpp::Gate & io_rGate ); ~Distributor(); // OPERATIONS - void AssignPartners( + void AssignPartners( CharacterSource & io_rSourceText, const MacroMap & i_rValidMacros ); void StartNewFile( const csv::ploc::Path & i_file ); - virtual void Deal_Eol(); - virtual void Deal_Eof(); + virtual void Deal_Eol(); + virtual void Deal_Eof(); - virtual void Deal_CppCode( - cpp::Token & let_drToken ); + virtual void Deal_CppCode( + cpp::Token & let_drToken ); virtual void Deal_Cpp_UnblockMacro( - Tok_UnblockMacro & let_drToken ); + Tok_UnblockMacro & let_drToken ); - virtual void Deal_AdcDocu( - adoc::Token & let_drToken ); + virtual void Deal_AdcDocu( + adoc::Token & let_drToken ); virtual Distributor * AsDistributor(); private: // DATA PreProcessor aCppPreProcessor; - CodeExplorer aCodeExplorer; - adoc::DocuExplorer aDocuExplorer; + CodeExplorer aCodeExplorer; + adoc::DocuExplorer aDocuExplorer; ary::cpp::Gate * pGate; FileScope_EventHandler * pFileEventHandler; diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx index 1478496c057e..72c5612984bd 100644 --- a/autodoc/source/parser/cpp/c_rcode.cxx +++ b/autodoc/source/parser/cpp/c_rcode.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <x_parse.hxx> #include "pe_file.hxx" -const uintt C_nNO_TRY = uintt(-1); +const uintt C_nNO_TRY = uintt(-1); namespace cpp { @@ -124,10 +124,10 @@ CodeExplorer::AcknowledgeResult() { throw X_Parser( X_Parser::x_UnexpectedToken, CurToken().Text(), aGlobalParseContext.CurFileName(), aGlobalParseContext.LineCount() ); } - } break; + } break; default: csv_assert(false); - } // end switch(CurResult().eStackAction) + } // end switch(CurResult().eStackAction) } const Token & diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx index 740faaa9b9a9..ddc60b2de92d 100644 --- a/autodoc/source/parser/cpp/c_rcode.hxx +++ b/autodoc/source/parser/cpp/c_rcode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ class CodeExplorer : private TokenProcessing_Types ~CodeExplorer(); void StartNewFile(); - void Process_Token( - DYN cpp::Token & let_drToken ); + void Process_Token( + DYN cpp::Token & let_drToken ); // ACCESS FileScope_EventHandler & FileEventHandler() { return aGlobalParseContext; } @@ -79,21 +79,21 @@ class CodeExplorer : private TokenProcessing_Types private: typedef std::vector< cpp::Cpp_PE* > EnvironmentStack; - void AcknowledgeResult(); - const Token & CurToken() const; - Cpp_PE & CurEnv() const; - Cpp_PE & PushEnv() const; + void AcknowledgeResult(); + const Token & CurToken() const; + Cpp_PE & CurEnv() const; + Cpp_PE & PushEnv() const; TokenProcessing_Result & CurResult() { return aGlobalParseContext.CurResult(); } // DATA ContextForAry aGlobalParseContext; - EnvironmentStack aEnvironments; + EnvironmentStack aEnvironments; Dyn<PE_File> pPE_File; - ary::cpp::Gate * pGate; - cpp::Token * dpCurToken; + ary::cpp::Gate * pGate; + cpp::Token * dpCurToken; }; diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx index 1e224897186d..45c4e84a13ce 100644 --- a/autodoc/source/parser/cpp/cpp_pe.cxx +++ b/autodoc/source/parser/cpp/cpp_pe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,24 +40,24 @@ namespace cpp { void -Cpp_PE::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +Cpp_PE::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { - rMyEnv.SetTokenResult( i_eDone, + rMyEnv.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); } Cpp_PE::Cpp_PE( Cpp_PE * io_pParent ) - : ParseEnvironment( io_pParent ), + : ParseEnvironment( io_pParent ), rMyEnv( io_pParent->Env() ) { csv_assert(io_pParent != 0); } Cpp_PE::Cpp_PE( EnvData & i_rEnv ) - : ParseEnvironment(0), + : ParseEnvironment(0), rMyEnv(i_rEnv) { } diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx index cd3ba0af46f2..c1b0b5589857 100644 --- a/autodoc/source/parser/cpp/cpp_pe.hxx +++ b/autodoc/source/parser/cpp/cpp_pe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,32 +47,32 @@ class Cpp_PE : public ::ParseEnvironment, public TokenInterpreter { public: - typedef cpp::PeEnvironment EnvData; + typedef cpp::PeEnvironment EnvData; - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push = 0 ); + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push = 0 ); virtual Cpp_PE * Handle_ChildFailure(); // Defaulted to 0. protected: Cpp_PE( - Cpp_PE * io_pParent ); + Cpp_PE * io_pParent ); Cpp_PE( - EnvData & i_rEnv ); + EnvData & i_rEnv ); - EnvData & Env() const; + EnvData & Env() const; void StdHandlingOfSyntaxError( const char * i_sText ); private: // DATA - EnvData & rMyEnv; + EnvData & rMyEnv; }; -inline Cpp_PE::EnvData & +inline Cpp_PE::EnvData & Cpp_PE::Env() const { return rMyEnv; } diff --git a/autodoc/source/parser/cpp/cpp_tok.hxx b/autodoc/source/parser/cpp/cpp_tok.hxx index 7f4200a86dda..960ad0dc7f79 100644 --- a/autodoc/source/parser/cpp/cpp_tok.hxx +++ b/autodoc/source/parser/cpp/cpp_tok.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,14 +46,14 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual INT16 TypeId() const = 0; - virtual void DealOut( - ::TokenDealer & o_rDealer ); - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual INT16 TypeId() const = 0; + virtual void DealOut( + ::TokenDealer & o_rDealer ); + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; diff --git a/autodoc/source/parser/cpp/cx_base.cxx b/autodoc/source/parser/cpp/cx_base.cxx index dad8a50b10e0..2493a700a766 100644 --- a/autodoc/source/parser/cpp/cx_base.cxx +++ b/autodoc/source/parser/cpp/cx_base.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace cpp { Cx_Base::Cx_Base( TkpContext * io_pFollowUpContext ) - : pDealer(0), + : pDealer(0), pFollowUpContext(io_pFollowUpContext) // pNewToken { @@ -57,7 +57,7 @@ Cx_Base::PassNewToken() return false; } -TkpContext & +TkpContext & Cx_Base::FollowUpContext() { csv_assert(pFollowUpContext != 0); diff --git a/autodoc/source/parser/cpp/cx_base.hxx b/autodoc/source/parser/cpp/cx_base.hxx index 4e7ff2e3b34b..0bdbb6e5cb8f 100644 --- a/autodoc/source/parser/cpp/cx_base.hxx +++ b/autodoc/source/parser/cpp/cx_base.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class Distributor; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); @@ -57,27 +57,27 @@ class Cx_Base : public ::TkpContext protected: // LIFECYCLE Cx_Base( - TkpContext * io_pFollowUpContext ); + TkpContext * io_pFollowUpContext ); - void SetNewToken( - DYN ::TextToken * let_dpToken ); - void SetFollowUpContext( - TkpContext * io_pContext ); + void SetNewToken( + DYN ::TextToken * let_dpToken ); + void SetFollowUpContext( + TkpContext * io_pContext ); Distributor & Dealer() const; private: // DATA - Distributor * pDealer; - TkpContext * pFollowUpContext; - Dyn< ::TextToken > pNewToken; + Distributor * pDealer; + TkpContext * pFollowUpContext; + Dyn< ::TextToken > pNewToken; }; inline void -Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken ) +Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken ) { pNewToken = let_dpToken; } inline void Cx_Base::SetFollowUpContext( TkpContext * io_pContext ) diff --git a/autodoc/source/parser/cpp/cx_c_pp.cxx b/autodoc/source/parser/cpp/cx_c_pp.cxx index 9c81fe71af36..6e494e9f799a 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.cxx +++ b/autodoc/source/parser/cpp/cx_c_pp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace cpp { Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_Parent(&i_rFollowUpContext), pContext_PP_MacroParams( 0 ), pContext_PP_Definition( new Context_PP_Definition(i_rFollowUpContext) ) @@ -51,7 +51,7 @@ Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext ) } void -Context_Preprocessor::ReadCharChain( CharacterSource & io_rText ) +Context_Preprocessor::ReadCharChain( CharacterSource & io_rText ) { jumpOverWhite( io_rText ); jumpToWhite( io_rText ); @@ -87,7 +87,7 @@ Context_Preprocessor::ReadDefault( CharacterSource & io_rText ) } void -Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) +Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) { jumpOverWhite( io_rText ); io_rText.CutToken(); @@ -116,7 +116,7 @@ Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) Context_PP_MacroParams::Context_PP_MacroParams( Cx_Base & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_PP_Definition(&i_rFollowUpContext) { } @@ -150,7 +150,7 @@ Context_PP_MacroParams::ReadCharChain( CharacterSource & io_rText ) } Context_PP_Definition::Context_PP_Definition( TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_Parent(&i_rFollowUpContext) { } diff --git a/autodoc/source/parser/cpp/cx_c_pp.hxx b/autodoc/source/parser/cpp/cx_c_pp.hxx index 0b0e86d2e690..a2320fe67f62 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.hxx +++ b/autodoc/source/parser/cpp/cx_c_pp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,22 +44,22 @@ class Context_Preprocessor : public Cx_Base { public: Context_Preprocessor( - TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ); + virtual void ReadCharChain( + CharacterSource & io_rText ); virtual void AssignDealer( Distributor & o_rDealer ); private: // Locals void ReadDefault( - CharacterSource & io_rText ); + CharacterSource & io_rText ); void ReadDefine( - CharacterSource & io_rText ); + CharacterSource & io_rText ); // DATA - TkpContext * pContext_Parent; - Dyn<Cx_Base> pContext_PP_MacroParams; - Dyn<Cx_Base> pContext_PP_Definition; + TkpContext * pContext_Parent; + Dyn<Cx_Base> pContext_PP_MacroParams; + Dyn<Cx_Base> pContext_PP_Definition; }; class Context_PP_MacroParams : public Cx_Base @@ -68,25 +68,25 @@ class Context_PP_MacroParams : public Cx_Base Context_PP_MacroParams( Cx_Base & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + virtual void ReadCharChain( + CharacterSource & io_rText ); private: // DATA - Cx_Base * pContext_PP_Definition; + Cx_Base * pContext_PP_Definition; }; class Context_PP_Definition : public Cx_Base { public: Context_PP_Definition( - TkpContext & i_rFollowUpContext ); + TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + virtual void ReadCharChain( + CharacterSource & io_rText ); private: // DATA - TkpContext * pContext_Parent; + TkpContext * pContext_Parent; }; diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx index 73eed711dad4..741336280166 100644 --- a/autodoc/source/parser/cpp/cx_c_std.cxx +++ b/autodoc/source/parser/cpp/cx_c_std.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ Context_CppStd::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText); // !!! - // The order of the next two lines is essential, because + // The order of the next two lines is essential, because // pFollowUpContext may be changed by PerformStatusFunction() also, // which then MUST override the previous assignment. SetFollowUpContext(rBound.FollowUpContext()); @@ -175,9 +175,9 @@ Context_CppStd::AssignDealer( Distributor & o_rDealer ) } void -Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, - F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ) +Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, + F_CRTOK i_fTokenCreateFunction, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -233,19 +233,19 @@ Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, String sCurChar( &cCC, 1 ); throw X_Parser( X_Parser::x_InvalidChar, sCurChar, String::Null_(), 0 ); } - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_CppStd::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 top = 0; // Top-Status - const INT16 wht = 1; // Whitespace-berlese-Status - const INT16 bez = 2; // Bezeichner-lese-Status +// const INT16 top = 0; // Top-Status + const INT16 wht = 1; // Whitespace-berlese-Status + const INT16 bez = 2; // Bezeichner-lese-Status // Tokenfinish-Stati: - const INT16 finError = 3; + const INT16 finError = 3; const INT16 finIgnore = 4; const INT16 finBezeichner = 5; const INT16 finKeyword = 6; @@ -256,12 +256,12 @@ Context_CppStd::SetupStateMachine() const INT16 finEOF = 11; // Kontextwechsel-Stati: - const INT16 gotoComment = 12; - const INT16 gotoDocu = 13; + const INT16 gotoComment = 12; + const INT16 gotoDocu = 13; const INT16 gotoPreprocessor = 14; - const INT16 gotoConstString = 15; - const INT16 gotoConstChar = 16; - const INT16 gotoConstNumeric = 17; + const INT16 gotoConstString = 15; + const INT16 gotoConstChar = 16; + const INT16 gotoConstNumeric = 17; const INT16 gotoUnblockMacro = 18; // Abbreviations to be used in status tables: @@ -277,7 +277,7 @@ Context_CppStd::SetupStateMachine() /// Zeros - '0' - will be replaced by AddToken(). const INT16 A_nTopStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht, 0,wht,wht, 0,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht, 0,cst, 0,err, 0, 0,cch, 0, 0, 0, 0, 0, 0, 0, 0, @@ -289,7 +289,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nWhitespaceStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, @@ -301,7 +301,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nBezeichnerStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -314,7 +314,7 @@ Context_CppStd::SetupStateMachine() const INT16 A_nOperatorDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ... err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, @@ -326,7 +326,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nBezDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -344,38 +344,38 @@ Context_CppStd::SetupStateMachine() DYN StmArrayStatus * dpStatusBez = new StmArrayStatus( C_nStatusSize, A_nBezeichnerStatus, TCF_Identifier, true); - DYN StmBoundsStatus * dpBst_finError + DYN StmBoundsStatus * dpBst_finError = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true ); - DYN StmBoundsStatus * dpBst_finIgnore + DYN StmBoundsStatus * dpBst_finIgnore = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true ); - DYN StmBoundsStatus * dpBst_finBezeichner + DYN StmBoundsStatus * dpBst_finBezeichner = new StmBoundsStatus( *this, *this, nF_fin_Bezeichner, true ); - DYN StmBoundsStatus * dpBst_finKeyword + DYN StmBoundsStatus * dpBst_finKeyword = new StmBoundsStatus( *this, *this, nF_fin_CreateWithoutText, false ); - DYN StmBoundsStatus * dpBst_finPunctuation + DYN StmBoundsStatus * dpBst_finPunctuation = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finBiType + DYN StmBoundsStatus * dpBst_finBiType = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finTypeModifier + DYN StmBoundsStatus * dpBst_finTypeModifier = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finEOL + DYN StmBoundsStatus * dpBst_finEOL = new StmBoundsStatus( *this, *this, nF_fin_EOL, false ); - DYN StmBoundsStatus * dpBst_finEOF + DYN StmBoundsStatus * dpBst_finEOF = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_EOF, false ); - DYN StmBoundsStatus * dpBst_gotoComment + DYN StmBoundsStatus * dpBst_gotoComment = new StmBoundsStatus( *this, *pContext_Comment, nF_goto_Comment, false ); - DYN StmBoundsStatus * dpBst_gotoDocu + DYN StmBoundsStatus * dpBst_gotoDocu = new StmBoundsStatus( *this, *pDocuContext, nF_goto_Docu, false ); - DYN StmBoundsStatus * dpBst_gotoPreprocessor + DYN StmBoundsStatus * dpBst_gotoPreprocessor = new StmBoundsStatus( *this, *pContext_Preprocessor, nF_goto_Preprocessor, false ); - DYN StmBoundsStatus * dpBst_gotoConstString + DYN StmBoundsStatus * dpBst_gotoConstString = new StmBoundsStatus( *this, *pContext_ConstString, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoConstChar + DYN StmBoundsStatus * dpBst_gotoConstChar = new StmBoundsStatus( *this, *pContext_ConstChar, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoConstNumeric + DYN StmBoundsStatus * dpBst_gotoConstNumeric = new StmBoundsStatus( *this, *pContext_ConstNumeric, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoUnblockMacro + DYN StmBoundsStatus * dpBst_gotoUnblockMacro = new StmBoundsStatus( *this, *pContext_UnblockMacro, nF_goto_UnblockMacro, false ); // dpMain aufbauen: @@ -482,47 +482,47 @@ Context_CppStd::SetupStateMachine() aStateMachine.AddToken(">>=",TCF_Operator,A_nOperatorDefStatus,finPunctuation); // Builtin types - aStateMachine.AddToken("char", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("short", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("int", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("long", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("float", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("double",TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("wchar_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("size_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("char", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("short", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("int", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("long", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("float", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("double",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("wchar_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("size_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); // Type modifiers - aStateMachine.AddToken("signed", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); - aStateMachine.AddToken("unsigned", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); + aStateMachine.AddToken("signed", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); + aStateMachine.AddToken("unsigned", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); // To ignore - aStateMachine.AddToken("auto", 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); - aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore); + aStateMachine.AddToken("auto", 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); + aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore); // Context changers - aStateMachine.AddToken("#", 0, A_nOperatorDefStatus, gotoPreprocessor); - aStateMachine.AddToken("#undef",0, A_nOperatorDefStatus, gotoPreprocessor); + aStateMachine.AddToken("#", 0, A_nOperatorDefStatus, gotoPreprocessor); + aStateMachine.AddToken("#undef",0, A_nOperatorDefStatus, gotoPreprocessor); aStateMachine.AddToken("#unblock-", - 0, A_nOperatorDefStatus, gotoUnblockMacro); - aStateMachine.AddToken("/*", 0, A_nOperatorDefStatus, gotoComment); - aStateMachine.AddToken("//", 0, A_nOperatorDefStatus, gotoComment); - aStateMachine.AddToken("/**", 0, A_nOperatorDefStatus, gotoDocu); - aStateMachine.AddToken("///", 0, A_nOperatorDefStatus, gotoDocu); + 0, A_nOperatorDefStatus, gotoUnblockMacro); + aStateMachine.AddToken("/*", 0, A_nOperatorDefStatus, gotoComment); + aStateMachine.AddToken("//", 0, A_nOperatorDefStatus, gotoComment); + aStateMachine.AddToken("/**", 0, A_nOperatorDefStatus, gotoDocu); + aStateMachine.AddToken("///", 0, A_nOperatorDefStatus, gotoDocu); // Line ends - // regular - aStateMachine.AddToken("\r\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL); - // To ignore in some cases(may be only at preprocessor?), but - // linecount has to be incremented. - aStateMachine.AddToken("\\\r\n",0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\\\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\\\r", 0, A_nOperatorDefStatus, finEOL); + // regular + aStateMachine.AddToken("\r\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL); + // To ignore in some cases(may be only at preprocessor?), but + // linecount has to be incremented. + aStateMachine.AddToken("\\\r\n",0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\\\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\\\r", 0, A_nOperatorDefStatus, finEOL); }; diff --git a/autodoc/source/parser/cpp/cx_c_std.hxx b/autodoc/source/parser/cpp/cx_c_std.hxx index fac94a548877..fadbde3caf78 100644 --- a/autodoc/source/parser/cpp/cx_c_std.hxx +++ b/autodoc/source/parser/cpp/cx_c_std.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,27 +49,27 @@ class Context_CppStd : public Cx_Base, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_CppStd( DYN autodoc::TkpDocuContext & - let_drContext_Docu ); + let_drContext_Docu ); ~Context_CppStd(); - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); virtual void AssignDealer( Distributor & o_rDealer ); private: - // SERVICE FUNCTIONS - void PerformStatusFunction( - uintt i_nStatusSignal, + // SERVICE FUNCTIONS + void PerformStatusFunction( + uintt i_nStatusSignal, StmArrayStatus::F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ); - void SetupStateMachine(); + CharacterSource & io_rText ); + void SetupStateMachine(); - // DATA - StateMachine aStateMachine; + // DATA + StateMachine aStateMachine; // Contexts Dyn<autodoc::TkpDocuContext> @@ -77,7 +77,7 @@ class Context_CppStd : public Cx_Base, Dyn<Context_Comment> pContext_Comment; - Dyn<Cx_Base> pContext_Preprocessor; + Dyn<Cx_Base> pContext_Preprocessor; Dyn<Cx_Base> pContext_ConstString; Dyn<Cx_Base> pContext_ConstChar; Dyn<Cx_Base> pContext_ConstNumeric; diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx index 76e5779312b4..9031342efc99 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.cxx +++ b/autodoc/source/parser/cpp/cx_c_sub.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ namespace cpp { void -Context_Comment::ReadCharChain( CharacterSource & io_rText ) +Context_Comment::ReadCharChain( CharacterSource & io_rText ) { // KORR_FUTURE - // Counting of lines must be implemented. + // Counting of lines must be implemented. if (bCurrentModeIsMultiline) { char cNext = NULCH; @@ -88,14 +88,14 @@ Context_Comment::ReadCharChain( CharacterSource & io_rText ) void -Context_ConstString::ReadCharChain( CharacterSource & io_rText ) +Context_ConstString::ReadCharChain( CharacterSource & io_rText ) { char cNext = io_rText.MoveOn(); while (cNext != '"') - { // Get one complete string constant: "...." + { // Get one complete string constant: "...." while (cNext != '"' AND cNext != '\\') - { // Get string till next '\\' + { // Get string till next '\\' cNext = io_rText.MoveOn(); } if (cNext == '\\') @@ -109,14 +109,14 @@ Context_ConstString::ReadCharChain( CharacterSource & io_rText ) } void -Context_ConstChar::ReadCharChain( CharacterSource & io_rText ) +Context_ConstChar::ReadCharChain( CharacterSource & io_rText ) { char cNext = io_rText.MoveOn(); while (cNext != '\'') - { // Get one complete char constant: "...." + { // Get one complete char constant: "...." while (cNext != '\'' AND cNext != '\\') - { // Get string till next '\\' + { // Get string till next '\\' cNext = io_rText.MoveOn(); } if (cNext == '\\') @@ -143,7 +143,7 @@ Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText) cNext = io_rText.MoveOn(); if (cNext == '+' OR cNext == '-') cNext = io_rText.MoveOn(); - } // endif + } // endif } while (isalnum(cNext) OR cNext == '.'); // Reicht aus, wenn Zahlen korrekt geschrieben sind SetNewToken(new Tok_Constant(io_rText.CutToken())); } diff --git a/autodoc/source/parser/cpp/cx_c_sub.hxx b/autodoc/source/parser/cpp/cx_c_sub.hxx index 6e2d3d8807ed..8f7c12f67d0b 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.hxx +++ b/autodoc/source/parser/cpp/cx_c_sub.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,55 +44,55 @@ class Context_Comment : public Cx_Base { public: Context_Comment( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetMode_IsMultiLine( - bool i_bTrue ) + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetMode_IsMultiLine( + bool i_bTrue ) { bCurrentModeIsMultiline = i_bTrue; } private: - bool bCurrentModeIsMultiline; + bool bCurrentModeIsMultiline; }; class Context_ConstString : public Cx_Base { public: Context_ConstString( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_ConstChar : public Cx_Base { public: Context_ConstChar( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_ConstNumeric : public Cx_Base { public: Context_ConstNumeric( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_UnblockMacro : public Cx_Base { public: Context_UnblockMacro( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; diff --git a/autodoc/source/parser/cpp/cxt2ary.cxx b/autodoc/source/parser/cpp/cxt2ary.cxx index eda70ca1045e..8a1deaef854f 100644 --- a/autodoc/source/parser/cpp/cxt2ary.cxx +++ b/autodoc/source/parser/cpp/cxt2ary.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,9 +117,9 @@ ContextForAry::inq_CurProtection() const } void -ContextForAry::do_SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +ContextForAry::do_SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { aTokenResult.eDone = i_eDone; aTokenResult.eStackAction = i_eWhat2DoWithEnvStack; @@ -148,7 +148,7 @@ ContextForAry::do_OpenClass( ary::cpp::Class & io_rOpenedClass ) } void -ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) +ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) { pOwnerStack->OpenEnum(io_rOpenedEnum); pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedEnum); diff --git a/autodoc/source/parser/cpp/cxt2ary.hxx b/autodoc/source/parser/cpp/cxt2ary.hxx index 9006aefa645e..1e3b142856e0 100644 --- a/autodoc/source/parser/cpp/cxt2ary.hxx +++ b/autodoc/source/parser/cpp/cxt2ary.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ class ContextForAry : public ary::cpp::InputContext, // LIFECYCLE ContextForAry( ary::cpp::Gate & io_rAryGate ); - virtual ~ContextForAry(); + virtual ~ContextForAry(); // OPERATIONS void ResetResult() { aTokenResult.Reset(); } @@ -105,18 +105,18 @@ class ContextForAry : public ary::cpp::InputContext, // Interface PeEnvironment virtual void do_SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ); + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ); virtual void do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ); virtual void do_OpenExternC( - bool i_bOnlyForOneDeclaration ); + bool i_bOnlyForOneDeclaration ); virtual void do_OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); virtual void do_OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); virtual void do_CloseBlock(); virtual void do_CloseClass(); virtual void do_CloseEnum(); @@ -160,7 +160,7 @@ class ContextForAry : public ary::cpp::InputContext, inq_AryGate() const; virtual const ary::cpp::InputContext & inq_Context() const; - virtual String inq_CurFileName() const; + virtual String inq_CurFileName() const; virtual uintt inq_LineCount() const; virtual bool inq_IsWaitingFor_Recovery() const; virtual bool inq_IsExternC() const; diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx index c233a5d93be4..e4751427f4be 100644 --- a/autodoc/source/parser/cpp/defdescr.cxx +++ b/autodoc/source/parser/cpp/defdescr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/defdescr.hxx b/autodoc/source/parser/cpp/defdescr.hxx index 3980ea7c77fa..feb78a7cf338 100644 --- a/autodoc/source/parser/cpp/defdescr.hxx +++ b/autodoc/source/parser/cpp/defdescr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/fevnthdl.hxx b/autodoc/source/parser/cpp/fevnthdl.hxx index 0198f404f588..1068448e04a7 100644 --- a/autodoc/source/parser/cpp/fevnthdl.hxx +++ b/autodoc/source/parser/cpp/fevnthdl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace cpp { -/** This is an interface, which accepts the file scope events that may +/** This is an interface, which accepts the file scope events that may be important for parsing. It is implementation-dependant, where to put or what to do with them. */ @@ -64,7 +64,7 @@ class FileScope_EventHandler // OPERATIONS void SetCurFile( - ary::loc::File & io_rCurFile ); + ary::loc::File & io_rCurFile ); void Event_IncrLineCount(); void Event_SwBracketOpen(); void Event_SwBracketClose(); @@ -72,7 +72,7 @@ class FileScope_EventHandler private: virtual void do_SetCurFile( - ary::loc::File & io_rCurFile ) = 0; + ary::loc::File & io_rCurFile ) = 0; virtual void do_Event_IncrLineCount() = 0; virtual void do_Event_SwBracketOpen() = 0; virtual void do_Event_SwBracketClose() = 0; diff --git a/autodoc/source/parser/cpp/icprivow.cxx b/autodoc/source/parser/cpp/icprivow.cxx index 8202e12862e7..526236f563ab 100644 --- a/autodoc/source/parser/cpp/icprivow.cxx +++ b/autodoc/source/parser/cpp/icprivow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/icprivow.hxx b/autodoc/source/parser/cpp/icprivow.hxx index 5321df48e34a..bf688a7cc924 100644 --- a/autodoc/source/parser/cpp/icprivow.hxx +++ b/autodoc/source/parser/cpp/icprivow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/pe_base.cxx b/autodoc/source/parser/cpp/pe_base.cxx index 0a4c823a47a4..a4ff9857e079 100644 --- a/autodoc/source/parser/cpp/pe_base.cxx +++ b/autodoc/source/parser/cpp/pe_base.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ PE_Base::PE_Base( Cpp_PE * i_pParent ) Setup_StatusFunctions(); aBaseIds.reserve(4); - pSpType = new SP_Type(*this); - pSpuBaseName = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName); + pSpType = new SP_Type(*this); + pSpuBaseName = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName); } @@ -74,25 +74,25 @@ PE_Base::Call_Handler( const cpp::Token & i_rTok ) void PE_Base::Setup_StatusFunctions() { - typedef CallFunction<PE_Base>::F_Tok F_Tok; - static F_Tok stateF_startOfNext[] = { &PE_Base::On_startOfNext_Identifier, + typedef CallFunction<PE_Base>::F_Tok F_Tok; + static F_Tok stateF_startOfNext[] = { &PE_Base::On_startOfNext_Identifier, &PE_Base::On_startOfNext_public, &PE_Base::On_startOfNext_protected, &PE_Base::On_startOfNext_private, &PE_Base::On_startOfNext_virtual, &PE_Base::On_startOfNext_DoubleColon }; - static INT16 stateT_startOfNext[] = { Tid_Identifier, + static INT16 stateT_startOfNext[] = { Tid_Identifier, Tid_public, Tid_protected, Tid_private, Tid_virtual, Tid_DoubleColon }; - static F_Tok stateF_inName[] = { &PE_Base::On_inName_Identifier, + static F_Tok stateF_inName[] = { &PE_Base::On_inName_Identifier, &PE_Base::On_inName_virtual, &PE_Base::On_inName_SwBracket_Left, &PE_Base::On_inName_DoubleColon, &PE_Base::On_inName_Comma }; - static INT16 stateT_inName[] = { Tid_Identifier, + static INT16 stateT_inName[] = { Tid_Identifier, Tid_virtual, Tid_SwBracket_Left, Tid_DoubleColon, diff --git a/autodoc/source/parser/cpp/pe_base.hxx b/autodoc/source/parser/cpp/pe_base.hxx index 0a39160b6a19..933d596b7f35 100644 --- a/autodoc/source/parser/cpp/pe_base.hxx +++ b/autodoc/source/parser/cpp/pe_base.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,45 +62,45 @@ class PE_Base : public Cpp_PE Cpp_PE * i_pParent ); ~PE_Base(); - const BaseList & Result_BaseIds() const; + const BaseList & Result_BaseIds() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Base, PE_Type > SP_Type; - typedef SubPeUse< PE_Base, PE_Type> SPU_BaseName; + typedef SubPe< PE_Base, PE_Type > SP_Type; + typedef SubPeUse< PE_Base, PE_Type> SPU_BaseName; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void SpReturn_BaseName(); + void SpReturn_BaseName(); - void On_startOfNext_Identifier(const char *); - void On_startOfNext_public(const char *); - void On_startOfNext_protected(const char *); - void On_startOfNext_private(const char *); - void On_startOfNext_virtual(const char *); - void On_startOfNext_DoubleColon(const char *); + void On_startOfNext_Identifier(const char *); + void On_startOfNext_public(const char *); + void On_startOfNext_protected(const char *); + void On_startOfNext_private(const char *); + void On_startOfNext_virtual(const char *); + void On_startOfNext_DoubleColon(const char *); - void On_inName_Identifier(const char *); - void On_inName_virtual(const char *); - void On_inName_SwBracket_Left(const char *); - void On_inName_DoubleColon(const char *); - void On_inName_Comma(const char *); + void On_inName_Identifier(const char *); + void On_inName_virtual(const char *); + void On_inName_SwBracket_Left(const char *); + void On_inName_DoubleColon(const char *); + void On_inName_Comma(const char *); - Base & CurObject(); + Base & CurObject(); // DATA Dyn< PeStatusArray<PE_Base> > pStati; - Dyn<SP_Type> pSpType; /// till "{" incl. - Dyn<SPU_BaseName> pSpuBaseName; + Dyn<SP_Type> pSpType; /// till "{" incl. + Dyn<SPU_BaseName> pSpuBaseName; - BaseList aBaseIds; + BaseList aBaseIds; }; diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx index 1b4910aff9be..5a4d24655deb 100644 --- a/autodoc/source/parser/cpp/pe_class.cxx +++ b/autodoc/source/parser/cpp/pe_class.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,15 +75,15 @@ PE_Class::PE_Class(Cpp_PE * i_pParent ) pSpIgnore = new SP_Ignore(*this); pSpDefs = new SP_Defines(*this); - pSpuBase = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base); - pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); + pSpuBase = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base); + pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, 0); pSpuTemplate= new SPU_Ignore(*pSpIgnore, 0, 0); pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); pSpuIgnoreFailure = new SPU_Ignore(*pSpIgnore, 0, 0); - pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); + pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); } @@ -92,7 +92,7 @@ PE_Class::~PE_Class() } void -PE_Class::Call_Handler( const cpp::Token & i_rTok ) +PE_Class::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -107,32 +107,32 @@ PE_Class::Handle_ChildFailure() void 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[] = { &PE_Class::On_start_class, + static F_Tok stateF_start[] = { &PE_Class::On_start_class, &PE_Class::On_start_struct, &PE_Class::On_start_union }; - static INT16 stateT_start[] = { Tid_class, + static INT16 stateT_start[] = { Tid_class, Tid_struct, Tid_union }; - static F_Tok stateF_expectName[] = { &PE_Class::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_Class::On_expectName_Identifier, &PE_Class::On_expectName_SwBracket_Left, &PE_Class::On_expectName_Colon }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_SwBracket_Left, Tid_Colon }; - static F_Tok stateF_gotName[] = { &PE_Class::On_gotName_SwBracket_Left, + static F_Tok stateF_gotName[] = { &PE_Class::On_gotName_SwBracket_Left, &PE_Class::On_gotName_Semicolon, &PE_Class::On_gotName_Colon }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left, + static INT16 stateT_gotName[] = { Tid_SwBracket_Left, Tid_Semicolon, Tid_Colon }; - static F_Tok stateF_bodyStd[] = { &PE_Class::On_bodyStd_VarFunc, + static F_Tok stateF_bodyStd[] = { &PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_ClassKey, &PE_Class::On_bodyStd_ClassKey, @@ -166,7 +166,7 @@ PE_Class::Setup_StatusFunctions() &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_class, Tid_struct, @@ -200,11 +200,11 @@ PE_Class::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon }; - static INT16 stateT_inProtection[] = { Tid_Colon }; + static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon }; + static INT16 stateT_inProtection[] = { Tid_Colon }; - static F_Tok stateF_afterDecl[] = { &PE_Class::On_afterDecl_Semicolon }; - static INT16 stateT_afterDecl[] = { Tid_Semicolon }; + static F_Tok stateF_afterDecl[] = { &PE_Class::On_afterDecl_Semicolon }; + static INT16 stateT_afterDecl[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Class, expectName, Hdl_SyntaxError); @@ -381,14 +381,14 @@ PE_Class::On_bodyStd_VarFunc( const char * ) void PE_Class::On_bodyStd_ClassKey( const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // classes are parsed via PE_Type. } void PE_Class::On_bodyStd_enum( const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // enums are parsed via PE_Type. } diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx index d94123a26265..518594ed787e 100644 --- a/autodoc/source/parser/cpp/pe_class.hxx +++ b/autodoc/source/parser/cpp/pe_class.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,10 +71,10 @@ class PE_Class : public cpp::Cpp_PE public: enum E_State { - start, /// before class, struct or union - expectName, /// after class, struct or union - gotName, /// after name, before : or { - bodyStd, /// after { + start, /// before class, struct or union + expectName, /// after class, struct or union + gotName, /// after name, before : or { + bodyStd, /// after { inProtection, /// after public, protected or private and before ":" afterDecl, /// after ending } size_of_states @@ -82,114 +82,114 @@ class PE_Class : public cpp::Cpp_PE enum E_KindOfResult { - is_declaration, // normal + is_declaration, // normal is_implicit_declaration, // like in: class Abc { public int n; } aAbc; - is_predeclaration, // like: class Abc; - is_qualified_typename // like in: class Abc * fx(); + is_predeclaration, // like: class Abc; + is_qualified_typename // like in: class Abc * fx(); }; PE_Class( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Class(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); virtual Cpp_PE * Handle_ChildFailure(); - E_KindOfResult Result_KindOf() const; - const String & Result_LocalName() const; - const String & Result_FirstNameSegment() const; + E_KindOfResult Result_KindOf() const; + const String & Result_LocalName() const; + const String & Result_FirstNameSegment() const; private: - typedef SubPe< PE_Class, PE_Base > SP_Base; -// typedef SubPe< PE_Class, PE_Enum> SP_Enum; - typedef SubPe< PE_Class, PE_Typedef> SP_Typedef; - typedef SubPe< PE_Class, PE_VarFunc> SP_VarFunc; - typedef SubPe< PE_Class, PE_Ignore > SP_Ignore; - typedef SubPe< PE_Class, PE_Defines> SP_Defines; - - typedef SubPeUse< PE_Class, PE_Base> SPU_Base; -// typedef SubPeUse< PE_Class, PE_Enum> SPU_Enum; - typedef SubPeUse< PE_Class, PE_Typedef> SPU_Typedef; - typedef SubPeUse< PE_Class, PE_VarFunc> SPU_VarFunc; - typedef SubPeUse< PE_Class, PE_Ignore> SPU_Ignore; - typedef SubPeUse< PE_Class, PE_Defines> SPU_Defines; + typedef SubPe< PE_Class, PE_Base > SP_Base; +// typedef SubPe< PE_Class, PE_Enum> SP_Enum; + typedef SubPe< PE_Class, PE_Typedef> SP_Typedef; + typedef SubPe< PE_Class, PE_VarFunc> SP_VarFunc; + typedef SubPe< PE_Class, PE_Ignore > SP_Ignore; + typedef SubPe< PE_Class, PE_Defines> SP_Defines; + + typedef SubPeUse< PE_Class, PE_Base> SPU_Base; +// typedef SubPeUse< PE_Class, PE_Enum> SPU_Enum; + typedef SubPeUse< PE_Class, PE_Typedef> SPU_Typedef; + typedef SubPeUse< PE_Class, PE_VarFunc> SPU_VarFunc; + typedef SubPeUse< PE_Class, PE_Ignore> SPU_Ignore; + typedef SubPeUse< PE_Class, PE_Defines> SPU_Defines; typedef ary::cpp::List_Bases BaseList; typedef ary::cpp::S_Classes_Base Base; typedef ary::cpp::E_Protection E_Protection; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - void Init_CurObject(); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + void Init_CurObject(); - void SpReturn_Base(); + void SpReturn_Base(); - void On_start_class( const char * ); - void On_start_struct( const char * ); - void On_start_union( const char * ); + void On_start_class( const char * ); + void On_start_struct( const char * ); + void On_start_union( const char * ); - void On_expectName_Identifier( const char * ); - void On_expectName_SwBracket_Left( const char * ); - void On_expectName_Colon( const char * ); + void On_expectName_Identifier( const char * ); + void On_expectName_SwBracket_Left( const char * ); + void On_expectName_Colon( const char * ); - void On_gotName_SwBracket_Left( const char * ); - void On_gotName_Semicolon( const char * ); - void On_gotName_Colon( const char * ); + void On_gotName_SwBracket_Left( const char * ); + void On_gotName_Semicolon( const char * ); + void On_gotName_Colon( const char * ); void On_gotName_Return2Type( const char * ); - void On_bodyStd_VarFunc( const char * ); - void On_bodyStd_ClassKey( const char * ); - void On_bodyStd_enum( const char * ); - void On_bodyStd_typedef( const char * ); - void On_bodyStd_public( const char * ); - void On_bodyStd_protected( const char * ); - void On_bodyStd_private( const char * ); - void On_bodyStd_template( const char * ); - void On_bodyStd_friend( const char * ); - void On_bodyStd_using( const char * ); - void On_bodyStd_SwBracket_Right( const char * ); - void On_bodyStd_DefineName(const char * ); - void On_bodyStd_MacroName(const char * ); - - void On_inProtection_Colon( const char * ); - - void On_afterDecl_Semicolon( const char * ); + void On_bodyStd_VarFunc( const char * ); + void On_bodyStd_ClassKey( const char * ); + void On_bodyStd_enum( const char * ); + void On_bodyStd_typedef( const char * ); + void On_bodyStd_public( const char * ); + void On_bodyStd_protected( const char * ); + void On_bodyStd_private( const char * ); + void On_bodyStd_template( const char * ); + void On_bodyStd_friend( const char * ); + void On_bodyStd_using( const char * ); + void On_bodyStd_SwBracket_Right( const char * ); + void On_bodyStd_DefineName(const char * ); + void On_bodyStd_MacroName(const char * ); + + void On_inProtection_Colon( const char * ); + + void On_afterDecl_Semicolon( const char * ); void On_afterDecl_Return2Type( const char * ); // DATA Dyn< PeStatusArray<PE_Class> > pStati; - Dyn<SP_Base> pSpBase; -// Dyn<SP_Enum> pSpEnum; - Dyn<SP_Typedef> pSpTypedef; - Dyn<SP_VarFunc> pSpVarFunc; - Dyn<SP_Ignore> pSpIgnore; - Dyn<SP_Defines> pSpDefs; + Dyn<SP_Base> pSpBase; +// Dyn<SP_Enum> pSpEnum; + Dyn<SP_Typedef> pSpTypedef; + Dyn<SP_VarFunc> pSpVarFunc; + Dyn<SP_Ignore> pSpIgnore; + Dyn<SP_Defines> pSpDefs; - Dyn<SPU_Base> pSpuBase; -// Dyn<SPU_Enum> pSpuEnum; - Dyn<SPU_Typedef> pSpuTypedef; - Dyn<SPU_VarFunc> pSpuVarFunc; + Dyn<SPU_Base> pSpuBase; +// Dyn<SPU_Enum> pSpuEnum; + Dyn<SPU_Typedef> pSpuTypedef; + Dyn<SPU_VarFunc> pSpuVarFunc; - Dyn<SPU_Ignore> pSpuTemplate; - Dyn<SPU_Ignore> pSpuUsing; - Dyn<SPU_Ignore> pSpuIgnoreFailure; - Dyn<SPU_Defines> pSpuDefs; + Dyn<SPU_Ignore> pSpuTemplate; + Dyn<SPU_Ignore> pSpuUsing; + Dyn<SPU_Ignore> pSpuIgnoreFailure; + Dyn<SPU_Defines> pSpuDefs; String sLocalName; ary::cpp::E_ClassKey eClassKey; - ary::cpp::Class * pCurObject; + ary::cpp::Class * pCurObject; BaseList aBases; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; }; @@ -240,7 +240,7 @@ public, protected, private -> Protection declaration friend - -> Friend Class + -> Friend Class -> Friend Function virtual diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx index d599ea9de1eb..fc2515336cf7 100644 --- a/autodoc/source/parser/cpp/pe_defs.cxx +++ b/autodoc/source/parser/cpp/pe_defs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,16 +68,16 @@ PE_Defines::Call_Handler( const cpp::Token & i_rTok ) void PE_Defines::Setup_StatusFunctions() { - typedef CallFunction<PE_Defines>::F_Tok F_Tok; - static F_Tok stateF_expectName[] = { &PE_Defines::On_expectName_DefineName, + typedef CallFunction<PE_Defines>::F_Tok F_Tok; + static F_Tok stateF_expectName[] = { &PE_Defines::On_expectName_DefineName, &PE_Defines::On_expectName_MacroName }; - static INT16 stateT_expectName[] = { Tid_DefineName, + static INT16 stateT_expectName[] = { Tid_DefineName, Tid_MacroName }; 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[] = { &PE_Defines::On_expectMacroParameters_MacroParameter, diff --git a/autodoc/source/parser/cpp/pe_defs.hxx b/autodoc/source/parser/cpp/pe_defs.hxx index 955dadef7828..b179dda868f8 100644 --- a/autodoc/source/parser/cpp/pe_defs.hxx +++ b/autodoc/source/parser/cpp/pe_defs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,22 +58,22 @@ class PE_Defines : public cpp::Cpp_PE }; PE_Defines( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Defines(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_expectName_DefineName( const char * ); - void On_expectName_MacroName( const char * ); + void On_expectName_DefineName( const char * ); + void On_expectName_MacroName( const char * ); - void On_gotDefineName_PreProDefinition( const char * ); + void On_gotDefineName_PreProDefinition( const char * ); void On_expectMacroParameters_MacroParameter( const char * ); void On_expectMacroParameters_PreProDefinition( const char * ); diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx index b56ffc96380b..abed323dcc4e 100644 --- a/autodoc/source/parser/cpp/pe_enum.cxx +++ b/autodoc/source/parser/cpp/pe_enum.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ PE_Enum::PE_Enum(Cpp_PE * i_pParent ) Setup_StatusFunctions(); pSpValue = new SP_EnumValue(*this); - pSpuValue = new SPU_EnumValue(*pSpValue, 0, 0); + pSpuValue = new SPU_EnumValue(*pSpValue, 0, 0); } @@ -70,24 +70,24 @@ PE_Enum::Call_Handler( const cpp::Token & i_rTok ) void PE_Enum::Setup_StatusFunctions() { - typedef CallFunction<PE_Enum>::F_Tok F_Tok; - static F_Tok stateF_expectName[] = { &PE_Enum::On_expectName_Identifier, + typedef CallFunction<PE_Enum>::F_Tok F_Tok; + static F_Tok stateF_expectName[] = { &PE_Enum::On_expectName_Identifier, &PE_Enum::On_expectName_SwBracket_Left }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_SwBracket_Left }; - static F_Tok stateF_gotName[] = { &PE_Enum::On_gotName_SwBracket_Left }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left }; + static F_Tok stateF_gotName[] = { &PE_Enum::On_gotName_SwBracket_Left }; + static INT16 stateT_gotName[] = { Tid_SwBracket_Left }; - static F_Tok stateF_bodyStd[] = { &PE_Enum::On_bodyStd_Identifier, + static F_Tok stateF_bodyStd[] = { &PE_Enum::On_bodyStd_Identifier, &PE_Enum::On_bodyStd_SwBracket_Right }; - static INT16 stateT_bodyStd[] = { Tid_Identifier, + static INT16 stateT_bodyStd[] = { Tid_Identifier, Tid_SwBracket_Right }; - static F_Tok stateF_afterBlock[] = { &PE_Enum::On_afterBlock_Semicolon }; - static INT16 stateT_afterBlock[] = { Tid_Semicolon }; + static F_Tok stateF_afterBlock[] = { &PE_Enum::On_afterBlock_Semicolon }; + static INT16 stateT_afterBlock[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Enum, gotName, On_gotName_Return2Type); diff --git a/autodoc/source/parser/cpp/pe_enum.hxx b/autodoc/source/parser/cpp/pe_enum.hxx index 8d7484a9a6df..8cae60ce9dd1 100644 --- a/autodoc/source/parser/cpp/pe_enum.hxx +++ b/autodoc/source/parser/cpp/pe_enum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,62 +52,62 @@ class PE_Enum : public cpp::Cpp_PE public: enum E_State { - expectName, /// after "enum" - gotName, /// after name, before : or { - bodyStd, /// after { + expectName, /// after "enum" + gotName, /// after name, before : or { + bodyStd, /// after { afterBlock, /// after ending } size_of_states }; enum E_KindOfResult { - is_declaration, // normal + is_declaration, // normal is_implicit_declaration, // like in: enum Abc { rot, gelb, blau } aAbc; - is_qualified_typename // like in: enum Abc * fx(); + is_qualified_typename // like in: enum Abc * fx(); }; PE_Enum( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Enum(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); - E_KindOfResult Result_KindOf() const; - const String & Result_LocalName() const; - const String & Result_FirstNameSegment() const; + E_KindOfResult Result_KindOf() const; + const String & Result_LocalName() const; + const String & Result_FirstNameSegment() const; private: - typedef SubPe< PE_Enum, PE_EnumValue > SP_EnumValue; - typedef SubPeUse< PE_Enum, PE_EnumValue> SPU_EnumValue; + typedef SubPe< PE_Enum, PE_EnumValue > SP_EnumValue; + typedef SubPeUse< PE_Enum, PE_EnumValue> SPU_EnumValue; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_expectName_Identifier( const char * ); - void On_expectName_SwBracket_Left( const char * ); + void On_expectName_Identifier( const char * ); + void On_expectName_SwBracket_Left( const char * ); - void On_gotName_SwBracket_Left( const char * ); + void On_gotName_SwBracket_Left( const char * ); void On_gotName_Return2Type( const char * ); - void On_bodyStd_Identifier( const char * ); - void On_bodyStd_SwBracket_Right( const char * ); + void On_bodyStd_Identifier( const char * ); + void On_bodyStd_SwBracket_Right( const char * ); - void On_afterBlock_Semicolon( const char * ); - void On_afterBlock_Return2Type( const char * ); + void On_afterBlock_Semicolon( const char * ); + void On_afterBlock_Return2Type( const char * ); // DATA Dyn< PeStatusArray<PE_Enum> > pStati; - Dyn<SP_EnumValue> pSpValue; - Dyn<SPU_EnumValue> pSpuValue; + Dyn<SP_EnumValue> pSpValue; + Dyn<SPU_EnumValue> pSpuValue; String sLocalName; - ary::cpp::Enum * pCurObject; + ary::cpp::Enum * pCurObject; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; }; diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx index 0480047fb10b..88b09779dbd2 100644 --- a/autodoc/source/parser/cpp/pe_enval.cxx +++ b/autodoc/source/parser/cpp/pe_enval.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ PE_EnumValue::~PE_EnumValue() } void -PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) +PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -66,21 +66,21 @@ PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) void 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[] = { &PE_EnumValue::On_start_Identifier }; - static INT16 stateT_start[] = { Tid_Identifier }; + static F_Tok stateF_start[] = { &PE_EnumValue::On_start_Identifier }; + static INT16 stateT_start[] = { Tid_Identifier }; - static F_Tok stateF_afterName[] = { &PE_EnumValue::On_afterName_SwBracket_Right, + static F_Tok stateF_afterName[] = { &PE_EnumValue::On_afterName_SwBracket_Right, &PE_EnumValue::On_afterName_Comma, &PE_EnumValue::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_SwBracket_Right, + static INT16 stateT_afterName[] = { Tid_SwBracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_expectFinish[] = { &PE_EnumValue::On_expectFinish_SwBracket_Right, + static F_Tok stateF_expectFinish[] = { &PE_EnumValue::On_expectFinish_SwBracket_Right, &PE_EnumValue::On_expectFinish_Comma }; - static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right, + static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right, Tid_Comma }; SEMPARSE_CREATE_STATUS(PE_EnumValue, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_enval.hxx b/autodoc/source/parser/cpp/pe_enval.hxx index 5cfdd5f447af..dde11b137e28 100644 --- a/autodoc/source/parser/cpp/pe_enval.hxx +++ b/autodoc/source/parser/cpp/pe_enval.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,35 +52,35 @@ class PE_EnumValue : public Cpp_PE { start, // before name afterName, - expectFinish, // after init-expression + expectFinish, // after init-expression size_of_states }; PE_EnumValue( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_EnumValue(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_EnumValue, PE_Expression > SP_Expression; - typedef SubPeUse< PE_EnumValue, PE_Expression> SPU_Expression; + typedef SubPe< PE_EnumValue, PE_Expression > SP_Expression; + typedef SubPeUse< PE_EnumValue, PE_Expression> SPU_Expression; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); void SpReturn_InitExpression(); - void On_start_Identifier(const char * ); + void On_start_Identifier(const char * ); - void On_afterName_SwBracket_Right(const char * ); - void On_afterName_Comma(const char * ); - void On_afterName_Assign(const char * ); + void On_afterName_SwBracket_Right(const char * ); + void On_afterName_Comma(const char * ); + void On_afterName_Assign(const char * ); - void On_expectFinish_SwBracket_Right(const char * ); - void On_expectFinish_Comma(const char * ); + void On_expectFinish_SwBracket_Right(const char * ); + void On_expectFinish_Comma(const char * ); // DATA Dyn< PeStatusArray<PE_EnumValue> > @@ -88,7 +88,7 @@ class PE_EnumValue : public Cpp_PE Dyn<SP_Expression> pSpExpression; Dyn<SPU_Expression> pSpuInitExpression; - String sName; + String sName; String sInitExpression; }; diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx index 0594e57077c5..9a34a86b8798 100644 --- a/autodoc/source/parser/cpp/pe_expr.cxx +++ b/autodoc/source/parser/cpp/pe_expr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,9 @@ PE_Expression::Call_Handler( const cpp::Token & i_rTok ) void 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[] = { &PE_Expression::On_std_SwBracket_Left, + static F_Tok stateF_std[] = { &PE_Expression::On_std_SwBracket_Left, &PE_Expression::On_std_SwBracket_Right, &PE_Expression::On_std_ArrayBracket_Left, &PE_Expression::On_std_ArrayBracket_Right, @@ -70,7 +70,7 @@ PE_Expression::Setup_StatusFunctions() &PE_Expression::On_std_Bracket_Right, &PE_Expression::On_std_Semicolon, &PE_Expression::On_std_Comma }; - static INT16 stateT_std[] = { Tid_SwBracket_Left, + static INT16 stateT_std[] = { Tid_SwBracket_Left, Tid_SwBracket_Right, Tid_ArrayBracket_Left, Tid_ArrayBracket_Right, diff --git a/autodoc/source/parser/cpp/pe_expr.hxx b/autodoc/source/parser/cpp/pe_expr.hxx index 8c1b5a94af9d..293651833e3a 100644 --- a/autodoc/source/parser/cpp/pe_expr.hxx +++ b/autodoc/source/parser/cpp/pe_expr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,19 +53,19 @@ class PE_Expression : public Cpp_PE size_of_states }; PE_Expression( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Expression(); const char * Result_Text() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void On_std_Default( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void On_std_Default( const char *); void On_std_SwBracket_Left( const char *); void On_std_SwBracket_Right( const char *); diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx index 6160f97b89b8..78e9898d7f17 100644 --- a/autodoc/source/parser/cpp/pe_file.cxx +++ b/autodoc/source/parser/cpp/pe_file.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,12 +71,12 @@ PE_File::PE_File( cpp::PeEnvironment & io_rEnv) pSpDefs = new SP_Defines(*this); pSpIgnore = new SP_Ignore(*this); - pSpuNamespace = new SPU_Namespace(*pSpNamespace, 0, 0); - pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); - pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc); - pSpuTemplate = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template); - pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); - pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); + pSpuNamespace = new SPU_Namespace(*pSpNamespace, 0, 0); + pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); + pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc); + pSpuTemplate = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template); + pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); + pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); pSpuIgnoreFailure = new SPU_Ignore(*pSpIgnore, 0, 0); } @@ -86,7 +86,7 @@ PE_File::~PE_File() } void -PE_File::Call_Handler( const cpp::Token & i_rTok ) +PE_File::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -101,8 +101,8 @@ PE_File::Handle_ChildFailure() void PE_File::Setup_StatusFunctions() { - typedef CallFunction<PE_File>::F_Tok F_Tok; - static F_Tok stateF_std[] = { &PE_File::On_std_VarFunc, + typedef CallFunction<PE_File>::F_Tok F_Tok; + static F_Tok stateF_std[] = { &PE_File::On_std_VarFunc, &PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey, @@ -129,7 +129,7 @@ PE_File::Setup_StatusFunctions() &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_struct, Tid_union, @@ -156,10 +156,10 @@ PE_File::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - 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 F_Tok stateF_in_externC[] = { &PE_File::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 }; @@ -221,7 +221,7 @@ PE_File::On_std_namespace(const char * ) void PE_File::On_std_ClassKey(const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // classes are parsed via PE_Type. } @@ -234,7 +234,7 @@ PE_File::On_std_typedef(const char * ) void PE_File::On_std_enum(const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // enums are parsed via PE_Type. } diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx index 7a36f2c6fe9c..b8d15abe3f95 100644 --- a/autodoc/source/parser/cpp/pe_file.hxx +++ b/autodoc/source/parser/cpp/pe_file.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ class PE_File : public Cpp_PE public: enum E_State { - std, /// before class, struct or union + std, /// before class, struct or union in_extern, in_externC, size_of_states @@ -67,45 +67,45 @@ class PE_File : public Cpp_PE PeEnvironment & io_rEnv ); ~PE_File(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); virtual Cpp_PE * Handle_ChildFailure(); private: - typedef SubPe< PE_File, PE_Namespace> SP_Namespace; - typedef SubPe< PE_File, PE_Typedef> SP_Typedef; - typedef SubPe< PE_File, PE_VarFunc> SP_VarFunc; - typedef SubPe< PE_File, PE_TemplateTop> SP_Template; - typedef SubPe< PE_File, PE_Defines> SP_Defines; - typedef SubPe< PE_File, PE_Ignore > SP_Ignore; + typedef SubPe< PE_File, PE_Namespace> SP_Namespace; + typedef SubPe< PE_File, PE_Typedef> SP_Typedef; + typedef SubPe< PE_File, PE_VarFunc> SP_VarFunc; + typedef SubPe< PE_File, PE_TemplateTop> SP_Template; + typedef SubPe< PE_File, PE_Defines> SP_Defines; + typedef SubPe< PE_File, PE_Ignore > SP_Ignore; typedef SubPeUse< PE_File, PE_Namespace> SPU_Namespace; - typedef SubPeUse< PE_File, PE_Typedef> SPU_Typedef; - typedef SubPeUse< PE_File, PE_VarFunc> SPU_VarFunc; - typedef SubPeUse< PE_File, PE_TemplateTop> SPU_Template; - typedef SubPeUse< PE_File, PE_Defines> SPU_Defines; - typedef SubPeUse< PE_File, PE_Ignore> SPU_Ignore; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpReturn_VarFunc(); - void SpReturn_Template(); - - void On_std_namespace(const char * i_sText); - void On_std_ClassKey(const char * i_sText); - void On_std_typedef(const char * i_sText); - void On_std_enum(const char * i_sText); - void On_std_VarFunc(const char * i_sText); - void On_std_template(const char * i_sText); - void On_std_extern(const char * i_sText); - void On_std_using(const char * i_sText); - void On_std_SwBracketRight(const char * i_sText); - - void On_std_DefineName(const char * i_sText); - void On_std_MacroName(const char * i_sText); + typedef SubPeUse< PE_File, PE_Typedef> SPU_Typedef; + typedef SubPeUse< PE_File, PE_VarFunc> SPU_VarFunc; + typedef SubPeUse< PE_File, PE_TemplateTop> SPU_Template; + typedef SubPeUse< PE_File, PE_Defines> SPU_Defines; + typedef SubPeUse< PE_File, PE_Ignore> SPU_Ignore; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpReturn_VarFunc(); + void SpReturn_Template(); + + void On_std_namespace(const char * i_sText); + void On_std_ClassKey(const char * i_sText); + void On_std_typedef(const char * i_sText); + void On_std_enum(const char * i_sText); + void On_std_VarFunc(const char * i_sText); + void On_std_template(const char * i_sText); + void On_std_extern(const char * i_sText); + void On_std_using(const char * i_sText); + void On_std_SwBracketRight(const char * i_sText); + + void On_std_DefineName(const char * i_sText); + void On_std_MacroName(const char * i_sText); void On_in_extern_Constant(const char * i_sText); void On_in_extern_Ignore(const char * i_sText); @@ -116,27 +116,27 @@ class PE_File : public Cpp_PE // DATA - PeEnvironment * pEnv; + PeEnvironment * pEnv; Dyn< PeStatusArray<PE_File> > pStati; - Dyn<SP_Namespace> pSpNamespace; - Dyn<SP_Typedef> pSpTypedef; - Dyn<SP_VarFunc> pSpVarFunc; - Dyn<SP_Template> pSpTemplate; - Dyn<SP_Defines> pSpDefs; + Dyn<SP_Namespace> pSpNamespace; + Dyn<SP_Typedef> pSpTypedef; + Dyn<SP_VarFunc> pSpVarFunc; + Dyn<SP_Template> pSpTemplate; + Dyn<SP_Defines> pSpDefs; - Dyn<SP_Ignore> pSpIgnore; + Dyn<SP_Ignore> pSpIgnore; - Dyn<SPU_Namespace> pSpuNamespace; - Dyn<SPU_Typedef> pSpuTypedef; - Dyn<SPU_VarFunc> pSpuVarFunc; - Dyn<SPU_Template> pSpuTemplate; - Dyn<SPU_Defines> pSpuDefs; + Dyn<SPU_Namespace> pSpuNamespace; + Dyn<SPU_Typedef> pSpuTypedef; + Dyn<SPU_VarFunc> pSpuVarFunc; + Dyn<SPU_Template> pSpuTemplate; + Dyn<SPU_Defines> pSpuDefs; - Dyn<SPU_Ignore> pSpuUsing; - Dyn<SPU_Ignore> pSpuIgnoreFailure; + Dyn<SPU_Ignore> pSpuUsing; + Dyn<SPU_Ignore> pSpuIgnoreFailure; bool bWithinSingleExternC; /** After 'extern "C"' without following '{', waiting for the next function or variable to diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx index 081f369a0c9c..c5e1ff8b3c47 100644 --- a/autodoc/source/parser/cpp/pe_funct.cxx +++ b/autodoc/source/parser/cpp/pe_funct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,9 +80,9 @@ PE_Function::PE_Function( Cpp_PE * i_pParent ) pSpParameter = new SP_Parameter(*this); pSpType = new SP_Type(*this); - pSpuParameter = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter); - pSpuException = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception); - pSpuCastOperatorType = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType); + pSpuParameter = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter); + pSpuException = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception); + pSpuCastOperatorType = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType); } PE_Function::~PE_Function() @@ -164,7 +164,7 @@ PE_Function::Call_Handler( const cpp::Token & i_rTok ) void PE_Function::Setup_StatusFunctions() { - typedef CallFunction<PE_Function>::F_Tok F_Tok; + typedef CallFunction<PE_Function>::F_Tok F_Tok; static F_Tok stateF_afterStdOperator[] = { &PE_Function::On_afterOperator_Std_Operator, @@ -219,8 +219,8 @@ PE_Function::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_afterName[] = { &PE_Function::On_afterName_Bracket_Left }; - static INT16 stateT_afterName[] = { Tid_Bracket_Left }; + static F_Tok stateF_afterName[] = { &PE_Function::On_afterName_Bracket_Left }; + static INT16 stateT_afterName[] = { Tid_Bracket_Left }; static F_Tok stateF_expectParameterSeparator[] = { &PE_Function::On_expectParameterSeparator_BracketRight, @@ -229,7 +229,7 @@ PE_Function::Setup_StatusFunctions() { Tid_Bracket_Right, Tid_Comma }; - static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const, + static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const, &PE_Function::On_afterParameters_volatile, &PE_Function::On_afterParameters_throw, &PE_Function::On_afterParameters_SwBracket_Left, @@ -246,8 +246,8 @@ PE_Function::Setup_StatusFunctions() Tid_Colon, Tid_Assign }; - static F_Tok stateF_afterThrow[] = { &PE_Function::On_afterThrow_Bracket_Left }; - static INT16 stateT_afterThrow[] = { Tid_Bracket_Left }; + static F_Tok stateF_afterThrow[] = { &PE_Function::On_afterThrow_Bracket_Left }; + static INT16 stateT_afterThrow[] = { Tid_Bracket_Left }; static F_Tok stateF_expectExceptionSeparator[] = { &PE_Function::On_expectExceptionSeparator_BracketRight, @@ -256,7 +256,7 @@ PE_Function::Setup_StatusFunctions() { Tid_Bracket_Right, Tid_Comma }; - static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left, + static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left, &PE_Function::On_afterExceptions_Semicolon, &PE_Function::On_afterExceptions_Comma, &PE_Function::On_afterExceptions_Colon, @@ -267,8 +267,8 @@ PE_Function::Setup_StatusFunctions() Tid_Colon, Tid_Assign }; - static F_Tok stateF_expectZero[] = { &PE_Function::On_expectZero_Constant }; - static INT16 stateT_expectZero[] = { Tid_Constant }; + static F_Tok stateF_expectZero[] = { &PE_Function::On_expectZero_Constant }; + static INT16 stateT_expectZero[] = { Tid_Constant }; static F_Tok stateF_inImplementation[] = { &PE_Function::On_inImplementation_SwBracket_Left, diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx index 20d8b5e35d5c..647180ca9c09 100644 --- a/autodoc/source/parser/cpp/pe_funct.hxx +++ b/autodoc/source/parser/cpp/pe_funct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,109 +67,109 @@ class PE_Function : public Cpp_PE afterStdOperatorLeftBracket, // if initializes as operator with ( or [ afterCastOperator, // if initializes as operator - afterName, // undecided - expectParameterSeparator, // + afterName, // undecided + expectParameterSeparator, // afterParameters, // before const, volatile throw or = 0. - afterThrow, // expect ( + afterThrow, // expect ( expectExceptionSeparator, // - afterExceptions, // = 0 oder ; oder , - expectZero, // after '=' + afterExceptions, // = 0 oder ; oder , + expectZero, // after '=' inImplementation, // after { size_of_states }; - typedef ary::cpp::E_Protection E_Protection; - typedef ary::cpp::E_Virtuality E_Virtuality; - typedef ary::cpp::E_ConVol E_ConVol; + typedef ary::cpp::E_Protection E_Protection; + typedef ary::cpp::E_Virtuality E_Virtuality; + typedef ary::cpp::E_ConVol E_ConVol; PE_Function( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Function(); - void Init_Std( + void Init_Std( const String & i_sName, ary::cpp::Type_id i_nReturnType, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_Ctor( + void Init_Ctor( const String & i_sName, ary::cpp::FunctionFlags i_aFlags ); - void Init_Dtor( + void Init_Dtor( const String & i_sName, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_CastOperator( + void Init_CastOperator( bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_NormalOperator( + void Init_NormalOperator( ary::cpp::Type_id i_nReturnType, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); ary::cpp::Ce_id Result_Id() const; - bool Result_WithImplementation() const; + bool Result_WithImplementation() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Function, PE_Type > SP_Type; - typedef SubPeUse< PE_Function, PE_Type > SPU_Type; - typedef SubPe< PE_Function, PE_Parameter> SP_Parameter; - typedef SubPeUse<PE_Function, PE_Parameter> SPU_Parameter; + typedef SubPe< PE_Function, PE_Type > SP_Type; + typedef SubPeUse< PE_Function, PE_Type > SPU_Type; + typedef SubPe< PE_Function, PE_Parameter> SP_Parameter; + typedef SubPeUse<PE_Function, PE_Parameter> SPU_Parameter; - typedef std::vector<ary::cpp::S_Parameter> ParameterList; - typedef std::vector<ary::cpp::Type_id> ExceptionTypeList; + typedef std::vector<ary::cpp::S_Parameter> ParameterList; + typedef std::vector<ary::cpp::Type_id> ExceptionTypeList; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char * i_sText); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char * i_sText); - void SpInit_CastOperatorType(); + void SpInit_CastOperatorType(); - void SpReturn_Parameter(); - void SpReturn_Exception(); - void SpReturn_CastOperatorType(); + void SpReturn_Parameter(); + void SpReturn_Exception(); + void SpReturn_CastOperatorType(); - void On_afterOperator_Std_Operator(const char * i_sText); // Operator+() etc. - void On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or () + void On_afterOperator_Std_Operator(const char * i_sText); // Operator+() etc. + void On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or () void On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText); - void On_afterOperator_Cast_Type(const char * i_sText); // Type + void On_afterOperator_Cast_Type(const char * i_sText); // Type - void On_afterName_Bracket_Left(const char * i_sText); + void On_afterName_Bracket_Left(const char * i_sText); - void On_expectParameterSeparator_BracketRight(const char * i_sText); - void On_expectParameterSeparator_Comma(const char * i_sText); + void On_expectParameterSeparator_BracketRight(const char * i_sText); + void On_expectParameterSeparator_Comma(const char * i_sText); - void On_afterParameters_const(const char * i_sText); - void On_afterParameters_volatile(const char * i_sText); - void On_afterParameters_throw(const char * i_sText); - void On_afterParameters_SwBracket_Left(const char * i_sText); - void On_afterParameters_Semicolon(const char * i_sText); - void On_afterParameters_Comma(const char * i_sText); - void On_afterParameters_Colon(const char * i_sText); - void On_afterParameters_Assign(const char * i_sText); + void On_afterParameters_const(const char * i_sText); + void On_afterParameters_volatile(const char * i_sText); + void On_afterParameters_throw(const char * i_sText); + void On_afterParameters_SwBracket_Left(const char * i_sText); + void On_afterParameters_Semicolon(const char * i_sText); + void On_afterParameters_Comma(const char * i_sText); + void On_afterParameters_Colon(const char * i_sText); + void On_afterParameters_Assign(const char * i_sText); - void On_afterThrow_Bracket_Left(const char * i_sText); + void On_afterThrow_Bracket_Left(const char * i_sText); - void On_expectExceptionSeparator_BracketRight(const char * i_sText); - void On_expectExceptionSeparator_Comma(const char * i_sText); + void On_expectExceptionSeparator_BracketRight(const char * i_sText); + void On_expectExceptionSeparator_Comma(const char * i_sText); - void On_afterExceptions_SwBracket_Left(const char * i_sText); - void On_afterExceptions_Semicolon(const char * i_sText); - void On_afterExceptions_Comma(const char * i_sText); - void On_afterExceptions_Colon(const char * i_sText); - void On_afterExceptions_Assign(const char * i_sText); + void On_afterExceptions_SwBracket_Left(const char * i_sText); + void On_afterExceptions_Semicolon(const char * i_sText); + void On_afterExceptions_Comma(const char * i_sText); + void On_afterExceptions_Colon(const char * i_sText); + void On_afterExceptions_Assign(const char * i_sText); - void On_expectZero_Constant(const char * i_sText); + void On_expectZero_Constant(const char * i_sText); - void On_inImplementation_SwBracket_Left(const char * i_sText); - void On_inImplementation_SwBracket_Right(const char * i_sText); - void On_inImplementation_Default(const char * i_sText); + void On_inImplementation_SwBracket_Left(const char * i_sText); + void On_inImplementation_SwBracket_Right(const char * i_sText); + void On_inImplementation_Default(const char * i_sText); void PerformFinishingPunctuation(); void EnterImplementation( @@ -219,16 +219,16 @@ PE_Function::Result_WithImplementation() const -/* // Overview of Stati +/* // Overview of Stati Undecided --------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern ->Typ -expectName // Typ ist da +expectName // Typ ist da afterName @@ -238,14 +238,14 @@ afterName Variable -------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern ->Typ -expectName // Typ ist da -> im Falle von '(': notyetimplemented +expectName // Typ ist da -> im Falle von '(': notyetimplemented afterName -expectSize // after [ +expectSize // after [ expectFinish // vor ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen @@ -257,18 +257,18 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen Function -------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern ->Typ -expectName // Typ ist da -expectBracket // Nach Name -expectParameter // nach ( oder , +expectName // Typ ist da +expectBracket // Nach Name +expectParameter // nach ( oder , -> Parameter after Parameters // before const, volatile throw or = 0. -after throw // expect ( -expectException // after ( -after exceptions // = 0 oder ; oder , +after throw // expect ( +expectException // after ( +after exceptions // = 0 oder ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen diff --git a/autodoc/source/parser/cpp/pe_ignor.cxx b/autodoc/source/parser/cpp/pe_ignor.cxx index 67db5593c736..8453c8d6ed72 100644 --- a/autodoc/source/parser/cpp/pe_ignor.cxx +++ b/autodoc/source/parser/cpp/pe_ignor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,15 +57,15 @@ PE_Ignore::Call_Handler( const cpp::Token & i_rTok ) { switch (i_rTok.TypeId()) { - case Tid_SwBracket_Left: SetTokenResult(done, stay); + case Tid_SwBracket_Left: SetTokenResult(done, stay); nBracketCounter++; bBlockOpened = true; break; - case Tid_Semicolon: SetTokenResult(done, pop_success); + case Tid_Semicolon: SetTokenResult(done, pop_success); break; default: SetTokenResult(done, stay); - } // end switch + } // end switch } else if ( nBracketCounter > 0 ) { @@ -73,11 +73,11 @@ PE_Ignore::Call_Handler( const cpp::Token & i_rTok ) switch (i_rTok.TypeId()) { - case Tid_SwBracket_Left: nBracketCounter++; + case Tid_SwBracket_Left: nBracketCounter++; break; - case Tid_SwBracket_Right: nBracketCounter--; + case Tid_SwBracket_Right: nBracketCounter--; break; - } // end switch + } // end switch } else if ( i_rTok.TypeId() == Tid_Semicolon ) { diff --git a/autodoc/source/parser/cpp/pe_ignor.hxx b/autodoc/source/parser/cpp/pe_ignor.hxx index 7efb2757479b..b9a1cec2ca91 100644 --- a/autodoc/source/parser/cpp/pe_ignor.hxx +++ b/autodoc/source/parser/cpp/pe_ignor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,19 +46,19 @@ class PE_Ignore : public Cpp_PE { public: PE_Ignore( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Ignore(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); // DATA - uintt nBracketCounter; - bool bBlockOpened; + uintt nBracketCounter; + bool bBlockOpened; }; diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx index bf9ca483abbe..741699a229a6 100644 --- a/autodoc/source/parser/cpp/pe_namsp.cxx +++ b/autodoc/source/parser/cpp/pe_namsp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,16 +60,16 @@ PE_Namespace::~PE_Namespace() void PE_Namespace::Setup_StatusFunctions() { - typedef CallFunction<PE_Namespace>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Namespace::On_start_Identifier, + typedef CallFunction<PE_Namespace>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Namespace::On_start_Identifier, &PE_Namespace::On_start_SwBracket_Left }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_SwBracket_Left }; - static F_Tok stateF_gotName[] = { &PE_Namespace::On_gotName_SwBracket_Left, + static F_Tok stateF_gotName[] = { &PE_Namespace::On_gotName_SwBracket_Left, &PE_Namespace::On_gotName_Assign }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left, + static INT16 stateT_gotName[] = { Tid_SwBracket_Left, Tid_Assign }; - static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon }; + static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon }; static INT16 stateT_expectSemicolon[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError); @@ -78,7 +78,7 @@ PE_Namespace::Setup_StatusFunctions() } void -PE_Namespace::Call_Handler( const cpp::Token & i_rTok ) +PE_Namespace::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } diff --git a/autodoc/source/parser/cpp/pe_namsp.hxx b/autodoc/source/parser/cpp/pe_namsp.hxx index d07ab61ad3b7..386aded56b79 100644 --- a/autodoc/source/parser/cpp/pe_namsp.hxx +++ b/autodoc/source/parser/cpp/pe_namsp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,37 +59,37 @@ class PE_Namespace : public Cpp_PE { start, gotName, - expectSemicolon, /// after namespace assignment + expectSemicolon, /// after namespace assignment size_of_states }; PE_Namespace( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Namespace(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); ary::cpp::Namespace * Result_OpenedNamespace() const; private: - void Setup_StatusFunctions(); + void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_start_Identifier(const char * i_sText); - void On_start_SwBracket_Left(const char * i_sText); - void On_gotName_SwBracket_Left(const char * i_sText); - void On_gotName_Assign(const char * i_sText); - void On_expectSemicolon_Semicolon(const char * i_sText); + void On_start_Identifier(const char * i_sText); + void On_start_SwBracket_Left(const char * i_sText); + void On_gotName_SwBracket_Left(const char * i_sText); + void On_gotName_Assign(const char * i_sText); + void On_expectSemicolon_Semicolon(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Namespace> > pStati; String sLocalName; - bool bPush; + bool bPush; }; diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx index 19ce4607d060..c00f81db836c 100644 --- a/autodoc/source/parser/cpp/pe_param.cxx +++ b/autodoc/source/parser/cpp/pe_param.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace cpp { -//*********************** PE_Parameter ***********************// +//*********************** PE_Parameter ***********************// PE_Parameter::PE_Parameter( Cpp_PE * i_pParent ) @@ -75,8 +75,8 @@ PE_Parameter::Call_Handler( const cpp::Token & i_rTok ) void PE_Parameter::Setup_StatusFunctions() { - typedef CallFunction<PE_Parameter>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Parameter::On_start_Type, + typedef CallFunction<PE_Parameter>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, @@ -91,7 +91,7 @@ PE_Parameter::Setup_StatusFunctions() &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_class, Tid_struct, Tid_union, @@ -107,27 +107,27 @@ PE_Parameter::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_expectName[] = { &PE_Parameter::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_Parameter::On_expectName_Identifier, &PE_Parameter::On_expectName_ArrayBracket_Left, &PE_Parameter::On_expectName_Bracket_Right, &PE_Parameter::On_expectName_Comma, &PE_Parameter::On_afterName_Assign }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_ArrayBracket_Left, Tid_Bracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_afterName[] = { &PE_Parameter::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_Parameter::On_afterName_ArrayBracket_Left, &PE_Parameter::On_afterName_Bracket_Right, &PE_Parameter::On_afterName_Comma, &PE_Parameter::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Bracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_finished[] = { &PE_Parameter::On_finished_Comma, + static F_Tok stateF_finished[] = { &PE_Parameter::On_finished_Comma, &PE_Parameter::On_finished_Bracket_Right }; - static INT16 stateT_finished[] = { Tid_Bracket_Right, + static INT16 stateT_finished[] = { Tid_Bracket_Right, Tid_Comma }; SEMPARSE_CREATE_STATUS(PE_Parameter, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx index 44688796236f..a4312b41093b 100644 --- a/autodoc/source/parser/cpp/pe_param.hxx +++ b/autodoc/source/parser/cpp/pe_param.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,57 +61,57 @@ class PE_Parameter : public Cpp_PE }; typedef ary::cpp::S_Parameter S_ParamInfo; - explicit PE_Parameter( - Cpp_PE * i_pParent ); + explicit PE_Parameter( + Cpp_PE * i_pParent ); ~PE_Parameter(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); ary::cpp::Type_id Result_FrontType() const; const S_ParamInfo & Result_ParamInfo() const; private: - typedef SubPe< PE_Parameter, PE_Type > SP_Type; - typedef SubPeUse< PE_Parameter, PE_Type > SPU_Type; - typedef SubPe< PE_Parameter, PE_Variable > SP_Variable; - typedef SubPeUse< PE_Parameter, PE_Variable > SPU_Variable; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpInit_Type(); // Type and Ignore. - void SpInit_Variable(); - void SpReturn_Type(); - void SpReturn_Variable(); - - void On_start_Type(const char * i_sText); - void On_start_Bracket_Right(const char * i_sText); + typedef SubPe< PE_Parameter, PE_Type > SP_Type; + typedef SubPeUse< PE_Parameter, PE_Type > SPU_Type; + typedef SubPe< PE_Parameter, PE_Variable > SP_Variable; + typedef SubPeUse< PE_Parameter, PE_Variable > SPU_Variable; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpInit_Type(); // Type and Ignore. + void SpInit_Variable(); + void SpReturn_Type(); + void SpReturn_Variable(); + + void On_start_Type(const char * i_sText); + void On_start_Bracket_Right(const char * i_sText); void On_start_Ellipse(const char * i_sText); - void On_expectName_Identifier(const char * i_sText); - void On_expectName_ArrayBracket_Left(const char * i_sText); - void On_expectName_Bracket_Right(const char * i_sText); - void On_expectName_Comma(const char * i_sText); + void On_expectName_Identifier(const char * i_sText); + void On_expectName_ArrayBracket_Left(const char * i_sText); + void On_expectName_Bracket_Right(const char * i_sText); + void On_expectName_Comma(const char * i_sText); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Bracket_Right(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Bracket_Right(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); - void On_finished_Bracket_Right(const char * i_sText); - void On_finished_Comma(const char * i_sText); + void On_finished_Bracket_Right(const char * i_sText); + void On_finished_Comma(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Parameter> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; - Dyn<SP_Variable> pSpVariable; - Dyn<SPU_Variable> pSpuVariable; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; + Dyn<SP_Variable> pSpVariable; + Dyn<SPU_Variable> pSpuVariable; S_ParamInfo aResultParamInfo; }; diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx index 1cbb5b47c851..9c6986f06104 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.cxx +++ b/autodoc/source/parser/cpp/pe_tpltp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ PE_TemplateTop::Call_Handler( const cpp::Token & i_rTok ) void 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[] = { &PE_TemplateTop::On_start_Less }; + static F_Tok stateF_start[] = { &PE_TemplateTop::On_start_Less }; static INT16 stateT_start[] = { Tid_Less }; static F_Tok stateF_expect_qualifier[]= { &PE_TemplateTop::On_expect_qualifier_ClassOrTypename, @@ -74,10 +74,10 @@ PE_TemplateTop::Setup_StatusFunctions() Tid_Greater, Tid_typename }; - static F_Tok stateF_expect_name[] = { &PE_TemplateTop::On_expect_name_Identifier }; + static F_Tok stateF_expect_name[] = { &PE_TemplateTop::On_expect_name_Identifier }; static INT16 stateT_expect_name[] = { Tid_Identifier }; - static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma, + static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma, &PE_TemplateTop::On_expect_separator_Greater }; static INT16 stateT_expect_separator[]= { Tid_Comma, Tid_Greater }; diff --git a/autodoc/source/parser/cpp/pe_tpltp.hxx b/autodoc/source/parser/cpp/pe_tpltp.hxx index 9d1fdbff8911..99c6545bd420 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.hxx +++ b/autodoc/source/parser/cpp/pe_tpltp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,31 +56,31 @@ class PE_TemplateTop : public cpp::Cpp_PE size_of_states }; PE_TemplateTop( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_TemplateTop(); const StringVector & Result_Parameters() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); - void On_start_Less(const char *); + void On_start_Less(const char *); - void On_expect_qualifier_ClassOrTypename(const char *); - void On_expect_qualifier_Greater(const char *); - void On_expect_qualifier_Other(const char *); + void On_expect_qualifier_ClassOrTypename(const char *); + void On_expect_qualifier_Greater(const char *); + void On_expect_qualifier_Other(const char *); - void On_expect_name_Identifier(const char *); + void On_expect_name_Identifier(const char *); - void On_expect_separator_Comma(const char *); - void On_expect_separator_Greater(const char *); + void On_expect_separator_Comma(const char *); + void On_expect_separator_Greater(const char *); // DATA Dyn< PeStatusArray<PE_TemplateTop> > diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx index fa5527fefbc4..01c498168ecf 100644 --- a/autodoc/source/parser/cpp/pe_tydef.cxx +++ b/autodoc/source/parser/cpp/pe_tydef.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,14 +68,14 @@ PE_Typedef::Call_Handler( const cpp::Token & i_rTok ) void PE_Typedef::Setup_StatusFunctions() { - typedef CallFunction<PE_Typedef>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Typedef::On_start_typedef }; - static INT16 stateT_start[] = { Tid_typedef }; + typedef CallFunction<PE_Typedef>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Typedef::On_start_typedef }; + static INT16 stateT_start[] = { Tid_typedef }; - static F_Tok stateF_expectName[] = { &PE_Typedef::On_expectName_Identifier }; + static F_Tok stateF_expectName[] = { &PE_Typedef::On_expectName_Identifier }; static INT16 stateT_expectName[] = { Tid_Identifier }; - static F_Tok stateF_afterName[] = { &PE_Typedef::On_afterName_Semicolon }; + static F_Tok stateF_afterName[] = { &PE_Typedef::On_afterName_Semicolon }; static INT16 stateT_afterName[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx index 5c4cac474814..12b4749bf1d3 100644 --- a/autodoc/source/parser/cpp/pe_tydef.hxx +++ b/autodoc/source/parser/cpp/pe_tydef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,34 +54,34 @@ class PE_Typedef : public cpp::Cpp_PE size_of_states }; PE_Typedef( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Typedef(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Typedef, PE_Type > SP_Type; - typedef SubPeUse< PE_Typedef, PE_Type> SPU_Type; + typedef SubPe< PE_Typedef, PE_Type > SP_Type; + typedef SubPeUse< PE_Typedef, PE_Type> SPU_Type; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void SpReturn_Type(); + void SpReturn_Type(); - void On_start_typedef( const char * ); - void On_expectName_Identifier( const char * ); - void On_afterName_Semicolon( const char * ); + void On_start_typedef( const char * ); + void On_expectName_Identifier( const char * ); + void On_afterName_Semicolon( const char * ); // DATA Dyn< PeStatusArray<PE_Typedef> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; String sName; - ary::cpp::Type_id nType; + ary::cpp::Type_id nType; }; diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx index 1f34ddffc14e..69f848598dd6 100644 --- a/autodoc/source/parser/cpp/pe_type.cxx +++ b/autodoc/source/parser/cpp/pe_type.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,10 +77,10 @@ NullType::inq_IsConst() const } void -NullType::inq_Get_Text( StreamStr & , +NullType::inq_Get_Text( StreamStr & , StreamStr & , StreamStr & , - const ary::cpp::Gate & ) const + const ary::cpp::Gate & ) const { // Does nothing. } @@ -121,11 +121,11 @@ PE_Type::PE_Type( Cpp_PE * i_pParent ) pSpEnum = new SP_Enum(*this); pSpuType_TemplateParameter - = new SPU_Type( *pSpType, 0, + = new SPU_Type( *pSpType, 0, &PE_Type::SpReturn_Type_TemplateParameter ); - pSpuClass = new SPU_Class( *pSpClass, 0, + pSpuClass = new SPU_Class( *pSpClass, 0, & PE_Type::SpReturn_Class ); - pSpuEnum = new SPU_Enum( *pSpEnum, 0, + pSpuEnum = new SPU_Enum( *pSpEnum, 0, & PE_Type::SpReturn_Enum ); } @@ -148,8 +148,8 @@ PE_Type::Call_Handler( const cpp::Token & i_rTok ) void PE_Type::Setup_StatusFunctions() { - typedef CallFunction<PE_Type>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Type::On_start_Identifier, + typedef CallFunction<PE_Type>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Type::On_start_Identifier, &PE_Type::On_start_class, &PE_Type::On_start_class, &PE_Type::On_start_class, @@ -161,7 +161,7 @@ PE_Type::Setup_StatusFunctions() &PE_Type::On_start_typename, &PE_Type::On_start_BuiltInType, &PE_Type::On_start_TypeSpecializer }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_class, Tid_struct, Tid_union, @@ -179,7 +179,7 @@ PE_Type::Setup_StatusFunctions() static INT16 stateT_expect_namesegment[] = { Tid_Identifier, Tid_BuiltInType }; - static F_Tok stateF_after_namesegment[] = { &PE_Type::On_after_namesegment_const, + static F_Tok stateF_after_namesegment[] = { &PE_Type::On_after_namesegment_const, &PE_Type::On_after_namesegment_volatile, &PE_Type::On_after_namesegment_Bracket_Left, &PE_Type::On_after_namesegment_DoubleColon, @@ -199,14 +199,14 @@ PE_Type::Setup_StatusFunctions() static INT16 stateT_afterclass_expect_semicolon[] = { Tid_Semicolon }; - static F_Tok stateF_within_template[] = { &PE_Type::On_within_template_Comma, + static F_Tok stateF_within_template[] = { &PE_Type::On_within_template_Comma, &PE_Type::On_within_template_Greater, &PE_Type::On_within_template_Constant }; - static INT16 stateT_within_template[] = { Tid_Comma, + static INT16 stateT_within_template[] = { Tid_Comma, Tid_Greater, Tid_Constant }; - static F_Tok stateF_within_indirection[] = { &PE_Type::On_within_indirection_const, + static F_Tok stateF_within_indirection[] = { &PE_Type::On_within_indirection_const, &PE_Type::On_within_indirection_volatile, &PE_Type::On_within_indirection_Asterix, &PE_Type::On_within_indirection_AmpersAnd }; diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx index 55eeaa5279f4..33afdaa880b0 100644 --- a/autodoc/source/parser/cpp/pe_type.hxx +++ b/autodoc/source/parser/cpp/pe_type.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,92 +74,92 @@ class PE_Type : public Cpp_PE }; PE_Type( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Type(); void Init_AsCastOperatorType(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); - E_KindOfResult Result_KindOf() const; + E_KindOfResult Result_KindOf() const; const ary::cpp::Type & Result_Type() const; private: - typedef SubPe< PE_Type, PE_Type > SP_Type; - typedef SubPe< PE_Type, PE_Class > SP_Class; - typedef SubPe< PE_Type, PE_Enum > SP_Enum; - typedef SubPeUse< PE_Type, PE_Type > SPU_Type; - typedef SubPeUse< PE_Type, PE_Class > SPU_Class; - typedef SubPeUse< PE_Type, PE_Enum > SPU_Enum; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpReturn_Type_TemplateParameter(); - void SpReturn_Class(); - void SpReturn_Enum(); - - void On_EndOfType(const char *); - - void On_start_Identifier(const char *); - void On_start_class(const char *); - void On_start_enum(const char *); - void On_start_const(const char *); - void On_start_volatile(const char *); - void On_start_Bracket_Right(const char *); - void On_start_DoubleColon(const char *); - void On_start_BuiltInType(const char *); - void On_start_TypeSpecializer(const char *); - void On_start_typename(const char *); - - void On_expect_namesegment_Identifier(const char *); - - void On_after_namesegment_const(const char *); - void On_after_namesegment_volatile(const char *); + typedef SubPe< PE_Type, PE_Type > SP_Type; + typedef SubPe< PE_Type, PE_Class > SP_Class; + typedef SubPe< PE_Type, PE_Enum > SP_Enum; + typedef SubPeUse< PE_Type, PE_Type > SPU_Type; + typedef SubPeUse< PE_Type, PE_Class > SPU_Class; + typedef SubPeUse< PE_Type, PE_Enum > SPU_Enum; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpReturn_Type_TemplateParameter(); + void SpReturn_Class(); + void SpReturn_Enum(); + + void On_EndOfType(const char *); + + void On_start_Identifier(const char *); + void On_start_class(const char *); + void On_start_enum(const char *); + void On_start_const(const char *); + void On_start_volatile(const char *); + void On_start_Bracket_Right(const char *); + void On_start_DoubleColon(const char *); + void On_start_BuiltInType(const char *); + void On_start_TypeSpecializer(const char *); + void On_start_typename(const char *); + + void On_expect_namesegment_Identifier(const char *); + + void On_after_namesegment_const(const char *); + void On_after_namesegment_volatile(const char *); void On_after_namesegment_Bracket_Left(const char *); - void On_after_namesegment_DoubleColon(const char *); - void On_after_namesegment_Less(const char *); - void On_after_namesegment_Asterix(const char *); - void On_after_namesegment_AmpersAnd(const char *); + void On_after_namesegment_DoubleColon(const char *); + void On_after_namesegment_Less(const char *); + void On_after_namesegment_Asterix(const char *); + void On_after_namesegment_AmpersAnd(const char *); - void On_afterclass_expect_semicolon_Semicolon(const char *); + void On_afterclass_expect_semicolon_Semicolon(const char *); - void On_within_template_Comma(const char *); - void On_within_template_Greater(const char *); - void On_within_template_Constant(const char *); - void On_within_template_TypeStart(const char *); + void On_within_template_Comma(const char *); + void On_within_template_Greater(const char *); + void On_within_template_Constant(const char *); + void On_within_template_TypeStart(const char *); - void On_within_indirection_const(const char *); - void On_within_indirection_volatile(const char *); - void On_within_indirection_Asterix(const char *); - void On_within_indirection_AmpersAnd(const char *); + void On_within_indirection_const(const char *); + void On_within_indirection_volatile(const char *); + void On_within_indirection_Asterix(const char *); + void On_within_indirection_AmpersAnd(const char *); - bool IsType() const; + bool IsType() const; // DATA Dyn< PeStatusArray<PE_Type> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType_TemplateParameter; - Dyn<SP_Class> pSpClass; - Dyn<SPU_Class> pSpuClass; - Dyn<SP_Enum> pSpEnum; - Dyn<SPU_Enum> pSpuEnum; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType_TemplateParameter; + Dyn<SP_Class> pSpClass; + Dyn<SPU_Class> pSpuClass; + Dyn<SP_Enum> pSpEnum; + Dyn<SPU_Enum> pSpuEnum; Dyn<ary::cpp::UsedType> pType; ary::cpp::ut::List_TplParameter * pCurTemplate_ParameterList; String sOwningClassName; - String sParsedClass_Name; + String sParsedClass_Name; const ary::cpp::Type * pResult_Type; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; bool bIsCastOperatorType; }; diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx index ca9a538f544e..be771157b81c 100644 --- a/autodoc/source/parser/cpp/pe_vafu.cxx +++ b/autodoc/source/parser/cpp/pe_vafu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace cpp { -//*********************** PE_VarFunc ***********************// +//*********************** PE_VarFunc ***********************// PE_VarFunc::PE_VarFunc( Cpp_PE * i_pParent ) @@ -114,9 +114,9 @@ PE_VarFunc::Call_Handler( const cpp::Token & i_rTok ) void 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[] = { &PE_VarFunc::On_start_Identifier, + static F_Tok stateF_start[] = { &PE_VarFunc::On_start_Identifier, &PE_VarFunc::On_start_operator, &PE_VarFunc::On_start_TypeKey, &PE_VarFunc::On_start_TypeKey, @@ -137,7 +137,7 @@ PE_VarFunc::Setup_StatusFunctions() &PE_VarFunc::On_start_typename, &PE_VarFunc::On_start_Identifier, &PE_VarFunc::On_start_Identifier }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_operator, Tid_class, Tid_struct, @@ -159,27 +159,27 @@ PE_VarFunc::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_expectCtor[] = { &PE_VarFunc::On_expectCtor_Bracket_Left }; - static INT16 stateT_expectCtor[] = { Tid_Bracket_Left }; + static F_Tok stateF_expectCtor[] = { &PE_VarFunc::On_expectCtor_Bracket_Left }; + static INT16 stateT_expectCtor[] = { Tid_Bracket_Left }; - static F_Tok stateF_afterClassDecl[] = { &PE_VarFunc::On_afterClassDecl_Semicolon }; + static F_Tok stateF_afterClassDecl[] = { &PE_VarFunc::On_afterClassDecl_Semicolon }; static INT16 stateT_afterClassDecl[] = { Tid_Semicolon }; - static F_Tok stateF_expectName[] = { &PE_VarFunc::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_VarFunc::On_expectName_Identifier, &PE_VarFunc::On_expectName_operator, &PE_VarFunc::On_expectName_Bracket_Left }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_operator, Tid_Bracket_Left }; - static F_Tok stateF_afterName[] = { &PE_VarFunc::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_VarFunc::On_afterName_ArrayBracket_Left, &PE_VarFunc::On_afterName_Bracket_Left, &PE_VarFunc::On_afterName_DoubleColon, &PE_VarFunc::On_afterName_Semicolon, &PE_VarFunc::On_afterName_Comma, &PE_VarFunc::On_afterName_Assign, &PE_VarFunc::On_afterName_Less }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Bracket_Left, Tid_DoubleColon, Tid_Semicolon, @@ -194,9 +194,9 @@ PE_VarFunc::Setup_StatusFunctions() { Tid_Less, Tid_Greater }; - static F_Tok stateF_finished[] = { &PE_VarFunc::On_finished_Semicolon, + static F_Tok stateF_finished[] = { &PE_VarFunc::On_finished_Semicolon, &PE_VarFunc::On_finished_Comma }; - static INT16 stateT_finished[] = { Tid_Semicolon, + static INT16 stateT_finished[] = { Tid_Semicolon, Tid_Comma }; static F_Tok stateF_finishedIncludingFunctionImplementation[] = @@ -345,7 +345,7 @@ PE_VarFunc::SpReturn_Variable() // ary::S_InitData aData( 0, Env().CurCeSpace().Id(), i_sName, 0 ); ary::cpp::Variable & rCurParsedVariable - = Env().AryGate().Ces().Store_Variable( Env().Context(), + = Env().AryGate().Ces().Store_Variable( Env().Context(), sName, nResultFrontType, aFlags, diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx index c31bbb5daf47..1f3f4ff1d13c 100644 --- a/autodoc/source/parser/cpp/pe_vafu.hxx +++ b/autodoc/source/parser/cpp/pe_vafu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,92 +69,92 @@ class PE_VarFunc : public Cpp_PE enum E_ResultType { result_unknown = 0, - result_ignore, /// Used for class and enum declarations and predeclarations and for extern variables and functions. + result_ignore, /// Used for class and enum declarations and predeclarations and for extern variables and functions. result_variable, result_function }; - typedef ary::cpp::E_Protection E_Protection; + typedef ary::cpp::E_Protection E_Protection; PE_VarFunc( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_VarFunc(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); const std::vector<ary::cpp::Ce_id> & Result_Ids() const; ary::cpp::Type_id Result_FrontType() const; const StringVector & Result_Names() const; - E_ResultType Result_CeType() const; + E_ResultType Result_CeType() const; private: - typedef SubPe< PE_VarFunc, PE_Type > SP_Type; - typedef SubPeUse< PE_VarFunc, PE_Type > SPU_Type; - typedef SubPe< PE_VarFunc, PE_Variable > SP_Variable; - typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable; - typedef SubPe< PE_VarFunc, PE_Function > SP_Function; - typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function; - typedef SubPe< PE_VarFunc, PE_Ignore > SP_Ignore; + typedef SubPe< PE_VarFunc, PE_Type > SP_Type; + typedef SubPeUse< PE_VarFunc, PE_Type > SPU_Type; + typedef SubPe< PE_VarFunc, PE_Variable > SP_Variable; + typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable; + typedef SubPe< PE_VarFunc, PE_Function > SP_Function; + typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function; + typedef SubPe< PE_VarFunc, PE_Ignore > SP_Ignore; typedef SubPeUse< PE_VarFunc, PE_Ignore > SPU_Ignore; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_UnknownToken( const char *); - - void SpInit_FunctionStd(); - void SpInit_FunctionCtor(); - void SpInit_FunctionDtor(); - void SpInit_FunctionCastOperator(); - void SpInit_FunctionNormalOperator(); - void SpReturn_Type(); - void SpReturn_Variable(); - void SpReturn_FunctionStd(); - void SpReturn_Ignore(); - - void On_start_Identifier(const char * i_sText); - void On_start_operator(const char * i_sText); - void On_start_TypeKey(const char * i_sText); - void On_start_virtual(const char * i_sText); - void On_start_Tilde(const char * i_sText); - void On_start_const(const char * i_sText); - void On_start_volatile(const char * i_sText); - void On_start_extern(const char * i_sText); - void On_start_static(const char * i_sText); - void On_start_mutable(const char * i_sText); - void On_start_register(const char * i_sText); - void On_start_inline(const char * i_sText); - void On_start_explicit(const char * i_sText); - void On_start_Bracket_Right(const char * i_sText); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_UnknownToken( const char *); + + void SpInit_FunctionStd(); + void SpInit_FunctionCtor(); + void SpInit_FunctionDtor(); + void SpInit_FunctionCastOperator(); + void SpInit_FunctionNormalOperator(); + void SpReturn_Type(); + void SpReturn_Variable(); + void SpReturn_FunctionStd(); + void SpReturn_Ignore(); + + void On_start_Identifier(const char * i_sText); + void On_start_operator(const char * i_sText); + void On_start_TypeKey(const char * i_sText); + void On_start_virtual(const char * i_sText); + void On_start_Tilde(const char * i_sText); + void On_start_const(const char * i_sText); + void On_start_volatile(const char * i_sText); + void On_start_extern(const char * i_sText); + void On_start_static(const char * i_sText); + void On_start_mutable(const char * i_sText); + void On_start_register(const char * i_sText); + void On_start_inline(const char * i_sText); + void On_start_explicit(const char * i_sText); + void On_start_Bracket_Right(const char * i_sText); void On_start_typename(const char * i_sText); - void On_expectCtor_Bracket_Left(const char * i_sText); + void On_expectCtor_Bracket_Left(const char * i_sText); - void On_afterClassDecl_Semicolon(const char * i_sText); + void On_afterClassDecl_Semicolon(const char * i_sText); - void On_expectName_Identifier(const char * i_sText); - void On_expectName_operator(const char * i_sText); - void On_expectName_Bracket_Left(const char * i_sText); + void On_expectName_Identifier(const char * i_sText); + void On_expectName_operator(const char * i_sText); + void On_expectName_Bracket_Left(const char * i_sText); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Bracket_Left(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Bracket_Left(const char * i_sText); void On_afterName_DoubleColon(const char * i_sText); - void On_afterName_Semicolon(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); - void On_afterName_Less(const char * i_sText); + void On_afterName_Semicolon(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); + void On_afterName_Less(const char * i_sText); void On_afterName_inErraneousTemplate_Less(const char * i_sText); void On_afterName_inErraneousTemplate_Greater(const char * i_sText); void On_afterName_inErraneousTemplate_Default(const char * i_sText); - void On_finished_Semicolon(const char * i_sText); - void On_finished_Comma(const char * i_sText); - void On_finished_Default(const char * i_sText); + void On_finished_Semicolon(const char * i_sText); + void On_finished_Comma(const char * i_sText); + void On_finished_Default(const char * i_sText); void On_finishedIncludingFunctionImplementation_Default(const char * i_sText); @@ -165,25 +165,25 @@ class PE_VarFunc : public Cpp_PE Dyn< PeStatusArray<PE_VarFunc> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; - Dyn<SP_Variable> pSpVariable; - Dyn<SPU_Variable> pSpuVariable; - Dyn<SP_Function> pSpFunction; - Dyn<SPU_Function> pSpuFunctionStd; - Dyn<SPU_Function> pSpuFunctionCtor; - Dyn<SPU_Function> pSpuFunctionDtor; - Dyn<SPU_Function> pSpuFunctionCastOperator; - Dyn<SPU_Function> pSpuFunctionNormalOperator; - Dyn<SP_Ignore> pSpIgnore; - Dyn<SPU_Ignore> pSpuIgnore; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; + Dyn<SP_Variable> pSpVariable; + Dyn<SPU_Variable> pSpuVariable; + Dyn<SP_Function> pSpFunction; + Dyn<SPU_Function> pSpuFunctionStd; + Dyn<SPU_Function> pSpuFunctionCtor; + Dyn<SPU_Function> pSpuFunctionDtor; + Dyn<SPU_Function> pSpuFunctionCastOperator; + Dyn<SPU_Function> pSpuFunctionNormalOperator; + Dyn<SP_Ignore> pSpIgnore; + Dyn<SPU_Ignore> pSpuIgnore; intt nCounter_TemplateBrackets; bool bInDestructor; std::vector<ary::cpp::Ce_id> aResultIds; - ary::cpp::Type_id nResultFrontType; + ary::cpp::Type_id nResultFrontType; E_ResultType eResultType; // Pre-Results @@ -223,12 +223,12 @@ PE_VarFunc::Result_CeType() const #endif -/* // Overview of Stati +/* // Overview of Stati Undecided --------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern any ->stay operaator ->goto Function @@ -246,14 +246,14 @@ afterName ->goto Variable or Function Variable -------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern ->Typ -expectName // Typ ist da -> im Falle von '(': notyetimplemented +expectName // Typ ist da -> im Falle von '(': notyetimplemented afterName -expectSize // after [ +expectSize // after [ expectFinish // vor ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen @@ -265,18 +265,18 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen Function -------- -start // vor und whrend storage class specifiern +start // vor und whrend storage class specifiern ->Typ -expectName // Typ ist da -expectBracket // Nach Name -expectParameter // nach ( oder , +expectName // Typ ist da +expectBracket // Nach Name +expectParameter // nach ( oder , -> Parameter after Parameters // before const, volatile throw or = 0. -after throw // expect ( -expectException // after ( -after exceptions // = 0 oder ; oder , +after throw // expect ( +expectException // after ( +after exceptions // = 0 oder ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx index f062c5a1901f..257537210fdd 100644 --- a/autodoc/source/parser/cpp/pe_vari.cxx +++ b/autodoc/source/parser/cpp/pe_vari.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ PE_Variable::~PE_Variable() } void -PE_Variable::Call_Handler( const cpp::Token & i_rTok ) +PE_Variable::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -70,22 +70,22 @@ PE_Variable::Call_Handler( const cpp::Token & i_rTok ) void 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[] = { &PE_Variable::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_Variable::On_afterName_ArrayBracket_Left, &PE_Variable::On_afterName_Semicolon, &PE_Variable::On_afterName_Comma, &PE_Variable::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Semicolon, Tid_Comma, Tid_Assign }; - static F_Tok stateF_afterSize[] = { &PE_Variable::On_afterSize_ArrayBracket_Right }; - static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right }; - static F_Tok stateF_expectFinish[] = { &PE_Variable::On_expectFinish_Bracket_Right, + static F_Tok stateF_afterSize[] = { &PE_Variable::On_afterSize_ArrayBracket_Right }; + static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right }; + static F_Tok stateF_expectFinish[] = { &PE_Variable::On_expectFinish_Bracket_Right, &PE_Variable::On_expectFinish_Semicolon, &PE_Variable::On_expectFinish_Comma }; - static INT16 stateT_expectFinish[] = { Tid_Bracket_Right, + static INT16 stateT_expectFinish[] = { Tid_Bracket_Right, Tid_Semicolon, Tid_Comma }; diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx index 58370616359a..8f3ce687bbcb 100644 --- a/autodoc/source/parser/cpp/pe_vari.hxx +++ b/autodoc/source/parser/cpp/pe_vari.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,11 +54,11 @@ class PE_Variable : public Cpp_PE { afterName, // afterSize, // after ] - expectFinish, // after InitExpression + expectFinish, // after InitExpression size_of_states }; PE_Variable( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Variable(); /** @return @@ -67,33 +67,33 @@ class PE_Variable : public Cpp_PE */ UINT16 Result_Pattern() const; const String & Result_SizeExpression() const; - const String & Result_InitExpression() const; + const String & Result_InitExpression() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Variable, PE_Expression > SP_Expression; - typedef SubPeUse< PE_Variable, PE_Expression> SPU_Expression; + typedef SubPe< PE_Variable, PE_Expression > SP_Expression; + typedef SubPeUse< PE_Variable, PE_Expression> SPU_Expression; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); void SpReturn_ArraySizeExpression(); void SpReturn_InitExpression(); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Semicolon(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Semicolon(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); - void On_afterSize_ArrayBracket_Right(const char * i_sText); + void On_afterSize_ArrayBracket_Right(const char * i_sText); - void On_expectFinish_Semicolon(const char * i_sText); - void On_expectFinish_Comma(const char * i_sText); - void On_expectFinish_Bracket_Right(const char * i_sText); + void On_expectFinish_Semicolon(const char * i_sText); + void On_expectFinish_Comma(const char * i_sText); + void On_expectFinish_Bracket_Right(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Variable> > diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx index 31a873ef7f0f..eb10ecbdfd78 100644 --- a/autodoc/source/parser/cpp/pev.hxx +++ b/autodoc/source/parser/cpp/pev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,25 +68,25 @@ class PeEnvironment : protected TokenProcessing_Types { public: // INQUIRY - virtual ~PeEnvironment() {} + virtual ~PeEnvironment() {} // OPERATIONS // Token results - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push = 0 ); + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push = 0 ); // Owner stack void OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ); void OpenExternC( - bool i_bOnlyForOneDeclaration = false ); + bool i_bOnlyForOneDeclaration = false ); void OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); void OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); void CloseBlock(); /// Handles a '}' on file scope. void CloseClass(); void CloseEnum(); @@ -141,18 +141,18 @@ class PeEnvironment : protected TokenProcessing_Types private: virtual void do_SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) = 0; + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) = 0; virtual void do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ) = 0; virtual void do_OpenExternC( - bool i_bOnlyForOneDeclaration ) = 0; + bool i_bOnlyForOneDeclaration ) = 0; virtual void do_OpenClass( - ary::cpp::Class & io_rOpenedClass ) = 0; + ary::cpp::Class & io_rOpenedClass ) = 0; virtual void do_OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ) = 0; + ary::cpp::Enum & io_rOpenedEnum ) = 0; virtual void do_CloseBlock() = 0; virtual void do_CloseClass() = 0; virtual void do_CloseEnum() = 0; @@ -193,7 +193,7 @@ class PeEnvironment : protected TokenProcessing_Types inq_AryGate() const = 0; virtual const ary::cpp::InputContext & inq_Context() const = 0; - virtual String inq_CurFileName() const = 0; + virtual String inq_CurFileName() const = 0; virtual uintt inq_LineCount() const = 0; virtual bool inq_IsWaitingFor_Recovery() const = 0; virtual bool inq_IsExternC() const = 0; @@ -204,9 +204,9 @@ class PeEnvironment : protected TokenProcessing_Types // IMPLEMENTATION inline void -PeEnvironment::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +PeEnvironment::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { do_SetTokenResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } inline void PeEnvironment::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ) @@ -215,7 +215,7 @@ inline void PeEnvironment::OpenExternC( bool i_bOnlyForOneDeclaration ) { do_OpenExternC(i_bOnlyForOneDeclaration); } inline void -PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass ) +PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass ) { do_OpenClass(io_rOpenedClass); } inline void PeEnvironment::OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) @@ -283,7 +283,7 @@ PeEnvironment::AryGate() const inline const ary::cpp::InputContext & PeEnvironment::Context() const { return inq_Context(); } -inline String +inline String PeEnvironment::CurFileName() const { return inq_CurFileName(); } inline uintt diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx index 856736b96442..5955f0378563 100644 --- a/autodoc/source/parser/cpp/preproc.cxx +++ b/autodoc/source/parser/cpp/preproc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/preproc.hxx b/autodoc/source/parser/cpp/preproc.hxx index 0f78e5affb1f..dc4e99349229 100644 --- a/autodoc/source/parser/cpp/preproc.hxx +++ b/autodoc/source/parser/cpp/preproc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/prs_cpp.cxx b/autodoc/source/parser/cpp/prs_cpp.cxx index 6cda9eab509a..f4781e67d97f 100644 --- a/autodoc/source/parser/cpp/prs_cpp.cxx +++ b/autodoc/source/parser/cpp/prs_cpp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,11 +74,11 @@ class Udk_MacroMap struct S_RunningData { - CharacterSource aFileContent; + CharacterSource aFileContent; ary::cpp::Gate & rCppGate; Udk_MacroMap aMacros; - Distributor aDealer; - TokenParser_Cpp aTkp; + Distributor aDealer; + TokenParser_Cpp aTkp; S_RunningData( ary::Repository & o_rRepository, diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx index 10e6fd4dced8..e7fe91982d58 100644 --- a/autodoc/source/parser/cpp/sdocdist.hxx +++ b/autodoc/source/parser/cpp/sdocdist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,18 +61,18 @@ struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore private: // Interface ary::info::DocuStore - virtual void do_Store2CurFile( + virtual void do_Store2CurFile( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2CurNamespace( + virtual void do_Store2CurNamespace( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2ConnectedDeclaration( + virtual void do_Store2ConnectedDeclaration( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2Glossary( + virtual void do_Store2Glossary( DYN ary::doc::Node& let_drDocu, - const String & i_sExplainedTerm ); - virtual void do_Store2GlobalTexts( + const String & i_sExplainedTerm ); + virtual void do_Store2GlobalTexts( DYN ary::doc::Node& let_drDocu, ary::info::GlobalTextId i_nId ); @@ -135,7 +135,7 @@ S_DocuDistributor::do_Store2ConnectedDeclaration( DYN ary::doc::Node & let_drDoc void ContextForAry:: S_DocuDistributor::do_Store2Glossary( DYN ary::doc::Node & let_drDocu, - const String & // i_sExplainedTerm + const String & // i_sExplainedTerm ) { // KORR_FUTURE diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx index 6f3eaa7b4225..ec27790a8409 100644 --- a/autodoc/source/parser/cpp/sfscope.hxx +++ b/autodoc/source/parser/cpp/sfscope.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx index 5c00e40dabf7..8f4a2d7bb5d4 100644 --- a/autodoc/source/parser/cpp/sownstck.hxx +++ b/autodoc/source/parser/cpp/sownstck.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,9 +66,9 @@ struct ContextForAry::S_OwnerStack io_rOpenedNamespace ); void OpenExternC(); void OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); void OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); void CloseBlock(); void CloseClass(); void CloseEnum(); diff --git a/autodoc/source/parser/cpp/srecover.hxx b/autodoc/source/parser/cpp/srecover.hxx index 8408604db3fd..35bc3d7e0645 100644 --- a/autodoc/source/parser/cpp/srecover.hxx +++ b/autodoc/source/parser/cpp/srecover.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/autodoc/source/parser/cpp/tkp_cpp.cxx b/autodoc/source/parser/cpp/tkp_cpp.cxx index ffe0ca26dfdb..609bdb58d4ee 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.cxx +++ b/autodoc/source/parser/cpp/tkp_cpp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace cpp { TokenParser_Cpp::TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext ) - : pBaseContext( new Context_CppStd( let_drDocuContext ) ), + : pBaseContext( new Context_CppStd( let_drDocuContext ) ), pCurContext(0), pDealer(0), pCharacterSource(0) diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx index 70dfab605c6f..ac84a76b1e79 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.hxx +++ b/autodoc/source/parser/cpp/tkp_cpp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ class TokenParser_Cpp : public TokenParser TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext ); - virtual ~TokenParser_Cpp(); + virtual ~TokenParser_Cpp(); // OPERATIONS void AssignPartners( @@ -79,13 +79,13 @@ class TokenParser_Cpp : public TokenParser const csv::ploc::Path & i_file ); private: - virtual void SetStartContext(); + virtual void SetStartContext(); virtual void SetCurrentContext( - TkpContext & io_rContext ); + TkpContext & io_rContext ); virtual TkpContext & CurrentContext(); // DATA - Dyn<Context_CppStd> pBaseContext; + Dyn<Context_CppStd> pBaseContext; TkpContext * pCurContext; Distributor * pDealer; CharacterSource * pCharacterSource; diff --git a/autodoc/source/parser/cpp/tokintpr.hxx b/autodoc/source/parser/cpp/tokintpr.hxx index f526ba00ee06..2420555d7e54 100644 --- a/autodoc/source/parser/cpp/tokintpr.hxx +++ b/autodoc/source/parser/cpp/tokintpr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ namespace cpp { #define DECL_TOK_HANDLER(token) \ - void Hdl_##token( \ + void Hdl_##token( \ const Tok_##token & i_rTok ) { Call_Handler(i_rTok); } class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} DECL_TOK_HANDLER(Identifier) DECL_TOK_HANDLER(Operator) @@ -102,8 +102,8 @@ class TokenInterpreter DECL_TOK_HANDLER(Constant) protected: - virtual void Call_Handler( - const cpp::Token & i_rTok ) = 0; + virtual void Call_Handler( + const cpp::Token & i_rTok ) = 0; }; #undef DECL_TOK_HANDLER |