Changeset 93178 in vbox for trunk

Timestamp:

Jan 11, 2022 8:28:01 AM (3 years ago)

Author:

vboxsync

Message:

iprt/RTExprEval: Only expand ${VAR}, drop $(VAR). Simplifies the code. bugref:9781

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/expreval.cpp (modified) (11 diffs)
• testcase/tstRTExprEval.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/expreval.cpp

@@ -563 +563 @@
 
 /**
- * Finds the end of the current variable expansion, taking nested expansoins
+ * Finds the end of the current variable expansion, taking nested expansion
  * into account.
  *
@@ -575 +575 @@
  * @param   pfNested    Where to return whether it's a nested (@c true) or plain
  *                      one.
- *
- * @note    This code would be somewhat simpler if we only used one style of
- *          wrappers (either parentheses or curly brackets).
- */
-DECL_NO_INLINE(static, EXPRRET) expr_expand_find_end(PEXPR pThis, const char *pchSrc, size_t cchSrc,
-                                                     size_t *pcchVarRef, bool *pfNested)
+ */
+static EXPRRET expr_expand_find_end(PEXPR pThis, const char *pchSrc, size_t cchSrc, size_t *pcchVarRef, bool *pfNested)
 {
     const char * const  pchStart = pchSrc;
-    char                achPars[EXPR_MAX_VAR_RECURSION];
 
     /*
@@ -590 +585 @@
     Assert(cchSrc >= 2);
     Assert(pchSrc[0] == '$');
-    Assert(pchSrc[1] == '(' || pchSrc[1] == '}');
-    unsigned            cPars    = 1;
-    char                chEndPar = pchSrc[1] == '(' ? ')' : '}';
-    achPars[0] = chEndPar;
+    Assert(pchSrc[1] == '{');
+    unsigned            cPars = 1;
     pchSrc += 2;
     cchSrc -= 2;
@@ -603 +596 @@
     while (cchSrc > 0)
     {
-        char       ch2;
         char const ch = *pchSrc;
         if (   ch == '$'
             && cchSrc >= 2
-            && (   (ch2 = pchSrc[1]) == '('
-                || ch2 == '{'))
-        {
-            if (cPars < RT_ELEMENTS(achPars))
-                achPars[cPars++] = chEndPar = ch2 == '(' ? ')' : '}';
+            && pchSrc[1] == '{')
+        {
+            if (cPars < EXPR_MAX_VAR_RECURSION)
+                cPars++;
             else
             {
@@ -625 +616 @@
             pchSrc += 1;
             cchSrc -= 1;
-            if (ch == chEndPar)
-            {
+            if (ch == '}')
                 if (--cPars == 0)
                 {
@@ -632 +622 @@
                     return kExprRet_Ok;
                 }
-                chEndPar = achPars[cPars];
-            }
-            Assert(chEndPar != '\0');
         }
     }
@@ -651 +638 @@
  * @param   cchSrc      The length of the string to expand.
  * @param   cDepth      The recursion depth, starting at zero.
- *
- * @note    This code would be somewhat simpler if we only used one style of
- *          wrappers (either parentheses or curly brackets).
  */
 static char *expr_expand_string(PEXPR pThis, const char *pchSrc, size_t cchSrc, unsigned cDepth)
@@ -675 +659 @@
                 if (pchDollar)
                 {
-                    /* Treat lone $ w/o a following ( or { as plain text. */
+                    /* Treat lone $ w/o a following { as plain text. */
                     if (   cchPlain + 1 >= cchSrc
                         && pchDollar[0] == '$'
                         && (   cchPlain + 1 == cchSrc
-                            || (pchDollar[1] != '{' && pchDollar[1] != '(')) )
+                            || pchDollar[1] != '{') )
                     {
                         cchPlain  += 1;
@@ -723 +707 @@
                         break;
 
-                    /* If we don't have ${ or $( loop, just loop. */
+                    /* If we don't have ${, just loop. */
                     if (   cchSrc < 2
                         || pchSrc[0] != '$'
-                        || (pchSrc[1] != '{' && pchSrc[1] != '('))
+                        || pchSrc[1] != '{')
                         continue;
                 }
@@ -734 +718 @@
                  * finding the end of it and recursively dealing with any sub-expansions first.
                  */
-                Assert(pchSrc[0] == '$' && (pchSrc[1] == '{' || pchSrc[1] == '('));
+                Assert(pchSrc[0] == '$' && pchSrc[1] == '{');
                 size_t cchVarRef;
                 bool   fNested;
@@ -2379 +2363 @@
         else
         {
-            char    achPars[EXPR_MAX_VAR_RECURSION];
-            int     iPar = -1;
-            char    chEndPar = '\0';
-
+            unsigned cPars = 0;
             pszStart = psz;
             while ((ch = *psz) != '\0')
             {
-                char ch2;
-
-                /* $(adsf) or ${asdf} needs special handling. */
-                if (    ch == '$'
-                    &&  (   (ch2 = psz[1]) == '('
-                         || ch2 == '{'))
+                /* ${asdf} needs special handling. */
+                if (   ch == '$'
+                    && psz[1] == '{')
                 {
                     psz++;
-                    if (iPar > (int)(sizeof(achPars) / sizeof(achPars[0])))
+                    if (cPars < EXPR_MAX_VAR_RECURSION)
+                        ++cPars;
+                    else
                     {
                         rc = expr_error(pThis, "Too deep nesting of variable expansions");
                         break;
                     }
-                    achPars[++iPar] = chEndPar = ch2 == '(' ? ')' : '}';
                 }
-                else if (ch == chEndPar)
+                else if (ch == '}')
                 {
-                    iPar--;
-                    chEndPar = iPar >= 0 ? achPars[iPar] : '\0';
+                    if (cPars > 0)
+                        cPars--;
                 }
-                else if (!chEndPar)
+                else if (cPars == 0)
                 {
                     uchVal = expr_map_get(ch);

trunk/src/VBox/Runtime/testcase/tstRTExprEval.cpp

@@ -133 +133 @@
     CHECK_iResult(INT64_MAX);
     g_fQueryVariableExpected = true;
-    RTTESTI_CHECK_RC(RTExprEvalToInteger(hExprEval, RT_STR_TUPLE("$(MYVAR1) + 0"), &iResult, NULL), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTExprEvalToInteger(hExprEval, RT_STR_TUPLE("${MYVAR1} + 0"), &iResult, NULL), VINF_SUCCESS);
     CHECK_iResult(42);
-    RTTESTI_CHECK_RC(RTExprEvalToInteger(hExprEval, RT_STR_TUPLE("$($(MYNESTED1)) + 2"), &iResult, NULL), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTExprEvalToInteger(hExprEval, RT_STR_TUPLE("${${MYNESTED1}} + 2"), &iResult, NULL), VINF_SUCCESS);
     CHECK_iResult(44);
     g_fQueryVariableExpected = false;
@@ -173 +173 @@
 }
 
-