Changeset 2163 in kBuild for trunk

Timestamp:

Dec 30, 2008 12:57:13 AM (16 years ago)

Author:

bird

Message:

kmk: Added a $(select ) function for handling switch like stuff. Fixes #74.

Location:

trunk

Files:

• kBuild/doc/QuickReference-kmk.html (modified) (2 diffs)
• kBuild/doc/QuickReference-kmk.txt (modified) (2 diffs)
• src/kmk/function.c (modified) (2 diffs)
• src/kmk/tests/scripts/functions/select (added)

trunk/kBuild/doc/QuickReference-kmk.html

@@ -841 +841 @@
 </pre>
 </blockquote>
-<p>(Mostly) Boolean Functions:</p>
+<p>Boolean and Conditional Functions:</p>
 <blockquote>
 <p>Condition is false if the <tt class="docutils literal"><span class="pre">condition</span></tt> evaluates to an empty string
@@ -879 +879 @@
 <p>Same as <tt class="docutils literal"><span class="pre">$(if</span> <span class="pre">)</span></tt> execpt that the condition is a <tt class="docutils literal"><span class="pre">kmk</span></tt> expression:</p>
 <pre class="literal-block">
-$(if kmk-expression,true-part[,false-part])
+$(if-expr kmk-expression,true-part[,false-part])
+</pre>
+<p>Select the first true condition (<tt class="docutils literal"><span class="pre">kmk</span></tt> expression) and expand the
+following body. Special condition strings <tt class="docutils literal"><span class="pre">default</span></tt> and <tt class="docutils literal"><span class="pre">otherwise</span></tt>:</p>
+<pre class="literal-block">
+$(select when1-cond, when1-body[, whenN-cond, whenN-body])
 </pre>
 <p>Evalutate the <tt class="docutils literal"><span class="pre">kmk</span></tt> expression returning what it evalues as. This is

trunk/kBuild/doc/QuickReference-kmk.txt

@@ -482 +482 @@
 
 
-(Mostly) Boolean Functions:
+Boolean and Conditional Functions:
 
     Condition is false if the ``condition`` evaluates to an empty string
@@ -521 +521 @@
     Same as ``$(if )`` execpt that the condition is a ``kmk`` expression::
 
-        $(if kmk-expression,true-part[,false-part])
+        $(if-expr kmk-expression,true-part[,false-part])
+
+    Select the first true condition (``kmk`` expression) and expand the
+    following body. Special condition strings ``default`` and ``otherwise``::
+
+        $(select when1-cond, when1-body[, whenN-cond, whenN-body])
 
     Evalutate the ``kmk`` expression returning what it evalues as. This is

trunk/src/kmk/function.c

@@ -4140 +4140 @@
   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);
+    variable_expand_string_2 (o, to_expand, -1, &o);
+
+  return o;
+}
+
+/*
+  $(select when1-cond, when1-body[,whenN-cond, whenN-body]).
+  */
+static char *
+func_select (char *o, char **argv, const char *funcname UNUSED)
+{
+  int i;
+
+  /* Test WHEN-CONDs until one matches. The check for 'otherwise[:]'
+     and 'default[:]' make this a bit more fun... */
+
+  for (i = 0; argv[i] != NULL; i += 2)
+    {
+      const char *cond = argv[i];
+      int is_otherwise = 0;
+
+      if (argv[i + 1] == NULL)
+        fatal (NILF, _("$(select ): not an even argument count\n"));
+
+      while (isspace ((unsigned char)*cond))
+        cond++;
+      if (   (*cond == 'o' && strncmp (cond, "otherwise", 9) == 0)
+          || (*cond == 'd' && strncmp (cond, "default",   7) == 0))
+        {
+          const char *end = cond + (*cond == 'o' ? 9 : 7);
+          while (isspace ((unsigned char)*end))
+            end++;
+          if (*end == ':')
+            do end++;
+            while (isspace ((unsigned char)*end));
+          is_otherwise = *end == '\0';
+        }
+
+      if (   is_otherwise
+          || expr_eval_if_conditionals (cond, NULL) == 0 /* true */)
+        {
+          variable_expand_string_2 (o, argv[i + 1], -1, &o);
+          break;
+        }
     }
 
@@ -5030 +5068 @@
   { STRING_SIZE_TUPLE("expr"),          1,  1,  0,  func_expr},
   { STRING_SIZE_TUPLE("if-expr"),       2,  3,  0,  func_if_expr},
+  { STRING_SIZE_TUPLE("select"),        2,  0,  0,  func_select},
 #endif
 #ifdef CONFIG_WITH_SET_CONDITIONALS