Changeset 44842 in vbox for trunk/src/VBox/Storage/testcase

Timestamp:

Feb 27, 2013 12:40:44 PM (12 years ago)

Author:

vboxsync

Message:

Storage/testcase: Script engine updates

Location:

trunk/src/VBox/Storage/testcase

Files:

• VDScript.cpp (modified) (39 diffs)
• VDScriptChecker.cpp (added)
• VDScriptInternal.h (added)
• VDScriptInterp.cpp (added)

trunk/src/VBox/Storage/testcase/VDScript.cpp

@@ -51 +51 @@
 #include <VBox/log.h>
 
-#include "VDScript.h"
 #include "VDScriptAst.h"
+#include "VDScriptInternal.h"
 
 /**
@@ -181 +181 @@
     PVDSCRIPTTOKEN pTokenNext;
 } VDTOKENIZER;
-/** Pointer to a tokenize state. */
-typedef struct VDTOKENIZER *PVDTOKENIZER;
 
 /**
@@ -220 +218 @@
 } VDSCRIPTFN;
 typedef VDSCRIPTFN *PVDSCRIPTFN;
-
-/**
- * Script context.
- */
-typedef struct VDSCRIPTCTXINT
-{
-    /** String space of external registered and source defined functions. */
-    RTSTRSPACE        hStrSpaceFn;
-    /** List of ASTs for functions - VDSCRIPTASTFN. */
-    RTLISTANCHOR      ListAst;
-    /** Pointer to the current tokenizer state. */
-    PVDTOKENIZER      pTokenizer;
-} VDSCRIPTCTXINT;
-/** Pointer to a script context. */
-typedef VDSCRIPTCTXINT *PVDSCRIPTCTXINT;
 
 /**
@@ -512 +495 @@
         ch = vdScriptTokenizerGetCh(pTokenizer);
     }
-    while (RT_C_IS_ALNUM(ch));
+    while (RT_C_IS_ALNUM(ch) || ch == '_');
 
     /* Check whether we got an identifier or an reserved keyword. */
@@ -950 +933 @@
     int rc = VINF_SUCCESS;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     if (vdScriptTokenizerSkipIfIsPunctuatorEqual(pThis->pTokenizer, '('))
     {
@@ -1001 +986 @@
     }
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1016 +1002 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseAssignmentExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1033 +1021 @@
     }
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1054 +1043 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParsePrimaryExpression(pThis, &pExpr);
@@ -1113 +1104 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1139 +1132 @@
     PVDSCRIPTASTEXPR pExprTop = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     while (true)
     {
+        bool fQuit = false;
         PVDSCRIPTASTEXPR pExprNew = NULL;
 
@@ -1195 +1191 @@
             /* Must be a postfix expression. */
             rc = vdScriptParsePostfixExpression(pThis, &pExprNew);
+            fQuit = true;
         }
 
@@ -1209 +1206 @@
                 pExpr = pExprNew;
             }
+            if (fQuit)
+                break;
         }
         else
@@ -1219 +1218 @@
         vdScriptAstNodeFree(&pExprTop->Core);
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1241 +1241 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseUnaryExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1286 +1288 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1307 +1311 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseMultiplicativeExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1344 +1350 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1365 +1373 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseAdditiveExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1402 +1412 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1425 +1437 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseShiftExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1478 +1492 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1499 +1515 @@
     PVDSCRIPTASTEXPR pExpr = NULL;
 
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
+
     rc = vdScriptParseRelationalExpression(pThis, &pExpr);
     if (RT_SUCCESS(rc))
@@ -1536 +1554 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1555 +1575 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseEqualityExpression(pThis, &pExpr);
@@ -1582 +1604 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1601 +1625 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseBitwiseAndExpression(pThis, &pExpr);
@@ -1628 +1654 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1647 +1675 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseBitwiseXorExpression(pThis, &pExpr);
@@ -1674 +1704 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1693 +1725 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseBitwiseOrExpression(pThis, &pExpr);
@@ -1720 +1754 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1739 +1775 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseLogicalAndExpression(pThis, &pExpr);
@@ -1766 +1804 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1800 +1840 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pExpr;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseLogicalOrExpression(pThis, &pExpr);
@@ -1910 +1952 @@
             vdScriptAstNodeFree(&pExpr->Core);
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -1929 +1973 @@
     int rc = VINF_SUCCESS;
     PVDSCRIPTASTEXPR pAssignExpr = NULL;
+
+    LogFlowFunc(("pThis=%p ppAstNodeExpr=%p\n"));
 
     rc = vdScriptParseAssignmentExpression(pThis, &pAssignExpr);
@@ -1959 +2005 @@
         *ppAstNodeExpr = pAssignExpr;
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -2434 +2481 @@
                     pAstNodeFn->pFnIde   = pFnIde;
                     pAstNodeFn->pRetType = pRetType;
+                    RTListInit(&pAstNodeFn->ListArgs);
 
                     pFnIde = NULL;