Changeset 41559 in vbox for trunk

Timestamp:

Jun 4, 2012 12:57:02 AM (13 years ago)

Author:

vboxsync

Message:

DBGC: More parser fixes, added comma (,) as a argument separator (in addition to space and tab). Not entirely perfect yet for trailing, but who cares.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Debugger/DBGCEval.cpp (modified) (10 diffs)
• src/VBox/Debugger/testcase/tstDBGCParser.cpp (modified) (3 diffs)

trunk/include/VBox/err.h

@@ -2122 +2122 @@
 /** Syntax error - too many arguments for static storage. */
 #define VERR_DBGC_PARSE_ARGUMENT_OVERFLOW           (VERR_DBGC_PARSE_LOWEST + 2)
+/** Syntax error - expected binary operator. */
+#define VERR_DBGC_PARSE_EXPECTED_BINARY_OP          (VERR_DBGC_PARSE_LOWEST + 3)
 
 /** Syntax error - the argument does not allow a range to be specified. */

trunk/src/VBox/Debugger/DBGCEval.cpp

@@ -549 +549 @@
     unsigned    cBinaryOps  = 0;
     unsigned    cPar        = 0;
+    unsigned    cchWord     = 0;
     char        chQuote     = '\0';
     char        chPrev      = ' ';
@@ -557 +558 @@
     while ((ch = *psz) != '\0')
     {
-        //Log2(("ch=%c cPar=%d fBinary=%d\n", ch, cPar, fBinary));
         /*
          * String quoting.
@@ -563 +563 @@
         if (chQuote)
         {
-            if (   ch == chQuote
-                && psz[1] != chQuote)
-            {
-                chQuote = '\0';
-                fBinary = true;
-            }
+            if (ch == chQuote)
+            {
+                if (psz[1] == chQuote)
+                {
+                    psz++;              /* escaped quote */
+                    cchWord++;
+                }
+                else
+                {
+                    chQuote = '\0';
+                    fBinary = true;
+                    cchWord = 0;
+                }
+            }
+            else
+                cchWord++;
         }
         else if (ch == '"' || ch == '\'')
+        {
+            if (fBinary || cchWord)
+                return VERR_DBGC_PARSE_EXPECTED_BINARY_OP;
             chQuote = ch;
+        }
         /*
          * Parentheses.
@@ -577 +591 @@
         else if (ch == '(')
         {
+            if (!cPar && (fBinary || cchWord)) /** @todo function call */
+                return VERR_DBGC_PARSE_EXPECTED_BINARY_OP;
             cPar++;
             fBinary = false;
+            cchWord = 0;
         }
         else if (ch == ')')
@@ -586 +603 @@
             cPar--;
             fBinary = true;
+            cchWord = 0;
         }
         /*
@@ -622 +640 @@
                 psz += pOp->cchName - 1;
                 fBinary = false;
-            }
+                cchWord = 0;
+            }
+            else if (fBinary && !cchWord)
+                return VERR_DBGC_PARSE_EXPECTED_BINARY_OP;
             else
+            {
                 fBinary = true;
-        }
+                cchWord++;
+            }
+        }
+        else if (cPar == 0 && RT_C_IS_BLANK(ch))
+            cchWord++;
 
         /* next */
@@ -974 +1000 @@
 
         /*
-         * Find the end of the argument.
+         * Find the end of the argument.  This is just rough splitting,
+         * dbgcEvalSub will do stricter syntax checking later on.
          */
         int     cPar    = 0;
@@ -1000 +1027 @@
              * We use the REXX way of escaping the quotation char, i.e. double occurrence.
              */
-            else if (ch == '\'' || ch == '"')
-            {
-                if (chQuote)
+            else if (chQuote)
+            {
+                if (ch == chQuote)
                 {
-                    /* end quote? */
-                    if (ch == chQuote)
+                    if (psz[1] == chQuote)
+                        psz++;          /* skip the escaped quote char */
+                    else
                     {
-                        if (psz[1] == ch)
-                            psz++;          /* skip the escaped quote char */
-                        else
-                            chQuote = '\0'; /* end of quoted string. */
+                        chQuote = '\0'; /* end of quoted string. */
+                        fBinary = true;
                     }
                 }
-                else
-                    chQuote = ch;           /* open new quote */
+            }
+            else if (ch == '\'' || ch == '"')
+            {
+                if (fBinary)
+                    return VERR_DBGC_PARSE_EXPECTED_BINARY_OP;
+                chQuote = ch;
             }
             /*
              * Parenthesis can of course be nested.
              */
-            else if (!chQuote && ch == '(')
-            {
+            else if (ch == '(')
+            {
+                if (!cPar && fBinary)
+                    return VERR_DBGC_PARSE_EXPECTED_BINARY_OP;
                 cPar++;
                 fBinary = false;
             }
-            else if (!chQuote && ch == ')')
+            else if (ch == ')')
             {
                 if (!cPar)
@@ -1031 +1063 @@
                 fBinary = true;
             }
-            else if (!chQuote && !cPar)
+            else if (!cPar)
             {
                 /*
-                 * Encountering blanks may mean the end of it all. A binary operator
-                 * will force continued parsing.
+                 * Encountering a comma is a definite end of parameter.
                  */
-                if (RT_C_IS_BLANK(*psz))
+                if (ch == ',')
                 {
-                    pszEnd = psz++;         /* just in case. */
+                    pszEnd = psz++;
+                    break;
+                }
+
+                /*
+                 * Encountering blanks may mean the end of it all.  A binary
+                 * operator will force continued parsing.
+                 */
+                if (RT_C_IS_BLANK(ch))
+                {
+                    pszEnd = psz++;         /* in case it's the end. */
                     while (RT_C_IS_BLANK(*psz))
                         psz++;
+
+                    if (*psz == ',')
+                    {
+                        psz++;
+                        break;
+                    }
+
                     PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, fBinary, ' ');
                     if (!pOp || pOp->fBinary != fBinary)
                         break;              /* the end. */
+
                     psz += pOp->cchName;
                     while (RT_C_IS_BLANK(*psz))   /* skip blanks so we don't get here again */
@@ -1055 +1104 @@
                  * Look for operators without a space up front.
                  */
-                if (dbgcIsOpChar(*psz))
+                if (dbgcIsOpChar(ch))
                 {
                     PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, fBinary, ' ');

trunk/src/VBox/Debugger/testcase/tstDBGCParser.cpp

@@ -861 +861 @@
     tstTry(pDbgc, "cpu @eax\n", VINF_SUCCESS);
     tstTry(pDbgc, "cpu %bad:bad\n", VERR_DBGC_PARSE_CONVERSION_FAILED);
+    tstTry(pDbgc, "cpu '1'\n", VERR_DBGC_PARSE_INVALID_NUMBER);
 }
 
@@ -872 +873 @@
 
     /* The idea here is that since the prefered input is a string, we
-       definitely won't be mistaking number like beginnings as numbers. */
+       definitely won't be confused by the number like beginning. */
     tstTryEx(pDbgc, "echo 1234567890abcdefghijklmn\n", VINF_SUCCESS, false, "1234567890abcdefghijklmn", -1);
 
@@ -1127 +1128 @@
     tstTry(pDbgc, "format \n", VERR_DBGC_PARSE_TOO_FEW_ARGUMENTS);
     tstTry(pDbgc, "format 0 1 23 4\n", VERR_DBGC_PARSE_TOO_MANY_ARGUMENTS);
+    tstTry(pDbgc, "format 'x'\n", VINF_SUCCESS);
+    tstTry(pDbgc, "format 'x' 'x'\n", VERR_DBGC_PARSE_TOO_MANY_ARGUMENTS);
+    tstTry(pDbgc, "format 'x''x'\n", VINF_SUCCESS);
+    tstTry(pDbgc, "format 'x'\"x\"\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP);
+    tstTry(pDbgc, "format 'x'1\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP);
+    tstTry(pDbgc, "format (1)1\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP);
+    tstTry(pDbgc, "format (1)(1)\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP);
+    tstTry(pDbgc, "format (1)''\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP);
+    tstTry(pDbgc, "format foo(1)\n", VERR_DBGC_PARSE_EXPECTED_BINARY_OP); /** @todo VERR_DBGC_PARSE_FUNCTION_NOT_FOUND */
     tstTry(pDbgc, "sa 3 23 4 'q' \"21123123\" 'b' \n", VINF_SUCCESS);
+    tstTry(pDbgc, "sa 3,23, 4,'q' ,\"21123123\" , 'b' \n", VINF_SUCCESS);
 }