Changeset 41301 in vbox for trunk/src/bldprogs

Timestamp:

May 15, 2012 10:01:07 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77970

Message:

recursive expansion needs to be prevent in a different way.

File:

• trunk/src/bldprogs/VBoxCPP.cpp (modified) (8 diffs)

trunk/src/bldprogs/VBoxCPP.cpp

@@ -111 +111 @@
     /** The string space core. */
     RTSTRSPACECORE      Core;
+#if 0
     /** For linking macros that have the fExpanding flag set. */
     struct VBCPPMACRO  *pUpExpanding;
+#endif
     /** Whether it's a function. */
     bool                fFunction;
@@ -144 +146 @@
     /** The expansion buffer. */
     VBCPPSTRBUF     StrBuf;
+#if 0
     /** List of expanding macros (Stack). */
     PVBCPPMACRO     pMacroStack;
+#endif
     /** The input stream (in case we want to look for parameter lists). */
     PSCMSTREAM      pStrmInput;
@@ -1564 +1568 @@
          */
         VBCPPMACROEXP ExpCtx;
+#if 0
         ExpCtx.pMacroStack    = NULL;
+#endif
         ExpCtx.pStrmInput     = pStrmInput;
         ExpCtx.papszArgs      = NULL;
@@ -2239 +2245 @@
     if (rcExit == RTEXITCODE_SUCCESS)
     {
+#if 0 /* wrong */
         /*
          * Push the macro onto the stack.
@@ -2245 +2252 @@
         pMacro->pUpExpanding = pExp->pMacroStack;
         pExp->pMacroStack    = pMacro;
+#endif
     }
 
@@ -2471 +2479 @@
 static void vbcppMacroExpandCleanup(PVBCPPMACROEXP pExp)
 {
+#if 0
     while (pExp->pMacroStack)
     {
@@ -2479 +2488 @@
         pMacro->pUpExpanding = NULL;
     }
+#endif
 
     while (pExp->cArgs > 0)
@@ -4452 +4462 @@
     size_t              offComment;
     VBCPPMACROEXP       ExpCtx;
+#if 0
     ExpCtx.pMacroStack    = NULL;
+#endif
     ExpCtx.pStrmInput     = NULL;
     ExpCtx.papszArgs      = NULL;