INTEGRATION: CWS adc18 (1.2.56); FILE MERGED

2007/10/19 10:37:30 np 1.2.56.2: #i81775#
2007/10/18 15:23:18 np 1.2.56.1: #i81775#

3 files changed, 36 insertions, 50 deletions

diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx
index c10346bbeb2b..bf31771d2c12 100644
--- a/autodoc/source/parser/cpp/pe_vari.hxx
+++ b/autodoc/source/parser/cpp/pe_vari.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_vari.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:31:15 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:59:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,7 +44,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
 
@@ -73,8 +73,8 @@ class PE_Variable : public Cpp_PE
         bit 0x0002 != 0, if there is an initialisation.
     */
     UINT16              Result_Pattern() const;
-    const udmstri &     Result_SizeExpression() const;
-    const udmstri &     Result_InitExpression() const;
+    const String  &     Result_SizeExpression() const;
+    const String  &     Result_InitExpression() const;
 
     virtual void        Call_Handler(
                             const cpp::Token &  i_rTok );
@@ -110,8 +110,8 @@ class PE_Variable : public Cpp_PE
     Dyn<SPU_Expression> pSpuArraySizeExpression;
     Dyn<SPU_Expression> pSpuInitExpression;
 
-    udmstri             sResultSizeExpression;
-    udmstri             sResultInitExpression;
+    String              sResultSizeExpression;
+    String              sResultInitExpression;
 };
 
 
@@ -123,10 +123,10 @@ inline UINT16
 PE_Variable::Result_Pattern() const
     { return ( sResultSizeExpression.length() > 0 ? 1 : 0 )
              + ( sResultInitExpression.length() > 0 ? 2 : 0 ); }
-inline const udmstri &
+inline const String  &
 PE_Variable::Result_SizeExpression() const
     { return sResultSizeExpression; }
-inline const udmstri &
+inline const String  &
 PE_Variable::Result_InitExpression() const
     { return sResultInitExpression; }
 
diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx
index 6684deee6245..a1860aab88f3 100644
--- a/autodoc/source/parser/cpp/sdocdist.hxx
+++ b/autodoc/source/parser/cpp/sdocdist.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdocdist.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:32:36 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:01:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -62,33 +62,31 @@ struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore
     void                Reset()                 { pCurRe = 0; pLastStoredDocu = 0; }
 
     void                SetCurrentlyStoredRe(
-                            ary::RepositoryEntity &
+                            ary::cpp::CppEntity &
                                                 io_rRe );
     void                Event_LineBreak();
 
   private:
     // Interface ary::info::DocuStore
-    virtual void        do_Store2CurProject(
-                            DYN Documentation & let_drDocu );
     virtual void        do_Store2CurFile(
-                            DYN Documentation & let_drDocu );
+                            DYN ary::doc::Node& let_drDocu );
     virtual void        do_Store2CurNamespace(
-                            DYN Documentation & let_drDocu );
+                            DYN ary::doc::Node& let_drDocu );
 
     virtual void        do_Store2ConnectedDeclaration(
-                            DYN Documentation & let_drDocu );
+                            DYN ary::doc::Node& let_drDocu );
 
     virtual void        do_Store2Glossary(
-                            DYN Documentation & let_drDocu,
-                            const udmstri &     i_sExplainedTerm );
+                            DYN ary::doc::Node& let_drDocu,
+                            const String  &     i_sExplainedTerm );
     virtual void        do_Store2GlobalTexts(
-                            DYN Documentation & let_drDocu,
+                            DYN ary::doc::Node& let_drDocu,
                             ary::info::GlobalTextId
                                                 i_nId );
     // DATA
-    ary::RepositoryEntity *
+    ary::cpp::CppEntity *
                         pCurRe;
-    Dyn<Documentation>  pLastStoredDocu;
+    Dyn<ary::doc::Node> pLastStoredDocu;
 };
 
 
@@ -101,11 +99,11 @@ struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore
 
 void
 ContextForAry::
-S_DocuDistributor::SetCurrentlyStoredRe( ary::RepositoryEntity & io_rRe )
+S_DocuDistributor::SetCurrentlyStoredRe( ary::cpp::CppEntity & io_rRe )
 {
     pCurRe = &io_rRe;
     if ( pLastStoredDocu )
-        pCurRe->Add_Documentation( *pLastStoredDocu.Release() );
+        pCurRe->Set_Docu( *pLastStoredDocu.Release() );
 }
 
 inline void
@@ -117,7 +115,7 @@ S_DocuDistributor::Event_LineBreak()
 
 void
 ContextForAry::
-S_DocuDistributor::do_Store2CurProject( DYN Documentation & let_drDocu )
+S_DocuDistributor::do_Store2CurFile( DYN ary::doc::Node & let_drDocu )
 {
     // KORR_FUTURE
     delete &let_drDocu;
@@ -125,7 +123,7 @@ S_DocuDistributor::do_Store2CurProject( DYN Documentation & let_drDocu )
 
 void
 ContextForAry::
-S_DocuDistributor::do_Store2CurFile( DYN Documentation &    let_drDocu )
+S_DocuDistributor::do_Store2CurNamespace( DYN ary::doc::Node & let_drDocu )
 {
     // KORR_FUTURE
     delete &let_drDocu;
@@ -133,26 +131,18 @@ S_DocuDistributor::do_Store2CurFile( DYN Documentation &    let_drDocu )
 
 void
 ContextForAry::
-S_DocuDistributor::do_Store2CurNamespace( DYN Documentation &   let_drDocu )
-{
-    // KORR_FUTURE
-    delete &let_drDocu;
-}
-
-void
-ContextForAry::
-S_DocuDistributor::do_Store2ConnectedDeclaration( DYN Documentation & let_drDocu )
+S_DocuDistributor::do_Store2ConnectedDeclaration( DYN ary::doc::Node & let_drDocu )
 {
     if ( pCurRe != 0 )
-        pCurRe->Add_Documentation(let_drDocu);
+        pCurRe->Set_Docu(let_drDocu);
     else
         pLastStoredDocu = &let_drDocu;
 }
 
 void
 ContextForAry::
-S_DocuDistributor::do_Store2Glossary( DYN Documentation &   let_drDocu,
-                                      const udmstri &       // i_sExplainedTerm
+S_DocuDistributor::do_Store2Glossary( DYN ary::doc::Node & let_drDocu,
+                                      const String &           // i_sExplainedTerm
                                       )
 {
     // KORR_FUTURE
@@ -161,9 +151,9 @@ S_DocuDistributor::do_Store2Glossary( DYN Documentation &   let_drDocu,
 
 void
 ContextForAry::
-S_DocuDistributor::do_Store2GlobalTexts( DYN Documentation &    let_drDocu,
-                                      ary::info::GlobalTextId // i_nId
-                                         )
+S_DocuDistributor::do_Store2GlobalTexts( DYN ary::doc::Node &       let_drDocu,
+                                         ary::info::GlobalTextId    // i_nId
+                                       )
 {
     // KORR_FUTURE
     delete &let_drDocu;
@@ -173,7 +163,4 @@ S_DocuDistributor::do_Store2GlobalTexts( DYN Documentation &    let_drDocu,
 
 
 }   // namespace cpp
-
-
 #endif
-
diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx
index 27bb96f4781b..3430850a1613 100644
--- a/autodoc/source/parser/cpp/tkp_cpp.hxx
+++ b/autodoc/source/parser/cpp/tkp_cpp.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tkp_cpp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:34:03 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:02:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -70,7 +70,7 @@ class Distributor;
 class TokenParser_Cpp : public TokenParser
 {
   public:
-    typedef std::map< udmstri, DefineDescription* >     MacroMap;
+    typedef std::map< String, DefineDescription* >     MacroMap;
 
     // LIFECYCLE
                         TokenParser_Cpp(
@@ -83,9 +83,8 @@ class TokenParser_Cpp : public TokenParser
                             CharacterSource &   io_rCharacterSource,
                             cpp::Distributor &  o_rDealer );
     void                StartNewFile(
-                            const udmstri &     i_sFileName,
-                            const csv::ploc::DirectoryChain &
-                                                i_rFileSubPath );
+                            const csv::ploc::Path &
+                                                i_file );
   private:
     virtual void        SetStartContext();
     virtual void        SetCurrentContext(