Changeset 41195 in vbox

Timestamp:

May 8, 2012 12:51:07 AM (13 years ago)

Author:

vboxsync

Message:

Working on parsing defines.

Location:

trunk/src/bldprogs

Files:

• VBoxCPP.cpp (modified) (14 diffs)
• scmstream.cpp (modified) (2 diffs)

trunk/src/bldprogs/VBoxCPP.cpp

@@ -93 +93 @@
     /** Variable argument count. */
     bool                fVarArg;
+    /** Set if originating on the command line. */
+    bool                fCmdLine;
     /** The number of known arguments.*/
     uint32_t            cArgs;
@@ -534 +536 @@
  * @param   pszValue            The value.
  * @param   cchDefine           The length of the value.
+ * @param   fCmdLine            Set if originating on the command line.
  */
 static RTEXITCODE vbcppDefineAddFn(PVBCPP pThis, const char *pszDefine, size_t cchDefine,
                                    const char *pszParams, size_t cchParams,
-                                   const char *pszValue, size_t cchValue)
+                                   const char *pszValue, size_t cchValue,
+                                   bool fCmdLine)
 
 {
@@ -598 +602 @@
     pDef->fFunction = true;
     pDef->fVarArg   = false;
+    pDef->fCmdLine  = fCmdLine;
     pDef->cArgs     = cArgs;
     pDef->papszArgs = (const char **)((uintptr_t)pDef + cbDef - sizeof(const char *) * cArgs);
@@ -651 +656 @@
  * @param   pszValue            The value.
  * @param   cchDefine           The length of the value. RTSTR_MAX is ok.
+ * @param   fCmdLine            Set if originating on the command line.
  */
 static RTEXITCODE vbcppDefineAdd(PVBCPP pThis, const char *pszDefine, size_t cchDefine,
-                                 const char *pszValue, size_t cchValue)
+                                 const char *pszValue, size_t cchValue, bool fCmdLine)
 {
     /*
@@ -688 +694 @@
         pszParams++;
         cchParams -= 2;
-        return vbcppDefineAddFn(pThis, pszDefine, cchDefine, pszParams, cchParams, pszValue, cchValue);
+        return vbcppDefineAddFn(pThis, pszDefine, cchDefine, pszParams, cchParams, pszValue, cchValue, fCmdLine);
     }
 
@@ -706 +712 @@
     pDef->fFunction = false;
     pDef->fVarArg   = false;
+    pDef->fCmdLine  = fCmdLine;
     pDef->cArgs     = 0;
     pDef->papszArgs = NULL;
@@ -817 +824 @@
                 const char *pszEqual = strchr(ValueUnion.psz, '=');
                 if (pszEqual)
-                    rcExit = vbcppDefineAdd(pThis, ValueUnion.psz, pszEqual - ValueUnion.psz, pszEqual + 1, RTSTR_MAX);
+                    rcExit = vbcppDefineAdd(pThis, ValueUnion.psz, pszEqual - ValueUnion.psz, pszEqual + 1, RTSTR_MAX, true);
                 else
-                    rcExit = vbcppDefineAdd(pThis, ValueUnion.psz, RTSTR_MAX, "1", 1);
+                    rcExit = vbcppDefineAdd(pThis, ValueUnion.psz, RTSTR_MAX, "1", 1, true);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -938 +945 @@
 
 
-static RTEXITCODE vbcppOutputComment(PVBCPP pThis, PSCMSTREAM pStrmInput, size_t offStart, size_t cchOutputted)
+static RTEXITCODE vbcppOutputComment(PVBCPP pThis, PSCMSTREAM pStrmInput, size_t offStart, size_t cchOutputted,
+                                     size_t cchMinIndent)
 {
     size_t offCur = ScmStreamTell(pStrmInput);
@@ -1360 +1368 @@
                 /* Pretty print the passthru. */
                 unsigned cchIndent = pThis->pCondStack ? pThis->pCondStack->iKeepLevel : 0;
-                size_t cch;
+                size_t   cch;
                 if (chType == '<')
                     cch = ScmStreamPrintf(&pThis->StrmOutput, "#%*sinclude <%.*s>",
@@ -1371 +1379 @@
                                           cchIndent, "", cchFileSpec, pchFileSpec);
                 if (cch > 0)
-                    rcExit = vbcppOutputComment(pThis, pStrmInput, offIncEnd, cch);
+                    rcExit = vbcppOutputComment(pThis, pStrmInput, offIncEnd, cch, 1);
                 else
                     rcExit = vbcppError(pThis, "Output error %Rrc", (int)cch);
@@ -1394 +1402 @@
 static RTEXITCODE vbcppProcessDefine(PVBCPP pThis, PSCMSTREAM pStrmInput, size_t offStart)
 {
-    return vbcppError(pThis, "Not implemented %s", __FUNCTION__);
+    /*
+     * Parse it.
+     */
+    RTEXITCODE rcExit = vbcppProcessSkipWhiteEscapedEolAndComments(pThis, pStrmInput);
+    if (rcExit == RTEXITCODE_SUCCESS)
+    {
+        size_t      cchDefine;
+        const char *pchDefine = ScmStreamCGetWord(pStrmInput, &cchDefine);
+        if (pchDefine)
+        {
+            /* If it's a function style define, parse out the parameter list. */
+            size_t      cchParams = 0;
+            const char *pchParams = NULL;
+            unsigned    ch = ScmStreamPeekCh(pStrmInput);
+            if (ch == '(')
+            {
+                ScmStreamGetCh(pStrmInput);
+                pchParams = ScmStreamGetCur(pStrmInput);
+
+                unsigned chPrev = ch;
+                while ((ch = ScmStreamPeekCh(pStrmInput)) != ~(unsigned)0)
+                {
+                    if (ch == '\r' || ch == '\n')
+                    {
+                        if (chPrev != '\\')
+                        {
+                            rcExit = vbcppError(pThis, "Missing ')'");
+                            break;
+                        }
+                        ScmStreamSeekByLine(pStrmInput, ScmStreamTellLine(pStrmInput) + 1);
+                    }
+                    if (ch == ')')
+                    {
+                        cchParams = ScmStreamGetCur(pStrmInput) - pchParams;
+                        ScmStreamGetCh(pStrmInput);
+                        break;
+                    }
+                    ScmStreamGetCh(pStrmInput);
+                }
+            }
+            /* The simple kind. */
+            else if (!RT_C_IS_SPACE(ch) && ch != ~(unsigned)0)
+                rcExit = vbcppError(pThis, "Expected whitespace after macro name");
+
+            /* Parse out the value. */
+            if (rcExit == RTEXITCODE_SUCCESS)
+                rcExit = vbcppProcessSkipWhiteEscapedEolAndComments(pThis, pStrmInput);
+            if (rcExit == RTEXITCODE_SUCCESS)
+            {
+                size_t      offValue = ScmStreamTell(pStrmInput);
+                const char *pchValue = ScmStreamGetCur(pStrmInput);
+                unsigned    chPrev = ch;
+                while ((ch = ScmStreamPeekCh(pStrmInput)) != ~(unsigned)0)
+                {
+                    if (ch == '\r' || ch == '\n')
+                    {
+                        if (chPrev != '\\')
+                            break;
+                        ScmStreamSeekByLine(pStrmInput, ScmStreamTellLine(pStrmInput) + 1);
+                    }
+                    ScmStreamGetCh(pStrmInput);
+                }
+                size_t cchValue = ScmStreamGetCur(pStrmInput) - pchValue;
+
+                /*
+                 * Execute.
+                 */
+                if (pchParams)
+                    rcExit = vbcppDefineAddFn(pThis, pchDefine, cchDefine, pchParams, cchParams, pchValue, cchValue, false);
+                else
+                    rcExit = vbcppDefineAdd(pThis, pchDefine, cchDefine, pchValue, cchValue, false);
+
+                /*
+                 * Pass thru?
+                 */
+                if (   pThis->enmMode >= kVBCppMode_Selective
+                    && pThis->enmMode != kVBCppMode_SelectiveD
+                    && rcExit == RTEXITCODE_SUCCESS)
+                {
+                    unsigned cchIndent = pThis->pCondStack ? pThis->pCondStack->iKeepLevel : 0;
+                    size_t   cch;
+                    if (pchParams)
+                        cch = ScmStreamPrintf(&pThis->StrmOutput, "#%*sdefine %.*s(%.*s)",
+                                              cchIndent, "", cchDefine, pchDefine, cchParams, pchParams);
+                    else
+                        cch = ScmStreamPrintf(&pThis->StrmOutput, "#%*sdefine %.*s",
+                                              cchIndent, "", cchDefine, pchDefine);
+                    if (cch > 0)
+                        vbcppOutputComment(pThis, pStrmInput, offValue, cch, 1);
+                    else
+                        rcExit = vbcppError(pThis, "output error");
+                }
+            }
+
+        }
+    }
+    return rcExit;
 }
 
@@ -1576 +1680 @@
         }
         else
-            rcExit = vbcppError(pThis, "Malformed #ifdef");
+            rcExit = vbcppError(pThis, "Malformed #ifndef");
     }
     return rcExit;
@@ -1628 +1732 @@
                     ssize_t cch = ScmStreamPrintf(&pThis->StrmOutput, "#%*selse", pCond->iKeepLevel - 1, "");
                     if (cch > 0)
-                        rcExit = vbcppOutputComment(pThis, pStrmInput, offStart, cch);
+                        rcExit = vbcppOutputComment(pThis, pStrmInput, offStart, cch, 2);
                     else
                         rcExit = vbcppError(pThis, "Output error %Rrc", (int)cch);
@@ -1678 +1782 @@
                 ssize_t cch = ScmStreamPrintf(&pThis->StrmOutput, "#%*sendif", pCond->iKeepLevel - 1, "");
                 if (cch > 0)
-                    rcExit = vbcppOutputComment(pThis, pStrmInput, offStart, cch);
+                    rcExit = vbcppOutputComment(pThis, pStrmInput, offStart, cch, 1);
                 else
                     rcExit = vbcppError(pThis, "Output error %Rrc", (int)cch);

trunk/src/bldprogs/scmstream.cpp

@@ -1286 +1286 @@
 
     /* Is it a leading C character. */
-    if (!RT_C_IS_ALPHA(*psz) && *psz == '_')
+    if (!RT_C_IS_ALPHA(*psz) && *psz != '_')
         return NULL;
 
@@ -1325 +1325 @@
 
     /* Is it a leading C character. */
-    if (!RT_C_IS_ALPHA(*psz) && *psz == '_')
+    if (!RT_C_IS_ALPHA(*psz) && *psz != '_')
         return NULL;