diff options
Diffstat (limited to 'autodoc/source/parser')
22 files changed, 56 insertions, 50 deletions
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) { |