diff options
Diffstat (limited to 'autodoc/source')
59 files changed, 286 insertions, 244 deletions
diff --git a/autodoc/source/ary_i/kernel/ci_atag2.cxx b/autodoc/source/ary_i/kernel/ci_atag2.cxx index 4767112656f7..8bc877bdd7b8 100644 --- a/autodoc/source/ary_i/kernel/ci_atag2.cxx +++ b/autodoc/source/ary_i/kernel/ci_atag2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ci_atag2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:21 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,27 @@ // NOT FULLY DEFINED SERVICES +#include <ary_i/disdocum.hxx> +namespace ary +{ +namespace info +{ + +void DocuTag_Display::Display_TextToken( + const csi::dsapi::DT_TextToken & ) {} +void DocuTag_Display::Display_MupType( + const csi::dsapi::DT_MupType & ) {} +void DocuTag_Display::Display_MupMember( + const csi::dsapi::DT_MupMember & ) {} +void DocuTag_Display::Display_MupConst( + const csi::dsapi::DT_MupConst & ) {} +void DocuTag_Display::Display_Style( + const csi::dsapi::DT_Style & ) {} +void DocuTag_Display::Display_EOL() {} + + +} // namespace info +} // namespace ary diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx index d052a65bc002..89686b6d4d69 100644 --- a/autodoc/source/ary_i/kernel/ci_text2.cxx +++ b/autodoc/source/ary_i/kernel/ci_text2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ci_text2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:21 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,7 @@ // NOT FULLY DEFINED SERVICES +#include <ary_i/disdocum.hxx> namespace ary @@ -121,6 +122,16 @@ DocuTex2::IsEmpty() const } + +void DocuText_Display::Display_StdAtTag( + const csi::dsapi::DT_StdAtTag & ) {} +void DocuText_Display::Display_SeeAlsoAtTag( + const csi::dsapi::DT_SeeAlsoAtTag & ) {} +void DocuText_Display::Display_ParameterAtTag( + const csi::dsapi::DT_ParameterAtTag & ) {} + + + } // namespace info } // namespace ary diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx index 9db898370fcb..6c02675e226d 100644 --- a/autodoc/source/display/html/aryattrs.cxx +++ b/autodoc/source/display/html/aryattrs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: aryattrs.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:22 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,11 @@ Get_TypeKey( const ary::CodeEntity & i_rCe ) bool Ce_IsInternal( const ary::CodeEntity & i_rCe ) { - return static_cast< const ary::info::CodeInfo& >(i_rCe.Info()).IsInternal(); + const ary::info::CodeInfo * + pInfo = dynamic_cast< const ary::info::CodeInfo* >( &i_rCe.Info() ); + return pInfo != 0 + ? pInfo->IsInternal() + : false; } const char * diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index 0fe24d1a01c4..2b41edc625b3 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cfrstd.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:22 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ StdFrame::LogoLink() const const char * StdFrame::CopyrightText() const { - return "Copyright 2001-2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA."; + return "Copyright 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA."; // return "Copyright 2001 OpenOffice.org Foundation. All Rights Reserved."; } diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx index 97dbd513ee09..f33231eb1076 100644 --- a/autodoc/source/display/html/hd_chlst.cxx +++ b/autodoc/source/display/html/hd_chlst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hd_chlst.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:23 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -400,6 +400,7 @@ ChildList_Display::Display_Class( const ary::cpp::Class & i_rData ) if ( i_rData.Protection() == ary::cpp::PROTECT_global ) { sLink = ClassFileName(i_rData.LocalName()); + } else { diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx index 9a3ff8afedd5..dee9d525af98 100644 --- a/autodoc/source/display/html/hdimpl.cxx +++ b/autodoc/source/display/html/hdimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hdimpl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:23 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,7 +333,7 @@ Create_ChildListTable( const char * i_sTitle ) html::Table * dpTable = new html::Table; *dpTable -// << new xml::AnAttribute( "border", "1" ) + << new xml::AnAttribute( "border", "1" ) << new xml::AnAttribute( "cellpadding", "5" ) << new xml::AnAttribute( "cellspacing", "0" ) << new html::WidthAttr( "100%" ); diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx index 6c853443a77b..d5707cdfd923 100644 --- a/autodoc/source/display/html/outfile.cxx +++ b/autodoc/source/display/html/outfile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outfile.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,6 +194,10 @@ HtmlDocuFile::CreateFile() WriteHeader(aFile); WriteBody(aFile); + // Write end + static const char sCompletion[] = "\n</html>\n"; + aFile.write( sCompletion ); + aFile.close(); Cout() << '.' << Flush(); return true; diff --git a/autodoc/source/display/html/pm_index.cxx b/autodoc/source/display/html/pm_index.cxx index ce129b0d7c9f..7895033a819b 100644 --- a/autodoc/source/display/html/pm_index.cxx +++ b/autodoc/source/display/html/pm_index.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pm_index.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -314,7 +314,6 @@ PageMaker_Index::Write_CeIndexEntry( const ary::CodeEntity & i_rCe, const ary::CodeEntity & rOwner = Env().Gate().Ref_Ce(i_rCe.Owner()); - pCurIndex->AddEntry(); pCurIndex->Term() >> *new html::Link( Link2Ce(Env(), i_rCe) ) diff --git a/autodoc/source/display/html/pm_index.hxx b/autodoc/source/display/html/pm_index.hxx index ba3a4ec10af8..6c95870866a1 100644 --- a/autodoc/source/display/html/pm_index.hxx +++ b/autodoc/source/display/html/pm_index.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pm_index.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ class ChildList_Display; class NavigationBar; class PageMaker_Index : public SpecializedPageMaker, - private ary::cpp::Display + public ary::cpp::Display // Must be 'public' because of a Solaris-Compiler-bug with dynamic_cast in hierarchies with private inheritance. { public: PageMaker_Index( diff --git a/autodoc/source/display/kernel/displfct.cxx b/autodoc/source/display/kernel/displfct.cxx index a7fc7ddbd788..6cf5491e6062 100644 --- a/autodoc/source/display/kernel/displfct.cxx +++ b/autodoc/source/display/kernel/displfct.cxx @@ -2,9 +2,9 @@ * * $RCSfile: displfct.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,7 @@ // NOT FULLY DECLARED SERVICES #include <html/chd_udk2.hxx> +#include <html/hd_udk2.hxx> #include <html/cfrstd.hxx> @@ -93,17 +94,24 @@ DisplayToolsFactory::~DisplayToolsFactory() { } +// DYN autodoc::TextDisplay_FunctionList_Ifc * +// DisplayToolsFactory::Create_TextDisplay_FunctionList() const +// { +// return new CppTextDisplay_FunctionList; +// } + + DYN autodoc::HtmlDisplay_UdkStd * DisplayToolsFactory::Create_HtmlDisplay_UdkStd() const { return new CppHtmlDisplay_Udk2; } -// DYN autodoc::TextDisplay_FunctionList_Ifc * -// DisplayToolsFactory::Create_TextDisplay_FunctionList() const -// { -// return new CppTextDisplay_FunctionList; -// } +DYN autodoc::HtmlDisplay_Idl_Ifc * +DisplayToolsFactory::Create_HtmlDisplay_Idl() const +{ + return new IdlHtmlDisplay_Udk2; +} const display::CorporateFrame & DisplayToolsFactory::Create_StdFrame() const diff --git a/autodoc/source/display/kernel/displfct.hxx b/autodoc/source/display/kernel/displfct.hxx index b35455df5831..4a1f85c07d32 100644 --- a/autodoc/source/display/kernel/displfct.hxx +++ b/autodoc/source/display/kernel/displfct.hxx @@ -2,9 +2,9 @@ * * $RCSfile: displfct.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,10 +75,14 @@ class DisplayToolsFactory : public autodoc::DisplayToolsFactory_Ifc DisplayToolsFactory(); virtual ~DisplayToolsFactory(); - virtual DYN autodoc::HtmlDisplay_UdkStd * - Create_HtmlDisplay_UdkStd() const; // virtual DYN autodoc::TextDisplay_FunctionList_Ifc * // Create_TextDisplay_FunctionList() const; + + virtual DYN autodoc::HtmlDisplay_UdkStd * + Create_HtmlDisplay_UdkStd() const; + virtual DYN autodoc::HtmlDisplay_Idl_Ifc * + Create_HtmlDisplay_Idl() const; + virtual const display::CorporateFrame & Create_StdFrame() const; private: diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx index e9b4dda18288..097a83204494 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.cxx +++ b/autodoc/source/exes/adc_uni/cmd_run.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cmd_run.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-02 12:36:16 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,6 @@ // NOT FULLY DEFINED SERVICES #include <cosv/x.hxx> -#include <cosv/ploc.hxx> #include <ary/ary.hxx> #include <ary/ary.hxx> #include <ary/cpp/c_rwgate.hxx> @@ -141,11 +140,15 @@ CommandRunner::CommandRunner() pReposy(0), nResultCode(0) { + Cout() << "\nAutodoc version 2.1" + << "\n-------------------" + << "\n" << Endl(); } CommandRunner::~CommandRunner() { ary::Repository::Destroy_(); + Cout() << "\n" << Endl(); } int @@ -211,14 +214,14 @@ CommandRunner::Parse() switch ( Get_ProjectLanguage(rCmd, *(*it)).eLanguage ) { - case command::S_LanguageInfo::cpp: + case command::S_LanguageInfo::cpp: { Get_CppParser().Run( (*it)->sName, (*it)->aRootDirectory, *pFiles ); // pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites(); } break; - case command::S_LanguageInfo::idl: + case command::S_LanguageInfo::idl: { Get_IdlParser().Run(*pFiles); } break; @@ -404,8 +407,8 @@ CommandRunner::CreateHtml_NewStyle() rGate = pReposy->DisplayGate_Cpp(); Dyn< autodoc::HtmlDisplay_UdkStd > pHtmlDisplay; - pHtmlDisplay = DisplayToolsFactory_Ifc::GetIt_(). - Create_HtmlDisplay_UdkStd(); + pHtmlDisplay = DisplayToolsFactory_Ifc::GetIt_() + .Create_HtmlDisplay_UdkStd(); pHtmlDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(), rGate, @@ -417,7 +420,9 @@ CommandRunner::CreateHtml_OldIdlStyle() { ary::uidl::Gate & rAryGate = pReposy->RwGate_Idl(); +#if 0 // Should become obsolete G_pGate = &rAryGate; + ary::uidl::CeNamespace & rGlobalNamespace = rAryGate.GlobalNamespace(); @@ -426,11 +431,19 @@ CommandRunner::CreateHtml_OldIdlStyle() pCommandLine->Cmd_CreateHtml()->OutputDir(), DisplayToolsFactory_Ifc::GetIt_() .Create_StdFrame() ); - Recursive_PutOutNamespace( *pDisplay, rGlobalNamespace, rAryGate ); pDisplay->WriteGlobalIndices(); +#endif // 0 + + // New Style Output + Dyn<autodoc::HtmlDisplay_Idl_Ifc> pNewDisplay; + pNewDisplay = DisplayToolsFactory_Ifc::GetIt_() + .Create_HtmlDisplay_Idl(); + pNewDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(), + rAryGate, + DisplayToolsFactory_Ifc::GetIt_().Create_StdFrame() ); } diff --git a/autodoc/source/exes/adc_uni/main.cxx b/autodoc/source/exes/adc_uni/main.cxx index 1c028594683b..06d96d8f0e18 100644 --- a/autodoc/source/exes/adc_uni/main.cxx +++ b/autodoc/source/exes/adc_uni/main.cxx @@ -2,9 +2,9 @@ * * $RCSfile: main.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-03-22 11:25:43 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,6 @@ #include "cmd_run.hxx" - - int #ifdef WNT _cdecl @@ -77,7 +75,7 @@ int main( int argc, char * argv[] ) { - autodoc::CommandLine aCL; + autodoc::CommandLine aCL; autodoc::CommandRunner aRunner; aCL.Init(argc, argv); @@ -85,7 +83,6 @@ main( int argc, return 1; int ret = aRunner.Run(aCL); - return ret; } diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk index 2077ee9baaea..e8b60f216626 100644 --- a/autodoc/source/exes/adc_uni/makefile.mk +++ b/autodoc/source/exes/adc_uni/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: np $ $Date: 2002-03-22 12:43:36 $ +# last change: $Author: np $ $Date: 2002-05-14 09:02:17 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -94,13 +94,13 @@ LIB1FILES= \ $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \ $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \ $(LB)$/csi_html.lib \ - $(LB)$/display_kernel.lib $(LB)$/display_html.lib \ + $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_udm2html.lib \ $(LB)$/ary2_kernel.lib $(LB)$/ary2_uidl.lib \ $(LB)$/csi2_uidl.lib $(LB)$/csi2_dsapi.lib $(LB)$/csi2_html.lib \ $(LB)$/parser2_tokens.lib \ $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \ - $(LB)$/display2_dsapi.lib \ - $(LB)$/comphelp.lib + $(LB)$/display2_dsapi.lib +# $(LB)$/comphelp.lib # $(LB)$/display_funclist.lib @@ -126,13 +126,13 @@ APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \ $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \ $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \ $(LB)$/csi_html.lib \ - $(LB)$/display_kernel.lib $(LB)$/display_html.lib \ + $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_udm2html.lib \ $(LB)$/ary2_kernel.lib $(LB)$/ary2_uidl.lib \ $(LB)$/csi2_uidl.lib $(LB)$/csi2_dsapi.lib $(LB)$/csi2_html.lib \ $(LB)$/parser2_tokens.lib \ $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \ - $(LB)$/display2_dsapi.lib \ - $(LB)$/comphelp.lib + $(LB)$/display2_dsapi.lib +# $(LB)$/comphelp.lib # $(LB)$/display_funclist.lib diff --git a/autodoc/source/inc/luxenum.hxx b/autodoc/source/inc/luxenum.hxx index 657d0e8dd43f..d5e031759efe 100644 --- a/autodoc/source/inc/luxenum.hxx +++ b/autodoc/source/inc/luxenum.hxx @@ -2,9 +2,9 @@ * * $RCSfile: luxenum.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:27 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ #include <algorithm> -namespace udm +namespace lux { typedef std::map< intt, udmstri > EnumValueMap; @@ -152,7 +152,7 @@ Enum<DIFF>::GetSpecialAgent() const } */ -} // namespace udm +} // namespace lux #endif diff --git a/autodoc/source/inc/tools/filecoll.hxx b/autodoc/source/inc/tools/filecoll.hxx index a25a059252e0..b3c0d6a86e31 100644 --- a/autodoc/source/inc/tools/filecoll.hxx +++ b/autodoc/source/inc/tools/filecoll.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filecoll.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,19 +94,8 @@ class FileCollector : public autodoc::FileCollector_Ifc virtual uintt Size() const; private: - typedef StringVector FilePathList; - typedef StringVector FileNameList; - typedef StringVector DirNameList; - - void GetSubDirectories( - DirNameList & o_rList, - const char * i_sParentDir ); - void GetFiles( - FileNameList & o_rList, - const char * i_sParentDir, - const char * i_sFilter ); - - FilePathList aFoundFiles; + // DATA + StringVector aFoundFiles; }; diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index 29caa3135a08..4a78b0e05b46 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tkpchars.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ class CharacterSource const char * i_sText2Insert ); /// @return CurChar() after moving forward one char. - const char & MoveOn(); + char MoveOn(); /** @return The token which starts at the char which was CurChar(), when CutToken() was called the last time - or at the beginning of the text. @@ -129,7 +129,7 @@ class CharacterSource const char * CutToken(); // INQUIRY - const char & CurChar() const; + char CurChar() const; /// @return The result of the last CutToken(). Or NULL, if there was none yet. const char * CurToken() const; @@ -159,7 +159,7 @@ class CharacterSource void BeginSource(); intt CurPos() const; - const char & MoveOn_OverStack(); + char MoveOn_OverStack(); // DATA std::stack< S_SourceState > @@ -175,7 +175,7 @@ class CharacterSource }; -inline const char & +inline char CharacterSource::MoveOn() { if (DEBUG_ShowText()) @@ -189,7 +189,7 @@ if (DEBUG_ShowText()) else return dpSource[nCurPos = nSourceSize]; } -inline const char & +inline char CharacterSource::CurChar() const { return nCurPos != nLastCut ? dpSource[nCurPos] : cCharAtLastCut; } inline const char * diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk index 0ea8822173a4..a8db82382e28 100644 --- a/autodoc/source/mkinc/fullcpp.mk +++ b/autodoc/source/mkinc/fullcpp.mk @@ -2,9 +2,9 @@ # # $RCSfile: fullcpp.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ +# last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,3 +86,8 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBU .ENDIF +.IF "$(OS)"=="LINUX" +CFLAGSCXX+= -frtti +.ENDIF + + diff --git a/autodoc/source/parser/adoc/adoc_tok.cxx b/autodoc/source/parser/adoc/adoc_tok.cxx index 39c95d3d5c1e..ff71b84f03c8 100644 --- a/autodoc/source/parser/adoc/adoc_tok.cxx +++ b/autodoc/source/parser/adoc/adoc_tok.cxx @@ -2,9 +2,9 @@ * * $RCSfile: adoc_tok.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/adoc/cx_a_std.cxx b/autodoc/source/parser/adoc/cx_a_std.cxx index c6fbf996ee0b..93486cca3274 100644 --- a/autodoc/source/parser/adoc/cx_a_std.cxx +++ b/autodoc/source/parser/adoc/cx_a_std.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cx_a_std.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:28 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -225,7 +225,8 @@ Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, { case nF_fin_Error: { - udmstri sChar( &io_rText.CurChar(), 1 ); + char cCC = io_rText.CurChar(); + udmstri sChar( &cCC, 1 ); throw X_Parser(X_Parser::x_InvalidChar, sChar, udmstri::Null_(), 0); } break; case nF_fin_Ignore: @@ -272,7 +273,8 @@ Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, break; default: { - udmstri sChar( &io_rText.CurChar(), 1 ); + char cCC = io_rText.CurChar(); + udmstri sChar( &cCC, 1 ); throw X_Parser(X_Parser::x_InvalidChar, sChar, udmstri::Null_(), 0); } } // end switch (i_nStatusSignal) diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx index fc9d8a4ab38a..8f821bf44444 100644 --- a/autodoc/source/parser/cpp/all_toks.cxx +++ b/autodoc/source/parser/cpp/all_toks.cxx @@ -2,9 +2,9 @@ * * $RCSfile: all_toks.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ // NOT FULLY DEFINED SERVICES #include <cpp/ctokdeal.hxx> -#include <c_dealer.hxx> +#include "c_dealer.hxx" #include "tokintpr.hxx" @@ -77,6 +77,7 @@ namespace cpp { void Token::DealOut( ::TokenDealer & o_rDealer ) { + // KORR HACK (casting to derivation cpp::TokenDealer) o_rDealer.AsDistributor()->Deal_CppCode(*this); } @@ -177,6 +178,7 @@ Tok_UnblockMacro::Text() const void Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer ) { + // KORR HACK (casting to derivation cpp::TokenDealer) o_rDealer.AsDistributor()->Deal_Cpp_UnblockMacro(*this); } diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx index 586021b0b27a..5452b26fe539 100644 --- a/autodoc/source/parser/cpp/cx_c_std.cxx +++ b/autodoc/source/parser/cpp/cx_c_std.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cx_c_std.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:29 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,7 +261,8 @@ Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, case nF_fin_Error: default: { - udmstri sCurChar( &io_rText.CurChar(), 1 ); + char cCC = io_rText.CurChar(); + udmstri sCurChar( &cCC, 1 ); throw X_Parser( X_Parser::x_InvalidChar, sCurChar, udmstri::Null_(), 0 ); } } // end switch (i_nStatusSignal) diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx index bc35daf6f80a..c4a8891bd143 100644 --- a/autodoc/source/parser/cpp/pe_class.cxx +++ b/autodoc/source/parser/cpp/pe_class.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_class.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx index f71d3789c49f..9d6525d1ce15 100644 --- a/autodoc/source/parser/cpp/pe_defs.cxx +++ b/autodoc/source/parser/cpp/pe_defs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_defs.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx index 38ac4ad3c038..aa859d1f57d9 100644 --- a/autodoc/source/parser/cpp/pe_enum.cxx +++ b/autodoc/source/parser/cpp/pe_enum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_enum.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx index b7f496e97e52..7c5f47313da8 100644 --- a/autodoc/source/parser/cpp/pe_enval.cxx +++ b/autodoc/source/parser/cpp/pe_enval.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_enval.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx index 5ed2f38d5ff4..13b4b7d36e14 100644 --- a/autodoc/source/parser/cpp/pe_expr.cxx +++ b/autodoc/source/parser/cpp/pe_expr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_expr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx index 302e611ed583..db03bb8d4e42 100644 --- a/autodoc/source/parser/cpp/pe_file.cxx +++ b/autodoc/source/parser/cpp/pe_file.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_file.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx index e298d6b40926..c392905a1492 100644 --- a/autodoc/source/parser/cpp/pe_funct.cxx +++ b/autodoc/source/parser/cpp/pe_funct.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_funct.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx index f844c076b61d..13e6f8a2daab 100644 --- a/autodoc/source/parser/cpp/pe_namsp.cxx +++ b/autodoc/source/parser/cpp/pe_namsp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_namsp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx index 2035deccb512..cde002e1f2a9 100644 --- a/autodoc/source/parser/cpp/pe_param.cxx +++ b/autodoc/source/parser/cpp/pe_param.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_param.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx index 20bbf470945b..f2199650267c 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.cxx +++ b/autodoc/source/parser/cpp/pe_tpltp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_tpltp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx index 75ca98abb122..397a1e9fc47e 100644 --- a/autodoc/source/parser/cpp/pe_tydef.cxx +++ b/autodoc/source/parser/cpp/pe_tydef.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_tydef.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx index 8296ce4c7a92..195d6fd838a3 100644 --- a/autodoc/source/parser/cpp/pe_type.cxx +++ b/autodoc/source/parser/cpp/pe_type.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_type.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx index f727e3a630bf..a0df88666ba3 100644 --- a/autodoc/source/parser/cpp/pe_vafu.cxx +++ b/autodoc/source/parser/cpp/pe_vafu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_vafu.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx index f7d01da11652..75ce40596bc2 100644 --- a/autodoc/source/parser/cpp/pe_vari.cxx +++ b/autodoc/source/parser/cpp/pe_vari.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_vari.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx index d61882ed5181..36c5c1225a34 100644 --- a/autodoc/source/parser/cpp/preproc.cxx +++ b/autodoc/source/parser/cpp/preproc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: preproc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:24 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser/inc/adoc/atokdeal.hxx b/autodoc/source/parser/inc/adoc/atokdeal.hxx index dd9d2ac740d1..dfd9fe0a4a5b 100644 --- a/autodoc/source/parser/inc/adoc/atokdeal.hxx +++ b/autodoc/source/parser/inc/adoc/atokdeal.hxx @@ -2,9 +2,9 @@ * * $RCSfile: atokdeal.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:32 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ namespace adoc class Token; -class TokenDealer : public virtual ::TokenDealer +class TokenDealer : virtual public ::TokenDealer { public: diff --git a/autodoc/source/parser/inc/cpp/ctokdeal.hxx b/autodoc/source/parser/inc/cpp/ctokdeal.hxx index 594a66721e10..aead9c9990cb 100644 --- a/autodoc/source/parser/inc/cpp/ctokdeal.hxx +++ b/autodoc/source/parser/inc/cpp/ctokdeal.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ctokdeal.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:33 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ class Token; class Tok_UnblockMacro; -class TokenDealer : public virtual ::TokenDealer +class TokenDealer : virtual public ::TokenDealer { public: diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx index 901e8370506a..1ece9976e704 100644 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ b/autodoc/source/parser/tokens/tkpstama.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tkpstama.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,6 +147,7 @@ StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, CharacterSource & io_rText ) { nCurrentStatus = C_nTopStatus; + Peek(io_rText.CurChar()); while (BoundsStatus() == 0) { diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx index ec4078368596..2ec084f02666 100644 --- a/autodoc/source/parser_i/idl/pe_const.cxx +++ b/autodoc/source/parser_i/idl/pe_const.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_const.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx index 7d7f5e1bea84..32aedc79f6e4 100644 --- a/autodoc/source/parser_i/idl/pe_enum2.cxx +++ b/autodoc/source/parser_i/idl/pe_enum2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_enum2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index 7bf06dfc4db8..1f8b5917ed7e 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_evalu.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index 0ee4bc58546e..ad5ebd01249e 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_iface.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx index d1c3b4ee13d2..8df847dbff6b 100644 --- a/autodoc/source/parser_i/idl/pe_servi.cxx +++ b/autodoc/source/parser_i/idl/pe_servi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_servi.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:34 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -327,7 +327,6 @@ PE_Service::ReceiveData() if (bOptionalMember) { pPE_Type->SetOptional(); - bOptionalMember = false; } pData->Data().aServedInterfaces.push_back( CommentedLink(aCurParsed_Type.Id(),pPE_Type->ReleaseDocu()) ); @@ -336,7 +335,9 @@ PE_Service::ReceiveData() break; case in_service_type: if (bOptionalMember) + { pPE_Type->SetOptional(); + } pData->Data().aIncludedServices.push_back( CommentedLink(aCurParsed_Type.Id(),pPE_Type->ReleaseDocu()) ); aCurParsed_Type = 0; @@ -345,6 +346,8 @@ PE_Service::ReceiveData() default: csv_assert(false); } + + bOptionalMember = false; } diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx index 63aedc5733df..e81feed28008 100644 --- a/autodoc/source/parser_i/idl/pe_tydf2.cxx +++ b/autodoc/source/parser_i/idl/pe_tydf2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pe_tydf2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx index a3c674891815..366cc2c5134d 100644 --- a/autodoc/source/parser_i/idl/tk_keyw.cxx +++ b/autodoc/source/parser_i/idl/tk_keyw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_keyw.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ using csi::uidl::TokStereotype; using csi::uidl::TokParameterHandling; -udm::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"); @@ -88,13 +88,13 @@ TokBuiltInType::EV_TokenId ev_bty_string(TokBuiltInType::bty_string,"string"); TokBuiltInType::EV_TokenId ev_bty_void(TokBuiltInType::bty_void,"void"); -udm::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"); -udm::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"); @@ -110,7 +110,7 @@ TokMetaType::EV_TokenId ev_mt_typedef(TokMetaType::mt_typedef,"typedef"); TokMetaType::EV_TokenId ev_mt_uik(TokMetaType::mt_uik,"uik"); -udm::EnumValueMap G_aTokStereotype_EV_TokenId_Values; +lux::EnumValueMap G_aTokStereotype_EV_TokenId_Values; TokStereotype::EV_TokenId ev_ste_none(TokStereotype::e_none,""); TokStereotype::EV_TokenId ev_ste_const(TokStereotype::ste_const,"const"); TokStereotype::EV_TokenId ev_ste_oneway(TokStereotype::ste_oneway,"oneway"); @@ -119,14 +119,14 @@ TokStereotype::EV_TokenId ev_ste_readonly(TokStereotype::ste_readonly,"readonl TokStereotype::EV_TokenId ev_ste_virtual(TokStereotype::ste_virtual,"virtual"); -udm::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"); -namespace udm +namespace lux { EnumValueMap & @@ -140,7 +140,7 @@ TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId EnumValueMap & TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } -} // namespace udm +} // namespace lux diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx index 3e4b58fa0c42..c6a602389851 100644 --- a/autodoc/source/parser_i/idl/tk_punct.cxx +++ b/autodoc/source/parser_i/idl/tk_punct.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_punct.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ using csi::uidl::TokPunctuation; -udm::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,")"); @@ -88,7 +88,7 @@ TokPunctuation::EV_TokenId Fullstop(TokPunctuation::Fullstop,"."); -namespace udm +namespace lux { EnumValueMap & TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx index 532b15c68724..bd9fcdc9df84 100644 --- a/autodoc/source/parser_i/idoc/cx_docu2.cxx +++ b/autodoc/source/parser_i/idoc/cx_docu2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cx_docu2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,6 @@ Cx_Base::FollowUpContext() void Cx_Base::Handle_DocuSyntaxError( CharacterSource & io_rText ) { - io_rText.MoveOn(); Cerr() << "Error: Syntax error in documentation within " << "this text:\n\"" << io_rText.CutToken() @@ -152,6 +151,8 @@ Cx_EoXmlLink_BeginTag::ReadCharChain( CharacterSource & io_rText ) char c = jumpTo(io_rText,'"','*', '>'); if ( NULCH == c OR '*' == c OR '>' == c) { + if ( '>' == c ) + io_rText.MoveOn(); Handle_DocuSyntaxError(io_rText); return; } @@ -211,6 +212,8 @@ Cx_EoXmlFormat_BeginTag::ReadCharChain( CharacterSource & io_rText ) char c = jumpTo(io_rText,'"','*','>'); if ( NULCH == c OR '*' == c OR '>' == c ) { + if ('>' == c ) + io_rText.MoveOn(); Handle_DocuSyntaxError(io_rText); return; } diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index d984545a582b..7dc73949d701 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docu_pe2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ const char * AtTagTitle( SapiDocu_PE::SapiDocu_PE() : pDocu(0), eState(e_none), - fCurTokenAddFunction(AddDocuToken2Void), + fCurTokenAddFunction(&SapiDocu_PE::AddDocuToken2Void), pCurAtTag(0) { } @@ -114,7 +114,7 @@ SapiDocu_PE::ProcessToken( DYN csi::dsapi::Token & let_drToken ) { pDocu = new ary::info::CodeInformation; eState = st_short; - fCurTokenAddFunction = AddDocuToken2Short; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Short; } csv_assert(pDocu); @@ -129,7 +129,7 @@ SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) if (NOT pCurAtTag) { eState = st_attags; - fCurTokenAddFunction = AddDocuToken2CurAtTag; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; } else { @@ -140,23 +140,23 @@ SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) if (i_rToken.Id() == Tok_AtTag::param) { pCurAtTag = new DT_ParameterAtTag; - fCurTokenAddFunction = SetCurParameterAtTagName; + fCurTokenAddFunction = &SapiDocu_PE::SetCurParameterAtTagName; } else if (i_rToken.Id() == Tok_AtTag::see) { pCurAtTag = new DT_SeeAlsoAtTag; - fCurTokenAddFunction = SetCurSeeAlsoAtTagLinkText; + fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText; } else if (i_rToken.Id() == Tok_AtTag::deprecated) { pDocu->SetDeprecated(); pCurAtTag = new DT_StdAtTag(""); - fCurTokenAddFunction = AddDocuToken2CurAtTag; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; } else { pCurAtTag = new DT_StdAtTag( AtTagTitle(i_rToken) ); - fCurTokenAddFunction = AddDocuToken2CurAtTag; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; } } @@ -166,7 +166,7 @@ SapiDocu_PE::Process_HtmlTag( const Tok_HtmlTag & i_rToken ) if (eState == st_short AND i_rToken.IsParagraphStarter()) { eState = st_description; - fCurTokenAddFunction = AddDocuToken2Description; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Description; } // Workaround special for some errors in API docu: @@ -318,7 +318,7 @@ SapiDocu_PE::Process_DocuEnd() eState = st_complete; if (pCurAtTag) pDocu->AddAtTag(*pCurAtTag.Release()); - fCurTokenAddFunction = AddDocuToken2Void; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Void; } void @@ -383,7 +383,7 @@ SapiDocu_PE::SetCurParameterAtTagName( DYN ary::info::DocuToken & let_drNewToken else pCurAtTag->SetName("parameter ?"); delete &let_drNewToken; - fCurTokenAddFunction = AddDocuToken2CurAtTag; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; } void @@ -396,7 +396,7 @@ SapiDocu_PE::SetCurSeeAlsoAtTagLinkText( DYN ary::info::DocuToken & let_drNewTok else pCurAtTag->SetName("unknown ?"); delete &let_drNewToken; - fCurTokenAddFunction = AddDocuToken2CurAtTag; + fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; } const char * diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx index 44f1dd1b5221..1fdaf1361404 100644 --- a/autodoc/source/parser_i/idoc/tk_atag2.cxx +++ b/autodoc/source/parser_i/idoc/tk_atag2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_atag2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ using csi::dsapi::Tok_AtTag; -udm::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"); @@ -87,7 +87,7 @@ Tok_AtTag::EV_TokenId ev_guarantees(Tok_AtTag::guarantees,"@guarantees"); Tok_AtTag::EV_TokenId ev_exception(Tok_AtTag::exception,"@exception"); -namespace udm +namespace lux { EnumValueMap & Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx index 8101260e7f72..08e17aa1f025 100644 --- a/autodoc/source/parser_i/idoc/tk_xml.cxx +++ b/autodoc/source/parser_i/idoc/tk_xml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_xml.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,27 +71,27 @@ using csi::dsapi::Tok_XmlLink_Tag; using csi::dsapi::Tok_XmlFormat_Tag; -udm::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"); -udm::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"); -udm::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 udm +namespace lux { EnumValueMap & @@ -101,7 +101,7 @@ Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_Token EnumValueMap & Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } -} // namespace udm +} // namespace lux 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 d61cfb606587..81ca5d748afa 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cx_docu2.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,7 +142,7 @@ class Cx_EoXmlConst : public Cx_Base virtual void ReadCharChain( CharacterSource & io_rText ); void SetTokenId( - udm::Enum< Tok_XmlConst::E_TokenId > + lux::Enum< Tok_XmlConst::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } private: @@ -202,11 +202,11 @@ class Cx_EoXmlFormat_BeginTag : public Cx_Base virtual void ReadCharChain( CharacterSource & io_rText ); void SetTokenId( - udm::Enum< Tok_XmlFormat_BeginTag::E_TokenId > + lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } private: - udm::Enum< Tok_XmlFormat_BeginTag::E_TokenId > + lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId > eTokenId; }; @@ -222,11 +222,11 @@ class Cx_EoXmlFormat_EndTag : public Cx_Base virtual void ReadCharChain( CharacterSource & io_rText ); void SetTokenId( - udm::Enum< Tok_XmlFormat_EndTag::E_TokenId > + lux::Enum< Tok_XmlFormat_EndTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } private: - udm::Enum< Tok_XmlFormat_EndTag::E_TokenId > + lux::Enum< Tok_XmlFormat_EndTag::E_TokenId > eTokenId; }; 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 d9d1d353b506..ed8bc9322101 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_atag2.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ class Tok_AtTag : public Token guarantees = 12, exception = 13 }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; // Spring and Fall Tok_AtTag( 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 158b18d6a59d..555d5c374cff 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_xml.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:35 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ class Tok_XmlConst : public Tok_XmlTag e_null = 3, e_void = 4 }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; // Spring and Fall Tok_XmlConst( @@ -122,7 +122,7 @@ class Tok_XmlLink_Tag : public Tok_XmlTag member = 2, type = 3 }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; }; class Tok_XmlLink_BeginTag : public Tok_XmlLink_Tag @@ -182,7 +182,7 @@ class Tok_XmlFormat_Tag : public Tok_XmlTag listing = 2, atom = 3 }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; }; class Tok_XmlFormat_BeginTag : public Tok_XmlFormat_Tag 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 b57edb2129f0..79e864b8316a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_keyw.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:36 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ class TokBuiltInType : public TokKeyword bty_string = 9, bty_void = 10 }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokBuiltInType( EV_TokenId i_eTag ) @@ -123,7 +123,7 @@ class TokTypeModifier : public TokKeyword tmod_unsigned = 1, tmod_sequence }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokTypeModifier( EV_TokenId i_eTag ) @@ -158,7 +158,7 @@ class TokMetaType : public TokKeyword mt_typedef, mt_uik }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokMetaType( EV_TokenId i_eTag ) @@ -189,7 +189,7 @@ class TokStereotype : public TokKeyword ste_readonly, ste_virtual }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokStereotype( EV_TokenId i_eTag ) @@ -218,7 +218,7 @@ class TokParameterHandling : public TokKeyword ph_out, ph_inout }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokParameterHandling( EV_TokenId i_eTag ) 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 0cd070e2e637..ebeb58d32919 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tk_punct.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:36 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ class TokPunctuation : public Token Minus = 11, // "-" Fullstop = 12 // "." }; - typedef udm::Enum<E_TokenId> EV_TokenId; + typedef lux::Enum<E_TokenId> EV_TokenId; TokPunctuation( diff --git a/autodoc/source/tools/filecoll.cxx b/autodoc/source/tools/filecoll.cxx index 6057c366080d..00d1912c4f5b 100644 --- a/autodoc/source/tools/filecoll.cxx +++ b/autodoc/source/tools/filecoll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filecoll.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2002-05-07 18:32:25 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,7 +105,7 @@ FileCollector::AddFilesFrom( const char * i_sRootDir, aPath << i_sRootDir << csv::ploc::Delimiter(); uintt nSubDirStart = aPath.tellp(); - DirNameList aSubDirs; + StringVector aSubDirs; aDir.GetContainedDirectories(aSubDirs); for ( const_iterator iter = aSubDirs.begin(); @@ -161,32 +161,6 @@ FileCollector::Size() const return aFoundFiles.size(); } -void -FileCollector::GetSubDirectories( DirNameList & o_rList, - const char * i_sParentDir ) -{ - csv::ploc::Directory aSubDirs(i_sParentDir); - aSubDirs.GetContainedDirectories(o_rList); -} - -void -FileCollector::GetFiles( FileNameList & o_rList, - const char * i_sParentDir, - const char * i_sFilter ) -{ - // Alife sign: - Cout() << "." << Flush(); - - csv::ploc::Directory aDir(i_sParentDir); - if (NOT aDir.Exists()) - { - Cerr() << "Error: The path for the files to be parsed could not be found." - << Endl(); - return; - } - - aDir.GetContainedFiles(o_rList, i_sFilter); -} diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index 5d23e65ba22f..a6a62a6bc635 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tkpchars.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2002-03-08 14:45:36 $ + * last change: $Author: np $ $Date: 2002-05-14 09:02:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -163,7 +163,7 @@ CharacterSource::BeginSource() } /// KORR: So far, this works only when tokens do not cross inserted text boundaries. -const char & +char CharacterSource::MoveOn_OverStack() { while ( aSourcesStack.size() > 0 AND nCurPos >= nSourceSize-1 ) |