summaryrefslogtreecommitdiff
path: root/autodoc/source/exes
diff options
context:
space:
mode:
Diffstat (limited to 'autodoc/source/exes')
-rw-r--r--autodoc/source/exes/adc_uni/adc_cmds.cxx59
-rw-r--r--autodoc/source/exes/adc_uni/cmd_run.cxx111
-rw-r--r--autodoc/source/exes/adc_uni/cmd_run.hxx20
-rw-r--r--autodoc/source/exes/adc_uni/makefile.mk36
4 files changed, 128 insertions, 98 deletions
diff --git a/autodoc/source/exes/adc_uni/adc_cmds.cxx b/autodoc/source/exes/adc_uni/adc_cmds.cxx
index 785396783d15..bc500a771005 100644
--- a/autodoc/source/exes/adc_uni/adc_cmds.cxx
+++ b/autodoc/source/exes/adc_uni/adc_cmds.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: adc_cmds.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:45:26 $
+ * last change: $Author: np $ $Date: 2002-11-01 17:15:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -163,20 +163,47 @@ Parse::Options()
if ( aOptions_.size() > 0 )
return aOptions_;
- aOptions_[udmstri(C_opt_Parse)] = &Parse::FI_Start_ParseOptions;
- aOptions_[udmstri(C_opt_Name)] = &Parse::FI_SetName;
- aOptions_[udmstri(C_opt_Update)] = &Parse::FI_SetUpdate;
- aOptions_[udmstri(C_opt_LangAll)] = &Parse::FI_SetLanguage4All;
- aOptions_[udmstri(C_opt_ExtensionsAll)] = &Parse::FI_SetExtensions4All;
- aOptions_[udmstri(C_opt_DocAll)] = &Parse::FI_SetDocAttrs4All;
-
- aOptions_[udmstri(C_opt_Project)] = &Parse::FI_Start_ProjectOptions;
- aOptions_[udmstri(C_opt_Lang)] = &Parse::FI_SetLanguage;
- aOptions_[udmstri(C_opt_Extensions)] = &Parse::FI_SetExtensions;
- aOptions_[udmstri(C_opt_Doc)] = &Parse::FI_SetDocAttrs;
- aOptions_[udmstri(C_opt_SourceDir)] = &Parse::FI_SetSourceDirs;
- aOptions_[udmstri(C_opt_SourceTree)] = &Parse::FI_SetSourceTrees;
- aOptions_[udmstri(C_opt_SourceFile)] = &Parse::FI_SetSourceFiles;
+ // Workaround for MacOSX, gcc3 compiler bug with
+ // assigning temporaries of member function ptrs
+ // to const references of them:
+ F_Init fTemp = &Parse::FI_Start_ParseOptions;
+ aOptions_[udmstri(C_opt_Parse)] = fTemp;
+
+ fTemp = &Parse::FI_SetName;
+ aOptions_[udmstri(C_opt_Name)] = fTemp;
+
+ fTemp = &Parse::FI_SetUpdate;
+ aOptions_[udmstri(C_opt_Update)] = fTemp;
+
+ fTemp = &Parse::FI_SetLanguage4All;
+ aOptions_[udmstri(C_opt_LangAll)] = fTemp;
+
+ fTemp = &Parse::FI_SetExtensions4All;
+ aOptions_[udmstri(C_opt_ExtensionsAll)] = fTemp;
+
+ fTemp = &Parse::FI_SetDocAttrs4All;
+ aOptions_[udmstri(C_opt_DocAll)] = fTemp;
+
+ fTemp = &Parse::FI_Start_ProjectOptions;
+ aOptions_[udmstri(C_opt_Project)] = fTemp;
+
+ fTemp = &Parse::FI_SetLanguage;
+ aOptions_[udmstri(C_opt_Lang)] = fTemp;
+
+ fTemp = &Parse::FI_SetExtensions;
+ aOptions_[udmstri(C_opt_Extensions)] = fTemp;
+
+ fTemp = &Parse::FI_SetDocAttrs;
+ aOptions_[udmstri(C_opt_Doc)] = fTemp;
+
+ fTemp = &Parse::FI_SetSourceDirs;
+ aOptions_[udmstri(C_opt_SourceDir)] = fTemp;
+
+ fTemp = &Parse::FI_SetSourceTrees;
+ aOptions_[udmstri(C_opt_SourceTree)] = fTemp;
+
+ fTemp = &Parse::FI_SetSourceFiles;
+ aOptions_[udmstri(C_opt_SourceFile)] = fTemp;
return aOptions_;
}
diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx
index 097a83204494..014c8a008276 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.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: np $ $Date: 2002-05-14 09:02:17 $
+ * last change: $Author: np $ $Date: 2002-11-01 17:15:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,13 +65,16 @@
// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
#include <cosv/x.hxx>
-#include <ary/ary.hxx>
+#include <ary/action/act_all.hxx>
#include <ary/ary.hxx>
#include <ary/cpp/c_rwgate.hxx>
-#include <ary_i/ce2.hxx>
-#include <ary_i/uidl/cenamesp.hxx>
-#include <ary_i/uidl/gate.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_2s.hxx>
#include <autodoc/displaying.hxx>
#include <autodoc/dsp_html_std.hxx>
#include <autodoc/filecoli.hxx>
@@ -84,27 +87,26 @@
#include "adc_cmds.hxx"
-ary::uidl::Gate * G_pGate = 0;
+ary::idl::Gate * G_pGate = 0;
-ary::uidl::Gate &
+ary::idl::Gate &
GetAryGate()
{
csv_assert(G_pGate != 0);
return *G_pGate;
}
-
+#if 0
namespace
{
void Recursive_PutOutNamespace(
csi::uidl::Display & o_rDisplay,
- const ary::uidl::CeNamespace &
- i_rNamespace,
- const ary::uidl::Gate & i_rGate );
+ const ary::idl::Module & i_rNamespace,
+ const ary::idl::Gate & i_rGate );
} // anonymous namespace
-
+#endif // 0
namespace autodoc
{
@@ -138,9 +140,10 @@ CommandRunner::HasParsedIdl() const
CommandRunner::CommandRunner()
: pCommandLine(0),
pReposy(0),
+ pNewReposy(0),
nResultCode(0)
{
- Cout() << "\nAutodoc version 2.1"
+ Cout() << "\nAutodoc version 2.2"
<< "\n-------------------"
<< "\n" << Endl();
}
@@ -193,11 +196,16 @@ CommandRunner::Parse()
<< Endl();
if ( pReposy == 0 )
- pReposy = & ary::Repository::Create_( rCmd.ReposyName(), 0 );
+ pReposy = & ary::Repository::Create_( rCmd.ReposyName(), 0 );
+ if ( pNewReposy == 0 )
+ pNewReposy = & ary::n22::Repository::Create_( rCmd.ReposyName() );
Dyn< FileCollector_Ifc > pFiles;
pFiles = ParseToolsFactory().Create_FileCollector(6000);
+ bool bCpp = false;
+ bool bIDL = false;
+
command::Parse::ProjectIterator itEnd = rCmd.ProjectsEnd();
for ( command::Parse::ProjectIterator it = rCmd.ProjectsBegin();
it != itEnd;
@@ -219,19 +227,26 @@ CommandRunner::Parse()
Get_CppParser().Run( (*it)->sName,
(*it)->aRootDirectory,
*pFiles );
-// pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites();
+ bCpp = true;
} break;
case command::S_LanguageInfo::idl:
{
Get_IdlParser().Run(*pFiles);
+ bIDL = true;
} break;
default:
- Cerr() << "Project in yet unimplemented language skipped."
- << Endl();
+ Cerr() << "Project in yet unimplemented language skipped."
+ << Endl();
}
- }
+ } // end for
- pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites();
+ if (bCpp)
+ pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites();
+ if (bIDL)
+ {
+ pNewReposy->Gate_Idl().Secondaries().Connect_Types2Ces();
+ pNewReposy->Gate_Idl().Secondaries().Gather_CrossReferences();
+ }
} // end try
catch (csv::Exception & xx)
@@ -321,7 +336,7 @@ CommandRunner::Create_CppParser()
void
CommandRunner::Create_IdlParser()
{
- pIdlParser = new IdlParser(*pReposy);
+ pIdlParser = new IdlParser(*pNewReposy);
}
uintt
@@ -418,24 +433,18 @@ CommandRunner::CreateHtml_NewStyle()
void
CommandRunner::CreateHtml_OldIdlStyle()
{
- ary::uidl::Gate &
- rAryGate = pReposy->RwGate_Idl();
-#if 0 // Should become obsolete
- G_pGate = &rAryGate;
-
- ary::uidl::CeNamespace &
- rGlobalNamespace = rAryGate.GlobalNamespace();
-
- Dyn<csi::uidl::Display> pDisplay;
- pDisplay = csi::uidl::Create_HtmlDisplay_(
- pCommandLine->Cmd_CreateHtml()->OutputDir(),
- DisplayToolsFactory_Ifc::GetIt_()
- .Create_StdFrame() );
- Recursive_PutOutNamespace( *pDisplay,
- rGlobalNamespace,
- rAryGate );
- pDisplay->WriteGlobalIndices();
-#endif // 0
+ ary::idl::Gate &
+ rAryGate = pNewReposy->Gate_Idl();
+
+ // Read DevManualLinkFile:
+ // KORR
+ csv::File
+ aFile("devmanref.txt", csv::CFM_READ);
+ if ( aFile.open() )
+ {
+ rAryGate.Secondaries().Read_Links2DevManual(aFile);
+ aFile.close();
+ }
// New Style Output
Dyn<autodoc::HtmlDisplay_Idl_Ifc> pNewDisplay;
@@ -449,25 +458,25 @@ CommandRunner::CreateHtml_OldIdlStyle()
} // namespace autodoc
+#if 0
namespace
{
-typedef std::vector< ary::uidl::CeNamespace * > LocalSNList;
+typedef std::vector< ary::idl::Module * > LocalSNList;
inline void
DisplayCe( csi::uidl::Display & o_rDisplay,
- ary::Cei i_nID,
- const ary::uidl::Gate & i_rGate )
+ ary::idl::Ce_id i_nID,
+ const ary::idl::Gate & i_rGate )
{
- ary::CodeEntity2 * pEntity = i_rGate.FindCe(i_nID);
- if (pEntity != 0)
- pEntity->DisplayAt(o_rDisplay);
+ const ary::idl::CodeEntity & rEntity = i_rGate.Ces().Find_Ce(i_nID);
+ rEntity.Visit(o_rDisplay);
}
void
-Recursive_PutOutNamespace( csi::uidl::Display & o_rDisplay,
- const ary::uidl::CeNamespace & i_rNamespace,
- const ary::uidl::Gate & i_rGate )
+Recursive_PutOutNamespace( csi::uidl::Display & o_rDisplay,
+ const ary::idl::Module & i_rNamespace,
+ const ary::idl::Gate & i_rGate )
{
static StreamStr sPath(512);
sPath.seekp(0);
@@ -478,9 +487,9 @@ Recursive_PutOutNamespace( csi::uidl::Display & o_rDisplay,
DisplayCe(o_rDisplay, i_rNamespace.Id(), i_rGate);
- const ary::uidl::CeNamespace::NameMap & rMap = i_rNamespace.LocalNames();
+ const ary::idl::Module::NameMap & rMap = i_rNamespace.LocalNames();
- for ( ary::uidl::CeNamespace::NameMap::const_iterator iter = rMap.begin();
+ for ( ary::idl::Module::NameMap::const_iterator iter = rMap.begin();
iter != rMap.end();
++iter )
{
@@ -502,5 +511,7 @@ Recursive_PutOutNamespace( csi::uidl::Display & o_rDisplay,
} // anonymous namespace
+#endif // 0
+
diff --git a/autodoc/source/exes/adc_uni/cmd_run.hxx b/autodoc/source/exes/adc_uni/cmd_run.hxx
index 2f1655b6f58b..2a2ae519bb11 100644
--- a/autodoc/source/exes/adc_uni/cmd_run.hxx
+++ b/autodoc/source/exes/adc_uni/cmd_run.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cmd_run.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-11-01 17:15:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,18 +73,20 @@
namespace ary
{
class Repository;
-}
-namespace csi
-{
- namespace uidl
+ namespace n22
{
- class Uidl_Parser;
+ class Repository;
}
}
namespace autodoc
{
+ class Uidl_Parser;
+}
+
+namespace autodoc
+{
namespace command
{
class Parse;
@@ -97,7 +99,7 @@ namespace autodoc
class ParseToolsFactory_Ifc;
class CodeParser_Ifc;
class DocumentationParser_Ifc;
- typedef csi::uidl::Uidl_Parser IdlParser;
+ typedef autodoc::Uidl_Parser IdlParser;
class CommandRunner
@@ -145,6 +147,8 @@ class CommandRunner
// DATA
const CommandLine * pCommandLine;
ary::Repository * pReposy;
+ ary::n22::Repository *
+ pNewReposy;
int nResultCode;
Dyn<CodeParser_Ifc> pCppParser;
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index e8b60f216626..f7e20e7186b5 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.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: np $ $Date: 2002-05-14 09:02:17 $
+# last change: $Author: np $ $Date: 2002-11-01 17:15:32 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -89,20 +89,14 @@ OBJFILES= \
LIB1TARGET=$(LB)$/atdoc.lib
LIB1FILES= \
$(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
- $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_info.lib \
- $(LB)$/ary_loc.lib $(LB)$/ary_store.lib \
+ $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib \
+ $(LB)$/ary_info.lib $(LB)$/ary_loc.lib $(LB)$/ary_store.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_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)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+ $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib \
$(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
- $(LB)$/display2_dsapi.lib
-# $(LB)$/comphelp.lib
-
-# $(LB)$/display_funclist.lib
+ $(LB)$/ary2_cinfo.lib
@@ -121,20 +115,14 @@ APP1LIBS=$(LB)$/atdoc.lib
DEPOBJFILES += $(APP1OBJS)
APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
- $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_info.lib \
- $(LB)$/ary_loc.lib $(LB)$/ary_store.lib \
+ $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib \
+ $(LB)$/ary_info.lib $(LB)$/ary_loc.lib $(LB)$/ary_store.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_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)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+ $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib \
$(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
- $(LB)$/display2_dsapi.lib
-# $(LB)$/comphelp.lib
-
-# $(LB)$/display_funclist.lib
+ $(LB)$/ary2_cinfo.lib
.INCLUDE : target.mk
generated by cgit (git 2.34.1) at 2025-05-06 22:24:19 +0000