Changeset 2157 in kBuild for trunk

Timestamp:

Dec 29, 2008 3:43:12 PM (16 years ago)

Author:

bird

Message:

kmk: Extended evalcall and evalcall2 with a return value, local .RETURN.

File:

• trunk/src/kmk/function.c (modified) (8 diffs)

trunk/src/kmk/function.c

@@ -2270 +2270 @@
   return math_int_to_variable_buffer (o, len);
 }
+
 /*
   $(length-var var)
@@ -2283 +2284 @@
 
 
-/* func_insert helper. */
-static char *
-helper_insert_pad (char *o, size_t to_add, const char *pad, size_t pad_len)
+/* func_insert and func_substr helper. */
+static char *
+helper_pad (char *o, size_t to_add, const char *pad, size_t pad_len)
 {
   while (to_add > 0)
@@ -2359 +2360 @@
         {
           o = variable_buffer_output (o, str, str_len);
-          o = helper_insert_pad (o, n - str_len, pad, pad_len);
+          o = helper_pad (o, n - str_len, pad, pad_len);
         }
     }
@@ -2369 +2370 @@
     {
       o = variable_buffer_output (o, in, in_len);
-      o = helper_insert_pad (o, length - in_len, pad, pad_len);
+      o = helper_pad (o, length - in_len, pad, pad_len);
     }
 
@@ -2510 +2511 @@
           start--;      /* one-origin */
           if (start >= str_len)
-            return length ? helper_insert_pad (o, length, pad, pad_len) : o;
+            return length ? helper_pad (o, length, pad, pad_len) : o;
           if (length == 0)
             length = str_len - start;
@@ -2520 +2521 @@
             {
               if (start + length <= 0)
-                return length ? helper_insert_pad (o, length, pad, pad_len) : o;
-              o = helper_insert_pad (o, -start, pad, pad_len);
+                return length ? helper_pad (o, length, pad, pad_len) : o;
+              o = helper_pad (o, -start, pad, pad_len);
               return variable_buffer_output (o, str, length + start);
             }
@@ -2532 +2533 @@
         {
           o = variable_buffer_output (o, str + start, str_len - start);
-          o = helper_insert_pad (o, start + length - str_len, pad, pad_len);
+          o = helper_pad (o, start + length - str_len, pad, pad_len);
         }
     }
@@ -5304 +5305 @@
       restore_variable_buffer (buf, len);
       reading_file = reading_file_saved;
+
+      /* Deal with the .RETURN value if present. */
+
+      v = lookup_variable_in_set (".RETURN", sizeof (".RETURN") - 1,
+                                  current_variable_set_list->set);
+      if (v && v->value_length)
+        {
+          if (v->recursive)
+            {
+              v->exp_count = EXP_COUNT_MAX;
+              variable_expand_string_2 (o, v->value, v->value_length, &o);
+              v->exp_count = 0;
+            }
+          else
+            o = variable_buffer_output (o, v->value, v->value_length);
+        }
     }
 #endif /* CONFIG_WITH_EVALPLUS */