INTEGRATION: CWS adc18 (1.2.56); FILE MERGED

2007/10/18 15:23:18 np 1.2.56.1: #i81775#

4 files changed, 67 insertions, 79 deletions

diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx
index 8972766c3394..7d288d0a53cf 100644
--- a/autodoc/source/parser/cpp/pe_funct.hxx
+++ b/autodoc/source/parser/cpp/pe_funct.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_funct.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:26:49 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:55:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,7 @@
     // COMPONENTS
 #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
 
@@ -93,17 +93,17 @@ class PE_Function : public Cpp_PE
                         ~PE_Function();
 
     void                Init_Std(
-                            const udmstri &     i_sName,
-                            ary::Tid            i_nReturnType,
+                            const String  &     i_sName,
+                            ary::cpp::Type_id   i_nReturnType,
                             bool                i_bVirtual,
                             ary::cpp::FunctionFlags
                                                 i_aFlags );
     void                Init_Ctor(
-                            const udmstri &     i_sName,
+                            const String  &     i_sName,
                             ary::cpp::FunctionFlags
                                                 i_aFlags );
     void                Init_Dtor(
-                            const udmstri &     i_sName,
+                            const String  &     i_sName,
                             bool                i_bVirtual,
                             ary::cpp::FunctionFlags
                                                 i_aFlags );
@@ -112,12 +112,12 @@ class PE_Function : public Cpp_PE
                             ary::cpp::FunctionFlags
                                                 i_aFlags );
     void                Init_NormalOperator(
-                            ary::Tid            i_nReturnType,
+                            ary::cpp::Type_id   i_nReturnType,
                             bool                i_bVirtual,
                             ary::cpp::FunctionFlags
                                                 i_aFlags );
 
-    ary::Cid            Result_Id() const;
+    ary::cpp::Ce_id     Result_Id() const;
     bool                Result_WithImplementation() const;
 
     virtual void        Call_Handler(
@@ -129,7 +129,7 @@ class PE_Function : public Cpp_PE
     typedef SubPeUse<PE_Function, PE_Parameter>     SPU_Parameter;
 
     typedef std::vector<ary::cpp::S_Parameter>      ParameterList;
-    typedef std::vector<ary::Tid>                   ExceptionTypeList;
+    typedef std::vector<ary::cpp::Type_id>          ExceptionTypeList;
 
     void                Setup_StatusFunctions();
     virtual void        InitData();
@@ -192,7 +192,7 @@ class PE_Function : public Cpp_PE
     Dyn< SPU_Type >     pSpuException;
     Dyn< SPU_Type >     pSpuCastOperatorType;       // in "operator int()" or "operator ThatClass *()"
 
-    ary::Cid            nResult;
+    ary::cpp::Ce_id     nResult;
     bool                bResult_WithImplementation; // Necessary for the parent ParseEnvironment
                                                     //   to know, there is no semicolon or comma following.
         // Pre results
@@ -201,7 +201,7 @@ class PE_Function : public Cpp_PE
     E_ConVol            eConVol;
     ary::cpp::FunctionFlags
                         aFlags;
-    ary::Tid            nReturnType;
+    ary::cpp::Type_id   nReturnType;
     ParameterList       aParameters;
     ExceptionTypeList   aExceptions;
     bool                bThrow;                     // Indicates, if there is a throw - important, if there are 0 exceptions listed.
@@ -210,20 +210,20 @@ class PE_Function : public Cpp_PE
 
 
 
-// IMPLEMENTATION
-
 
+// IMPLEMENTATION
 inline bool
 PE_Function::Result_WithImplementation() const
     { return bResult_WithImplementation; }
 
 
-}   // namespace cpp
 
 
+}   // namespace cpp
+#endif
+
 
 
-#endif
 
 
 /*  // Overview of Stati
diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx
index 77be9a970075..a13dfed02967 100644
--- a/autodoc/source/parser/cpp/pe_param.hxx
+++ b/autodoc/source/parser/cpp/pe_param.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_param.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:28:35 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:56:46 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,21 +37,22 @@
 #ifndef ADC_CPP_PE_PARAM_HXX
 #define ADC_CPP_PE_PARAM_HXX
 
-
-// USED SERVICES
-    // BASE CLASSES
+// BASE CLASSES
 #include "cpp_pe.hxx"
-    // COMPONENTS
+// USED SERVICES
 #include <semantic/callf.hxx>
 #include <semantic/sub_peu.hxx>
-    // PARAMETERS
 #include <ary/cpp/c_vfflag.hxx>
 
 
-namespace cpp {
 
-class PE_Type;
-class PE_Variable;
+
+namespace cpp
+{
+    class PE_Type;
+    class PE_Variable;
+
+
 
 
 class PE_Parameter : public Cpp_PE
@@ -65,18 +66,17 @@ class PE_Parameter : public Cpp_PE
         finished,
         size_of_states
     };
-    typedef ary::cpp::S_Parameter   S_ParamInfo;
+    typedef ary::cpp::S_Parameter       S_ParamInfo;
 
-                        PE_Parameter(
+    explicit            PE_Parameter(
                             Cpp_PE *            i_pParent );
                         ~PE_Parameter();
 
     virtual void        Call_Handler(
                             const cpp::Token &  i_rTok );
 
-    ary::Tid            Result_FrontType() const;
-    const S_ParamInfo &
-                        Result_ParamInfo() const;
+    ary::cpp::Type_id   Result_FrontType() const;
+    const S_ParamInfo & Result_ParamInfo() const;
 
   private:
     typedef SubPe< PE_Parameter, PE_Type >          SP_Type;
@@ -126,23 +126,22 @@ class PE_Parameter : public Cpp_PE
 
 
 
-// IMPLEMENTATION
 
-inline ary::Tid
+// IMPLEMENTATION
+inline ary::cpp::Type_id
 PE_Parameter::Result_FrontType() const
-    { return aResultParamInfo.nType; }
+{
+    return aResultParamInfo.nType;
+}
+
 inline const PE_Parameter::S_ParamInfo &
 PE_Parameter::Result_ParamInfo() const
-    { return aResultParamInfo; }
-
-
-
-}   // namespace cpp
+{
+    return aResultParamInfo;
+}
 
 
 
 
+}   // namespace cpp
 #endif
-
-
-
diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx
index e34f52617489..063253a29f9e 100644
--- a/autodoc/source/parser/cpp/pe_tydef.hxx
+++ b/autodoc/source/parser/cpp/pe_tydef.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_tydef.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:29:40 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:57:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,20 +36,18 @@
 #ifndef ADC_CPP_PE_TYDEF_HXX
 #define ADC_CPP_PE_TYDEF_HXX
 
-
-
-// USED SERVICES
-    // BASE CLASSES
+// BASE CLASSES
 #include "cpp_pe.hxx"
-    // COMPONENTS
+// USED SERVICES
 #include <semantic/callf.hxx>
 #include <semantic/sub_peu.hxx>
-    // PARAMETERS
 
 
-namespace cpp {
+namespace cpp
+{
+    class PE_Type;
+
 
-class PE_Type;
 
 
 class PE_Typedef : public cpp::Cpp_PE
@@ -70,7 +68,7 @@ class PE_Typedef : public cpp::Cpp_PE
                             const cpp::Token &  i_rTok );
   private:
     typedef SubPe< PE_Typedef, PE_Type >        SP_Type;
-    typedef SubPeUse< PE_Typedef, PE_Type>  SPU_Type;
+    typedef SubPeUse< PE_Typedef, PE_Type>      SPU_Type;
 
     void                Setup_StatusFunctions();
     virtual void        InitData();
@@ -89,17 +87,12 @@ class PE_Typedef : public cpp::Cpp_PE
     Dyn<SP_Type>        pSpType;
     Dyn<SPU_Type>       pSpuType;
 
-    udmstri             sName;
-    ary::Tid            nType;
+    String              sName;
+    ary::cpp::Type_id   nType;
 };
 
 
 
-// IMPLEMENTATION
-
 
 }   // namespace cpp
-
-
 #endif
-
diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx
index 281126e028a9..8557eff229ec 100644
--- a/autodoc/source/parser/cpp/sfscope.hxx
+++ b/autodoc/source/parser/cpp/sfscope.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sfscope.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:32:55 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:01:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,26 +36,21 @@
 #ifndef ADC_CPP_SFSCOPE_HXX
 #define ADC_CPP_SFSCOPE_HXX
 
-
-
 // USED SERVICES
-    // BASE CLASSES
 #include "cxt2ary.hxx"
-    // COMPONENTS
-    // PARAMETERS
+
+
+
 
 namespace cpp
 {
 
+
 /** Implementation struct for cpp::ContextForAry.
 */
 struct ContextForAry::S_FileScopeInfo
 {
-    udmstri             sCurFileName;
-    ary::cpp::ProjectGroup *
-                        pCurProject;
-    ary::cpp::FileGroup *
-                        pCurFile;
+    ary::loc::File *    pCurFile;
     uintt               nLineCount;
     Dyn<StringVector>   pCurTemplateParameters;
 
@@ -63,19 +58,20 @@ struct ContextForAry::S_FileScopeInfo
 };
 
 
+
+
+// IMPLEMENTATION
 inline
 ContextForAry::
 S_FileScopeInfo::S_FileScopeInfo()
-    :   // sCurFileName,
-        pCurProject(0),
-        pCurFile(0),
-        nLineCount(0)
-        // pCurTemplateParameters
+    :   pCurFile(0),
+        nLineCount(0),
+        pCurTemplateParameters(0)
 {
 }
 
-}   // namespace cpp
 
 
-#endif
 
+}   // namespace cpp
+#endif