FCL/sftools/depl/doctools: comparison Orb/Doxygen/src/pre.l

equal deleted inserted replaced

-:42188c7ea2d9
+:82f11024044a
 #include <qstrlist.h>
 #include <qdict.h>
 #include <qregexp.h>
 #include <qfileinfo.h>
 #include <qdir.h>
+#include <qmap.h>
 #include "pre.h"
 #include "constexp.h"
 #include "define.h"
 #include "doxygen.h"
 #include "bufstr.h"
 #include "portable.h"
 #include "bufstr.h"
 #define YY_NEVER_INTERACTIVE 1
 struct FileState
 {
 FileState(int size) : fileBuf(size), oldFileBuf(0), oldFileBufPos(0) {}
 int lineNr;
 {
 bool ambig;
 QFileInfo fi(name);
 g_yyFileName=convertToQCString(fi.absFilePath());
 g_yyFileDef=findFileDef(Doxygen::inputNameDict,g_yyFileName,ambig);
+if (g_yyFileDef == 0 && Config_getBool("PREPROCESS_INCLUDES")) {
+		// Search again using Doxygen::includeNameDict
+	    // First insert the include file in the Doxygen::includeNameDict if
+	    // it is not there already. This can happen if the Doxygen::includeNameDict
+	    // has scanned .../inc but the #include "usr/usr.h"
+	    // The Doxygen::includeNameDict will not have usr.h in it so we poke it in.
+		if (!Doxygen::includeNameDict->find(g_yyFileName.data())) {
+			//Debug::print(Debug::IncludeGraph, 0, "pre.l setFileName() inserting in Doxygen::includeNameDict: %s\n", name);
+			FileDef  *fd=new FileDef(fi.dirPath()+"/", fi.fileName());
+FileName *fn=0;
+if (!fi.absFilePath().isEmpty() && (fn=(*Doxygen::includeNameDict)[name])) {
+				fn->append(fd);
+} else {
+				fn = new FileName(fi.absFilePath(), name);
+				fn->append(fd);
+				Doxygen::includeNameDict->insert(name, fn);
+}
+			g_yyFileDef = fd;
+		} else {
+			// Search the dictionary
+			FileName *fn = Doxygen::includeNameDict->find(g_yyFileName.data());
+			FileNameIterator fni(*fn);
+			FileDef *fd = 0;
+			for (fni.toFirst(); (fd=fni.current()); ++fni) {
+				if (fd && fd->absFilePath() == g_yyFileName) {
+					break;
+				}
+				fd = 0;
+			}
+			g_yyFileDef = fd;
+		}
+		//printf("pre.l setFileName() searching Doxygen::includeNameDict for %s, result=%p\n", name, g_yyFileDef);
+		//Debug::print(Debug::IncludeGraph, 0, "pre.l setFileName() searching Doxygen::includeNameDict for %s, result=%p\n", name, g_yyFileDef);
+}
 if (g_yyFileDef && g_yyFileDef->isReference()) g_yyFileDef=0;
 g_insideCS = g_yyFileName.right(3)==".cs";
 }
 static void incrLevel()
 static FileState *checkAndOpenFile(const QCString &fileName,bool &alreadyIncluded)
 {
 alreadyIncluded = FALSE;
 FileState *fs = 0;
-//printf("checkAndOpenFile(%s)\n",fileName.data());
+//msg("checkAndOpenFile(%s)\n", fileName.data());
 QFileInfo fi(fileName);
 if (fi.exists() && fi.isFile())
 {
 QCString absName = convertToQCString(fi.absFilePath());
+	//msg("checkAndOpenFile() found: %s\n", absName.data());
 // global guard
 if (g_curlyCount==0) // not #include inside { ... }
 {
 if (g_allIncludes.find(absName)!=0)
 {
 alreadyIncluded = TRUE;
 //printf("  already included 1\n");
-return 0; // already done
+if (!Config_getBool("PREPROCCESS_FULL_TU")) {
-}
+			return 0; // already done
-g_allIncludes.insert(absName,(void *)0x8);
+		}
+} else {
+		g_allIncludes.insert(absName,(void *)0x8);
+	  }
 }
 // check include stack for absName
 	// This is equivelent to walking the stack and setting alreadyIncluded to
 	// TRUE if absName matches any filename
 QStack<FileState> tmpStack;
 return fs;
 }
 static FileState *findFile(const char *fileName,bool localInclude,bool &alreadyIncluded)
 {
-//printf("** findFile(%s,%d) g_yyFileName=%s\n",fileName,localInclude,g_yyFileName.data());
+//msg("** findFile(%s,%d) g_yyFileName=%s\n",fileName,localInclude,g_yyFileName.data());
 if (localInclude && !g_yyFileName.isEmpty())
 {
 QFileInfo fi(g_yyFileName);
 if (fi.exists())
 {
 msg("#include %s: parsing...\n",incFileName.data());
 }
 if (oldFileDef)
 {
 // add include dependency to the file in which the #include was found
+	    //Debug::print(Debug::IncludeGraph, 0, "pre.l readIncludeFile() adding dependency \"%s\" to \"%s\"\n", incFileName, oldFileDef->absFilePath().data());
 oldFileDef->addIncludeDependency(g_yyFileDef,incFileName,localInclude,g_isImported);
 // add included by dependency
 if (g_yyFileDef)
 {
 //printf("Adding include dependency %s->%s\n",oldFileDef->name().data(),incFileName.data());
 					  outputChar(*yytext);
 					  BEGIN( CopyLine );
 					}
 <CopyLine>{ID}/{BN}{0,80}"("			{
 					  Define *def=0;
-					  //def=g_fileDefineDict->find(yytext);
+					  def=g_fileDefineDict->find(yytext);
-					  //printf("Search for define %s found=%d g_includeStack.isEmpty()=%d "
+					  //printf("Search for define %s found=%d g_includeStack.count()=%d "
 					  //       "g_curlyCount=%d g_macroExpansion=%d g_expandOnlyPredef=%d "
-					  //	 "isPreDefined=%d\n",yytext,def ? 1 : 0,
+					  //	 "isPreDefined=%d tu=%d\n",yytext,def ? 1 : 0,
-					  //	 g_includeStack.isEmpty(),g_curlyCount,g_macroExpansion,g_expandOnlyPredef,
+					  //	 g_includeStack.count(),g_curlyCount,g_macroExpansion,g_expandOnlyPredef,
-					  //	 def ? def->isPredefined : -1
+					  //	 def ? def->isPredefined : -1,
+					  //	 Config_getBool("PREPROCCESS_FULL_TU")
 					  //	);
-					  if ((g_includeStack.isEmpty() || g_curlyCount>0) &&
+					  if ((g_includeStack.isEmpty() || g_curlyCount>0 || Config_getBool("PREPROCCESS_FULL_TU")) &&
 					      g_macroExpansion &&
 					      (def=g_fileDefineDict->find(yytext)) &&
-					      (!g_expandOnlyPredef || def->isPredefined)
+					      (!g_expandOnlyPredef || def->isPredefined || Config_getBool("PREPROCCESS_FULL_TU"))
 					     )
 					  {
 					    //printf("Found it!\n");
 					    g_roundCount=0;
 					    g_defArgsStr=yytext;
 					  g_defName = yytext;
 g_defArgsStr.resize(0);
 					  g_defText.resize(0);
 					  g_defLitText.resize(0);
 					  g_defVarArgs = FALSE;
-					  if ( g_defName!=g_lastGuardName )
+					  if ( g_defName!=g_lastGuardName || Config_getBool("PREPROCCESS_FULL_TU"))
 					  { // define may appear in the output
 					    QCString tmp=(QCString)"#define "+g_defName;
 					    outputArray(tmp.data(),tmp.length());
 					    g_quoteArg=FALSE;
 					    g_insideComment=FALSE;
 //delete g_fileDefineDict; g_fileDefineDict=0;
 delete g_expandedDict; g_expandedDict=0;
 delete g_pathList; g_pathList=0;
 }
-void loadGolbalInput(BufStr &input)
+void dumpDefineDict(const DefineDict *theDefDict)
 {
-	QStrList& preIncList = Config_getList("PRE_INCLUDES");
+	if (Debug::isFlagSet(Debug::Preprocessor)) {
-	int countPreInc = 0;
+		// Make a map to sort the macros in alphbetical order
-	if (!preIncList.isEmpty()) {
+		typedef QMap<QString, Define*> DefineMapType;
-		QStrListIterator sli(preIncList);
+		DefineMapType DefineMap;
-		char *filterStr;
+		Define *def = 0;
-		for (sli.toFirst(); (filterStr = sli.current()); ++sli) {
+		QDictIterator<Define> it(*theDefDict);
-			printf("Adding %s\n", filterStr);
+		while (it.current()) {
-			QString incStmt = "#include \"";
+			def = it.current();
-			incStmt += filterStr;
+			DefineMap.insert(def->name, def);
-			incStmt += "\"\n";
+			++it;
-			printf("Adding string %s, length %d\n", incStmt.data(), incStmt.length());
-			g_inputBuf->addArray(incStmt.data(), incStmt.length());
-			printf("Added  string %s, length %d\n", incStmt.data(), incStmt.length());
-			countPreInc++;
 		}
-	}
+		// Now write them out
-	msg("Added pre-includes[%d]\n", countPreInc);
+		DefineMapType::Iterator mapIt;
-	g_inputBuf->addArray(input.data(), input.size());
+		for (mapIt = DefineMap.begin(); mapIt != DefineMap.end(); ++mapIt) {
-	// Is this really needed?
+			def = mapIt.data();
-	g_inputBuf->addChar('\0');
+			QString myDecl = def->name;
-	msg("Added input\n");
+			if (def->nargs > 0) {
-}
+				myDecl.append("(");
+				myDecl.append(def->args);
-class GlobalInBufProtect
+				myDecl.append(")");
-{
+			}
-public:
+			printf("#define %s %s /* %s %d */\n",
-	GlobalInBufProtect(int size) {
+				myDecl.data(),
-		g_inputBuf = new BufStr(size);
+				def->definition.data(),
-	}
+				def->fileName.data(),
-	~GlobalInBufProtect() {
+				def->lineNr
-		delete g_inputBuf;
+				);
-		g_inputBuf = 0;
+		}
 	}
-};
+}
+void dumpDefineDicts()
+{
+	if (Debug::isFlagSet(Debug::Preprocessor)) {
+		printf("g_expandedDict:\n");
+		dumpDefineDict(g_expandedDict);
+		printf("g_fileDefineDict:\n");
+		dumpDefineDict(g_fileDefineDict);
+	}
+}
 void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
 {
 uint orgOffset=output.curPos();
 //printf("##########################\n%s\n####################\n",
 g_macroExpansion = Config_getBool("MACRO_EXPANSION");
 g_expandOnlyPredef = Config_getBool("EXPAND_ONLY_PREDEF");
 g_curlyCount=0;
 g_nospaces=FALSE;
-// Initialise the global buffer and when I go out of scope free it
+g_inputBuf=&input;
-GlobalInBufProtect g_input_protect(input.size());
-//g_inputBuf=&input;
-loadGolbalInput(input);
 g_inputBufPos=0;
 g_outputBuf=&output;
 g_includeStack.setAutoDelete(TRUE);
 g_includeStack.clear();
 //g_fileDefineDict->setAutoDelete(TRUE);
 //g_fileDefineDict->clear();
 g_expandedDict->setAutoDelete(FALSE);
 g_expandedDict->clear();
 g_condStack.clear();
 g_condStack.setAutoDelete(TRUE);
 static bool firstTime=TRUE;
 if (firstTime)
 {
 // add predefined macros
 char *defStr;
 Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",cmd.data());
 preYYin = portable_popen(cmd,"r");
 if (!preYYin)
 {
 err("Error: could not execute filter %s\n",cmd.data());
-	  delete g_inputBuf;
 return;
 }
 }
 #endif
 g_yyLineNr = 1;
 portable_pclose(preYYin);
 #endif
 if (Debug::isFlagSet(Debug::Preprocessor))
 {
+	printf("preprocessFile() dump from %d to %d\n", orgOffset, output.curPos());
 char *orgPos=output.data()+orgOffset;
 char *newPos=output.data()+output.curPos();
-msg("Preprocessor output (size: %d bytes):\n",newPos-orgPos);
+printf("Preprocessor output (size: %d bytes):\n",newPos-orgPos);
 int line=1;
-msg("---------\n00001 ");
+printf("---------\n00001 ");
 while (orgPos<newPos)
 {
 putchar(*orgPos);
 if (*orgPos=='\n') printf("%05d ",++line);
 orgPos++;
 }
-msg("\n---------\n");
+printf("\n---------\n");
+	dumpDefineDicts();
 }
 }
 void preFreeScanner()
 {

changeset 1	82f11024044a
parent 0	42188c7ea2d9