Changeset 1458 for trunk/src/kmk/function.c

Timestamp:

Mar 31, 2008, 12:16:15 AM (17 years ago)

Author:

bird

Message:

Use the variable file location in evalval and evalcall.

File:

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

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 */