Changeset 40555 in vbox

Timestamp:

Mar 20, 2012 6:21:37 PM (13 years ago)

Author:

vboxsync

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

76948

Message:

a bit more.

File:

• trunk/src/bldprogs/VBoxTpG.cpp (modified) (4 diffs)

trunk/src/bldprogs/VBoxTpG.cpp

@@ -318 +318 @@
 }
 
+
+/**
+ * Parser error with line and position.
+ *
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pStrm               The stream.
+ * @param   cb                  The offset from the current position to the
+ *                              point of failure.
+ * @param   pszMsg              The message to display.
+ */
+static RTEXITCODE parseErrorAbs(PSCMSTREAM pStrm, size_t off, const char *pszMsg)
+{
+    ScmStreamSeekAbsolute(pStrm, off);
+    return parseError(pStrm, 0, pszMsg);
+}
+
 /**
  * Handles a C++ one line comment.
@@ -390 +406 @@
 
 
+/**
+ * Skips spaces and comments, returning the next character.
+ *
+ * @returns Next non-space-non-comment character. ~(unsigned)0 on EOF or
+ *          failure.
+ * @param   pStrm               The stream.
+ */
+static unsigned parseGetNextNonSpaceNonCommentCh(PSCMSTREAM pStrm)
+{
+    unsigned ch;
+    while ((ch = ScmStreamGetCh(pStrm)) != ~(unsigned)0)
+    {
+        if (!RT_C_IS_SPACE(ch) && ch != '/')
+            return ch;
+        if (ch == '/')
+        {
+            ch = ScmStreamGetCh(pStrm);
+            RTEXITCODE rcExit;
+            if (ch == '*')
+                rcExit = parseMultiLineComment(pStrm);
+            else if (ch == '/')
+                rcExit = parseOneLineComment(pStrm);
+            else
+                rcExit = parseError(pStrm, 2, "Unexpected character");
+            if (rcExit != RTEXITCODE_SUCCESS)
+                return ~(unsigned)0;
+        }
+    }
+
+    parseError(pStrm, 0, "Unexpected end of file");
+    return ~(unsigned)0;
+}
+
+
 
 static RTEXITCODE parseProvider(PSCMSTREAM pStrm)
@@ -406 +456 @@
         return parseError(pStrm, 1, "A provider name cannot end with digit");
 
-    rcExit = parseSkipSpacesAndComments(pStrm);
-    if (rcExit != RTEXITCODE_SUCCESS)
-        return parseError(pStrm, 1, "Expected a provider name starting with an alphabetical character");
-    unsigned ch = ScmStreamGetCh(pStrm);
+    unsigned ch = parseGetNextNonSpaceNonCommentCh(pStrm);
     if (ch != '{')
         return parseError(pStrm, 1, "Expected '{' after the provider name");
@@ -421 +468 @@
     RTListAppend(&g_ProviderHead, &pProv->ListEntry);
     pProv->pszName = RTStrCacheEnterN(g_hStrCache, pszName, cchName);
-    if (pProv->pszName)
+    if (!pProv->pszName)
         return parseError(pStrm, 0, "Out of memory");
 
     /*
-     * Next up is a brace
+     * Parse loop.
      */
-
-
-    return parseError(pStrm, 0, "'provider' not implemented");
+    for (;;)
+    {
+        ch = parseGetNextNonSpaceNonCommentCh(pStrm);
+        switch (ch)
+        {
+            case 'p':
+                if (ScmStreamCMatchingWordM1(pStrm, RT_STR_TUPLE("probe")))
+                    return parseError(pStrm, 5, "probe parsing not implemented");
+                else
+                    return parseError(pStrm, 1, "Unexpected character");
+                break;
+
+            case '}':
+            {
+                size_t off = ScmStreamTell(pStrm);
+                ch = parseGetNextNonSpaceNonCommentCh(pStrm);
+                if (ch != ';')
+                    return parseErrorAbs(pStrm, off, "Expected ';'");
+                return RTEXITCODE_SUCCESS;
+            }
+
+            case ~(unsigned)0:
+                return parseError(pStrm, 0, "Missing closing '}' on provider");
+
+            default:
+                return parseError(pStrm, 1, "Unexpected character");
+        }
+    }
 }