Changeset 2022 in kBuild for trunk

Timestamp:

Nov 2, 2008 2:15:00 AM (16 years ago)

Author:

bird

Message:

exprval.c: fixed bug parsing unqoted variable references ($(VAR) == $(VAR)). Converted ifcond testcases to the GNU Make tests and supplemented it with tests for this bug.

Location:

trunk/src/kmk

Files:

• expreval.c (modified) (3 diffs)
• testcase-ifcond.kmk (deleted)
• tests/scripts/features/ifcond (added)
• tests/scripts/functions/expr (added)
• tests/scripts/functions/if-expr (added)

trunk/src/kmk/expreval.c

@@ -1882 +1882 @@
             int     iPar = -1;
             char    chEndPar = '\0';
-            char    ch;
+            char    ch, ch2;
 
             pszStart = psz;
@@ -1889 +1889 @@
                 /* $(adsf) or ${asdf} needs special handling. */
                 if (    ch == '$'
-                    &&  (   psz[1] == '('
-                         || psz[1] == '{'))
+                    &&  (   (ch2 = psz[1]) == '('
+                         || ch2 == '{'))
                 {
                     psz++;
@@ -1899 +1899 @@
                         break;
                     }
-                    achPars[++iPar] = chEndPar = ch == '(' ? ')' : '}';
+                    achPars[++iPar] = chEndPar = ch2 == '(' ? ')' : '}';
                 }
                 else if (ch == chEndPar)