Changeset 1409

Timestamp:

Mar 17, 2008, 11:31:35 PM (18 years ago)

Author:

bird

Message:

Made a variation of the $(eval) function call evalctx that pushes and pops the variable context - CONFIG_WITH_EVALCTX.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• function.c (modified) (2 diffs)
• testcase-local.kmk (added)

trunk/src/kmk/Makefile.am

@@ -124 +124 @@
         -DCONFIG_WITH_FILE_SIZE \
         -DCONFIG_WITH_WHICH \
+        -DCONFIG_WITH_EVALCTX \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/Makefile.kmk

@@ -124 +124 @@
         CONFIG_WITH_FILE_SIZE \
         CONFIG_WITH_WHICH \
+        CONFIG_WITH_EVALCTX \
         CONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/function.c

@@ -1505 +1505 @@
 
 
+#ifdef CONFIG_WITH_EVALCTX
+/* Same as func_eval except that we push and pop the local variable
+   context before evaluating the buffer. */
+static char *
+func_evalctx (char *o, char **argv, const char *funcname UNUSED)
+{
+  char *buf;
+  unsigned int len;
+
+  /* Eval the buffer.  Pop the current variable buffer setting so that the
+     eval'd code can use its own without conflicting.  */
+
+  install_variable_buffer (&buf, &len);
+
+  push_new_variable_scope ();
+
+  eval_buffer (argv[0]);
+
+  pop_variable_scope ();
+
+  restore_variable_buffer (buf, len);
+
+  return o;
+}
+#endif /* CONFIG_WITH_EVALCTX */
+
 static char *
 func_value (char *o, char **argv, const char *funcname UNUSED)
@@ -3490 +3516 @@
   { STRING_SIZE_TUPLE("value"),         0,  1,  1,  func_value},
   { STRING_SIZE_TUPLE("eval"),          0,  1,  1,  func_eval},
+#ifdef CONFIG_WITH_EVALCTX
+  { STRING_SIZE_TUPLE("evalctx"),       0,  1,  1,  func_evalctx},
+#endif
 #ifdef EXPERIMENTAL
   { STRING_SIZE_TUPLE("eq"),            2,  2,  1,  func_eq},