Changeset 1458 in kBuild

Timestamp:

Mar 30, 2008 10:16:15 PM (17 years ago)

Author:

bird

Message:

Use the variable file location in evalval and evalcall.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (3 diffs)
• function.c (modified) (5 diffs)

trunk/src/kmk/expand.c

@@ -518 +518 @@
   char *result;
   struct variable_set_list *save;
+  const struct floc *reading_file_saved;
 
   if (file == 0)
@@ -524 +525 @@
   save = current_variable_set_list;
   current_variable_set_list = file->variables;
+  reading_file_saved = reading_file;
   if (file->cmds && file->cmds->fileinfo.filenm)
     reading_file = &file->cmds->fileinfo;
@@ -530 +532 @@
   result = variable_expand_string (o, line, (long)-1);
   current_variable_set_list = save;
-  reading_file = 0;
+  reading_file = reading_file_saved;
 
   return result;

trunk/src/kmk/function.c

@@ -1552 +1552 @@
       int var_ctx;
       size_t off;
+      const struct floc *reading_file_saved = reading_file;
 
       /* Make a copy of the value to the variable buffer since
@@ -1568 +1569 @@
       if (var_ctx)
         push_new_variable_scope ();
+      if (v->fileinfo.filenm)
+        reading_file = &v->fileinfo;
 
       eval_buffer (o);
 
+      reading_file = reading_file_saved;
       if (var_ctx)
         pop_variable_scope ();
@@ -4197 +4201 @@
   else
     {
+      const struct floc *reading_file_saved = reading_file;
+
       if (!strcmp (funcname, "evalcall"))
         {
@@ -4205 +4211 @@
           o = variable_buffer_output (o, v->value, v->value_length + 1);
           o = variable_buffer + off;
+          if (v->fileinfo.filenm)
+            reading_file = &v->fileinfo;
         }
       else
@@ -4218 +4226 @@
       eval_buffer (o);
       restore_variable_buffer (buf, len);
+      reading_file = reading_file_saved;
     }
 #endif /* CONFIG_WITH_EVALPLUS */