diff options
| -rw-r--r-- | autodoc/source/parser/cpp/pe_type.hxx | 10 | ||||
| -rw-r--r-- | autodoc/source/parser/cpp/pe_vafu.hxx | 34 | ||||
| -rw-r--r-- | autodoc/source/parser/cpp/pev.hxx | 40 | ||||
| -rw-r--r-- | autodoc/source/parser/cpp/sownstck.hxx | 14 |
4 files changed, 49 insertions, 49 deletions
diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx index 00ab866a92e5..a901984f79ee 100644 --- a/autodoc/source/parser/cpp/pe_type.hxx +++ b/autodoc/source/parser/cpp/pe_type.hxx @@ -4,9 +4,9 @@ * * $RCSfile: pe_type.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:30:09 $ + * last change: $Author: hr $ $Date: 2007-11-02 16:58:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,7 @@ #include <semantic/callf.hxx> #include <semantic/sub_peu.hxx> // PARAMETERS -#include <ary/cpp/c_etypes.hxx> +#include <ary/cpp/c_types4cpp.hxx> @@ -161,8 +161,8 @@ class PE_Type : public Cpp_PE pType; ary::cpp::ut::List_TplParameter * pCurTemplate_ParameterList; - udmstri sOwningClassName; - udmstri sParsedClass_Name; + String sOwningClassName; + String sParsedClass_Name; const ary::cpp::Type * pResult_Type; diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx index bb08c6abf429..9d5c9630f863 100644 --- a/autodoc/source/parser/cpp/pe_vafu.hxx +++ b/autodoc/source/parser/cpp/pe_vafu.hxx @@ -4,9 +4,9 @@ * * $RCSfile: pe_vafu.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:30:40 $ + * last change: $Author: hr $ $Date: 2007-11-02 16:59:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,20 +37,18 @@ #ifndef ADC_CPP_PE_VAFU_HXX #define ADC_CPP_PE_VAFU_HXX - - -// USED SERVICES - // BASE CLASSES +// BASE CLASSES #include "cpp_pe.hxx" - // COMPONENTS +// USED SERVICES #include <semantic/callf.hxx> #include <semantic/sub_peu.hxx> -#include <ary/cpp/c_etypes.hxx> +#include <ary/cpp/c_types4cpp.hxx> #include <ary/cpp/c_vfflag.hxx> - // PARAMETERS -namespace cpp { + +namespace cpp +{ class PE_Type; class PE_Variable; @@ -58,6 +56,8 @@ class PE_Function; class PE_Ignore; + + class PE_VarFunc : public Cpp_PE { public: @@ -91,9 +91,9 @@ class PE_VarFunc : public Cpp_PE virtual void Call_Handler( const cpp::Token & i_rTok ); - const std::vector<ary::Cid> & + const std::vector<ary::cpp::Ce_id> & Result_Ids() const; - ary::Tid Result_FrontType() const; + ary::cpp::Type_id Result_FrontType() const; const StringVector & Result_Names() const; E_ResultType Result_CeType() const; @@ -188,13 +188,13 @@ class PE_VarFunc : public Cpp_PE intt nCounter_TemplateBrackets; bool bInDestructor; - std::vector<ary::Cid> + std::vector<ary::cpp::Ce_id> aResultIds; - ary::Tid nResultFrontType; + ary::cpp::Type_id nResultFrontType; E_ResultType eResultType; // Pre-Results - udmstri sName; + String sName; bool bVirtual; bool bStatic; @@ -210,10 +210,10 @@ class PE_VarFunc : public Cpp_PE // IMPLEMENTATION -inline const std::vector<ary::Tid> & +inline const std::vector<ary::cpp::Ce_id> & PE_VarFunc::Result_Ids() const { return aResultIds; } -inline ary::Tid +inline ary::cpp::Type_id PE_VarFunc::Result_FrontType() const { return nResultFrontType; } inline PE_VarFunc::E_ResultType diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx index 5fa42a4bca9a..cf03f6c58282 100644 --- a/autodoc/source/parser/cpp/pev.hxx +++ b/autodoc/source/parser/cpp/pev.hxx @@ -4,9 +4,9 @@ * * $RCSfile: pev.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:31:31 $ + * last change: $Author: hr $ $Date: 2007-11-02 16:59:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,13 +43,13 @@ #include <tokens/tokproct.hxx> // COMPONENTS // PARAMETERS -#include <ary/cpp/c_etypes.hxx> +#include <ary/cpp/c_types4cpp.hxx> namespace ary { namespace cpp { - class RwGate; + class Gate; class InputContext; class Namespace; @@ -60,7 +60,7 @@ namespace ary class Variable; class EnumValue; - class CppDefinition; + class DefineEntity; } class Documentation; @@ -110,7 +110,7 @@ class PeEnvironment : protected TokenProcessing_Types // Special events void Event_Class_FinishedBase( - const udmstri & i_sParameterName ); + const String & i_sParameterName ); void Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef ); @@ -118,12 +118,12 @@ class PeEnvironment : protected TokenProcessing_Types ary::cpp::EnumValue & io_rEnumValue ); void Event_Store_CppDefinition( - ary::cpp::CppDefinition & + ary::cpp::DefineEntity & io_rDefinition ); void Event_EnterFunction_ParameterList(); void Event_Function_FinishedParameter( - const udmstri & i_sParameterName ); + const String & i_sParameterName ); void Event_LeaveFunction_ParameterList(); void Event_EnterFunction_Implementation(); void Event_LeaveFunction_Implementation(); @@ -138,10 +138,10 @@ class PeEnvironment : protected TokenProcessing_Types void StartWaitingFor_Recovery(); // INQUIRY - ary::cpp::RwGate & AryGate() const; + ary::cpp::Gate & AryGate() const; const ary::cpp::InputContext & Context() const; - udmstri CurFileName() const; + String CurFileName() const; uintt LineCount() const; bool IsWaitingFor_Recovery() const; bool IsExternC() const; @@ -173,7 +173,7 @@ class PeEnvironment : protected TokenProcessing_Types do_Get_CurTemplateParameters() = 0; virtual void do_Close_OpenTemplate() = 0; virtual void do_Event_Class_FinishedBase( - const udmstri & i_sBaseName ) = 0; + const String & i_sBaseName ) = 0; virtual void do_Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef ) = 0; @@ -181,11 +181,11 @@ class PeEnvironment : protected TokenProcessing_Types ary::cpp::EnumValue & io_rEnumValue ) = 0; virtual void do_Event_Store_CppDefinition( - ary::cpp::CppDefinition & + ary::cpp::DefineEntity & io_rDefinition ) = 0; virtual void do_Event_EnterFunction_ParameterList() = 0; virtual void do_Event_Function_FinishedParameter( - const udmstri & i_sParameterName ) = 0; + const String & i_sParameterName ) = 0; virtual void do_Event_LeaveFunction_ParameterList() = 0; virtual void do_Event_EnterFunction_Implementation() = 0; virtual void do_Event_LeaveFunction_Implementation() = 0; @@ -196,11 +196,11 @@ class PeEnvironment : protected TokenProcessing_Types ary::cpp::Variable & io_rVariable ) = 0; virtual void do_StartWaitingFor_Recovery() = 0; - virtual ary::cpp::RwGate & + virtual ary::cpp::Gate & inq_AryGate() const = 0; virtual const ary::cpp::InputContext & inq_Context() const = 0; - virtual udmstri inq_CurFileName() const = 0; + virtual String inq_CurFileName() const = 0; virtual uintt inq_LineCount() const = 0; virtual bool inq_IsWaitingFor_Recovery() const = 0; virtual bool inq_IsExternC() const = 0; @@ -249,7 +249,7 @@ inline void PeEnvironment::Close_OpenTemplate() { do_Close_OpenTemplate(); } inline void -PeEnvironment::Event_Class_FinishedBase( const udmstri & i_sBaseName ) +PeEnvironment::Event_Class_FinishedBase( const String & i_sBaseName ) { do_Event_Class_FinishedBase(i_sBaseName); } inline void PeEnvironment::Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef ) @@ -258,13 +258,13 @@ inline void PeEnvironment::Event_Store_EnumValue( ary::cpp::EnumValue & io_rEnumValue ) { do_Event_Store_EnumValue(io_rEnumValue); } inline void -PeEnvironment::Event_Store_CppDefinition( ary::cpp::CppDefinition & io_rDefinition ) +PeEnvironment::Event_Store_CppDefinition( ary::cpp::DefineEntity & io_rDefinition ) { do_Event_Store_CppDefinition(io_rDefinition); } inline void PeEnvironment::Event_EnterFunction_ParameterList() { do_Event_EnterFunction_ParameterList(); } inline void -PeEnvironment::Event_Function_FinishedParameter( const udmstri & i_sParameterName ) +PeEnvironment::Event_Function_FinishedParameter( const String & i_sParameterName ) { do_Event_Function_FinishedParameter(i_sParameterName); } inline void PeEnvironment::Event_LeaveFunction_ParameterList() @@ -284,13 +284,13 @@ PeEnvironment::Event_Store_Variable( ary::cpp::Variable & io_rVariable ) inline void PeEnvironment::StartWaitingFor_Recovery() { do_StartWaitingFor_Recovery(); } -inline ary::cpp::RwGate & +inline ary::cpp::Gate & PeEnvironment::AryGate() const { return inq_AryGate(); } inline const ary::cpp::InputContext & PeEnvironment::Context() const { return inq_Context(); } -inline udmstri +inline String PeEnvironment::CurFileName() const { return inq_CurFileName(); } inline uintt diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx index 8ebe3d4eb00f..38344f2c048a 100644 --- a/autodoc/source/parser/cpp/sownstck.hxx +++ b/autodoc/source/parser/cpp/sownstck.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sownstck.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:33:11 $ + * last change: $Author: hr $ $Date: 2007-11-02 17:01:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,7 +42,7 @@ // BASE CLASSES #include "cxt2ary.hxx" // COMPONENTS -#include <ary/cpp/c_etypes.hxx> +#include <ary/cpp/c_types4cpp.hxx> #include <estack.hxx> // PARAMETERS #include <ary/cpp/c_namesp.hxx> @@ -172,7 +172,7 @@ void ContextForAry:: S_OwnerStack::Reset() { - while ( aStack_Namespaces.top()->Owner() != 0 ) + while ( aStack_Namespaces.top()->Owner().IsValid() ) aStack_Namespaces.pop(); while ( NOT aStack_Classes.empty() ) aStack_Classes.pop(); @@ -285,14 +285,14 @@ S_OwnerStack::CloseBlock() { // csv_assert( aStack_Classes.size() == 0 ); if ( aStack_Classes.size() > 0 ) - throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", udmstri::Null_(), 0); + throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); csv_assert( pCurEnum == 0 ); aStack_Namespaces.pop(); // csv_assert( aStack_Namespaces.size() > 0 ); if( aStack_Namespaces.size() == 0 ) - throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", udmstri::Null_(), 0); + throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); } SetOwner_2CurNamespace(); @@ -304,7 +304,7 @@ S_OwnerStack::CloseClass() { // csv_assert( aStack_Classes.size() > 0 ); if ( aStack_Classes.size() == 0 ) - throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", udmstri::Null_(), 0); + throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); aStack_Classes.pop(); if ( aStack_Classes.size() > 0 ) |