Changeset 1728 for trunk/src/kmk/expreval.c

Timestamp:

Sep 5, 2008, 5:27:06 AM (17 years ago)

Author:

bird

Message:

kmk/expreval/ifcond: fixed the target operator and string parsing; wrote the remaining tests

File:

• trunk/src/kmk/expreval.c (modified) (3 diffs)

trunk/src/kmk/expreval.c

@@ -903 +903 @@
             pFile = NULL;
     }
-    if (pFile)
+    if (!pFile)
 #endif
     {
@@ -1828 +1828 @@
          * push it onto the stack.
          */
-        const char *pszStart = psz;
+        const char *pszStart;
 
         rc = kExprRet_Ok;
         if (*psz == '"')
         {
-            pszStart++;
+            pszStart = ++psz;
             while (*psz && *psz != '"')
                 psz++;
             expr_var_init_substring(&pThis->aVars[++pThis->iVar], pszStart, psz - pszStart, kExprVar_QuotedString);
+            if (*psz)
+                psz++;
         }
         else if (*psz == '\'')
         {
-            pszStart++;
+            pszStart = ++psz;
             while (*psz && *psz != '\'')
                 psz++;
             expr_var_init_substring(&pThis->aVars[++pThis->iVar], pszStart, psz - pszStart, kExprVar_QuotedSimpleString);
+            if (*psz)
+                psz++;
         }
         else
@@ -1852 +1856 @@
             char    ch;
 
+            pszStart = psz;
             while ((ch = *psz) != '\0')
             {