Changeset 1109 for trunk/src/kmk/read.c

Timestamp:

Sep 24, 2007, 4:27:14 AM (18 years ago)

Author:

bird

Message:

New feature: if1of and ifn1of (CONFIG_WITH_SET_CONDITIONALS).

File:

• trunk/src/kmk/read.c (modified) (6 diffs)

trunk/src/kmk/read.c

@@ -1519 +1519 @@
 
 /* Interpret conditional commands "ifdef", "ifndef", "ifeq",
-   "ifneq", "else" and "endif".
+   "ifneq", "if1of", "ifn1of", "else" and "endif".
    LINE is the input line, with the command as its first word.
 
@@ -1534 +1534 @@
 {
   char *cmdname;
+#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
   unsigned int i;
   unsigned int o;
@@ -1547 +1551 @@
   else chkword ("ifeq", c_ifeq)
   else chkword ("ifneq", c_ifneq)
+#ifdef CONFIG_WITH_SET_CONDITIONALS
+  else chkword ("if1of", c_if1of)
+  else chkword ("ifn1of", c_ifn1of)
+#endif
   else chkword ("else", c_else)
   else chkword ("endif", c_endif)
@@ -1687 +1695 @@
   else
     {
+#ifdef CONFIG_WITH_SET_CONDITIONALS
+      /* "ifeq", "ifneq", "if1of" or "ifn1of". */
+#else
       /* "ifeq" or "ifneq".  */
+#endif
       char *s1, *s2;
       unsigned int l;
@@ -1776 +1788 @@
 
       s2 = variable_expand (s2);
+#ifdef CONFIG_WITH_SET_CONDITIONALS
+      if (cmdtype == c_if1of || cmdtype == c_ifn1of)
+        {
+          const char *s1_cur;
+          unsigned int s1_len;
+          const char *s1_iterator = s1;
+
+          conditionals->ignoring[o] = (cmdtype == c_if1of); /* if not found */
+          while ((s1_cur = find_next_token (&s1_iterator, &s1_len)) != 0)
+            {
+              const char *s2_cur;
+              unsigned int s2_len;
+              const char *s2_iterator = s2;
+              while ((s2_cur = find_next_token (&s2_iterator, &s2_len)) != 0)
+                if (s2_len == s1_len
+                 && strneq (s2_cur, s1_cur, s1_len) )
+                  {
+                    conditionals->ignoring[o] = (cmdtype != c_if1of); /* found */
+                    break;
+                  }
+            }
+        }
+      else
+        conditionals->ignoring[o] = (streq (s1, s2) == (cmdtype == c_ifneq));
+#else
       conditionals->ignoring[o] = (streq (s1, s2) == (cmdtype == c_ifneq));
+#endif
     }
 
@@ -2069 +2107 @@
                 cmp timestamp maybe.h || cp -f timestamp maybe.h
 
-        This is implemented in remake.c where we don't consider the mtime of 
+        This is implemented in remake.c where we don't consider the mtime of
         the maybe-updated targets. */
       if (multi_mode != m_no && name[0] == '+'