Changeset 1739 in kBuild for trunk

Timestamp:

Sep 5, 2008 5:06:31 AM (16 years ago)

Author:

bird

Message:

kmk_expr: Fixed regex disabling.

File:

• trunk/src/kmk/kmkbuiltin/expr.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/expr.c

@@ -14 +14 @@
 #ifdef KMK_WITH_REGEX
 #include <regex.h>
-#endif 
+#endif
 #include <setjmp.h>
 #include <assert.h>
@@ -248 +248 @@
         av++;
 
-        
+
         if (pat == 0 && p[0] != '\0') {
                 if (p[1] == '\0') {
@@ -318 +318 @@
         char            errbuf[256];
         int             eval;
-        struct val     *l, *r;
+        struct val     *r;
         struct val     *v;
+#endif
+        struct val     *l;
 
         l = eval6();
         while (token == MATCH) {
+#ifdef KMK_WITH_REGEX
                 nexttoken(1);
                 r = eval6();
@@ -360 +363 @@
 
                 l = v;
+#else
+                longjmp(g_expr_jmp, errx(2, "regex not supported, sorry."));
+#endif
         }
 
         return l;
-#else
-        longjmp(g_expr_jmp, errx(2, "regex not supported, sorry."));
-#endif 
 }
 
@@ -575 +578 @@
                 nexttoken(0);
                 vp = eval0();
-        
+
                 if (token != EOI) {
                         error();
                         /* NOTREACHED */
                 }
-        
+
                 if (vp->type == integer)
                         printf("%d\n", vp->u.i);
                 else
                         printf("%s\n", vp->u.s);
-        
+
                 rval = is_zero_or_null(vp);
-        } 
+        }
         /* else: longjmp */