Changeset 2161 in kBuild for trunk

Timestamp:

Dec 29, 2008 10:20:11 PM (16 years ago)

Author:

bird

Message:

kmk: Implemented $(for ) and $(while ) loops (C-style). Fixes #73.

Location:

trunk

Files:

• kBuild/doc/QuickReference-kmk.html (modified) (1 diff)
• kBuild/doc/QuickReference-kmk.txt (modified) (1 diff)
• src/kmk/Makefile.am (modified) (1 diff)
• src/kmk/Makefile.kmk (modified) (1 diff)
• src/kmk/expreval.c (modified) (2 diffs)
• src/kmk/function.c (modified) (2 diffs)
• src/kmk/make.h (modified) (1 diff)
• src/kmk/tests/scripts/functions/for (added)
• src/kmk/tests/scripts/functions/while (added)

trunk/kBuild/doc/QuickReference-kmk.html

@@ -913 +913 @@
 $(value var)
 </pre>
-<p>Evaluate <tt class="docutils literal"><span class="pre">text</span></tt> with <tt class="docutils literal"><span class="pre">var</span></tt> bound to each word in <tt class="docutils literal"><span class="pre">words</span></tt>, and
+<p>Evaluate <tt class="docutils literal"><span class="pre">body</span></tt> with <tt class="docutils literal"><span class="pre">var</span></tt> bound to each word in <tt class="docutils literal"><span class="pre">words</span></tt>, and
 concatenate the results (spaced):</p>
 <pre class="literal-block">
-$(foreach var,words,text)
+$(foreach var,words,body)
+</pre>
+<p>C-style for-loop. Start by evaluating <tt class="docutils literal"><span class="pre">init</span></tt>. Each iteration will
+first check whether the <tt class="docutils literal"><span class="pre">condition</span></tt> (<tt class="docutils literal"><span class="pre">kmk</span></tt>-expression) is true,
+then expand <tt class="docutils literal"><span class="pre">body</span></tt> concatenating the result to the previous iterations
+(spaced), and finally evaluate <tt class="docutils literal"><span class="pre">next</span></tt>:</p>
+<pre class="literal-block">
+$(for init,conditions,next,body)
+</pre>
+<p>C-style while-loop. Each iteration will check whether the <tt class="docutils literal"><span class="pre">condition</span></tt>
+(<tt class="docutils literal"><span class="pre">kmk</span></tt>-expression) is true, then expand <tt class="docutils literal"><span class="pre">body</span></tt> concatenating the
+result to the previous iterations:</p>
+<pre class="literal-block">
+$(while conditions,body)
 </pre>
 <p>Evaluate the variable <tt class="docutils literal"><span class="pre">var</span></tt> replacing any references to <tt class="docutils literal"><span class="pre">$(1)</span></tt>,

trunk/kBuild/doc/QuickReference-kmk.txt

@@ -555 +555 @@
         $(value var)
 
-    Evaluate ``text`` with ``var`` bound to each word in ``words``, and
+    Evaluate ``body`` with ``var`` bound to each word in ``words``, and
     concatenate the results (spaced)::
 
-        $(foreach var,words,text)
+        $(foreach var,words,body)
+
+    C-style for-loop. Start by evaluating ``init``. Each iteration will
+    first check whether the ``condition`` (``kmk``-expression) is true,
+    then expand ``body`` concatenating the result to the previous iterations
+    (spaced), and finally evaluate ``next``::
+
+        $(for init,conditions,next,body)
+
+    C-style while-loop. Each iteration will check whether the ``condition``
+    (``kmk``-expression) is true, then expand ``body`` concatenating the
+    result to the previous iterations::
+
+        $(while conditions,body)
 
     Evaluate the variable ``var`` replacing any references to ``$(1)``,

trunk/src/kmk/Makefile.am

@@ -144 +144 @@
         -DCONFIG_WITH_COMMANDS_FUNC \
         -DCONFIG_WITH_STRING_FUNCTIONS \
+        -DCONFIG_WITH_LOOP_FUNCTIONS \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         -DCONFIG_WITH_PRINT_STATS_SWITCH \

trunk/src/kmk/Makefile.kmk

@@ -170 +170 @@
         CONFIG_WITH_PRINTF \
         CONFIG_WITH_STRING_FUNCTIONS \
+        CONFIG_WITH_LOOP_FUNCTIONS \
         CONFIG_PRETTY_COMMAND_PRINTING \
         CONFIG_WITH_PRINT_STATS_SWITCH \

trunk/src/kmk/expreval.c

@@ -2073 +2073 @@
  * Evaluates the given if expression.
  *
- * @returns -1, 0 or 1.
+ * @returns -1, 0 or 1. (GNU make conditional check convention, see read.c.)
  * @retval  -1 if the expression is invalid.
  * @retval  0 if the expression is true
  * @retval  1 if the expression is false.
  *
- * @param   line    The expression. Can modify this as we like.
+ * @param   line    The expression.
  * @param   flocp   The file location, used for errors.
  */
-int expr_eval_if_conditionals(char *line, const struct floc *flocp)
+int expr_eval_if_conditionals(const char *line, const struct floc *flocp)
 {
     /*
@@ -2115 +2115 @@
  * @param   expr    The expression.
  */
-char *expr_eval_to_string(char *o, char *expr)
+char *expr_eval_to_string(char *o, const char *expr)
 {
     /*

trunk/src/kmk/function.c

@@ -1071 +1071 @@
 }
 
+#ifdef CONFIG_WITH_LOOP_FUNCTIONS
+
+
+/* Helper for func_for that evaluates the INIT and NEXT parts. */
+static void
+helper_eval (char *text, size_t text_len)
+{
+    unsigned int buf_len;
+    char *buf;
+
+    install_variable_buffer (&buf, &buf_len);
+    eval_buffer (text, text + text_len);
+    restore_variable_buffer (buf, buf_len);
+}
+
+/*
+  $(for init,condition,next,body)
+  */
+static char *
+func_for (char *o, char **argv, const char *funcname UNUSED)
+{
+  char        *init     = argv[0];
+  const char  *cond     = argv[1];
+  const char  *next     = argv[2];
+  size_t       next_len = strlen (next);
+  char        *next_buf = xmalloc (next_len + 1);
+  const char  *body     = argv[3];
+  size_t       body_len = strlen (body);
+  unsigned int doneany  = 0;
+
+  push_new_variable_scope ();
+
+  /* Evaluate INIT. */
+
+  helper_eval (init, strlen (init));
+
+  /* Loop till COND is false. */
+
+  while (expr_eval_if_conditionals (cond, NULL) == 0 /* true */)
+    {
+      /* Expand BODY. */
+
+      if (!doneany)
+        doneany = 1;
+      else
+        o = variable_buffer_output (o, " ", 1);
+      variable_expand_string_2 (o, body, body_len, &o);
+
+      /* Evaluate NEXT. */
+
+      memcpy (next_buf, next, next_len + 1);
+      helper_eval (next_buf, next_len);
+    }
+
+  pop_variable_scope ();
+  free (next_buf);
+
+  return o;
+}
+
+/*
+  $(while condition,body)
+ */
+static char *
+func_while (char *o, char **argv, const char *funcname UNUSED)
+{
+  const char  *cond     = argv[0];
+  const char  *body     = argv[1];
+  size_t       body_len = strlen (body);
+  unsigned int doneany  = 0;
+
+  push_new_variable_scope ();
+
+  while (expr_eval_if_conditionals (cond, NULL) == 0 /* true */)
+    {
+      if (!doneany)
+        doneany = 1;
+      else
+        o = variable_buffer_output (o, " ", 1);
+      variable_expand_string_2 (o, body, body_len, &o);
+    }
+
+  pop_variable_scope ();
+
+  return o;
+}
+
+
+#endif /* CONFIG_WITH_LOOP_FUNCTIONS */
+
 struct a_word
 {
@@ -4866 +4956 @@
   { STRING_SIZE_TUPLE("origin"),        0,  1,  1,  func_origin},
   { STRING_SIZE_TUPLE("foreach"),       3,  3,  0,  func_foreach},
+#ifdef CONFIG_WITH_LOOP_FUNCTIONS
+  { STRING_SIZE_TUPLE("for"),           4,  4,  0,  func_for},
+  { STRING_SIZE_TUPLE("while"),         2,  2,  0,  func_while},
+#endif
   { STRING_SIZE_TUPLE("call"),          1,  0,  1,  func_call},
   { STRING_SIZE_TUPLE("info"),          0,  1,  1,  func_error},

trunk/src/kmk/make.h

@@ -911 +911 @@
 
 #ifdef CONFIG_WITH_IF_CONDITIONALS
-extern int expr_eval_if_conditionals(char *line, const struct floc *flocp);
-extern char *expr_eval_to_string(char *o, char *expr);
+extern int expr_eval_if_conditionals(const char *line, const struct floc *flocp);
+extern char *expr_eval_to_string(char *o, const char *expr);
 #endif