Changeset 2021 in kBuild

Timestamp:

Nov 2, 2008 1:18:47 AM (16 years ago)

Author:

bird

Message:

kmk: Added a $(intersects set-a, set-b) function to complement the if1of/ifn1of conditionals. Fixes #56.

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• tests/scripts/functions/intersects (added)
• variable.c (modified) (2 diffs)

trunk/src/kmk/function.c

@@ -3705 +3705 @@
 func_if_expr (char *o, char **argv, const char *funcname UNUSED)
 {
-    int rc;
-    char *to_expand;
-
-    /* Evaluate the condition in argv[0] and expand the 2nd or
-       3rd argument according to the result. */
-    rc = expr_eval_if_conditionals (argv[0], NULL);
-    to_expand = rc == 0 ? argv[1] : argv[2];
-    if (*to_expand)
-      {
-        char *expansion = expand_argument (to_expand, NULL);
-
-        o = variable_buffer_output (o, expansion, strlen (expansion));
-
-        free (expansion);
-      }
-
-    return o;
+  int rc;
+  char *to_expand;
+
+  /* Evaluate the condition in argv[0] and expand the 2nd or
+     3rd argument according to the result. */
+  rc = expr_eval_if_conditionals (argv[0], NULL);
+  to_expand = rc == 0 ? argv[1] : argv[2];
+  if (*to_expand)
+    {
+      char *expansion = expand_argument (to_expand, NULL);
+
+      o = variable_buffer_output (o, expansion, strlen (expansion));
+
+      free (expansion);
+    }
+
+  return o;
 }
 
 #endif /* CONFIG_WITH_IF_CONDITIONALS */
+
+#ifdef CONFIG_WITH_SET_CONDITIONALS
+static char *
+func_set_intersects (char *o, char **argv, const char *funcname UNUSED)
+{
+  const char *s1_cur;
+  unsigned int s1_len;
+  const char *s1_iterator = argv[0];
+
+  while ((s1_cur = find_next_token (&s1_iterator, &s1_len)) != 0)
+    {
+      const char *s2_cur;
+      unsigned int s2_len;
+      const char *s2_iterator = argv[1];
+      while ((s2_cur = find_next_token (&s2_iterator, &s2_len)) != 0)
+        if (s2_len == s1_len
+         && strneq (s2_cur, s1_cur, s1_len) )
+          return variable_buffer_output (o, "1", 1); /* found intersection */
+    }
+
+  return o; /* no intersection */
+}
+#endif /* CONFIG_WITH_SET_CONDITIONALS */
 
 #ifdef CONFIG_WITH_STACK
@@ -4611 +4634 @@
   { STRING_SIZE_TUPLE("if-expr"),       2,  3,  0,  func_if_expr},
 #endif
+#ifdef CONFIG_WITH_SET_CONDITIONALS
+  { STRING_SIZE_TUPLE("intersects"),    2,  2,  1,  func_set_intersects},
+#endif
 #ifdef CONFIG_WITH_STACK
   { STRING_SIZE_TUPLE("stack-push"),    2,  2,  1,  func_stack_push},

trunk/src/kmk/variable.c

@@ -1217 +1217 @@
                           " explicit-multitarget"
                           " prepend-assignment"
-                          " set-conditionals"
+                          " set-conditionals intersects"
                           " date"
                           " file-size"
@@ -1261 +1261 @@
 #  endif
 #  if defined (CONFIG_WITH_SET_CONDITIONALS)
-  strcat (buf, " set-conditionals");
+  strcat (buf, " set-conditionals intersects");
 #  endif
 #  if defined (CONFIG_WITH_DATE)