diff options
Diffstat (limited to 'autodoc/source/parser_i')
94 files changed, 1569 insertions, 1569 deletions
diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx index 42ace9448462..877b7fe45eea 100644 --- a/autodoc/source/parser_i/idl/cx_idlco.cxx +++ b/autodoc/source/parser_i/idl/cx_idlco.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 @@ -151,9 +151,9 @@ const UINT16 nTok_EOF = 802; -Context_UidlCode::Context_UidlCode( Token_Receiver & o_rReceiver, +Context_UidlCode::Context_UidlCode( Token_Receiver & o_rReceiver, DYN TkpDocuContext & let_drContext_Docu ) - : aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati), + : aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati), pReceiver(&o_rReceiver), pDocuContext(&let_drContext_Docu), dpContext_MLComment(0), @@ -185,7 +185,7 @@ Context_UidlCode::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, 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. pFollowUpContext = rBound.FollowUpContext(); @@ -211,9 +211,9 @@ Context_UidlCode::FollowUpContext() } void -Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) +Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -265,7 +265,7 @@ Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch ( i_nTokenId / 50 ) + } // end switch ( i_nTokenId / 50 ) break; case nF_fin_Punctuation: io_rText.CutToken(); @@ -302,19 +302,19 @@ Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_UidlCode::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 finErr = 3; + const INT16 finErr = 3; const INT16 finIgn = 4; const INT16 finBez = 5; const INT16 finKeyw = 6; @@ -323,25 +323,25 @@ Context_UidlCode::SetupStateMachine() const INT16 finEOF = 9; // Kontextwechsel-Stati: - const INT16 gotoMld = 10; - const INT16 gotoSld = 11; - const INT16 gotoMlc = 12; - const INT16 gotoSlc = 13; + const INT16 gotoMld = 10; + const INT16 gotoSld = 11; + const INT16 gotoMlc = 12; + const INT16 gotoSlc = 13; const INT16 gotoPrp = 14; - const INT16 gotoAsg = 15; + const INT16 gotoAsg = 15; // Konstanten zur Benutzung in der Tabelle: const INT16 err = finErr; const INT16 fbz = finBez; const INT16 fig = finIgn; const INT16 fof = finEOF; -// const INT16 fkw = finKeyw; -// const INT16 fpc = finPunct; +// const INT16 fkw = finKeyw; +// const INT16 fpc = finPunct; /// Die '0'en werden spaeter durch AddToken() ersetzt. 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,err,wht, 0,err,err,err,err, 0, 0,err,err, 0, 0, 0,err, @@ -353,7 +353,7 @@ Context_UidlCode::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,wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, @@ -365,7 +365,7 @@ Context_UidlCode::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, @@ -377,7 +377,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nPunctDefStatus[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, @@ -389,7 +389,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nKeywordDefStatus[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, @@ -407,32 +407,32 @@ Context_UidlCode::SetupStateMachine() DYN StmArrayStatu2 * dpStatusBez = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true); - DYN StmBoundsStatu2 * dpBst_finErr + DYN StmBoundsStatu2 * dpBst_finErr = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); - DYN StmBoundsStatu2 * dpBst_finIgn + DYN StmBoundsStatu2 * dpBst_finIgn = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true ); - DYN StmBoundsStatu2 * dpBst_finBez + DYN StmBoundsStatu2 * dpBst_finBez = new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true ); - DYN StmBoundsStatu2 * dpBst_finKeyw + DYN StmBoundsStatu2 * dpBst_finKeyw = new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false ); - DYN StmBoundsStatu2 * dpBst_finPunct + DYN StmBoundsStatu2 * dpBst_finPunct = new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false ); - DYN StmBoundsStatu2 * dpBst_finEOL + DYN StmBoundsStatu2 * dpBst_finEOL = new StmBoundsStatu2( *this, *this, nF_fin_EOL, false ); - DYN StmBoundsStatu2 * dpBst_finEOF + DYN StmBoundsStatu2 * dpBst_finEOF = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false ); - DYN StmBoundsStatu2 * dpBst_gotoMld + DYN StmBoundsStatu2 * dpBst_gotoMld = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false ); - DYN StmBoundsStatu2 * dpBst_gotoSld + DYN StmBoundsStatu2 * dpBst_gotoSld = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false ); - DYN StmBoundsStatu2 * dpBst_gotoMlc + DYN StmBoundsStatu2 * dpBst_gotoMlc = new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false ); - DYN StmBoundsStatu2 * dpBst_gotoSlc + DYN StmBoundsStatu2 * dpBst_gotoSlc = new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false ); - DYN StmBoundsStatu2 * dpBst_gotoPrp + DYN StmBoundsStatu2 * dpBst_gotoPrp = new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false ); - DYN StmBoundsStatu2 * dpBst_gotoAsg + DYN StmBoundsStatu2 * dpBst_gotoAsg = new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false ); // dpMain aufbauen: @@ -456,8 +456,8 @@ Context_UidlCode::SetupStateMachine() aStateMachine.AddStatus(dpBst_gotoPrp); aStateMachine.AddStatus(dpBst_gotoAsg); - aStateMachine.AddToken("any", nTok_bty_any, A_nKeywordDefStatus, finKeyw); - aStateMachine.AddToken("attribute", nTok_mt_attribute, A_nKeywordDefStatus, finKeyw); + aStateMachine.AddToken("any", nTok_bty_any, A_nKeywordDefStatus, finKeyw); + aStateMachine.AddToken("attribute", nTok_mt_attribute, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("boolean", nTok_bty_boolean, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("bound", nTok_ste_bound, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("byte", nTok_bty_byte, A_nKeywordDefStatus, finKeyw); @@ -517,7 +517,7 @@ Context_UidlCode::SetupStateMachine() A_nPunctDefStatus, finPunct); aStateMachine.AddToken("}", nTok_punct_CurledBracketClose, A_nPunctDefStatus, finPunct); - aStateMachine.AddToken("<", nTok_punct_Lesser, A_nPunctDefStatus, finPunct); + aStateMachine.AddToken("<", nTok_punct_Lesser, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(">", nTok_punct_Greater, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(";", nTok_punct_Semicolon, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(":", nTok_punct_Colon, A_nPunctDefStatus, finPunct); @@ -526,7 +526,7 @@ Context_UidlCode::SetupStateMachine() aStateMachine.AddToken("-", nTok_punct_Minus, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(".", nTok_punct_Fullstop, A_nPunctDefStatus, finPunct); aStateMachine.AddToken("/**", nTok_none_MLDocuBegin, A_nPunctDefStatus, gotoMld); - aStateMachine.AddToken("///", nTok_none_SLDocuBegin, A_nPunctDefStatus, gotoSld); + aStateMachine.AddToken("///", nTok_none_SLDocuBegin, A_nPunctDefStatus, gotoSld); aStateMachine.AddToken("/*", nTok_none_MLCommentBegin, A_nPunctDefStatus, gotoMlc); aStateMachine.AddToken("//", nTok_none_SLCommentBegin, diff --git a/autodoc/source/parser_i/idl/cx_sub.cxx b/autodoc/source/parser_i/idl/cx_sub.cxx index e098d6cc1c3c..facf23f68909 100644 --- a/autodoc/source/parser_i/idl/cx_sub.cxx +++ b/autodoc/source/parser_i/idl/cx_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 @@ -63,7 +63,7 @@ Cx_Base::FollowUpContext() } void -Context_MLComment::ReadCharChain( CharacterSource & io_rText ) +Context_MLComment::ReadCharChain( CharacterSource & io_rText ) { char cNext = NULCH; @@ -89,7 +89,7 @@ Context_MLComment::ReadCharChain( CharacterSource & io_rText ) } void -Context_SLComment::ReadCharChain( CharacterSource & io_rText ) +Context_SLComment::ReadCharChain( CharacterSource & io_rText ) { jumpToEol(io_rText); if (io_rText.CurChar() != NULCH) @@ -101,7 +101,7 @@ Context_SLComment::ReadCharChain( CharacterSource & io_rText ) } void -Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) +Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) { jumpToEol(io_rText); if (io_rText.CurChar() != NULCH) @@ -113,7 +113,7 @@ Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) } void -Context_Assignment::ReadCharChain( CharacterSource & io_rText ) +Context_Assignment::ReadCharChain( CharacterSource & io_rText ) { // KORR_FUTURE // How to handle new lines within this, so he y get realised by @@ -134,7 +134,7 @@ Context_Assignment::ReadCharChain( CharacterSource & io_rText ) io_rText.MoveOn(); } cNext = io_rText.MoveOn(); - } // endif (cNext == '"') + } // endif (cNext == '"') } while (cNext != ';' AND cNext != ',' AND cNext != '}'); if (cNext == ',' OR cNext == ';') diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx index 75c245bfa96e..3c8cb6a2698c 100644 --- a/autodoc/source/parser_i/idl/distrib.cxx +++ b/autodoc/source/parser_i/idl/distrib.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 @@ -const uintt C_nNO_TRY = uintt(-1); +const uintt C_nNO_TRY = uintt(-1); namespace csi @@ -52,7 +52,7 @@ namespace uidl TokenDistributor::TokenDistributor( ary::Repository & io_rRepository, ParserInfo & io_rParserInfo ) - : pTokenSource(0), + : pTokenSource(0), aDocumentation(io_rParserInfo), aProcessingData( io_rRepository, aDocumentation, io_rParserInfo ) { @@ -75,10 +75,10 @@ TokenDistributor::TradeToken() } TokenDistributor::ProcessingData::ProcessingData( - ary::Repository & io_rRepository, - Documentation & i_rDocuProcessor, + ary::Repository & io_rRepository, + Documentation & i_rDocuProcessor, ParserInfo & io_rParserInfo ) - : // aEnvironments + : // aEnvironments // aTokenQueue // itCurToken // aCurResult @@ -203,10 +203,10 @@ TokenDistributor::ProcessingData::AcknowledgeResult() DecrementTryCount(); aEnvironments.pop_back(); CurEnv().Enter(pop_failure); - } break; + } break; default: csv_assert(false); - } // end switch(aCurResult.eStackAction) + } // end switch(aCurResult.eStackAction) } void @@ -222,7 +222,7 @@ TokenDistributor::ProcessingData::DecrementTryCount() TokenDistributor:: Documentation::Documentation(ParserInfo & io_rParserInfo) - : pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)), + : pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)), rParserInfo(io_rParserInfo), pMostRecentDocu(0), bIsPassedFirstDocu(false) @@ -246,7 +246,7 @@ Documentation::Receive( DYN csi::dsapi::Token & let_drToken ) pMostRecentDocu = pDocuParseEnv->ReleaseJustParsedDocu(); if (NOT bIsPassedFirstDocu) { - pMostRecentDocu = 0; // Deletes the most recent docu. + pMostRecentDocu = 0; // Deletes the most recent docu. bIsPassedFirstDocu = true; } } diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx index 4327ae1e3cbd..cd8d6d7f93d7 100644 --- a/autodoc/source/parser_i/idl/parsenv2.cxx +++ b/autodoc/source/parser_i/idl/parsenv2.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,8 +60,8 @@ UnoIDL_PE::~UnoIDL_PE() } void -UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { pRepository = &io_rRepository; @@ -69,15 +69,15 @@ UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, } //void -//UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, -// ary::idl::Gate & io_rGate, -// TokenProcessing_Result & o_rResult ) +//UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, +// ary::idl::Gate & io_rGate, +// TokenProcessing_Result & o_rResult ) //{ -// aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult); +// aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult); //} void -UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) +UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) { switch (i_eWayOfEntering) { @@ -95,11 +95,11 @@ UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) // no break because of throw default: csv_assert(false); - } // end switch + } // end switch } void -UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) +UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) { switch (i_eWayOfLeaving) { @@ -116,7 +116,7 @@ UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) // no break because of throw default: csv_assert(false); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_attri.cxx b/autodoc/source/parser_i/idl/pe_attri.cxx index 31fe8063ea6c..fe362c429915 100644 --- a/autodoc/source/parser_i/idl/pe_attri.cxx +++ b/autodoc/source/parser_i/idl/pe_attri.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,8 +68,8 @@ PE_Attribute::PE_Attribute( const Ce_id & i_rCurOwner ) void PE_Attribute::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx index 4013f33d02d7..7b07b8d858e6 100644 --- a/autodoc/source/parser_i/idl/pe_const.cxx +++ b/autodoc/source/parser_i/idl/pe_const.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,11 +51,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Constant::On_Default +#define DF &PE_Constant::On_Default PE_Constant::F_TOK PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { DF, &PE_Constant::On_expect_name_Identifier, DF }, // expect_name { DF, DF, &PE_Constant::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open @@ -69,15 +69,15 @@ PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] = inline void -PE_Constant::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Constant::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Constant::PE_Constant() - : eState(e_none), + : eState(e_none), sData_Name(), nDataId(0), pPE_Type(0), @@ -91,9 +91,9 @@ PE_Constant::PE_Constant() } void -PE_Constant::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Constant::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); @@ -256,11 +256,11 @@ PE_Constant::ReceiveData() CreateSingleConstant(); EmptySingleConstData(); eState = expect_const; - } break; + } break; default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx index 68fb46d48a56..e6e96cfd2b15 100644 --- a/autodoc/source/parser_i/idl/pe_enum2.cxx +++ b/autodoc/source/parser_i/idl/pe_enum2.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,11 +51,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Enum::On_Default +#define DF &PE_Enum::On_Default PE_Enum::F_TOK PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] = - { { DF, DF }, // e_none + { { DF, DF }, // e_none { &PE_Enum::On_expect_name_Identifier, DF }, // expect_name { DF, &PE_Enum::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open @@ -67,15 +67,15 @@ PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] = inline void -PE_Enum::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Enum::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Enum::PE_Enum() - : eState(e_none), + : eState(e_none), sData_Name(), nDataId(0), pPE_Value(0), @@ -86,9 +86,9 @@ PE_Enum::PE_Enum() } void -PE_Enum::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Enum::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Value->EstablishContacts(this,io_rRepository,o_rResult); @@ -227,11 +227,11 @@ PE_Enum::ReceiveData() CreateSingleValue(); EmptySingleValueData(); - } break; + } break; default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index 4e1aafabb10b..2d754e8da4bb 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.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 @@ -48,11 +48,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Value::On_Default +#define DF &PE_Value::On_Default PE_Value::F_TOK PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { &PE_Value::On_expect_name_Identifier, DF, DF }, // expect_name { DF, &PE_Value::On_got_name_Punctuation, @@ -62,18 +62,18 @@ PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] = inline void -PE_Value::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Value::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } -PE_Value::PE_Value( String & o_rName, - String & o_rAssignment, - bool i_bIsConst ) - : eState(e_none), +PE_Value::PE_Value( String & o_rName, + String & o_rAssignment, + bool i_bIsConst ) + : eState(e_none), pName(&o_rName), pAssignment(&o_rAssignment), bIsConst(i_bIsConst) @@ -81,9 +81,9 @@ PE_Value::PE_Value( String & o_rName, } void -PE_Value::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Value::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); } diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx index 23d3843583bb..76ee2d4f71ed 100644 --- a/autodoc/source/parser_i/idl/pe_excp.cxx +++ b/autodoc/source/parser_i/idl/pe_excp.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,16 +51,16 @@ namespace uidl PE_Exception::PE_Exception() - // : aWork, + // : aWork, // pStati { pStati = new S_Stati(*this); } void -PE_Exception::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Exception::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult); @@ -103,7 +103,7 @@ PE_Exception::ReceiveData() } PE_Exception::S_Work::S_Work() - : sData_Name(), + : sData_Name(), bIsPreDeclaration(false), nCurStruct(0), pPE_Element(0), @@ -146,7 +146,7 @@ PE_Exception::S_Work::Data_Set_Name( const char * i_sName ) } PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct) - : aNone(io_rStruct), + : aNone(io_rStruct), aWaitForName(io_rStruct), aGotName(io_rStruct), aWaitForBase(io_rStruct), @@ -159,7 +159,7 @@ PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct) } -//*********************** Stati ***************************// +//*********************** Stati ***************************// UnoIDL_PE & @@ -196,7 +196,7 @@ PE_Exception::State_GotName::Process_Punctuation( const TokPunctuation & i_rToke break; default: SetResult(not_done,pop_failure); - } // end switch + } // end switch } else { diff --git a/autodoc/source/parser_i/idl/pe_file2.cxx b/autodoc/source/parser_i/idl/pe_file2.cxx index 144470f8945e..f6caa5e8d765 100644 --- a/autodoc/source/parser_i/idl/pe_file2.cxx +++ b/autodoc/source/parser_i/idl/pe_file2.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 @@ -59,7 +59,7 @@ namespace uidl PE_File::PE_File( TokenDistributor & i_rTokenAdmin, const ParserInfo & i_parseInfo ) - : pTokenAdmin(&i_rTokenAdmin), + : pTokenAdmin(&i_rTokenAdmin), pPE_Service(new PE_Service), pPE_Singleton(new PE_Singleton), pPE_Interface(new PE_Interface), @@ -76,9 +76,9 @@ PE_File::PE_File( TokenDistributor & i_rTokenAdmin, } void -PE_File::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_File::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Service->EstablishContacts(this,io_rRepository,o_rResult); @@ -123,7 +123,7 @@ PE_File::Process_Identifier( const TokIdentifier & i_rToken ) SetResult(done, stay); eState = wait_for_module_bracket; - } break; + } break; case on_default: SetResult(done, stay); break; @@ -198,7 +198,7 @@ PE_File::Process_Punctuation( const TokPunctuation & i_rToken ) } void -PE_File::Process_MetaType( const TokMetaType & i_rToken ) +PE_File::Process_MetaType( const TokMetaType & i_rToken ) { switch (i_rToken.Id()) { @@ -245,7 +245,7 @@ PE_File::Process_MetaType( const TokMetaType & i_rToken ) default: Process_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx index 64a0c6d65736..1e8a487caac6 100644 --- a/autodoc/source/parser_i/idl/pe_func2.cxx +++ b/autodoc/source/parser_i/idl/pe_func2.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,8 +51,8 @@ namespace uidl { -PE_Function::PE_Function( const RParent & i_rCurInterface ) - : eState(e_none), +PE_Function::PE_Function( const RParent & i_rCurInterface ) + : eState(e_none), sData_Name(), nData_ReturnType(0), bData_Oneway(false), @@ -67,13 +67,13 @@ PE_Function::PE_Function( const RParent & i_rCurInterface ) sCurParsedParam_Name(), bIsForConstructors(false) { - pPE_Type = new PE_Type(nCurParsedType); - pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); + pPE_Type = new PE_Type(nCurParsedType); + pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); } -PE_Function::PE_Function( const RParent & i_rCurService, +PE_Function::PE_Function( const RParent & i_rCurService, E_Constructor ) - : eState(expect_name), + : eState(expect_name), sData_Name(), nData_ReturnType(0), bData_Oneway(false), @@ -88,13 +88,13 @@ PE_Function::PE_Function( const RParent & i_rCurService, sCurParsedParam_Name(), bIsForConstructors(true) { - pPE_Type = new PE_Type(nCurParsedType); - pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); + pPE_Type = new PE_Type(nCurParsedType); + pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); } void -PE_Function::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Function::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -125,7 +125,7 @@ PE_Function::Process_Stereotype( const TokStereotype & i_rToken ) break; default: OnDefault(); - } // end switch + } // end switch } else OnDefault(); @@ -286,7 +286,7 @@ PE_Function::Process_BuiltInType( const TokBuiltInType & i_rToken ) break; default: OnDefault(); - } // end switch + } // end switch } void @@ -344,7 +344,7 @@ PE_Function::Process_Default() break; default: OnDefault(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index 404c303d2c04..0853dc9513bc 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.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,11 +53,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Interface::On_Default +#define DF &PE_Interface::On_Default PE_Interface::F_TOK PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] = - { { DF, DF, DF, DF, DF }, // e_none + { { DF, DF, DF, DF, DF }, // e_none { &PE_Interface::On_need_uik_MetaType, DF, DF, DF, DF }, // need_uik { DF, &PE_Interface::On_uik_Identifier, @@ -92,14 +92,14 @@ PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] = inline void -PE_Interface::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Interface::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Interface::PE_Interface() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurInterface(0), @@ -110,15 +110,15 @@ PE_Interface::PE_Interface() nCurParsed_Base(0), bOptionalMember(false) { - pPE_Function = new PE_Function(nCurInterface); - pPE_Type = new PE_Type(nCurParsed_Base); + pPE_Function = new PE_Function(nCurInterface); + pPE_Type = new PE_Type(nCurParsed_Base); pPE_Attribute = new PE_Attribute(nCurInterface); } void -PE_Interface::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Interface::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Function->EstablishContacts(this,io_rRepository,o_rResult); @@ -138,7 +138,7 @@ PE_Interface::ProcessToken( const Token & i_rToken ) void -PE_Interface::Process_MetaType( const TokMetaType & i_rToken ) +PE_Interface::Process_MetaType( const TokMetaType & i_rToken ) { CallHandler( i_rToken.Text(), tt_metatype ); } @@ -270,7 +270,7 @@ PE_Interface::On_wait_for_base_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } else { @@ -322,7 +322,7 @@ PE_Interface::On_std_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void @@ -375,7 +375,7 @@ PE_Interface::On_need_finish_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_property.cxx b/autodoc/source/parser_i/idl/pe_property.cxx index fc138b3c9d27..e3176c23bbc4 100644 --- a/autodoc/source/parser_i/idl/pe_property.cxx +++ b/autodoc/source/parser_i/idl/pe_property.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 @@ -64,8 +64,8 @@ PE_Property::PE_Property( const Ce_id & i_rCurOwner ) void PE_Property::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx index 7dabd57b8205..94f4e97b5c5f 100644 --- a/autodoc/source/parser_i/idl/pe_selem.cxx +++ b/autodoc/source/parser_i/idl/pe_selem.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 @@ -50,10 +50,10 @@ namespace const String C_sNone; } -PE_StructElement::PE_StructElement( RStructElement & o_rResult, - const RStruct & i_rCurStruct, +PE_StructElement::PE_StructElement( RStructElement & o_rResult, + const RStruct & i_rCurStruct, const String & i_rCurStructTemplateParam ) - : eState(e_none), + : eState(e_none), pResult(&o_rResult), pCurStruct(&i_rCurStruct), bIsExceptionElement(false), @@ -65,9 +65,9 @@ PE_StructElement::PE_StructElement( RStructElement & o_rResult, pPE_Type = new PE_Type(nType); } -PE_StructElement::PE_StructElement( RStructElement & o_rResult, - const RStruct & i_rCurExc ) - : eState(e_none), +PE_StructElement::PE_StructElement( RStructElement & o_rResult, + const RStruct & i_rCurExc ) + : eState(e_none), pResult(&o_rResult), pCurStruct(&i_rCurExc), bIsExceptionElement(true), @@ -80,9 +80,9 @@ PE_StructElement::PE_StructElement( RStructElement & o_rResult, } void -PE_StructElement::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_StructElement::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx index a4209c58f7be..083fdd1884bd 100644 --- a/autodoc/source/parser_i/idl/pe_servi.cxx +++ b/autodoc/source/parser_i/idl/pe_servi.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 @@ namespace uidl PE_Service::PE_Service() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurService(0), @@ -66,14 +66,14 @@ PE_Service::PE_Service() pPE_Constructor(0), bOptionalMember(false) { - pPE_Property = new PE_Property(nCurService); - pPE_Type = new PE_Type(nCurParsed_Type); + pPE_Property = new PE_Property(nCurService); + pPE_Type = new PE_Type(nCurParsed_Type); pPE_Constructor = new PE_Function(nCurService, PE_Function::constructor); } void -PE_Service::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Service::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -94,7 +94,7 @@ PE_Service::ProcessToken( const Token & i_rToken ) void -PE_Service::Process_MetaType( const TokMetaType & i_rToken ) +PE_Service::Process_MetaType( const TokMetaType & i_rToken ) { switch ( i_rToken.Id() ) { @@ -130,7 +130,7 @@ PE_Service::Process_MetaType( const TokMetaType & i_rToken ) // KORR_FUTURE: // Should throw syntax error warning. ; - } // end switch + } // end switch } void @@ -239,11 +239,11 @@ PE_Service::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; default: On_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx index 292d380323ac..323ce23b55c2 100644 --- a/autodoc/source/parser_i/idl/pe_singl.cxx +++ b/autodoc/source/parser_i/idl/pe_singl.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 @@ -50,7 +50,7 @@ namespace uidl PE_Singleton::PE_Singleton() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurSingleton(0), @@ -58,12 +58,12 @@ PE_Singleton::PE_Singleton() pPE_Type(0), nCurParsed_Type(0) { - pPE_Type = new PE_Type(nCurParsed_Type); + pPE_Type = new PE_Type(nCurParsed_Type); } void -PE_Singleton::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Singleton::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -82,7 +82,7 @@ PE_Singleton::ProcessToken( const Token & i_rToken ) void -PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) +PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) { switch ( i_rToken.Id() ) { @@ -106,7 +106,7 @@ PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) // Should throw syntax error warning ; - } // end switch + } // end switch } void @@ -160,7 +160,7 @@ PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; case TokPunctuation::Colon: switch (eState) @@ -171,11 +171,11 @@ PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; default: On_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx index a9dc68448ee3..766597f07809 100644 --- a/autodoc/source/parser_i/idl/pe_struc.cxx +++ b/autodoc/source/parser_i/idl/pe_struc.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,8 +58,8 @@ PE_Struct::PE_Struct() void PE_Struct::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx index 310a8f57327b..c7051f3047bd 100644 --- a/autodoc/source/parser_i/idl/pe_tydf2.cxx +++ b/autodoc/source/parser_i/idl/pe_tydf2.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 @@ -49,11 +49,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Typedef::On_Default +#define DF &PE_Typedef::On_Default PE_Typedef::F_TOK PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { &PE_Typedef::On_expect_description_Any, &PE_Typedef::On_expect_description_Any, DF }, // expect_description @@ -65,8 +65,8 @@ PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] = inline void -PE_Typedef::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Typedef::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } @@ -74,7 +74,7 @@ PE_Typedef::CallHandler( const char * i_sTokenText, PE_Typedef::PE_Typedef() - : eState(e_none), + : eState(e_none), pPE_Type(0), nType(0), sName() @@ -83,8 +83,8 @@ PE_Typedef::PE_Typedef() } void -PE_Typedef::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Typedef::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_type2.cxx b/autodoc/source/parser_i/idl/pe_type2.cxx index fe73ce04bdca..d21d01795e81 100644 --- a/autodoc/source/parser_i/idl/pe_type2.cxx +++ b/autodoc/source/parser_i/idl/pe_type2.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,7 +75,7 @@ namespace uidl PE_Type::PE_Type( ary::idl::Type_id & o_rResult ) - : pResult(&o_rResult), + : pResult(&o_rResult), nIsSequenceCounter(0), nSequenceDownCounter(0), bIsUnsigned(false), diff --git a/autodoc/source/parser_i/idl/pe_vari2.cxx b/autodoc/source/parser_i/idl/pe_vari2.cxx index 8491d831c9b8..c3714a21d839 100644 --- a/autodoc/source/parser_i/idl/pe_vari2.cxx +++ b/autodoc/source/parser_i/idl/pe_vari2.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 @@ -47,9 +47,9 @@ namespace uidl { -PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, - String & i_rResult_Name ) - : eState(e_none), +PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, + String & i_rResult_Name ) + : eState(e_none), pResult_Type(&i_rResult_Type), pResult_Name(&i_rResult_Name), pPE_Type(0) @@ -58,9 +58,9 @@ PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, } void -PE_Variable::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Variable::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); @@ -84,7 +84,7 @@ PE_Variable::Process_Default() { SetResult( not_done, push_sure, pPE_Type.Ptr() ); } - else{ + else{ csv_assert(false); } } diff --git a/autodoc/source/parser_i/idl/pestate.cxx b/autodoc/source/parser_i/idl/pestate.cxx index 2799e2029783..214be8e9a958 100644 --- a/autodoc/source/parser_i/idl/pestate.cxx +++ b/autodoc/source/parser_i/idl/pestate.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 @@ -73,7 +73,7 @@ ParseEnvState::Process_TypeModifier( const TokTypeModifier & ) } void -ParseEnvState::Process_MetaType( const TokMetaType & ) +ParseEnvState::Process_MetaType( const TokMetaType & ) { Process_Default(); } @@ -131,7 +131,7 @@ ParseEnvState::Process_Default() { if (bDefaultIsError) MyPE().SetResult(not_done, pop_failure); - else // ignore: + else // ignore: MyPE().SetResult(done, stay); } diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx index f2e38a291e87..4ff1e3f191fd 100644 --- a/autodoc/source/parser_i/idl/semnode.cxx +++ b/autodoc/source/parser_i/idl/semnode.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 @@ -46,19 +46,19 @@ namespace uidl SemanticNode::SemanticNode() - : pParentPE(0), + : pParentPE(0), pAryGate(0), pTokenResult(0) { } void -SemanticNode::EstablishContacts( UnoIDL_PE * io_pParentPE, +SemanticNode::EstablishContacts( UnoIDL_PE * io_pParentPE, ary::idl::Gate & io_rGate, - TokenProcessing_Result & o_rResult ) + TokenProcessing_Result & o_rResult ) { - pParentPE = io_pParentPE; - pAryGate = &io_rGate; + pParentPE = io_pParentPE; + pAryGate = &io_rGate; pTokenResult = &o_rResult; } @@ -67,15 +67,15 @@ SemanticNode::~SemanticNode() } void -SemanticNode::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push ) +SemanticNode::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push ) { csv_assert(pTokenResult != 0); - pTokenResult->eDone = i_eDone; - pTokenResult->eStackAction = i_eWhat2DoWithEnvStack; - pTokenResult->pEnv2Push = i_pParseEnv2Push; + pTokenResult->eDone = i_eDone; + pTokenResult->eStackAction = i_eWhat2DoWithEnvStack; + pTokenResult->pEnv2Push = i_pParseEnv2Push; } diff --git a/autodoc/source/parser_i/idl/tk_const.cxx b/autodoc/source/parser_i/idl/tk_const.cxx index 98b418b3f679..69027f73dc06 100644 --- a/autodoc/source/parser_i/idl/tk_const.cxx +++ b/autodoc/source/parser_i/idl/tk_const.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 uidl void -TokAssignment::Trigger( TokenInterpreter & io_rInterpreter ) const +TokAssignment::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Assignment(*this); } diff --git a/autodoc/source/parser_i/idl/tk_ident.cxx b/autodoc/source/parser_i/idl/tk_ident.cxx index 13f5571d5e05..bda977da6085 100644 --- a/autodoc/source/parser_i/idl/tk_ident.cxx +++ b/autodoc/source/parser_i/idl/tk_ident.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 @@ -41,7 +41,7 @@ namespace uidl { void -TokIdentifier::Trigger( TokenInterpreter & io_rInterpreter ) const +TokIdentifier::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Identifier(*this); } @@ -53,7 +53,7 @@ TokIdentifier::Text() const } void -TokNameSeparator::Trigger( TokenInterpreter & io_rInterpreter ) const +TokNameSeparator::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_NameSeparator(); } diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx index 408f83dc4b58..7b3332705821 100644 --- a/autodoc/source/parser_i/idl/tk_keyw.cxx +++ b/autodoc/source/parser_i/idl/tk_keyw.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 @@ -41,7 +41,7 @@ using csi::uidl::TokStereotype; using csi::uidl::TokParameterHandling; -lux::EnumValueMap G_aTokBuiltInType_EV_TokenId_Values; +lux::EnumValueMap G_aTokBuiltInType_EV_TokenId_Values; TokBuiltInType::EV_TokenId ev_bty_none(TokBuiltInType::e_none,""); TokBuiltInType::EV_TokenId ev_bty_any(TokBuiltInType::bty_any,"any"); TokBuiltInType::EV_TokenId ev_bty_boolean(TokBuiltInType::bty_boolean,"boolean"); @@ -56,30 +56,30 @@ TokBuiltInType::EV_TokenId ev_bty_void(TokBuiltInType::bty_void,"void"); TokBuiltInType::EV_TokenId ev_bty_ellipse(TokBuiltInType::bty_ellipse,"..."); -lux::EnumValueMap G_aTokTypeModifier_EV_TokenId_Values; +lux::EnumValueMap G_aTokTypeModifier_EV_TokenId_Values; TokTypeModifier::EV_TokenId ev_tmod_none(TokTypeModifier::e_none,""); TokTypeModifier::EV_TokenId ev_tmod_unsigned(TokTypeModifier::tmod_unsigned,"unsigned"); TokTypeModifier::EV_TokenId ev_tmod_sequence(TokTypeModifier::tmod_sequence,"sequence"); -lux::EnumValueMap G_aTokMetaType_EV_TokenId_Values; +lux::EnumValueMap G_aTokMetaType_EV_TokenId_Values; TokMetaType::EV_TokenId ev_mt_none(TokMetaType::e_none,""); -TokMetaType::EV_TokenId ev_mt_attribute(TokMetaType::mt_attribute,"attribute"); -TokMetaType::EV_TokenId ev_mt_constants(TokMetaType::mt_constants,"constants"); -TokMetaType::EV_TokenId ev_mt_enum(TokMetaType::mt_enum,"enum"); -TokMetaType::EV_TokenId ev_mt_exception(TokMetaType::mt_exception,"exception"); -TokMetaType::EV_TokenId ev_mt_ident(TokMetaType::mt_ident,"ident"); -TokMetaType::EV_TokenId ev_mt_interface(TokMetaType::mt_interface,"interface"); -TokMetaType::EV_TokenId ev_mt_module(TokMetaType::mt_module,"module"); -TokMetaType::EV_TokenId ev_mt_property(TokMetaType::mt_property,"property"); -TokMetaType::EV_TokenId ev_mt_service(TokMetaType::mt_service,"service"); -TokMetaType::EV_TokenId ev_mt_singleton(TokMetaType::mt_singleton,"singleton"); -TokMetaType::EV_TokenId ev_mt_struct(TokMetaType::mt_struct,"struct"); -TokMetaType::EV_TokenId ev_mt_typedef(TokMetaType::mt_typedef,"typedef"); -TokMetaType::EV_TokenId ev_mt_uik(TokMetaType::mt_uik,"uik"); - - -lux::EnumValueMap G_aTokStereotype_EV_TokenId_Values; +TokMetaType::EV_TokenId ev_mt_attribute(TokMetaType::mt_attribute,"attribute"); +TokMetaType::EV_TokenId ev_mt_constants(TokMetaType::mt_constants,"constants"); +TokMetaType::EV_TokenId ev_mt_enum(TokMetaType::mt_enum,"enum"); +TokMetaType::EV_TokenId ev_mt_exception(TokMetaType::mt_exception,"exception"); +TokMetaType::EV_TokenId ev_mt_ident(TokMetaType::mt_ident,"ident"); +TokMetaType::EV_TokenId ev_mt_interface(TokMetaType::mt_interface,"interface"); +TokMetaType::EV_TokenId ev_mt_module(TokMetaType::mt_module,"module"); +TokMetaType::EV_TokenId ev_mt_property(TokMetaType::mt_property,"property"); +TokMetaType::EV_TokenId ev_mt_service(TokMetaType::mt_service,"service"); +TokMetaType::EV_TokenId ev_mt_singleton(TokMetaType::mt_singleton,"singleton"); +TokMetaType::EV_TokenId ev_mt_struct(TokMetaType::mt_struct,"struct"); +TokMetaType::EV_TokenId ev_mt_typedef(TokMetaType::mt_typedef,"typedef"); +TokMetaType::EV_TokenId ev_mt_uik(TokMetaType::mt_uik,"uik"); + + +lux::EnumValueMap G_aTokStereotype_EV_TokenId_Values; TokStereotype::EV_TokenId ev_ste_none(TokStereotype::e_none,""); TokStereotype::EV_TokenId ev_ste_bound(TokStereotype::ste_bound,"bound"); TokStereotype::EV_TokenId ev_ste_const(TokStereotype::ste_const,"const"); @@ -96,26 +96,26 @@ TokStereotype::EV_TokenId ev_ste_transient(TokStereotype::ste_transient,"trans TokStereotype::EV_TokenId ev_ste_published(TokStereotype::ste_published,"published"); -lux::EnumValueMap G_aTokParameterHandling_EV_TokenId_Values; +lux::EnumValueMap G_aTokParameterHandling_EV_TokenId_Values; TokParameterHandling::EV_TokenId ev_ph_none(TokParameterHandling::e_none,""); -TokParameterHandling::EV_TokenId ev_ph_in(TokParameterHandling::ph_in,"in"); -TokParameterHandling::EV_TokenId ev_ph_out(TokParameterHandling::ph_out,"out"); -TokParameterHandling::EV_TokenId ev_ph_inout(TokParameterHandling::ph_inout,"inout"); +TokParameterHandling::EV_TokenId ev_ph_in(TokParameterHandling::ph_in,"in"); +TokParameterHandling::EV_TokenId ev_ph_out(TokParameterHandling::ph_out,"out"); +TokParameterHandling::EV_TokenId ev_ph_inout(TokParameterHandling::ph_inout,"inout"); namespace lux { template<> EnumValueMap & -TokBuiltInType::EV_TokenId::Values_() { return G_aTokBuiltInType_EV_TokenId_Values; } +TokBuiltInType::EV_TokenId::Values_() { return G_aTokBuiltInType_EV_TokenId_Values; } template<> EnumValueMap & -TokTypeModifier::EV_TokenId::Values_() { return G_aTokTypeModifier_EV_TokenId_Values; } +TokTypeModifier::EV_TokenId::Values_() { return G_aTokTypeModifier_EV_TokenId_Values; } template<> EnumValueMap & -TokMetaType::EV_TokenId::Values_() { return G_aTokMetaType_EV_TokenId_Values; } +TokMetaType::EV_TokenId::Values_() { return G_aTokMetaType_EV_TokenId_Values; } template<> EnumValueMap & -TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId_Values; } +TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId_Values; } template<> EnumValueMap & -TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } +TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } } // namespace lux @@ -127,7 +127,7 @@ namespace uidl { void -TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const +TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_BuiltInType(*this); } @@ -139,7 +139,7 @@ TokBuiltInType::Text() const } void -TokTypeModifier::Trigger( TokenInterpreter & io_rInterpreter ) const +TokTypeModifier::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_TypeModifier(*this); } @@ -151,7 +151,7 @@ TokTypeModifier::Text() const } void -TokMetaType::Trigger( TokenInterpreter & io_rInterpreter ) const +TokMetaType::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_MetaType(*this); } @@ -163,7 +163,7 @@ TokMetaType::Text() const } void -TokStereotype::Trigger( TokenInterpreter & io_rInterpreter ) const +TokStereotype::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Stereotype(*this); } @@ -175,7 +175,7 @@ TokStereotype::Text() const } void -TokParameterHandling::Trigger( TokenInterpreter & io_rInterpreter ) const +TokParameterHandling::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_ParameterHandling(*this); } @@ -187,7 +187,7 @@ TokParameterHandling::Text() const } void -TokRaises::Trigger( TokenInterpreter & io_rInterpreter ) const +TokRaises::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Raises(); } @@ -199,7 +199,7 @@ TokRaises::Text() const } void -TokNeeds::Trigger( TokenInterpreter & io_rInterpreter ) const +TokNeeds::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Needs(); } @@ -210,7 +210,7 @@ TokNeeds::Text() const return "needs"; } void -TokObserves::Trigger( TokenInterpreter & io_rInterpreter ) const +TokObserves::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Observes(); } diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx index e617473fcd1b..970fc2ebce80 100644 --- a/autodoc/source/parser_i/idl/tk_punct.cxx +++ b/autodoc/source/parser_i/idl/tk_punct.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 @@ -38,7 +38,7 @@ using csi::uidl::TokPunctuation; -lux::EnumValueMap G_aTokPunctuation_EV_TokenId_Values; +lux::EnumValueMap G_aTokPunctuation_EV_TokenId_Values; TokPunctuation::EV_TokenId ev_none(TokPunctuation::e_none,""); TokPunctuation::EV_TokenId BracketOpen(TokPunctuation::BracketOpen,"("); TokPunctuation::EV_TokenId BracketClose(TokPunctuation::BracketClose,")"); @@ -61,7 +61,7 @@ TokPunctuation::EV_TokenId Greater(TokPunctuation::Greater,">"); namespace lux { template<> EnumValueMap & -TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } +TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } } @@ -73,7 +73,7 @@ namespace uidl { void -TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const +TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Punctuation(*this); } @@ -85,7 +85,7 @@ TokPunctuation::Text() const } void -Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_EOL(); } @@ -100,7 +100,7 @@ void Tok_EOF::Trigger( TokenInterpreter & ) const { csv_assert(false); -// io_rInterpreter.Process_EOF(); +// io_rInterpreter.Process_EOF(); } const char * diff --git a/autodoc/source/parser_i/idl/tkp_uidl.cxx b/autodoc/source/parser_i/idl/tkp_uidl.cxx index 66f8c556cdbf..2f6d944e4beb 100644 --- a/autodoc/source/parser_i/idl/tkp_uidl.cxx +++ b/autodoc/source/parser_i/idl/tkp_uidl.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,9 +40,9 @@ namespace uidl { -TokenParser_Uidl::TokenParser_Uidl( Token_Receiver & o_rUidlReceiver, - DYN ::TkpDocuContext & let_drDocuContext ) - : pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)), +TokenParser_Uidl::TokenParser_Uidl( Token_Receiver & o_rUidlReceiver, + DYN ::TkpDocuContext & let_drDocuContext ) + : pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)), pCurContext(0) { SetStartContext(); diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx index 5206a364d78e..b746b89baf1d 100644 --- a/autodoc/source/parser_i/idl/unoidl.cxx +++ b/autodoc/source/parser_i/idl/unoidl.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 @@ -61,13 +61,13 @@ class FileParsePerformers io_rRepository, ParserInfo & io_rParserInfo ); - void ParseFile( - const char * i_sFullPath ); + void ParseFile( + const char * i_sFullPath ); void ConnectLinks(); private: - CharacterSource aFileLoader; + CharacterSource aFileLoader; Dyn<csi::uidl::TokenParser_Uidl> pTokens; csi::uidl::TokenDistributor @@ -81,7 +81,7 @@ class FileParsePerformers IdlParser::IdlParser( ary::Repository & io_rRepository ) - : pRepository(&io_rRepository) + : pRepository(&io_rRepository) { } @@ -123,7 +123,7 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) { Cout() << "Unknown error." << Endl(); exit(0); -// pFileParsePerformers = new FileParsePerformers( *pRepository ); +// pFileParsePerformers = new FileParsePerformers( *pRepository ); } } @@ -131,7 +131,7 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) } FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository, - ParserInfo & io_rParserInfo ) + ParserInfo & io_rParserInfo ) : pTokens(0), aDistributor(io_rRepository, io_rParserInfo), rRepository( io_rRepository ), diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx index c39a1aa0f49a..a0418cbadc87 100644 --- a/autodoc/source/parser_i/idoc/cx_docu2.cxx +++ b/autodoc/source/parser_i/idoc/cx_docu2.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 @@ -107,8 +107,8 @@ Cx_EoXmlConst::ReadCharChain( CharacterSource & io_rText ) void Cx_EoXmlLink_BeginTag::ReadCharChain( CharacterSource & io_rText ) { - String sScope; - String sDim; + String sScope; + String sDim; do { char cReached = jumpTo(io_rText,'"','>','*'); @@ -169,7 +169,7 @@ Cx_EoXmlLink_EndTag::ReadCharChain( CharacterSource & io_rText ) void Cx_EoXmlFormat_BeginTag::ReadCharChain( CharacterSource & io_rText ) { - String sDim; + String sDim; char cReached = jumpTo(io_rText,'"','>','*'); switch (cReached) diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx index b1cf5fddcc63..ade06fd48164 100644 --- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx +++ b/autodoc/source/parser_i/idoc/cx_dsapi.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 @@ -108,7 +108,7 @@ const UINT16 nTok_EOL = 502; Context_Docu::Context_Docu( Token_Receiver & o_rReceiver ) - : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), + : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), pReceiver(&o_rReceiver), pParentContext(0), pCx_EoHtml(0), @@ -156,7 +156,7 @@ Context_Docu::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, 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. pFollowUpContext = rBound.FollowUpContext(); @@ -182,9 +182,9 @@ Context_Docu::FollowUpContext() } void -Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) +Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -273,34 +273,34 @@ Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_Docu::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 bas = 0; // Base-Status - const INT16 wht = 1; // Whitespace-overlook-Status - const INT16 awd = 2; // Any-Word-Read-Status +// const INT16 bas = 0; // Base-Status + const INT16 wht = 1; // Whitespace-overlook-Status + const INT16 awd = 2; // Any-Word-Read-Status // Kontextwechsel-Stati: - const INT16 goto_EoHtml = 3; - const INT16 goto_EoXmlConst = 4; - const INT16 goto_EoXmlLink_BeginTag = 5; - const INT16 goto_EoXmlLink_EndTag = 6; - const INT16 goto_EoXmlFormat_BeginTag = 7; - const INT16 goto_EoXmlFormat_EndTag = 8; - const INT16 goto_CheckStar = 9; + const INT16 goto_EoHtml = 3; + const INT16 goto_EoXmlConst = 4; + const INT16 goto_EoXmlLink_BeginTag = 5; + const INT16 goto_EoXmlLink_EndTag = 6; + const INT16 goto_EoXmlFormat_BeginTag = 7; + const INT16 goto_EoXmlFormat_EndTag = 8; + const INT16 goto_CheckStar = 9; // Tokenfinish-Stati: const INT16 finError = 10; -// const INT16 finIgnore = 11; +// const INT16 finIgnore = 11; const INT16 finEof = 12; const INT16 finAnyWord = 13; const INT16 finAtTag = 14; const INT16 finEndSign = 15; -// const INT16 finComma = 16; +// const INT16 finComma = 16; const INT16 finWhite = 17; // Konstanten zur Benutzung in der Tabelle: @@ -314,16 +314,16 @@ Context_Docu::SetupStateMachine() */ const INT16 err = finError; const INT16 faw = finAnyWord; -// const INT16 fig = finIgnore; -// const INT16 fes = finEndSign; +// const INT16 fig = finIgnore; +// const INT16 fes = finEndSign; const INT16 fof = finEof; -// const INT16 fat = finAtTag; +// const INT16 fat = finAtTag; const INT16 fwh = finWhite; /// The '0's will be replaced by calls of 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, // ... 31 wht,awd,awd,awd,awd,awd,awd,awd,awd,awd, 0,awd,awd,awd,awd,awd, @@ -347,7 +347,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nWordStatus[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 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -359,7 +359,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nAtTagDefStatus[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 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -371,7 +371,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nHtmlDefStatus[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 {ght,err,err,err,err,err,err,err,err,ght,ght,ght,ght,ght,err,err, err,err,err,err,err,err,err,err,err,err,ght,err,err,err,err,err, // ... 31 ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, @@ -383,7 +383,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nPunctDefStatus[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, @@ -401,37 +401,37 @@ Context_Docu::SetupStateMachine() DYN StmArrayStatu2 * dpStatusWord = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true); - DYN StmBoundsStatu2 * dpBst_goto_EoHtml + DYN StmBoundsStatu2 * dpBst_goto_EoHtml = new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst + DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst = new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag = new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag = new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_CheckStar + DYN StmBoundsStatu2 * dpBst_goto_CheckStar = new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true ); - DYN StmBoundsStatu2 * dpBst_finError + DYN StmBoundsStatu2 * dpBst_finError = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); - DYN StmBoundsStatu2 * dpBst_finIgnore + DYN StmBoundsStatu2 * dpBst_finIgnore = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true); - DYN StmBoundsStatu2 * dpBst_finEof + DYN StmBoundsStatu2 * dpBst_finEof = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Eof, false); - DYN StmBoundsStatu2 * dpBst_finAnyWord + DYN StmBoundsStatu2 * dpBst_finAnyWord = new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true); - DYN StmBoundsStatu2 * dpBst_finAtTag + DYN StmBoundsStatu2 * dpBst_finAtTag = new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false); - DYN StmBoundsStatu2 * dpBst_finEndSign + DYN StmBoundsStatu2 * dpBst_finEndSign = new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false); - DYN StmBoundsStatu2 * dpBst_fin_Comma + DYN StmBoundsStatu2 * dpBst_fin_Comma = new StmBoundsStatu2( *this, *this, nF_fin_Comma, false ); - DYN StmBoundsStatu2 * dpBst_finWhite + DYN StmBoundsStatu2 * dpBst_finWhite = new StmBoundsStatu2( *this, *this, nF_fin_White, false); @@ -458,7 +458,7 @@ Context_Docu::SetupStateMachine() aStateMachine.AddStatus(dpBst_finWhite); - aStateMachine.AddToken( "@author", nTok_at_author, A_nAtTagDefStatus, finAtTag ); + aStateMachine.AddToken( "@author", nTok_at_author, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@param", nTok_at_param, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@throws", nTok_at_throws, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@see", nTok_at_see, A_nAtTagDefStatus, finAtTag ); @@ -481,31 +481,31 @@ Context_Docu::SetupStateMachine() aStateMachine.AddToken( "<", 0, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "*", 0, A_nPunctDefStatus, goto_CheckStar ); -// aStateMachine.AddToken( ",", 0, A_nPunctDefStatus, finComma ); +// aStateMachine.AddToken( ",", 0, A_nPunctDefStatus, finComma ); aStateMachine.AddToken( "<type", nTok_link_typeB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); aStateMachine.AddToken( "</type", nTok_link_typeE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); aStateMachine.AddToken( "<member", nTok_link_memberB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); aStateMachine.AddToken( "</member", nTok_link_membeE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); aStateMachine.AddToken( "<const", nTok_link_constB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); - aStateMachine.AddToken( "</const", nTok_link_constE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); + aStateMachine.AddToken( "</const", nTok_link_constE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); - aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</listing",nTok_format_listingE,A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<code", nTok_format_codeB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<code", nTok_format_codeB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</code", nTok_format_codeE, A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<atom", nTok_format_atomB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<atom", nTok_format_atomB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</atom", nTok_format_atomE, A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<TRUE/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<true/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<FALSE/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<false/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<TRUE/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<true/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<FALSE/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<false/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); aStateMachine.AddToken( "<NULL/", nTok_const_NULL, A_nHtmlDefStatus, goto_EoXmlConst ); aStateMachine.AddToken( "<void/", nTok_const_void, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<p", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); - aStateMachine.AddToken( "<pre", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); + aStateMachine.AddToken( "<p", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); + aStateMachine.AddToken( "<pre", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<dl", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<ul", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<ol", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); @@ -517,13 +517,13 @@ Context_Docu::SetupStateMachine() aStateMachine.AddToken( "<OL", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<TABLE", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); - aStateMachine.AddToken( "\r\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); - aStateMachine.AddToken( "\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); - aStateMachine.AddToken( "\r", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\r\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\r", nTok_EOL, A_nPunctDefStatus, finEndSign ); }; void -Context_Docu::SetMode_IsMultiLine( bool i_bTrue ) +Context_Docu::SetMode_IsMultiLine( bool i_bTrue ) { bIsMultiline = i_bTrue; } diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index 3c8efce59a90..6b807a57bd95 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.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 @@ -55,12 +55,12 @@ namespace dsapi { -const char * AtTagTitle( - const Tok_AtTag & i_rToken ); +const char * AtTagTitle( + const Tok_AtTag & i_rToken ); SapiDocu_PE::SapiDocu_PE(ParserInfo & io_rPositionInfo) - : pDocu(0), + : pDocu(0), eState(e_none), pPositionInfo(&io_rPositionInfo), fCurTokenAddFunction(&SapiDocu_PE::AddDocuToken2Void), @@ -97,7 +97,7 @@ SapiDocu_PE::ProcessToken( DYN csi::dsapi::Token & let_drToken ) } void -SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) +SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) { if (NOT pCurAtTag) { @@ -294,7 +294,7 @@ SapiDocu_PE::Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ) } void -SapiDocu_PE::Process_Word( const Tok_Word & i_rToken ) +SapiDocu_PE::Process_Word( const Tok_Word & i_rToken ) { (this->*fCurTokenAddFunction)(*new DT_TextToken(i_rToken.Text())); } @@ -303,7 +303,7 @@ void SapiDocu_PE::Process_Comma() { csv_assert(1==7); -// (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text())); +// (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text())); } void @@ -485,12 +485,12 @@ SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewTo } /// Could emit warning, but don't because this parser is obsolete. -// Tok_XmlLink_BeginTag * -// pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken); -// if (pLinkEnd == 0) -// { -// warn_aboutMissingClosingTag(); -// } +// Tok_XmlLink_BeginTag * +// pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken); +// if (pLinkEnd == 0) +// { +// warn_aboutMissingClosingTag(); +// } delete &let_drNewToken; fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; @@ -579,20 +579,20 @@ AtTagTitle( const Tok_AtTag & i_rToken ) { switch (i_rToken.Id()) { - case Tok_AtTag::author: return ""; - case Tok_AtTag::see: return "See also"; - case Tok_AtTag::param: return "Parameters"; - case Tok_AtTag::e_return: return "Returns"; - case Tok_AtTag::e_throw: return "Throws"; - case Tok_AtTag::example: return "Example"; - case Tok_AtTag::deprecated: return "Deprecated"; - case Tok_AtTag::suspicious: return ""; - case Tok_AtTag::missing: return ""; - case Tok_AtTag::incomplete: return ""; - case Tok_AtTag::version: return ""; - case Tok_AtTag::guarantees: return "Guarantees"; - case Tok_AtTag::exception: return "Exception"; - case Tok_AtTag::since: return "Since version"; + case Tok_AtTag::author: return ""; + case Tok_AtTag::see: return "See also"; + case Tok_AtTag::param: return "Parameters"; + case Tok_AtTag::e_return: return "Returns"; + case Tok_AtTag::e_throw: return "Throws"; + case Tok_AtTag::example: return "Example"; + case Tok_AtTag::deprecated: return "Deprecated"; + case Tok_AtTag::suspicious: return ""; + case Tok_AtTag::missing: return ""; + case Tok_AtTag::incomplete: return ""; + case Tok_AtTag::version: return ""; + case Tok_AtTag::guarantees: return "Guarantees"; + case Tok_AtTag::exception: return "Exception"; + case Tok_AtTag::since: return "Since version"; default: // See below. ; diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx index 30264f68f1f0..1b4baddab098 100644 --- a/autodoc/source/parser_i/idoc/tk_atag2.cxx +++ b/autodoc/source/parser_i/idoc/tk_atag2.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 @@ -37,7 +37,7 @@ using csi::dsapi::Tok_AtTag; -lux::EnumValueMap G_aTokAtTag_EV_TokenId_Values; +lux::EnumValueMap G_aTokAtTag_EV_TokenId_Values; Tok_AtTag::EV_TokenId ev_none2(Tok_AtTag::e_none,""); Tok_AtTag::EV_TokenId ev_author(Tok_AtTag::author,"@author"); Tok_AtTag::EV_TokenId ev_see(Tok_AtTag::see,"@see"); @@ -58,7 +58,7 @@ Tok_AtTag::EV_TokenId ev_since(Tok_AtTag::since,"@since"); namespace lux { template<> EnumValueMap & -Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } +Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } } @@ -68,7 +68,7 @@ namespace dsapi { void -Tok_AtTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_AtTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_AtTag(*this); } diff --git a/autodoc/source/parser_i/idoc/tk_docw2.cxx b/autodoc/source/parser_i/idoc/tk_docw2.cxx index 097214a9c838..1243ae8c3ebb 100644 --- a/autodoc/source/parser_i/idoc/tk_docw2.cxx +++ b/autodoc/source/parser_i/idoc/tk_docw2.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 @@ -41,7 +41,7 @@ namespace dsapi { void -Tok_Word::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_Word::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Word(*this); } @@ -53,7 +53,7 @@ Tok_Word::Text() const } void -Tok_Comma::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_Comma::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Comma(); } @@ -65,7 +65,7 @@ Tok_Comma::Text() const } void -Tok_DocuEnd::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_DocuEnd::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_DocuEnd(); } @@ -77,7 +77,7 @@ Tok_DocuEnd::Text() const } void -Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_EOL(); } @@ -101,7 +101,7 @@ Tok_EOF::Text() const } void -Tok_White::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_White::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_White(); } diff --git a/autodoc/source/parser_i/idoc/tk_html.cxx b/autodoc/source/parser_i/idoc/tk_html.cxx index d26720bd9b0d..a1b719a4826c 100644 --- a/autodoc/source/parser_i/idoc/tk_html.cxx +++ b/autodoc/source/parser_i/idoc/tk_html.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 @@ -41,7 +41,7 @@ namespace dsapi { void -Tok_HtmlTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_HtmlTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_HtmlTag(*this); } diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx index a1f60d0ef98a..6d4e51aa2f42 100644 --- a/autodoc/source/parser_i/idoc/tk_xml.cxx +++ b/autodoc/source/parser_i/idoc/tk_xml.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 @@ -38,35 +38,35 @@ using csi::dsapi::Tok_XmlLink_Tag; using csi::dsapi::Tok_XmlFormat_Tag; -lux::EnumValueMap G_aTok_XmlConst_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlConst_EV_TokenId_Values; Tok_XmlConst::EV_TokenId ev_consts_none(Tok_XmlConst::e_none,""); Tok_XmlConst::EV_TokenId ev_e_true(Tok_XmlConst::e_true,"true"); Tok_XmlConst::EV_TokenId ev_e_false(Tok_XmlConst::e_false,"false"); Tok_XmlConst::EV_TokenId ev_e_null(Tok_XmlConst::e_null,"NULL"); Tok_XmlConst::EV_TokenId ev_e_void(Tok_XmlConst::e_void,"void"); -lux::EnumValueMap G_aTok_XmlLink_Tag_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlLink_Tag_EV_TokenId_Values; Tok_XmlLink_Tag::EV_TokenId ev_linktags_none(Tok_XmlLink_Tag::e_none,""); Tok_XmlLink_Tag::EV_TokenId ev_e_const(Tok_XmlLink_Tag::e_const,"const"); Tok_XmlLink_Tag::EV_TokenId ev_member(Tok_XmlLink_Tag::member,"member"); Tok_XmlLink_Tag::EV_TokenId ev_type(Tok_XmlLink_Tag::type,"type"); -lux::EnumValueMap G_aTok_XmlFormat_Tag_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlFormat_Tag_EV_TokenId_Values; Tok_XmlFormat_Tag::EV_TokenId ev_formattags_none(Tok_XmlFormat_Tag::e_none,""); Tok_XmlFormat_Tag::EV_TokenId ev_code(Tok_XmlFormat_Tag::code,"code"); Tok_XmlFormat_Tag::EV_TokenId ev_listing(Tok_XmlFormat_Tag::listing,"listing"); Tok_XmlFormat_Tag::EV_TokenId ev_atom(Tok_XmlFormat_Tag::atom,"code"); - + namespace lux { template<> EnumValueMap & -Tok_XmlConst::EV_TokenId::Values_() { return G_aTok_XmlConst_EV_TokenId_Values; } +Tok_XmlConst::EV_TokenId::Values_() { return G_aTok_XmlConst_EV_TokenId_Values; } template<> EnumValueMap & -Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_TokenId_Values; } +Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_TokenId_Values; } template<> EnumValueMap & -Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } +Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } } // namespace lux @@ -78,7 +78,7 @@ namespace dsapi { void -Tok_XmlConst::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlConst::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlConst(*this); } @@ -90,7 +90,7 @@ Tok_XmlConst::Text() const } void -Tok_XmlLink_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlLink_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlLink_BeginTag(*this); } @@ -118,7 +118,7 @@ Tok_XmlLink_BeginTag::Text() const } void -Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlLink_EndTag(*this); } @@ -135,7 +135,7 @@ Tok_XmlLink_EndTag::Text() const } void -Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlFormat_BeginTag(*this); } @@ -152,7 +152,7 @@ Tok_XmlFormat_BeginTag::Text() const } void -Tok_XmlFormat_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlFormat_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlFormat_EndTag(*this); } diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx index b8a08fa987b4..44269613e3b9 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.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 @@ -51,30 +51,30 @@ class Token_Receiver; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); protected: // LIFECYCLE Cx_Base( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : rReceiver(o_rReceiver), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : rReceiver(o_rReceiver), pFollowUpContext(&i_rFollowUpContext) // pNewToken { } protected: - void SetToken( - DYN Token * let_dpToken ) + void SetToken( + DYN Token * let_dpToken ) { pNewToken = let_dpToken; } void Handle_DocuSyntaxError( CharacterSource & io_rText ); private: // DATA - Token_Receiver & rReceiver; - TkpContext * pFollowUpContext; - Dyn<Token> pNewToken; + Token_Receiver & rReceiver; + TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; }; @@ -83,18 +83,18 @@ class Cx_EoHtml : public Cx_Base public: // LIFECYCLE Cx_EoHtml( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetIfIsStartOfParagraph( - bool i_bNextTokenProperty ) + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetIfIsStartOfParagraph( + bool i_bNextTokenProperty ) { bToken_IsStartOfParagraph = i_bNextTokenProperty; } private: - bool bToken_IsStartOfParagraph; + bool bToken_IsStartOfParagraph; }; class Cx_EoXmlConst : public Cx_Base @@ -102,18 +102,18 @@ class Cx_EoXmlConst : public Cx_Base public: // LIFECYCLE Cx_EoXmlConst( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlConst::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } private: - Tok_XmlConst::EV_TokenId + Tok_XmlConst::EV_TokenId eTokenId; }; @@ -122,13 +122,13 @@ class Cx_EoXmlLink_BeginTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlLink_BeginTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( Tok_XmlLink_BeginTag::EV_TokenId i_eTokenId ) { eTokenId = i_eTokenId; } @@ -142,13 +142,13 @@ class Cx_EoXmlLink_EndTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlLink_EndTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( Tok_XmlLink_EndTag::EV_TokenId i_eTokenId ) { eTokenId = i_eTokenId; } @@ -162,13 +162,13 @@ class Cx_EoXmlFormat_BeginTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlFormat_BeginTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } @@ -182,13 +182,13 @@ class Cx_EoXmlFormat_EndTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlFormat_EndTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlFormat_EndTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } @@ -202,26 +202,26 @@ class Cx_CheckStar : public Cx_Base public: // LIFECYCLE Cx_CheckStar( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext), bIsEnd(false), bEndTokenFound(false) { } - void Set_End_FolloUpContext( - TkpContext & i_rEnd_FollowUpContext ) + void Set_End_FolloUpContext( + TkpContext & i_rEnd_FollowUpContext ) { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; } - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetIsEnd( - bool i_bIsEnd ) + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetIsEnd( + bool i_bIsEnd ) { bIsEnd = i_bIsEnd; } virtual TkpContext & FollowUpContext(); private: - TkpContext * pEnd_FollowUpContext; - bool bIsEnd; - bool bEndTokenFound; + TkpContext * pEnd_FollowUpContext; + bool bIsEnd; + bool bEndTokenFound; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx index 6e229c0af51b..7cf99190c190 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.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,44 +61,44 @@ class Context_Docu : public TkpDocuContext, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_Docu( - Token_Receiver & o_rReceiver ); - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ); + Token_Receiver & o_rReceiver ); + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ); ~Context_Docu(); - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); - virtual bool PassNewToken(); - virtual void SetMode_IsMultiLine( - bool i_bTrue ); + virtual bool PassNewToken(); + virtual void SetMode_IsMultiLine( + bool i_bTrue ); - // INQUIRY + // INQUIRY virtual TkpContext & FollowUpContext(); private: - // SERVICE FUNCTIONS - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ); + // SERVICE FUNCTIONS + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ); - void SetupStateMachine(); + void SetupStateMachine(); - // DATA - StateMachin2 aStateMachine; - Token_Receiver * pReceiver; + // DATA + StateMachin2 aStateMachine; + Token_Receiver * pReceiver; // Contexts - TkpContext * pParentContext; - String sMultiLineEndToken; + TkpContext * pParentContext; + String sMultiLineEndToken; - Dyn<Cx_EoHtml> pCx_EoHtml; - Dyn<Cx_EoXmlConst> pCx_EoXmlConst; + Dyn<Cx_EoHtml> pCx_EoHtml; + Dyn<Cx_EoXmlConst> pCx_EoXmlConst; Dyn<Cx_EoXmlLink_BeginTag> pCx_EoXmlLink_BeginTag; Dyn<Cx_EoXmlLink_EndTag> @@ -107,11 +107,11 @@ class Context_Docu : public TkpDocuContext, pCx_EoXmlFormat_BeginTag; Dyn<Cx_EoXmlFormat_EndTag> pCx_EoXmlFormat_EndTag; - Dyn<Cx_CheckStar> pCx_CheckStar; + Dyn<Cx_CheckStar> pCx_CheckStar; // Temporary data, used during ReadCharChain() - Dyn<Token> pNewToken; - ::TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; + ::TkpContext * pFollowUpContext; bool bIsMultiline; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx index 977f9b65bf9e..a3a6b5306536 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.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,41 +70,41 @@ class SapiDocu_PE : public TokenInterpreter ParserInfo & io_rPositionInfo ); ~SapiDocu_PE(); - void ProcessToken( + void ProcessToken( DYN csi::dsapi::Token & let_drToken ); - virtual void Process_AtTag( - const Tok_AtTag & i_rToken ); - virtual void Process_HtmlTag( - const Tok_HtmlTag & i_rToken ); - virtual void Process_XmlConst( + virtual void Process_AtTag( + const Tok_AtTag & i_rToken ); + virtual void Process_HtmlTag( + const Tok_HtmlTag & i_rToken ); + virtual void Process_XmlConst( const Tok_XmlConst & i_rToken ); - virtual void Process_XmlLink_BeginTag( + virtual void Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken ); - virtual void Process_XmlLink_EndTag( + virtual void Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken ); - virtual void Process_XmlFormat_BeginTag( + virtual void Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken ); - virtual void Process_XmlFormat_EndTag( + virtual void Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ); - virtual void Process_Word( - const Tok_Word & i_rToken ); - virtual void Process_Comma(); - virtual void Process_DocuEnd(); - virtual void Process_EOL(); - virtual void Process_White(); + virtual void Process_Word( + const Tok_Word & i_rToken ); + virtual void Process_Comma(); + virtual void Process_DocuEnd(); + virtual void Process_EOL(); + virtual void Process_White(); DYN ary::doc::OldIdlDocu * ReleaseJustParsedDocu(); - bool IsComplete() const; + bool IsComplete() const; private: enum E_State @@ -118,48 +118,48 @@ class SapiDocu_PE : public TokenInterpreter typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Void( + void AddDocuToken2Void( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Short( + void AddDocuToken2Short( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Description( + void AddDocuToken2Description( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Deprecated( + void AddDocuToken2Deprecated( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2CurAtTag( + void AddDocuToken2CurAtTag( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurParameterAtTagName( + void SetCurParameterAtTagName( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText( + void SetCurSeeAlsoAtTagLinkText( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText_2( + void SetCurSeeAlsoAtTagLinkText_2( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText_3( + void SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSinceAtTagVersion( + void SetCurSinceAtTagVersion( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2SinceAtTag( + void AddDocuToken2SinceAtTag( DYN ary::inf::DocuToken & let_drNewToken ); // DATA Dyn<ary::doc::OldIdlDocu> pDocu; - E_State eState; + E_State eState; ParserInfo * pPositionInfo; - F_TokenAdder fCurTokenAddFunction; + F_TokenAdder fCurTokenAddFunction; - Dyn<DT_AtTag> pCurAtTag; + Dyn<DT_AtTag> pCurAtTag; String sCurDimAttribute; StreamStr sCurAtSeeType_byXML; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx index 9ccccee02ef8..8d8d418b1104 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.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,11 +49,11 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx index 57bf561ffdce..dd2e097678ce 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.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,17 +68,17 @@ class Tok_AtTag : public Token // Spring and Fall Tok_AtTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: - EV_TokenId eTag; + EV_TokenId eTag; }; } // namespace dsapi diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx index 5ee763969ad6..25ebd547f47c 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.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,27 +46,27 @@ class Tok_Word : public Token public: // Spring and Fall Tok_Word( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; private: // DATA - String sText; + String sText; }; class Tok_Comma : public Token { public: // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_DocuEnd : public Token @@ -74,10 +74,10 @@ class Tok_DocuEnd : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_EOL : public Token @@ -85,10 +85,10 @@ class Tok_EOL : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_EOF : public Token @@ -96,20 +96,20 @@ class Tok_EOF : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_White : public Token { public: // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx index 3d69c13d296c..7bb8a26aa195 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.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,22 +47,22 @@ class Tok_HtmlTag : public Token public: // Spring and Fall Tok_HtmlTag( - const char * i_sTag, - bool i_bIsParagraphStarter ) - : sTag(i_sTag), + const char * i_sTag, + bool i_bIsParagraphStarter ) + : sTag(i_sTag), bIsParagraphStarter(i_bIsParagraphStarter) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - bool IsParagraphStarter() const + virtual const char* Text() const; + bool IsParagraphStarter() const { return bIsParagraphStarter; } private: - String sTag; - bool bIsParagraphStarter; + String sTag; + bool bIsParagraphStarter; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx index 7bb8db52a27f..50d85212aaac 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.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 @@ -64,18 +64,18 @@ class Tok_XmlConst : public Tok_XmlTag // Spring and Fall Tok_XmlConst( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_XmlLink_Tag : public Tok_XmlTag @@ -97,26 +97,26 @@ class Tok_XmlLink_BeginTag : public Tok_XmlLink_Tag public: // Spring and Fall Tok_XmlLink_BeginTag( - EV_TokenId i_eTag, - const String & i_sScope, - const String & i_sDim ) - : eTag(i_eTag), + EV_TokenId i_eTag, + const String & i_sScope, + const String & i_sDim ) + : eTag(i_eTag), sScope(i_sScope), sDim(i_sDim) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } - const String & Scope() const { return sScope; } - const String & Dim() const { return sDim; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } + const String & Scope() const { return sScope; } + const String & Dim() const { return sDim; } private: // DATA - EV_TokenId eTag; - String sScope; - String sDim; + EV_TokenId eTag; + String sScope; + String sDim; }; class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag @@ -124,18 +124,18 @@ class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag public: // Spring and Fall Tok_XmlLink_EndTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_XmlFormat_Tag : public Tok_XmlTag @@ -157,21 +157,21 @@ class Tok_XmlFormat_BeginTag : public Tok_XmlFormat_Tag public: // Spring and Fall Tok_XmlFormat_BeginTag( - EV_TokenId i_eTag, + EV_TokenId i_eTag, const String & i_sDim ) - : eTag(i_eTag), + : eTag(i_eTag), sDim(i_sDim) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } - const String & Dim() const { return sDim; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } + const String & Dim() const { return sDim; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; String sDim; }; @@ -180,18 +180,18 @@ class Tok_XmlFormat_EndTag : public Tok_XmlFormat_Tag public: // Spring and Fall Tok_XmlFormat_EndTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx index fed4c0e25121..8437f4f23843 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/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 @@ -54,33 +54,33 @@ class Tok_HtmlTag; class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} - virtual void Process_AtTag( - const Tok_AtTag & i_rToken ) = 0; - virtual void Process_HtmlTag( - const Tok_HtmlTag & i_rToken ) = 0; - virtual void Process_XmlConst( + virtual void Process_AtTag( + const Tok_AtTag & i_rToken ) = 0; + virtual void Process_HtmlTag( + const Tok_HtmlTag & i_rToken ) = 0; + virtual void Process_XmlConst( const Tok_XmlConst & i_rToken ) = 0; - virtual void Process_XmlLink_BeginTag( + virtual void Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken ) = 0; - virtual void Process_XmlLink_EndTag( + virtual void Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken ) = 0; - virtual void Process_XmlFormat_BeginTag( + virtual void Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken ) = 0; - virtual void Process_XmlFormat_EndTag( + virtual void Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ) = 0; - virtual void Process_Word( - const Tok_Word & i_rToken ) = 0; - virtual void Process_Comma() = 0; - virtual void Process_DocuEnd() = 0; - virtual void Process_EOL() = 0; - virtual void Process_White() = 0; + virtual void Process_Word( + const Tok_Word & i_rToken ) = 0; + virtual void Process_Comma() = 0; + virtual void Process_DocuEnd() = 0; + virtual void Process_EOL() = 0; + virtual void Process_White() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx index 14ef872d4306..be7d77262073 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.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,9 +47,9 @@ class Token; class Token_Receiver { public: - virtual ~Token_Receiver() {} - virtual void Receive( - DYN Token & let_drToken ) = 0; + virtual ~Token_Receiver() {} + virtual void Receive( + DYN Token & let_drToken ) = 0; virtual void Increment_CurLine() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx index 07d325846238..db10741e5dd8 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.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 @@ -51,36 +51,36 @@ class Context_UidlCode : public TkpContext, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_UidlCode( - Token_Receiver & o_rReceiver, + Token_Receiver & o_rReceiver, DYN TkpDocuContext & - let_drContext_Docu ); + let_drContext_Docu ); ~Context_UidlCode(); - // OPERATORS + // OPERATORS - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); - // INQUIRY + // INQUIRY virtual TkpContext & FollowUpContext(); private: - // SERVICE FUNCTIONS - void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ); - void SetupStateMachine(); + // SERVICE FUNCTIONS + void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ); + void SetupStateMachine(); - // DATA - StateMachin2 aStateMachine; - Token_Receiver * pReceiver; + // DATA + StateMachin2 aStateMachine; + Token_Receiver * pReceiver; // Contexts - Dyn<TkpDocuContext> pDocuContext; + Dyn<TkpDocuContext> pDocuContext; Dyn<TkpContext> dpContext_MLComment; Dyn<TkpContext> dpContext_SLComment; @@ -88,8 +88,8 @@ class Context_UidlCode : public TkpContext, Dyn<TkpContext> dpContext_Assignment; // Temporary data, used during ReadCharChain() - Dyn<Token> pNewToken; - ::TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; + ::TkpContext * pFollowUpContext; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx index 0113a87c11e7..b1e96671b782 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_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 @@ -49,29 +49,29 @@ class Token; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); protected: // LIFECYCLE Cx_Base( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : rReceiver(o_rReceiver), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : rReceiver(o_rReceiver), pFollowUpContext(&i_rFollowUpContext), pNewToken() {} protected: - void SetToken( - DYN Token * let_dpToken ) + void SetToken( + DYN Token * let_dpToken ) { pNewToken = let_dpToken; } - Token_Receiver & Receiver() { return rReceiver; } + Token_Receiver & Receiver() { return rReceiver; } private: // DATA - Token_Receiver & rReceiver; - TkpContext * pFollowUpContext; - Dyn<Token> pNewToken; + Token_Receiver & rReceiver; + TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; }; @@ -84,44 +84,44 @@ class Context_MLComment : public Cx_Base { public: Context_MLComment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_SLComment : public Cx_Base { public: Context_SLComment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_Praeprocessor : public Cx_Base { public: Context_Praeprocessor( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_Assignment : public Cx_Base { public: Context_Assignment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx index 411fc402eb42..eec22017ff40 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.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,8 +68,8 @@ namespace uidl { -typedef std::vector< DYN Token * > TokenQueue; -typedef TokenQueue::iterator TokenIterator; +typedef std::vector< DYN Token * > TokenQueue; +typedef TokenQueue::iterator TokenIterator; class TokenParser_Uidl; class UnoIDL_PE; @@ -81,21 +81,21 @@ class TokenDistributor : private TokenProcessing_Types { public: TokenDistributor( - ary::Repository & io_rRepository, + ary::Repository & io_rRepository, ParserInfo & io_rParserInfo ); - void SetTokenProvider( - TokenParser_Uidl & io_rTokenSource ); - void SetTopParseEnvironment( - UnoIDL_PE & io_pTopParseEnvironment ); + void SetTokenProvider( + TokenParser_Uidl & io_rTokenSource ); + void SetTopParseEnvironment( + UnoIDL_PE & io_pTopParseEnvironment ); ~TokenDistributor(); - void Reset() { aDocumentation.Reset(); } - /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a + void Reset() { aDocumentation.Reset(); } + /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a usable token is found. This token will be forwarded to pTopParseEnv; */ - void TradeToken(); + void TradeToken(); csi::uidl::Token_Receiver & CodeTokens_Receiver(); @@ -122,59 +122,59 @@ class TokenDistributor : private TokenProcessing_Types class ProcessingData; friend class ProcessingData; - class ProcessingData : public csi::uidl::Token_Receiver, + class ProcessingData : public csi::uidl::Token_Receiver, private TokenProcessing_Types { public: ProcessingData( - ary::Repository & io_rRepository, - Documentation & i_rDocuProcessor, + ary::Repository & io_rRepository, + Documentation & i_rDocuProcessor, ParserInfo & io_rParserInfo ); ~ProcessingData(); - void SetTopParseEnvironment( - UnoIDL_PE & io_pTopParseEnvironment ); + void SetTopParseEnvironment( + UnoIDL_PE & io_pTopParseEnvironment ); - /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken() + /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken() call and passes the just parsed token to this class. */ - virtual void Receive( + virtual void Receive( DYN csi::uidl::Token & let_drToken ); virtual void Increment_CurLine(); - void ProcessCurToken(); + void ProcessCurToken(); - UnoIDL_PE & CurEnvironment() const; - bool NextTokenExists() const; + UnoIDL_PE & CurEnvironment() const; + bool NextTokenExists() const; void Set_PublishedOn() { bPublishedRecentlyOn = true; } private: - typedef uintt TokenQ_Position; - typedef std::pair< UnoIDL_PE *, TokenQ_Position > EnvironmentInfo; + typedef uintt TokenQ_Position; + typedef std::pair< UnoIDL_PE *, TokenQ_Position > EnvironmentInfo; typedef std::vector< EnvironmentInfo > EnvironmentStack; - void AcknowledgeResult(); + void AcknowledgeResult(); const csi::uidl::Token & CurToken() const; - UnoIDL_PE & CurEnv() const; - UnoIDL_PE & PushEnv() const; - uintt CurTokenPosition() const; + UnoIDL_PE & CurEnv() const; + UnoIDL_PE & PushEnv() const; + uintt CurTokenPosition() const; uintt CurEnv_TriedTokenPosition() const; - void DecrementTryCount(); + void DecrementTryCount(); - EnvironmentStack aEnvironments; - TokenQueue aTokenQueue; - TokenIterator itCurToken; + EnvironmentStack aEnvironments; + TokenQueue aTokenQueue; + TokenIterator itCurToken; TokenProcessing_Result aCurResult; - uintt nTryCount; - bool bFinished; + uintt nTryCount; + bool bFinished; ary::Repository & rRepository; ParserInfo & rParserInfo; - Documentation * pDocuProcessor; + Documentation * pDocuProcessor; bool bPublishedRecentlyOn; }; @@ -185,9 +185,9 @@ class TokenDistributor : private TokenProcessing_Types ParserInfo & io_rParserInfo); ~Documentation(); - void Reset() { bIsPassedFirstDocu = false; } + void Reset() { bIsPassedFirstDocu = false; } - virtual void Receive( + virtual void Receive( DYN csi::dsapi::Token & let_drToken ); virtual void Increment_CurLine(); @@ -200,13 +200,13 @@ class TokenDistributor : private TokenProcessing_Types ParserInfo & rParserInfo; Dyn<ary::doc::OldIdlDocu> pMostRecentDocu; - bool bIsPassedFirstDocu; + bool bIsPassedFirstDocu; }; // DATA - TokenParser_Uidl * pTokenSource; - Documentation aDocumentation; - ProcessingData aProcessingData; + TokenParser_Uidl * pTokenSource; + Documentation aDocumentation; + ProcessingData aProcessingData; }; @@ -214,7 +214,7 @@ class TokenDistributor : private TokenProcessing_Types // IMPLEMENTATION inline void -TokenDistributor::SetTokenProvider( TokenParser_Uidl & io_rTokenSource ) +TokenDistributor::SetTokenProvider( TokenParser_Uidl & io_rTokenSource ) { pTokenSource = &io_rTokenSource; } inline void diff --git a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx index 7708ac66775e..a6278f0dd240 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.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,60 +76,60 @@ class UnoIDL_PE : virtual protected TokenProcessing_Types public: virtual ~UnoIDL_PE(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); -// virtual void EstablishContacts( -// UnoIDL_PE * io_pParentPE, -// ary::idl::Gate & +// virtual void EstablishContacts( +// UnoIDL_PE * io_pParentPE, +// ary::idl::Gate & // io_rGate, -// TokenProcessing_Result & -// o_rResult ); - virtual void Enter( - E_EnvStackAction i_eWayOfEntering ); - virtual void Leave( - E_EnvStackAction i_eWayOfLeaving ); - virtual void ProcessToken( - const Token & i_rToken ) = 0; - - void SetDocu( +// TokenProcessing_Result & +// o_rResult ); + virtual void Enter( + E_EnvStackAction i_eWayOfEntering ); + virtual void Leave( + E_EnvStackAction i_eWayOfLeaving ); + virtual void ProcessToken( + const Token & i_rToken ) = 0; + + void SetDocu( DYN ary::doc::OldIdlDocu * let_dpDocu ); - void SetPublished(); - void SetOptional(); - void PassDocuAt( + void SetPublished(); + void SetOptional(); + void PassDocuAt( ary::idl::CodeEntity & io_rCe ); - UnoIDL_PE * Parent() const { return aMyNode.Parent(); } + UnoIDL_PE * Parent() const { return aMyNode.Parent(); } - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) { aMyNode.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); } virtual const ary::idl::Module & CurNamespace() const; virtual const ParserInfo & ParseInfo() const; - ary::idl::Gate & Gate() const { return aMyNode.AryGate(); } + ary::idl::Gate & Gate() const { return aMyNode.AryGate(); } TokenProcessing_Result & TokenResult() const { return aMyNode.TokenResult(); } DYN ary::doc::OldIdlDocu * - ReleaseDocu() { return pDocu.Release(); } + ReleaseDocu() { return pDocu.Release(); } protected: UnoIDL_PE(); ary::Repository & MyRepository() { csv_assert(pRepository != 0); return *pRepository; } private: - virtual void InitData(); - virtual void TransferData() = 0; - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData() = 0; + virtual void ReceiveData(); - SemanticNode aMyNode; + SemanticNode aMyNode; Dyn<ary::doc::OldIdlDocu> pDocu; ary::Repository * pRepository; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx index 222fcdf43b7a..5a6dffc76f7b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.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,30 +69,30 @@ class PE_Attribute : public UnoIDL_PE, PE_Attribute( const Ce_id & i_rCurOwner ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Attribute(); + virtual ~PE_Attribute(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Default(); + virtual void Process_Raises(); + virtual void Process_Default(); private: enum E_State @@ -106,23 +106,23 @@ class PE_Attribute : public UnoIDL_PE, in_set }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; const Ce_id * pCurOwner; - Dyn<PE_Variable> pPE_Variable; - Dyn<PE_Type> pPE_Exception; + Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Type> pPE_Exception; // object-data ary::idl::Attribute * pCurAttribute; - Type_id nCurParsedType; - String sCurParsedName; + Type_id nCurParsedType; + String sCurParsedName; bool bReadOnly; bool bBound; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx index 397a235e4748..74d9302107d8 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_const.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,24 +58,24 @@ class PE_Constant : public UnoIDL_PE, { public: PE_Constant(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Constant(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); @@ -100,40 +100,40 @@ class PE_Constant : public UnoIDL_PE, typedef void (PE_Constant::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_expect_curl_bracket_open_Punctuation(const char * i_sText); - void On_expect_const_Stereotype(const char * i_sText); - void On_expect_const_Punctuation(const char * i_sText); - void On_expect_value_Identifier(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_expect_curl_bracket_open_Punctuation(const char * i_sText); + void On_expect_const_Stereotype(const char * i_sText); + void On_expect_const_Punctuation(const char * i_sText); + void On_expect_value_Identifier(const char * i_sText); void On_expect_finish_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_Default(const char * ); - void EmptySingleConstData(); - void CreateSingleConstant(); + void EmptySingleConstData(); + void CreateSingleConstant(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; String sData_Name; - ary::idl::Ce_id nDataId; + ary::idl::Ce_id nDataId; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; - Dyn<PE_Value> pPE_Value; - String sName; - String sAssignment; + Dyn<PE_Value> pPE_Value; + String sName; + String sAssignment; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx index 2fef65658d9b..4d97c58ade7b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.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,20 +54,20 @@ class PE_Enum : public UnoIDL_PE, { public: PE_Enum(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Enum(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); @@ -90,36 +90,36 @@ class PE_Enum : public UnoIDL_PE, typedef void (PE_Enum::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_expect_curl_bracket_open_Punctuation(const char * i_sText); - void On_expect_value_Punctuation(const char * i_sText); - void On_expect_value_Identifier(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_expect_curl_bracket_open_Punctuation(const char * i_sText); + void On_expect_value_Punctuation(const char * i_sText); + void On_expect_value_Identifier(const char * i_sText); void On_expect_finish_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_Default(const char * ); - void EmptySingleValueData(); - void CreateSingleValue(); + void EmptySingleValueData(); + void CreateSingleValue(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; String sData_Name; - ary::idl::Ce_id nDataId; + ary::idl::Ce_id nDataId; - Dyn<PE_Value> pPE_Value; - String sName; - String sAssignment; + Dyn<PE_Value> pPE_Value; + String sName; + String sAssignment; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx index 13bb996e6380..dbd279578f2a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.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,27 +54,27 @@ class PE_Value : public UnoIDL_PE, { public: PE_Value( - String & o_rName, - String & o_rAssignment, - bool i_bIsConst ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + String & o_rName, + String & o_rAssignment, + bool i_bIsConst ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Value(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Assignment( + virtual void Process_Assignment( const TokAssignment & i_rToken ); private: @@ -85,7 +85,7 @@ class PE_Value : public UnoIDL_PE, got_name, e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_identifier = 0, tt_punctuation = 1, @@ -95,27 +95,27 @@ class PE_Value : public UnoIDL_PE, typedef void (PE_Value::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_got_name_Punctuation(const char * i_sText); - void On_got_name_Assignment(const char * i_sText); - void On_Default(const char * ); + void On_expect_name_Identifier(const char * i_sText); + void On_got_name_Punctuation(const char * i_sText); + void On_got_name_Assignment(const char * i_sText); + void On_Default(const char * ); - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); - bool IsConst() const { return bIsConst; } + bool IsConst() const { return bIsConst; } - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; - String * pName; - String * pAssignment; - bool bIsConst; + String * pName; + String * pAssignment; + bool bIsConst; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx index 4d6a9bd96872..6fe3b21105ba 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.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,35 +68,35 @@ class PE_Exception : public UnoIDL_PE { public: PE_Exception(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Exception(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); private: struct S_Work { S_Work(); - void InitData(); - void Prepare_PE_QualifiedName(); - void Prepare_PE_Element(); - void Data_Set_Name( - const char * i_sName ); + void InitData(); + void Prepare_PE_QualifiedName(); + void Prepare_PE_Element(); + void Data_Set_Name( + const char * i_sName ); // DATA String sData_Name; - bool bIsPreDeclaration; - ary::idl::Ce_id nCurStruct; + bool bIsPreDeclaration; + ary::idl::Ce_id nCurStruct; Dyn<PE_StructElement> pPE_Element; - ary::idl::Ce_id nCurParsed_ElementRef; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + ary::idl::Ce_id nCurParsed_ElementRef; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; }; struct S_Stati; @@ -111,50 +111,50 @@ class PE_Exception : public UnoIDL_PE protected: PE_StructState( - PE_Exception & i_rStruct ) - : rStruct(i_rStruct) {} - void MoveState( - ParseEnvState & i_rState ) const; - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) const + PE_Exception & i_rStruct ) + : rStruct(i_rStruct) {} + void MoveState( + ParseEnvState & i_rState ) const; + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) const { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } - S_Stati & Stati() const { return *rStruct.pStati; } - S_Work & Work() const { return rStruct.aWork; } - PE_Exception & PE() const { return rStruct; } + S_Stati & Stati() const { return *rStruct.pStati; } + S_Work & Work() const { return rStruct.aWork; } + PE_Exception & PE() const { return rStruct; } private: - virtual UnoIDL_PE & MyPE(); + virtual UnoIDL_PE & MyPE(); // DATA - PE_Exception & rStruct; + PE_Exception & rStruct; }; class State_None : public PE_StructState { public: State_None( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} }; class State_WaitForName : public PE_StructState - { // -> Name + { // -> Name public: State_WaitForName( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_GotName : public PE_StructState - { // -> : { ; + { // -> : { ; public: State_GotName( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -162,17 +162,17 @@ class PE_Exception : public UnoIDL_PE { // -> Base public: State_WaitForBase( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void On_SubPE_Left(); + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void On_SubPE_Left(); }; class State_GotBase : public PE_StructState { // -> { public: State_GotBase( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -180,30 +180,30 @@ class PE_Exception : public UnoIDL_PE { // -> Typ } public: State_WaitForElement( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); -// virtual void On_SubPE_Left(); +// virtual void On_SubPE_Left(); }; class State_WaitForFinish : public PE_StructState { // -> ; public: State_WaitForFinish( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -211,13 +211,13 @@ class PE_Exception : public UnoIDL_PE struct S_Stati { S_Stati( - PE_Exception & io_rStruct ); - void SetState( - ParseEnvState & i_rNextState ) + PE_Exception & io_rStruct ); + void SetState( + ParseEnvState & i_rNextState ) { pCurStatus = &i_rNextState; } - State_None aNone; - State_WaitForName aWaitForName; + State_None aNone; + State_WaitForName aWaitForName; State_GotName aGotName; State_WaitForBase aWaitForBase; State_GotBase aGotBase; @@ -225,31 +225,31 @@ class PE_Exception : public UnoIDL_PE aWaitForElement; State_WaitForFinish aWaitForFinish; - ParseEnvState * pCurStatus; + ParseEnvState * pCurStatus; }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); public: void store_Exception(); - + private: - S_Stati & Stati() { return *pStati; } - S_Work & Work() { return aWork; } + S_Stati & Stati() { return *pStati; } + S_Work & Work() { return aWork; } // DATA - S_Work aWork; - Dyn<S_Stati> pStati; + S_Work aWork; + Dyn<S_Stati> pStati; }; inline void PE_Exception::PE_StructState::MoveState( - ParseEnvState & i_rState ) const + ParseEnvState & i_rState ) const { rStruct.Stati().SetState(i_rState); } } // namespace uidl diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx index e499565e466a..80baf27bd806 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.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,30 +69,30 @@ class PE_File : public UnoIDL_PE, { public: PE_File( - TokenDistributor & i_rTokenAdmin, + TokenDistributor & i_rTokenAdmin, const ParserInfo & i_parseInfo ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_File(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -106,31 +106,31 @@ class PE_File : public UnoIDL_PE, on_default }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); virtual const ary::idl::Module & CurNamespace() const; virtual const ParserInfo & ParseInfo() const; // DATA - TokenDistributor * pTokenAdmin; - Dyn<PE_Service> pPE_Service; - Dyn<PE_Singleton> pPE_Singleton; - Dyn<PE_Interface> pPE_Interface; - Dyn<PE_Struct> pPE_Struct; - Dyn<PE_Exception> pPE_Exception; - Dyn<PE_Constant> pPE_Constant; - Dyn<PE_Enum> pPE_Enum; - Dyn<PE_Typedef> pPE_Typedef; + TokenDistributor * pTokenAdmin; + Dyn<PE_Service> pPE_Service; + Dyn<PE_Singleton> pPE_Singleton; + Dyn<PE_Interface> pPE_Interface; + Dyn<PE_Struct> pPE_Struct; + Dyn<PE_Exception> pPE_Exception; + Dyn<PE_Constant> pPE_Constant; + Dyn<PE_Enum> pPE_Enum; + Dyn<PE_Typedef> pPE_Typedef; const ary::idl::Module * pCurNamespace; const ParserInfo * pParseInfo; - E_State eState; - uintt nBracketCount_inDefMode; + E_State eState; + uintt nBracketCount_inDefMode; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx index 3d639c2f8b6a..ab0caef1277e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.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,47 +62,47 @@ class PE_Function : public UnoIDL_PE, public ParseEnvState { public: - typedef ary::idl::Ce_id RParent; - typedef ary::idl::Ce_id RFunction; + typedef ary::idl::Ce_id RParent; + typedef ary::idl::Ce_id RFunction; enum E_Constructor { constructor }; /// Constructor for interfaces. PE_Function( - const RParent & i_rCurInterface ); + const RParent & i_rCurInterface ); /// Constructor for single interface based services. PE_Function( - const RParent & i_rCurService, + const RParent & i_rCurService, E_Constructor i_eCtorMarker ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Function(); + virtual ~PE_Function(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Default(); + virtual void Process_Raises(); + virtual void Process_Default(); private: enum E_State @@ -124,15 +124,15 @@ class PE_Function : public UnoIDL_PE, exceptions_finished }; - void GoIntoReturnType(); - void GoIntoParameterVariable(); - void GoIntoException(); - void OnDefault(); + void GoIntoReturnType(); + void GoIntoParameterVariable(); + void GoIntoException(); + void OnDefault(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; @@ -143,18 +143,18 @@ class PE_Function : public UnoIDL_PE, ary::idl::Function * pCurFunction; - const RParent * pCurParent; + const RParent * pCurParent; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsedType; // ReturnType or Exception + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsedType; // ReturnType or Exception - String sName; + String sName; - Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Variable> pPE_Variable; ary::idl::E_ParameterDirection eCurParsedParam_Direction; ary::idl::Type_id nCurParsedParam_Type; - String sCurParsedParam_Name; + String sCurParsedParam_Name; bool bIsForConstructors; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx index 37f33cf8a73a..cf0b40a25dd6 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.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,35 +62,35 @@ class PE_Interface : public UnoIDL_PE, { public: PE_Interface(); - virtual ~PE_Interface(); + virtual ~PE_Interface(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State /// @ATTENTION Do not change existing values (except of e_STATES_MAX) !!! Else array-indices will break. @@ -112,7 +112,7 @@ class PE_Interface : public UnoIDL_PE, in_base_interface, // in body, after "interface" e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_metatype = 0, tt_identifier = 1, @@ -124,51 +124,51 @@ class PE_Interface : public UnoIDL_PE, typedef void (PE_Interface::*F_TOK)(const char *); - void On_need_uik_MetaType(const char * i_sText); - void On_uik_Identifier(const char * i_sText); - void On_uik_Punctuation(const char * i_sText); - void On_need_ident_MetaType(const char * i_sText); - void On_ident_Identifier(const char * i_sText); - void On_ident_Punctuation(const char * i_sText); - void On_need_interface_MetaType(const char * i_sText); - void On_need_name_Identifer(const char * i_sText); - void On_wait_for_base_Punctuation(const char * i_sText); - void On_need_curlbr_open_Punctuation(const char * i_sText); - void On_std_Metatype(const char * i_sText); - void On_std_Punctuation(const char * i_sText); - void On_std_Stereotype(const char * i_sText); - void On_std_GotoFunction(const char * i_sText); - void On_std_GotoAttribute(const char * i_sText); - void On_std_GotoBaseInterface(const char * i_sText); - void On_need_finish_Punctuation(const char * i_sText); - void On_Default(const char * i_sText); - - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); - - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + void On_need_uik_MetaType(const char * i_sText); + void On_uik_Identifier(const char * i_sText); + void On_uik_Punctuation(const char * i_sText); + void On_need_ident_MetaType(const char * i_sText); + void On_ident_Identifier(const char * i_sText); + void On_ident_Punctuation(const char * i_sText); + void On_need_interface_MetaType(const char * i_sText); + void On_need_name_Identifer(const char * i_sText); + void On_wait_for_base_Punctuation(const char * i_sText); + void On_need_curlbr_open_Punctuation(const char * i_sText); + void On_std_Metatype(const char * i_sText); + void On_std_Punctuation(const char * i_sText); + void On_std_Stereotype(const char * i_sText); + void On_std_GotoFunction(const char * i_sText); + void On_std_GotoAttribute(const char * i_sText); + void On_std_GotoBaseInterface(const char * i_sText); + void On_need_finish_Punctuation(const char * i_sText); + void On_Default(const char * i_sText); + + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); + + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); void store_Interface(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Interface * pCurInterface; ary::idl::Ce_id nCurInterface; - Dyn<PE_Function> pPE_Function; - Dyn<PE_Attribute> pPE_Attribute; + Dyn<PE_Function> pPE_Function; + Dyn<PE_Attribute> pPE_Attribute; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; bool bOptionalMember; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx index 1c75d25203d1..88e101566034 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.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,10 +49,10 @@ class PE_Module : public ::ParseEnvironment { public: - virtual void Enter( - E_EnvStackAction i_eWayOfEntering ); - virtual void Leave( - E_EnvStackAction i_eWayOfLeaving ); + virtual void Enter( + E_EnvStackAction i_eWayOfEntering ); + virtual void Leave( + E_EnvStackAction i_eWayOfLeaving ); private: }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx index 15aa52b7c31a..7c3016304bf0 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_property.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,29 +62,29 @@ class PE_Property : public UnoIDL_PE, PE_Property( const Ce_id & i_rCurOwner ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Property(); + virtual ~PE_Property(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); - void PresetOptional() { bIsOptional = true; } - void PresetStereotypes( + void PresetOptional() { bIsOptional = true; } + void PresetStereotypes( Stereotypes::E_Flags i_eFlag ) { aStereotypes.Set_Flag(i_eFlag); } @@ -97,21 +97,21 @@ class PE_Property : public UnoIDL_PE, in_variable }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; const Ce_id * pCurOwner; - Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Variable> pPE_Variable; // object-data - Type_id nCurParsedType; - String sCurParsedName; - bool bIsOptional; + Type_id nCurParsedType; + String sCurParsedName; + bool bIsOptional; Stereotypes aStereotypes; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx index 54088fdbdd9c..ddb060c255a6 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.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,27 +62,27 @@ class PE_StructElement : public UnoIDL_PE, typedef ary::idl::Ce_id RStruct; PE_StructElement( /// Use for Struct-elements - RStructElement & o_rResult, - const RStruct & i_rCurStruct, + RStructElement & o_rResult, + const RStruct & i_rCurStruct, const String & i_rCurStructTemplateParam ); PE_StructElement( /// Use for Exception-elements - RStructElement & o_rResult, - const RStruct & i_rCurExc ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + RStructElement & o_rResult, + const RStruct & i_rCurExc ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_StructElement(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Default(); - virtual void Process_Identifier( + virtual void Process_Default(); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); @@ -95,20 +95,20 @@ class PE_StructElement : public UnoIDL_PE, expect_finish }; - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); - ary::idl::Type_id lhf_FindTemplateParamType() const; + ary::idl::Type_id lhf_FindTemplateParamType() const; // DATA E_State eState; - RStructElement * pResult; - const RStruct * pCurStruct; + RStructElement * pResult; + const RStruct * pCurStruct; bool bIsExceptionElement; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; String sName; const String * pCurStructTemplateParam; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx index 691b97d5a432..c889e882a4c3 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.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,33 +62,33 @@ class PE_Service : public UnoIDL_PE, { public: PE_Service(); - virtual ~PE_Service(); + virtual ~PE_Service(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Needs(); - virtual void Process_Observes(); - virtual void Process_Default(); + virtual void Process_Needs(); + virtual void Process_Observes(); + virtual void Process_Default(); private: - void On_Default(); + void On_Default(); enum E_State { @@ -109,32 +109,32 @@ class PE_Service : public UnoIDL_PE, e_STATES_MAX }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); - void StartProperty(); + void StartProperty(); // DATA - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Service * pCurService; ary::idl::SglIfcService * pCurSiService; ary::idl::Ce_id nCurService; // Needed for PE_Attribute. - Dyn<PE_Property> pPE_Property; - ary::idl::Ce_id nCurParsed_Property; + Dyn<PE_Property> pPE_Property; + ary::idl::Ce_id nCurParsed_Property; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Type; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Type; - Dyn<PE_Function> pPE_Constructor; + Dyn<PE_Function> pPE_Constructor; - bool bOptionalMember; + bool bOptionalMember; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx index 5affacaa925e..9c38a8eda5c1 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.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,25 +61,25 @@ class PE_Singleton : public UnoIDL_PE, { public: PE_Singleton(); - virtual ~PE_Singleton(); + virtual ~PE_Singleton(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -94,26 +94,26 @@ class PE_Singleton : public UnoIDL_PE, e_STATES_MAX }; - void On_Default(); + void On_Default(); - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); // DATA -// static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; +// static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Singleton * pCurSingleton; ary::idl::SglIfcSingleton * pCurSiSingleton; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Type; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Type; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx index 3746d74e4144..6b7a5e16040f 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.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,38 +68,38 @@ class PE_Struct : public UnoIDL_PE { public: PE_Struct(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Struct(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); private: struct S_Work { S_Work(); - void InitData(); - void Prepare_PE_QualifiedName(); - void Prepare_PE_Element(); - void Data_Set_Name( - const char * i_sName ); - void Data_Set_TemplateParam( - const char * i_sTemplateParam ); + void InitData(); + void Prepare_PE_QualifiedName(); + void Prepare_PE_Element(); + void Data_Set_Name( + const char * i_sName ); + void Data_Set_TemplateParam( + const char * i_sTemplateParam ); String sData_Name; String sData_TemplateParam; - bool bIsPreDeclaration; - ary::idl::Ce_id nCurStruct; + bool bIsPreDeclaration; + ary::idl::Ce_id nCurStruct; Dyn<PE_StructElement> pPE_Element; - ary::idl::Ce_id nCurParsed_ElementRef; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + ary::idl::Ce_id nCurParsed_ElementRef; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; }; struct S_Stati; @@ -114,70 +114,70 @@ class PE_Struct : public UnoIDL_PE protected: PE_StructState( - PE_Struct & i_rStruct ) - : rStruct(i_rStruct) {} - void MoveState( - ParseEnvState & i_rState ) const; - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) const + PE_Struct & i_rStruct ) + : rStruct(i_rStruct) {} + void MoveState( + ParseEnvState & i_rState ) const; + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) const { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } - S_Stati & Stati() const { return *rStruct.pStati; } - S_Work & Work() const { return rStruct.aWork; } - PE_Struct & PE() const { return rStruct; } + S_Stati & Stati() const { return *rStruct.pStati; } + S_Work & Work() const { return rStruct.aWork; } + PE_Struct & PE() const { return rStruct; } private: - virtual UnoIDL_PE & MyPE(); + virtual UnoIDL_PE & MyPE(); // DATA - PE_Struct & rStruct; + PE_Struct & rStruct; }; class State_None : public PE_StructState { public: State_None( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} }; class State_WaitForName : public PE_StructState - { // -> Name + { // -> Name public: State_WaitForName( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_GotName : public PE_StructState - { // -> : { ; < + { // -> : { ; < public: State_GotName( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; class State_WaitForTemplateParam : public PE_StructState - { // -> Template parameter identifier + { // -> Template parameter identifier public: State_WaitForTemplateParam( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_WaitForTemplateEnd : public PE_StructState - { // -> > + { // -> > public: State_WaitForTemplateEnd( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -185,17 +185,17 @@ class PE_Struct : public UnoIDL_PE { // -> Base public: State_WaitForBase( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void On_SubPE_Left(); + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void On_SubPE_Left(); }; class State_GotBase : public PE_StructState { // -> { public: State_GotBase( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -203,19 +203,19 @@ class PE_Struct : public UnoIDL_PE { // -> Typ } public: State_WaitForElement( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -223,9 +223,9 @@ class PE_Struct : public UnoIDL_PE { // -> ; public: State_WaitForFinish( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -233,13 +233,13 @@ class PE_Struct : public UnoIDL_PE struct S_Stati { S_Stati( - PE_Struct & io_rStruct ); - void SetState( - ParseEnvState & i_rNextState ) + PE_Struct & io_rStruct ); + void SetState( + ParseEnvState & i_rNextState ) { pCurStatus = &i_rNextState; } - State_None aNone; - State_WaitForName aWaitForName; + State_None aNone; + State_WaitForName aWaitForName; State_GotName aGotName; State_WaitForTemplateParam aWaitForTemplateParam; @@ -251,12 +251,12 @@ class PE_Struct : public UnoIDL_PE aWaitForElement; State_WaitForFinish aWaitForFinish; - ParseEnvState * pCurStatus; + ParseEnvState * pCurStatus; }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); public: @@ -264,18 +264,18 @@ class PE_Struct : public UnoIDL_PE private: - S_Stati & Stati() { return *pStati; } - S_Work & Work() { return aWork; } + S_Stati & Stati() { return *pStati; } + S_Work & Work() { return aWork; } // DATA - S_Work aWork; - Dyn<S_Stati> pStati; + S_Work aWork; + Dyn<S_Stati> pStati; }; inline void PE_Struct::PE_StructState::MoveState( - ParseEnvState & i_rState ) const + ParseEnvState & i_rState ) const { rStruct.Stati().SetState(i_rState); } } // namespace uidl diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx index ea8228fecbae..261715239caa 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.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,23 +54,23 @@ class PE_Typedef : public UnoIDL_PE, { public: PE_Typedef(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Typedef(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -81,7 +81,7 @@ class PE_Typedef : public UnoIDL_PE, got_name, e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_any = 0, tt_identifier, @@ -91,27 +91,27 @@ class PE_Typedef : public UnoIDL_PE, typedef void (PE_Typedef::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_description_Any(const char * i_sText); - void On_expect_name_Identifier(const char * i_sText); - void On_got_name_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_expect_description_Any(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_got_name_Punctuation(const char * i_sText); + void On_Default(const char * ); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; - String sName; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; + String sName; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx index 2d6367528672..020c846fa9fe 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.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 @@ -51,26 +51,26 @@ class PE_Type : public UnoIDL_PE, { public: PE_Type( - ary::idl::Type_id & o_rResult ); + ary::idl::Type_id & o_rResult ); virtual ~PE_Type(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_Punctuation( + virtual void Process_NameSeparator(); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -82,23 +82,23 @@ class PE_Type : public UnoIDL_PE, in_template_type }; - void Finish(); + void Finish(); PE_Type & MyTemplateType(); - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA ary::idl::Type_id * pResult; - uintt nIsSequenceCounter; - uintt nSequenceDownCounter; - bool bIsUnsigned; - ary::QualifiedName sFullType; + uintt nIsSequenceCounter; + uintt nSequenceDownCounter; + bool bIsUnsigned; + ary::QualifiedName sFullType; - E_State eState; - String sLastPart; + E_State eState; + String sLastPart; Dyn<PE_Type> pPE_TemplateType; /// @attention Recursion, only initiate, if needed! ary::idl::Type_id nTemplateType; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx index 961539c57abd..58a7bc22cc86 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.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,27 +53,27 @@ class PE_Variable : public UnoIDL_PE, { public: PE_Variable( - ary::idl::Type_id & i_rResult_Type, - String & i_rResult_Name ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + ary::idl::Type_id & i_rResult_Type, + String & i_rResult_Name ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Variable(); + virtual ~PE_Variable(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Default(); - virtual void Process_Identifier( + virtual void Process_Default(); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); private: @@ -85,17 +85,17 @@ class PE_Variable : public UnoIDL_PE, expect_finish }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; - ary::idl::Type_id * pResult_Type; - String * pResult_Name; + ary::idl::Type_id * pResult_Type; + String * pResult_Name; - Dyn<PE_Type> pPE_Type; + Dyn<PE_Type> pPE_Type; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx index 78582ab0abae..26d03df6aecd 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pestate.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,50 +49,50 @@ class TokBuiltInType; class TokPunctuation; class Tok_Documentation; -class ParseEnvState : public TokenInterpreter, +class ParseEnvState : public TokenInterpreter, virtual protected TokenProcessing_Types { public: - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_Punctuation( + virtual void Process_NameSeparator(); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Needs(); - virtual void Process_Observes(); - virtual void Process_Assignment( + virtual void Process_Raises(); + virtual void Process_Needs(); + virtual void Process_Observes(); + virtual void Process_Assignment( const TokAssignment & i_rToken ); - virtual void Process_EOL(); + virtual void Process_EOL(); - virtual void On_SubPE_Left(); + virtual void On_SubPE_Left(); - virtual void Process_Default(); + virtual void Process_Default(); protected: - ParseEnvState() : bDefaultIsError(true) {} - void SetDefault2Ignore() { bDefaultIsError = false; } + ParseEnvState() : bDefaultIsError(true) {} + void SetDefault2Ignore() { bDefaultIsError = false; } private: - virtual UnoIDL_PE & MyPE() = 0; - bool bDefaultIsError; + virtual UnoIDL_PE & MyPE() = 0; + bool bDefaultIsError; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx index 75c8fdf4bdce..65f18a6c192e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/semnode.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 @@ -63,32 +63,32 @@ class Struct; class Token; -/** is an implementation class for UnoIDL_PE s +/** is an implementation class for UnoIDL_PE s */ class SemanticNode : private TokenProcessing_Types { public: SemanticNode(); - void EstablishContacts( - UnoIDL_PE * io_pParentPE, + void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::idl::Gate & io_rRepository, TokenProcessing_Result & o_rResult ); ~SemanticNode(); - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ); - UnoIDL_PE * Parent() const { return pParentPE; } - ary::idl::Gate & AryGate() const { return *pAryGate; } + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ); + UnoIDL_PE * Parent() const { return pParentPE; } + ary::idl::Gate & AryGate() const { return *pAryGate; } TokenProcessing_Result & TokenResult() const { return *pTokenResult; } private: // DATA - UnoIDL_PE * pParentPE; - ary::idl::Gate * pAryGate; + UnoIDL_PE * pParentPE; + ary::idl::Gate * pAryGate; TokenProcessing_Result * pTokenResult; }; @@ -98,26 +98,26 @@ class SemanticNode : private TokenProcessing_Types class Trying_PE { public: - virtual ~Trying_PE() {} + virtual ~Trying_PE() {} protected: Trying_PE(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - void StartTry( - UnoIDL_PE & i_rFirstTry ); - void Add2Try( - UnoIDL_PE & i_rTry ); - bool AmITrying() const; - UnoIDL_PE * NextTry() const; - void FinishTry(); + void StartTry( + UnoIDL_PE & i_rFirstTry ); + void Add2Try( + UnoIDL_PE & i_rTry ); + bool AmITrying() const; + UnoIDL_PE * NextTry() const; + void FinishTry(); private: std::vector<UnoIDL_PE*> aTryableSubEnvironments; - uintt nTryCounter; + uintt nTryCounter; }; */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx index c29f7297c181..ebdd7326c48a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.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 @@ -45,27 +45,27 @@ namespace uidl -/** is an implementation class for ParseEnvironment +/** is an implementation class for ParseEnvironment */ class SemanticParser : public csi::uidl::Token_Receiver, public csi::dsapi::Token_Receiver { public: - typedef std::deque< DYN TextToken * > TokenQueue; + typedef std::deque< DYN TextToken * > TokenQueue; ~SemanticParser(); - void Receive( + void Receive( DYN csi::uidl::Token & let_drToken ); - void Receive( + void Receive( DYN csi::dsapi::Token & let_drToken ); private: // DATA - TokenQueue aTokenQueue; + TokenQueue aTokenQueue; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx index e423a8130b0d..36e03a1e60fc 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_const.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 @@ -45,16 +45,16 @@ class TokAssignment : public Token { public: TokAssignment( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; private: // DATA - String sText; + String sText; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx index 1abc3cf77a46..c7345c2410c1 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.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,23 +46,23 @@ class TokIdentifier : public Token { public: TokIdentifier( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; private: // DATA - String sText; + String sText; }; class TokNameSeparator : public Token { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx index ac0120c7582d..a250a5dda485 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.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,18 +69,18 @@ class TokBuiltInType : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokBuiltInType( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; @@ -96,17 +96,17 @@ class TokTypeModifier : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokTypeModifier( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + EV_TokenId i_eTag ) + : eTag(i_eTag) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokMetaType : public TokKeyword @@ -132,19 +132,19 @@ class TokMetaType : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokMetaType( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokStereotype : public TokKeyword @@ -172,19 +172,19 @@ class TokStereotype : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokStereotype( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokParameterHandling : public TokKeyword @@ -201,26 +201,26 @@ class TokParameterHandling : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokParameterHandling( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokRaises : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; @@ -228,8 +228,8 @@ class TokRaises : public TokKeyword class TokNeeds : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; @@ -237,8 +237,8 @@ class TokNeeds : public TokKeyword class TokObserves : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx index 043256ef27e5..9bb2d48b2847 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.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 @@ -50,13 +50,13 @@ class TokPunctuation : public Token enum E_TokenId { e_none = 0, - BracketOpen = 1, // ( + BracketOpen = 1, // ( BracketClose = 2, // ) ArrayBracketOpen = 3, // [ ArrayBracketClose = 4, // ] CurledBracketOpen = 5, // { CurledBracketClose = 6, // } - Semicolon = 7, // ; + Semicolon = 7, // ; Colon = 8, // : DoubleColon = 9, // :: Comma = 10, // , @@ -69,27 +69,27 @@ class TokPunctuation : public Token TokPunctuation( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - EV_TokenId Id() const { return eTag; } + EV_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_EOL : public Token { // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; @@ -98,8 +98,8 @@ class Tok_EOL : public Token class Tok_EOF : public Token { // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx index 02c35e2fd871..50d2b4f5d5ba 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.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,19 +57,19 @@ class TokenParser_Uidl : public TokenParse2 public: // LIFECYCLE TokenParser_Uidl( - Token_Receiver & o_rUidlReceiver, + Token_Receiver & o_rUidlReceiver, DYN TkpDocuContext & let_drDocuContext ); - virtual ~TokenParser_Uidl(); + virtual ~TokenParser_Uidl(); // OPERATIONS private: virtual ::TkpContext & CurrentContext(); - virtual void SetStartContext(); + virtual void SetStartContext(); virtual void SetCurrentContext( - TkpContext & io_rContext ); + TkpContext & io_rContext ); // DATA Dyn<Context_UidlCode> pBaseContext; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx index fcfd1972ce1b..340ee0b7c5bf 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/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 @@ -56,36 +56,36 @@ class Tok_Documentation; class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ) = 0; - virtual void Process_NameSeparator() = 0; // :: - virtual void Process_Punctuation( + virtual void Process_NameSeparator() = 0; // :: + virtual void Process_Punctuation( const TokPunctuation & i_rToken ) = 0; - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ) = 0; - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ) = 0; - virtual void Process_MetaType( - const TokMetaType & i_rToken ) = 0; - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ) = 0; + virtual void Process_Stereotype( const TokStereotype & i_rToken ) = 0; - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ) = 0; - virtual void Process_Raises() = 0; - virtual void Process_Needs() = 0; - virtual void Process_Observes() = 0; - virtual void Process_Assignment( + virtual void Process_Raises() = 0; + virtual void Process_Needs() = 0; + virtual void Process_Observes() = 0; + virtual void Process_Assignment( const TokAssignment & i_rToken ) = 0; - virtual void Process_EOL() = 0; + virtual void Process_EOL() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx index 0afae87c52b7..ccacd3e6f371 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.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,7 +46,7 @@ namespace uidl class UnoIDL_PE; -/** is a parent class for classes, which take part in parsing tokens semantically. +/** is a parent class for classes, which take part in parsing tokens semantically. It provides some types for them. */ class TokenProcessing_Types @@ -60,7 +60,7 @@ class TokenProcessing_Types enum E_EnvStackAction { - stay, // same parse environment + stay, // same parse environment push_sure, // push sub environment, which must be the correct one push_try, // push sub environment, which is tried, if it may be the right one pop_success, // return to parent environment, parsing was successful @@ -69,13 +69,13 @@ class TokenProcessing_Types struct TokenProcessing_Result { - E_TokenDone eDone; - E_EnvStackAction eStackAction; - UnoIDL_PE * pEnv2Push; + E_TokenDone eDone; + E_EnvStackAction eStackAction; + UnoIDL_PE * pEnv2Push; TokenProcessing_Result() : eDone(not_done), eStackAction(stay), pEnv2Push(0) {} - void reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } + void reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } }; enum E_ParseResult diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx index f1d43dd5a435..033ff8da04b4 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.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,9 +48,9 @@ class Token; class Token_Receiver { public: - virtual ~Token_Receiver() {} - virtual void Receive( - DYN Token & let_drToken ) = 0; + virtual ~Token_Receiver() {} + virtual void Receive( + DYN Token & let_drToken ) = 0; virtual void Increment_CurLine() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx index a316582b381b..82f2b4b92042 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/uidl_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 @@ -50,11 +50,11 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; } // namespace uidl diff --git a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx index 75facea675ce..16b4af226f02 100644 --- a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/semantic/parsenv2.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,9 +42,9 @@ class ParseEnvironment { public: - virtual ~ParseEnvironment(); + virtual ~ParseEnvironment(); - virtual void Enter() = 0; + virtual void Enter() = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx index 1555cde5e0d6..e16e4fbdbc29 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstar2.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,32 +42,32 @@ class StmArrayStatu2 : public StmStatu2 public: // LIFECYCLE StmArrayStatu2( - intt i_nStatusSize, - const INT16 * in_aArrayModel, - uintt i_nTokenId, - bool in_bIsDefault ); + intt i_nStatusSize, + const INT16 * in_aArrayModel, + uintt i_nTokenId, + bool in_bIsDefault ); ~StmArrayStatu2(); // INQUIRY - StmStatu2::Branch NextBy( - intt in_nFollowersIndex) const; - UINT16 TokenId() const { return nTokenId; } - virtual bool IsADefault() const; + StmStatu2::Branch NextBy( + intt in_nFollowersIndex) const; + UINT16 TokenId() const { return nTokenId; } + virtual bool IsADefault() const; // ACCESS virtual StmArrayStatu2 * AsArray(); - bool SetBranch( - intt in_nBranchIx, + bool SetBranch( + intt in_nBranchIx, StmStatu2::Branch in_nBranch ); - void SetTokenId( - UINT16 in_nTokenId ); + void SetTokenId( + UINT16 in_nTokenId ); private: - StmStatu2::Branch * dpBranches; - intt nNrOfBranches; - UINT16 nTokenId; - bool bIsADefault; + StmStatu2::Branch * dpBranches; + intt nNrOfBranches; + UINT16 nTokenId; + bool bIsADefault; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx index 3d83bb0f77fb..4602da49c59c 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstat2.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 @@ -36,21 +36,21 @@ class StmArrayStatu2; class StmBoundsStatu2; -/** A StmStatu2 is a state within a StateMachin2. +/** A StmStatu2 is a state within a StateMachin2. There are two kinds of it. Either its an array of pointers to other states within the state machine - an ArrayStatus. Or it is a BoundsStatus, which shows, the token cannot be followed further within the StateMachin2. **/ -class StmStatu2 // := "State machine status" +class StmStatu2 // := "State machine status" { public: - typedef intt Branch; /// Values >= 0 give a next #Status' ID. + typedef intt Branch; /// Values >= 0 give a next #Status' ID. /// Values <= 0 tell, that a token is finished. /// a value < 0 returns the status back to an upper level state machine. // LIFECYCLE - virtual ~StmStatu2() {} + virtual ~StmStatu2() {} // OPERATIONS virtual StmArrayStatu2 * @@ -59,7 +59,7 @@ class StmStatu2 // := "State machine status" AsBounds(); // INQUIRY - virtual bool IsADefault() const = 0; + virtual bool IsADefault() const = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx index d5550752e6a3..b7b38d608573 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.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,13 +48,13 @@ class StmBoundsStatu2 : public StmStatu2 StmBoundsStatu2( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ); + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ); // INQUIRY - TkpContext * FollowUpContext(); - uintt StatusFunctionNr() const; - virtual bool IsADefault() const; + TkpContext * FollowUpContext(); + uintt StatusFunctionNr() const; + virtual bool IsADefault() const; // ACCESS virtual StmBoundsStatu2 * @@ -63,9 +63,9 @@ class StmBoundsStatu2 : public StmStatu2 private: StateMachineContext * pOwner; - TkpContext * pFollowUpContext; - uintt nStatusFunctionNr; - bool bIsDefault; + TkpContext * pFollowUpContext; + uintt nStatusFunctionNr; + bool bIsDefault; }; inline TkpContext * diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx index faf45d8e5332..f5d9839361de 100644 --- a/autodoc/source/parser_i/inc/tokens/tkp2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkp2.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,29 +54,29 @@ class TokenParse2 public: // LIFECYCLE TokenParse2(); - virtual ~TokenParse2() {} + virtual ~TokenParse2() {} // OPERATIONS - virtual void Start( + virtual void Start( CharacterSource & i_rSource ); - /** @short Gets the next identifiable token out of the + /** @short Gets the next identifiable token out of the source code. @return true, if there was passed a valid token. false, if the parsed stream is finished or - an error occured. + an error occured. */ - bool GetNextToken(); + bool GetNextToken(); private: - virtual void SetStartContext() = 0; + virtual void SetStartContext() = 0; virtual void SetCurrentContext( - TkpContext & io_rContext ) = 0; + TkpContext & io_rContext ) = 0; virtual TkpContext & CurrentContext() = 0; // DATA - CharacterSource * pChars; + CharacterSource * pChars; }; diff --git a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx index fc7991ae1832..2246385b09fc 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpcont2.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 @@ -37,7 +37,7 @@ class CharacterSource; class TkpNullContext; class TkpNullContex2; -/** @task +/** @task Specifies a context within which tokens are interpreted in a special way. For example in parsing C++ there could be a context for code, one for comments and a third one for preprocessor statements, because @@ -47,7 +47,7 @@ class TkpContext { public: // LIFECYCLE - virtual ~TkpContext() {} + virtual ~TkpContext() {} // OPERATIONS /** @descr @@ -67,13 +67,13 @@ class TkpContext passes the parsed token to the internally known receiver and returns true. The token is cut from io_rText. **/ - virtual void ReadCharChain( - CharacterSource & io_rText ) = 0; + virtual void ReadCharChain( + CharacterSource & io_rText ) = 0; /** Has to pass the parsed token to a known receiver. @return true, if a token was passed. false, if no token was parsed complete by this context. */ - virtual bool PassNewToken() = 0; + virtual bool PassNewToken() = 0; virtual TkpContext & FollowUpContext() = 0; @@ -89,10 +89,10 @@ class StateMachineContext virtual ~StateMachineContext() {} /// Is used by StmBoundsStatu2 only. - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) = 0; + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) = 0; }; class TkpNullContex2 : public TkpContext @@ -100,9 +100,9 @@ class TkpNullContex2 : public TkpContext public: ~TkpNullContex2(); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); }; @@ -110,11 +110,11 @@ class TkpNullContex2 : public TkpContext class TkpDocuContext : public TkpContext { public: - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ) = 0; - virtual void SetMode_IsMultiLine( - bool i_bTrue ) = 0; + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ) = 0; + virtual void SetMode_IsMultiLine( + bool i_bTrue ) = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx index a23da72f2c1e..635f696bf5d0 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.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 @@ -36,7 +36,7 @@ #include <tokens/stmstar2.hxx> #include <tokens/stmstfi2.hxx> -/** @descr +/** @descr This state-machine models state transitions from one state to another per indices of branches. If the indices represent ascii-char-values, the state-machine can be used for recognising tokens of text. @@ -52,62 +52,62 @@ class StateMachin2 { public: // Types - typedef StmStatu2::Branch Branch; - typedef StmStatu2 * * StatusList; + typedef StmStatu2::Branch Branch; + typedef StmStatu2 * * StatusList; //# Interface self // LIFECYCLE StateMachin2( - intt in_nStatusSize, - intt in_nInitial_StatusListSize ); /// The user of the constructor should guess + intt in_nStatusSize, + intt in_nInitial_StatusListSize ); /// The user of the constructor should guess /// the approximate number of stati here to - /// avoid multiple reallocations. + /// avoid multiple reallocations. /// @#AddStatus - intt AddStatus( /// @return the new #Status' ID - DYN StmStatu2 * let_dpStatus); + intt AddStatus( /// @return the new #Status' ID + DYN StmStatu2 * let_dpStatus); /// @#AddToken - void AddToken( - const char * in_sToken, - UINT16 in_nTokenId, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ); + void AddToken( + const char * in_sToken, + UINT16 in_nTokenId, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ); ~StateMachin2(); // OPERATIONS StmBoundsStatu2 & GetCharChain( - UINT16 & o_nTokenId, - CharacterSource & io_rText ); + UINT16 & o_nTokenId, + CharacterSource & io_rText ); private: // SERVICE FUNCTIONS - StmStatu2 & Status( - intt in_nStatusNr) const; + StmStatu2 & Status( + intt in_nStatusNr) const; StmArrayStatu2 & CurrentStatus() const; StmBoundsStatu2 * BoundsStatus() const; /// Sets the PeekedStatus. - void Peek( - intt in_nBranch); + void Peek( + intt in_nBranch); - void ResizeStati(); // Adds space for 32 stati. + void ResizeStati(); // Adds space for 32 stati. // DATA - StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace + StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace /// with nStatiLength valid members (beginning from zero). - intt nCurrentStatus; - intt nPeekedStatus; + intt nCurrentStatus; + intt nPeekedStatus; - intt nStatusSize; /// Size of the branch array of a single status. + intt nStatusSize; /// Size of the branch array of a single status. - intt nNrofStati; /// Nr of Stati so far. - intt nStatiSpace; /// Size of allocated array for #pStati (size in items). + intt nNrofStati; /// Nr of Stati so far. + intt nStatiSpace; /// Size of allocated array for #pStati (size in items). }; -/** @#AddToken +/** @#AddToken @descr Adds a token, which will be recogniszeds by the statemachine. diff --git a/autodoc/source/parser_i/inc/tokens/token2.hxx b/autodoc/source/parser_i/inc/tokens/token2.hxx index d1a4ac3b275c..1e6750c48359 100644 --- a/autodoc/source/parser_i/inc/tokens/token2.hxx +++ b/autodoc/source/parser_i/inc/tokens/token2.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 @@ -51,11 +51,11 @@ class TextToken { public: // LIFECYCLE - virtual ~TextToken() {} + virtual ~TextToken() {} // INQUIRY - virtual const char* Text() const = 0; + virtual const char* Text() const = 0; }; diff --git a/autodoc/source/parser_i/inc/x_parse2.hxx b/autodoc/source/parser_i/inc/x_parse2.hxx index 0301dc74f5a4..bbc69bb99239 100644 --- a/autodoc/source/parser_i/inc/x_parse2.hxx +++ b/autodoc/source/parser_i/inc/x_parse2.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,22 +42,22 @@ class X_AutodocParser : public csv::Exception // TYPES enum E_Type { - x_Any = 0, + x_Any = 0, x_InvalidChar, x_UnexpectedToken, x_UnexpectedEOF }; // LIFECYCLE X_AutodocParser( - E_Type i_eType, - const char * i_sName = "" ) - : eType(i_eType), sName(i_sName) {} + E_Type i_eType, + const char * i_sName = "" ) + : eType(i_eType), sName(i_sName) {} // INQUIRY - virtual void GetInfo( + virtual void GetInfo( std::ostream & o_rOutputMedium ) const; private: - E_Type eType; + E_Type eType; String sName; }; diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx index 1cc135fa63e1..f8894451d46d 100644 --- a/autodoc/source/parser_i/tokens/stmstar2.cxx +++ b/autodoc/source/parser_i/tokens/stmstar2.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 @@ -35,11 +35,11 @@ -StmArrayStatu2::StmArrayStatu2( intt i_nStatusSize, - const INT16 * in_aArrayModel, - uintt i_nTokenId, - bool in_bIsDefault ) - : dpBranches(new StmStatu2::Branch[i_nStatusSize]), +StmArrayStatu2::StmArrayStatu2( intt i_nStatusSize, + const INT16 * in_aArrayModel, + uintt i_nTokenId, + bool in_bIsDefault ) + : dpBranches(new StmStatu2::Branch[i_nStatusSize]), nNrOfBranches(i_nStatusSize), nTokenId(UINT16(i_nTokenId)), bIsADefault(in_bIsDefault) @@ -65,7 +65,7 @@ StmArrayStatu2::~StmArrayStatu2() } bool -StmArrayStatu2::SetBranch( intt in_nBranchIx, +StmArrayStatu2::SetBranch( intt in_nBranchIx, StmStatu2::Branch in_nBranch ) { if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) ) @@ -84,7 +84,7 @@ StmArrayStatu2::NextBy(intt in_nIndex) const throw X_AutodocParser(X_AutodocParser::x_InvalidChar); return in_nIndex < nNrOfBranches - ? dpBranches[in_nIndex] + ? dpBranches[in_nIndex] : dpBranches[nNrOfBranches - 1]; } @@ -96,7 +96,7 @@ StmArrayStatu2::IsADefault() const } StmArrayStatu2 * -StmArrayStatu2::AsArray() +StmArrayStatu2::AsArray() { return this; } diff --git a/autodoc/source/parser_i/tokens/stmstat2.cxx b/autodoc/source/parser_i/tokens/stmstat2.cxx index 4d0cf62c4ed2..701bfa33c0e5 100644 --- a/autodoc/source/parser_i/tokens/stmstat2.cxx +++ b/autodoc/source/parser_i/tokens/stmstat2.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_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx index 15bffb0bf937..528011900332 100644 --- a/autodoc/source/parser_i/tokens/stmstfi2.cxx +++ b/autodoc/source/parser_i/tokens/stmstfi2.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 @@ -36,10 +36,10 @@ StmBoundsStatu2::StmBoundsStatu2( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ) - : pOwner(&o_rOwner), + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ) + : pOwner(&o_rOwner), pFollowUpContext(&i_rFollowUpContext), nStatusFunctionNr(i_nStatusFunctionNr), bIsDefault(i_bIsDefault) diff --git a/autodoc/source/parser_i/tokens/tkp2.cxx b/autodoc/source/parser_i/tokens/tkp2.cxx index 58f740d871e0..950215019bb3 100644 --- a/autodoc/source/parser_i/tokens/tkp2.cxx +++ b/autodoc/source/parser_i/tokens/tkp2.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 @@ -34,7 +34,7 @@ #include <tokens/tkpcont2.hxx> TokenParse2::TokenParse2() - : pChars(0) + : pChars(0) { } diff --git a/autodoc/source/parser_i/tokens/tkpcont2.cxx b/autodoc/source/parser_i/tokens/tkpcont2.cxx index 4ccef4df4b12..73c93c5eaf55 100644 --- a/autodoc/source/parser_i/tokens/tkpcont2.cxx +++ b/autodoc/source/parser_i/tokens/tkpcont2.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_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx index 90978c10ae2b..39cf31e1a395 100644 --- a/autodoc/source/parser_i/tokens/tkpstam2.cxx +++ b/autodoc/source/parser_i/tokens/tkpstam2.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 @@ -34,12 +34,12 @@ #include <tools/tkpchars.hxx> -const intt C_nStatuslistResizeValue = 32; -const intt C_nTopStatus = 0; +const intt C_nStatuslistResizeValue = 32; +const intt C_nTopStatus = 0; -StateMachin2::StateMachin2( intt in_nStatusSize, - intt in_nInitial_StatusListSize ) - : pStati(new StmStatu2*[in_nInitial_StatusListSize]), +StateMachin2::StateMachin2( intt in_nStatusSize, + intt in_nInitial_StatusListSize ) + : pStati(new StmStatu2*[in_nInitial_StatusListSize]), nCurrentStatus(C_nTopStatus), nPeekedStatus(C_nTopStatus), nStatusSize(in_nStatusSize), @@ -64,10 +64,10 @@ StateMachin2::AddStatus(StmStatu2 * let_dpStatus) } void -StateMachin2::AddToken( const char * in_sToken, - UINT16 in_nTokenId, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ) +StateMachin2::AddToken( const char * in_sToken, + UINT16 in_nTokenId, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ) { if (csv::no_str(in_sToken)) return; @@ -88,14 +88,14 @@ StateMachin2::AddToken( const char * in_sToken, CurrentStatus().SetBranch( *pChar, nPeekedStatus ); } nCurrentStatus = nPeekedStatus; - } // end for + } // end for StmArrayStatu2 & rLastStatus = CurrentStatus(); rLastStatus.SetTokenId(in_nTokenId); for (intt i = 0; i < nStatusSize; i++) { if (Status(rLastStatus.NextBy(i)).AsBounds() != 0) rLastStatus.SetBranch(i,in_nBoundsStatus); - } // end for + } // end for } StateMachin2::~StateMachin2() @@ -108,7 +108,7 @@ StateMachin2::~StateMachin2() } StmBoundsStatu2 & -StateMachin2::GetCharChain( UINT16 & o_nTokenId, +StateMachin2::GetCharChain( UINT16 & o_nTokenId, CharacterSource & io_rText ) { nCurrentStatus = C_nTopStatus; @@ -168,7 +168,7 @@ StateMachin2::BoundsStatus() const } void -StateMachin2::Peek(intt in_nBranch) +StateMachin2::Peek(intt in_nBranch) { StmArrayStatu2 & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); diff --git a/autodoc/source/parser_i/tokens/x_parse2.cxx b/autodoc/source/parser_i/tokens/x_parse2.cxx index 8194985388e0..8824d2ccc4db 100644 --- a/autodoc/source/parser_i/tokens/x_parse2.cxx +++ b/autodoc/source/parser_i/tokens/x_parse2.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 @@ -33,12 +33,12 @@ enum E_Type { - x_Any = 0, + x_Any = 0, x_InvalidChar, x_UnexpectedEOF }; void -X_AutodocParser::GetInfo( std::ostream & o_rOutputMedium ) const +X_AutodocParser::GetInfo( std::ostream & o_rOutputMedium ) const { switch (eType) { |