Changeset 1715

Timestamp:

Sep 3, 2008, 1:05:55 AM (17 years ago)

Author:

bird

Message:

kmk: Started hacking on some useable if conditionals.

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (2 diffs)
• ifcond.c (added)
• make.h (modified) (1 diff)
• read.c (modified) (3 diffs)

trunk/src/kmk/Makefile.kmk ¶

@@ -158 +158 @@
         CONFIG_WITH_NANOTS \
         CONFIG_WITH_SET_CONDITIONALS \
+        CONFIG_WITH_IF_CONDITIONALS \
         CONFIG_WITH_DATE \
         CONFIG_WITH_FILE_SIZE \
@@ -176 +177 @@
         main.c \
         read.c \
+        ifcond.c \
         hash.c \
         strcache.c \

trunk/src/kmk/make.h ¶

@@ -728 +728 @@
 #endif
 
+#ifdef CONFIG_WITH_IF_CONDITIONALS
+extern int ifcond_eval(char *line, const struct floc *flocp);
+#endif
+

trunk/src/kmk/read.c ¶

@@ -2004 +2004 @@
 {
   char *cmdname;
+  enum { c_ifdef, c_ifndef, c_ifeq, c_ifneq, 
 #ifdef CONFIG_WITH_SET_CONDITIONALS
-  enum { c_ifdef, c_ifndef, c_ifeq, c_ifneq, c_if1of, c_ifn1of, c_else, c_endif } cmdtype;
-#else
-  enum { c_ifdef, c_ifndef, c_ifeq, c_ifneq, c_else, c_endif } cmdtype;
-#endif
+    c_if1of, c_ifn1of, 
+#endif
+#ifdef CONFIG_WITH_IF_CONDITIONALS
+    c_ifcond,
+#endif
+    c_else, c_endif 
+  } cmdtype;
   unsigned int i;
   unsigned int o;
@@ -2025 +2029 @@
   else chkword ("ifn1of", c_ifn1of)
 #endif
+#ifdef CONFIG_WITH_IF_CONDITIONALS
+  else chkword ("if", c_ifcond)
+#endif 
   else chkword ("else", c_else)
   else chkword ("endif", c_endif)
@@ -2163 +2170 @@
       free (var);
     }
+#ifdef CONFIG_WITH_IF_CONDITIONALS
+  else if (cmdtype == c_ifcond)
+    {
+      int rval = ifcond_eval (line, flocp);
+      if (rval == -1)
+          return rval;
+      conditionals->ignoring[o] = rval;
+    }
+#endif
   else
     {