FCL/sftools/depl/doctools: comparison Orb/Doxygen/src/doxygen.cpp

equal deleted inserted replaced

-:d8fccb2cd802
+:468f4c8d3d5b
 /******************************************************************************
 *
-* Copyright (C) 1997-2008 by Dimitri van Heesch.
+* Copyright (C) 1997-2010 by Dimitri van Heesch.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation under the terms of the GNU General Public License is hereby
 * granted. No representations are made about the suitability of this software
 * for any purpose. It is provided "as is" without express or implied warranty.
 static QDict<FileDef>   g_usingDeclarations(1009); // used classes
 static FileStorage     *g_storage = 0;
 static bool             g_successfulRun = FALSE;
 static bool             g_dumpSymbolMap = FALSE;
 static bool             g_dumpConfigAsXML = FALSE;
 void clearAll()
 {
 g_inputFiles.clear();
 //g_excludeNameDict.clear();
 }
 else
 {
 mn = new MemberName(name);
 mn->append(md);
-	// PaulRoss: This first line looks wrong to me but links to typedef's don't work without it!
 Doxygen::functionNameSDict->append(name,mn);
-//Doxygen::memberNameSDict->append(name,mn);
 }
 rootNav->changeSection(Entry::EMPTY_SEC);
 return md;
 }
 root->name.data(),
 root->args.data(),
 root->bodyLine,
 root->mGrpId
 );
-	//Entry *pParent = root->parent();
+//printf("root->parent->name=%s\n",root->parent->name.data());
-	//if (pParent) {
-	//	printf("root->parent->name=%s\n",root->parent()->name.data());
-	//} else {
-	//	printf("NO Parent\n");
-	//}
 if (root->type.isEmpty() && root->name.find("operator")==-1 &&
 (root->name.find('*')!=-1 || root->name.find('&')!=-1))
 {
 // recover from parse error caused by redundant braces
 // like in "int *(var[10]);", which is parsed as
 rootNav->section()==Entry::VARIABLE_SEC &&
 rootNav->type().find("typedef ")!=-1 // its a typedef
 )
 {
 addVariable(rootNav);
-	//printf("addVariable() done\n");
 }
 if (rootNav->children())
 {
 EntryNavListIterator eli(*rootNav->children());
 EntryNav *e;
 }
 }
 }
 else if (cd) // member specialization
 {
+MemberNameIterator mni(*mn);
+MemberDef *declMd=0;
+MemberDef *md=0;
+for (mni.toFirst();(md=mni.current());++mni)
+{
+if (md->getClassDef()==cd)
+{
+// TODO: we should probably also check for matching arguments
+declMd = md;
+break;
+}
+}
 MemberDef::MemberType mtype=MemberDef::Function;
 ArgumentList *tArgList = new ArgumentList;
 //  getTemplateArgumentsFromName(cd->name()+"::"+funcName,root->tArgLists);
-MemberDef *md=new MemberDef(
+md=new MemberDef(
 root->fileName,root->startLine,
 funcType,funcName,funcArgs,exceptions,
-root->protection,root->virt,root->stat,Member,
+declMd ? declMd->protection() : root->protection,
+root->virt,root->stat,Member,
 mtype,tArgList,root->argList);
 //printf("new specialized member %s args=`%s'\n",md->name().data(),funcArgs.data());
 md->setTagInfo(rootNav->tagInfo());
 md->setMemberClass(cd);
 md->setTemplateSpecialization(TRUE);
 fmd->addSectionsToDefinition(root->anchors);
 fmd->setInitializer(root->initializer);
 fmd->setMaxInitLines(root->initLines);
 fmd->setMemberGroupId(root->mGrpId);
 fmd->setExplicitExternal(root->explicitExternal);
+fmd->setRefItems(root->sli);
 if (fmd)
 {
 md->insertEnumField(fmd);
 fmd->setEnumScope(md);
 }
 rootNav->loadEntry(g_storage);
 Entry *root = rootNav->entry();
 QCString normalizedName = root->name;
 normalizedName = substitute(normalizedName,"\\","/");
+//printf("root->docFile=%s normalizedName=%s\n",
+//    root->docFile.data(),normalizedName.data());
+if (root->docFile==normalizedName) // current dir?
+{
+int lastSlashPos=normalizedName.findRev('/');
+if (lastSlashPos!=-1) // strip file name
+{
+normalizedName=normalizedName.left(lastSlashPos);
+}
+}
 if (normalizedName.at(normalizedName.length()-1)!='/')
 {
 normalizedName+='/';
 }
 DirDef *dir,*matchingDir=0;
 addDirToGroups(root,matchingDir);
 }
 else
 {
 warn(root->fileName,root->startLine,"Warning: No matching "
-"directory found for command \\dir %s\n",root->name.data());
+"directory found for command \\dir %s\n",normalizedName.data());
 }
 rootNav->releaseEntry();
 }
 RECURSE_ENTRYTREE(findDirDocumentation,rootNav);
 }
 QCString n=pd->getOutputFileBase();
 startFile(*g_outputList,n,n,pd->name());
 startTitle(*g_outputList,n);
 g_outputList->docify(pd->name());
 endTitle(*g_outputList,n,0);
+g_outputList->startContents();
 g_outputList->parseDoc(pd->docFile(),                            // file
 pd->docLine(),                            // startLine
 pd,                                       // context
 0,                                        // memberDef
 pd->documentation()+"\n\n\\include "+pd->name(),          // docs
 TRUE,                                     // index words
 TRUE,                                     // is example
 pd->name()
 );
+g_outputList->endContents();
 endFile(*g_outputList);
 }
 g_outputList->enable(OutputGenerator::Man);
 }
 parseTagFile(root,fi.absFilePath(),fi.fileName());
 }
 //----------------------------------------------------------------------------
-// returns TRUE if the name of the file represented by `fi' matches
-// one of the file patterns in the `patList' list.
-static bool patternMatch(QFileInfo *fi,QStrList *patList)
-{
-bool found=FALSE;
-if (patList)
-{
-QCString pattern=patList->first();
-while (!pattern.isEmpty() && !found)
-{
-int i=pattern.find('=');
-if (i!=-1) pattern=pattern.left(i); // strip of the extension specific filter name
-#if defined(_WIN32) // windows
-QRegExp re(pattern,FALSE,TRUE); // case insensitive match
-#else                // unix
-QRegExp re(pattern,TRUE,TRUE);  // case sensitive match
-#endif
-found = found || re.match(fi->fileName())!=-1 ||
-re.match(fi->filePath())!=-1 ||
-re.match(fi->absFilePath())!=-1;
-//printf("Matching `%s' against pattern `%s' found=%d\n",
-//    fi->fileName().data(),pattern.data(),found);
-pattern=patList->next();
-}
-}
-return found;
-}
-//----------------------------------------------------------------------------
 static void copyStyleSheet()
 {
 QCString &htmlStyleSheet = Config_getString("HTML_STYLESHEET");
 if (!htmlStyleSheet.isEmpty())
 {
 err("Warning: source %s is not a readable file or directory... skipping.\n",cfi->absFilePath().data());
 }
 }
 else if (cfi->isFile() &&
 (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
-(patList==0 || patternMatch(cfi,patList)) &&
+(patList==0 || patternMatch(*cfi,patList)) &&
-!patternMatch(cfi,exclPatList) &&
+!patternMatch(*cfi,exclPatList) &&
 (killDict==0 || killDict->find(cfi->absFilePath())==0)
 )
 {
 totalSize+=cfi->size()+cfi->absFilePath().length()+4;
 QCString name=convertToQCString(cfi->fileName());
 if (killDict) killDict->insert(cfi->absFilePath(),(void *)0x8);
 }
 else if (recursive &&
 (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
 cfi->isDir() && cfi->fileName()!="." &&
-!patternMatch(cfi,exclPatList) &&
+!patternMatch(*cfi,exclPatList) &&
 cfi->fileName()!="..")
 {
 cfi->setFile(cfi->absFilePath());
 totalSize+=readDir(cfi,fnList,fnDict,exclDict,
 patList,exclPatList,resultList,resultDict,errorIfNotExist,
 //----------------------------------------------------------------------------
 // print the usage of doxygen
 static void usage(const char *name)
 {
-msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2008\n\n",versionString);
+msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2010\n\n",versionString);
 msg("You can use doxygen in a number of ways:\n\n");
 msg("1) Use doxygen to generate a template configuration file:\n");
 msg("    %s [-s] -g [configName]\n\n",name);
 msg("    If - is used for configName doxygen will write to standard output.\n\n");
 msg("2) Use doxygen to update an old configuration file:\n");
 createTemplateInstanceMembers();
 msg("Computing class relations...\n");
 computeTemplateClassRelations();
 flushUnresolvedRelations();
+computeClassRelations();
 if (Config_getBool("OPTIMIZE_OUTPUT_VHDL"))
-{
 VhdlDocGen::computeVhdlComponentRelations();
-}
-else
-{
-computeClassRelations();
-}
 g_classEntries.clear();
 msg("Add enum values to enums...\n");
 addEnumValuesToEnums(rootNav);
 findEnumDocumentation(rootNav);
 msg("Determining which enums are documented\n");
 findDocumentedEnumValues();
 msg("Computing member relations...\n");
-// TODO: This seems to generate an infinite loop
 computeMemberRelations();
 msg("Building full member lists recursively...\n");
 buildCompleteMemberLists();
 Doxygen::indexList.addImageFile("tab_r.gif");
 Doxygen::indexList.addImageFile("tab_l.gif");
 Doxygen::indexList.addImageFile("tab_b.gif");
 Doxygen::indexList.addStyleSheetFile("tabs.css");
 Doxygen::indexList.addImageFile("doxygen.png");
-if (Config_getBool("HTML_DYNAMIC_SECTIONS")) HtmlGenerator::generateSectionImages();
+//if (Config_getBool("HTML_DYNAMIC_SECTIONS")) HtmlGenerator::generateSectionImages();
 copyStyleSheet();
 }
 if (Config_getBool("GENERATE_LATEX"))
 {
 g_outputList->add(new LatexGenerator);
 static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH");
 // generate search indices (need to do this before writing other HTML
 // pages as these contain a drop down menu with options depending on
 // what categories we find in this function.
-if (searchEngine)
+if (Config_getBool("GENERATE_HTML") && searchEngine)
 {
 QCString searchDirName = Config_getString("HTML_OUTPUT")+"/search";
 QDir searchDir(searchDirName);
 if (!searchDir.exists() && !searchDir.mkdir(searchDirName))
 {
-err("Could not create search results directory '%s/search'\n",searchDirName.data());
+err("Error: Could not create search results directory '%s' $PWD='%s'\n",
-return;
+searchDirName.data(),QDir::currentDirPath().data());
+exit(1);
 }
 HtmlGenerator::writeSearchData(searchDirName);
-writeSearchStyleSheet();
+if (!serverBasedSearch) // client side search index
-if (serverBasedSearch)
-{
-}
-else
 {
 writeJavascriptSearchIndex();
 }
 }

changeset 4	468f4c8d3d5b
parent 3	d8fccb2cd802