Changeset 1935

Timestamp:

Oct 25, 2008, 5:04:06 PM (17 years ago)

Author:

bird

Message:

kmk: new function - eval-opt-var

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• misc.c (modified) (1 diff)
• variable.c (modified) (2 diffs)

trunk/src/kmk/function.c

@@ -1678 +1678 @@
   return o;
 }
+
+/* Optimizes the content of one or more variables to save time in
+   the eval functions.  This function will collapse line continuations
+   and remove comments.  */
+static char *
+func_eval_optimize_variable (char *o, char **argv, const char *funcname)
+{
+  unsigned int i;
+
+  for (i = 0; argv[i]; i++)
+    {
+      struct variable *v = lookup_variable (argv[i], strlen (argv[i]));
+      if (v && !v->rdonly_val)
+        {
+          char *eos, *src;
+
+          eos = collapse_continuations (v->value, v->value_length);
+          v->value_length = eos - v->value;
+
+          /* remove comments */
+
+          src = memchr (v->value, '#', v->value_length);
+          if (src)
+            {
+              unsigned char ch;
+              char *dst = src;
+              do
+                {
+                  /* drop blanks preceeding the comment */
+                  while (dst > v->value)
+                    {
+                      ch = (unsigned char)dst[-1];
+                      if (!isblank (ch))
+                        break;
+                      dst--;
+                    }
+
+                  /* advance SRC to eol / eos. */
+                  src = memchr (src, '\n', eos - src);
+                  if (!src)
+                      break;
+
+                  /* drop a preceeding newline if possible (full line comment) */
+                  if (dst > v->value && dst[-1] == '\n')
+                    dst--;
+
+                  /* copy till next comment or eol. */
+                  while (src < eos)
+                    {
+                      ch = *src++;
+                      if (ch == '#')
+                        break;
+                      *dst++ = ch;
+                    }
+                }
+              while (ch == '#' && src < eos);
+
+              *dst = '\0';
+              v->value_length = dst - v->value;
+            }
+        }
+    }
+
+  return o;
+}
+
 #endif /* CONFIG_WITH_EVALPLUS */
 
@@ -4457 +4523 @@
   { STRING_SIZE_TUPLE("evalcall"),      1,  0,  1,  func_call},
   { STRING_SIZE_TUPLE("evalcall2"),     1,  0,  1,  func_call},
+  { STRING_SIZE_TUPLE("eval-opt-var"),  1,  0,  1,  func_eval_optimize_variable},
 #endif
 #ifdef EXPERIMENTAL

trunk/src/kmk/misc.c

@@ -112 +112 @@
   if (in == 0)
       return line + linelen;
+  if (in == line || in[-1] != '\\')
+    {
+      do
+        {
+          unsigned int off_in = in - line;
+          if (off_in == linelen)
+            return in;
+          in = memchr (in + 1, '\n', linelen - off_in - 1);
+          if (in == 0)
+            return line + linelen;
+        }
+      while (in[-1] != '\\');
+    }
 #endif
 

trunk/src/kmk/variable.c

@@ -1205 +1205 @@
                           " expr if-expr"
                           " which"
-                          " evalctx evalval evalvalctx evalcall evalcall2"
+                          " evalctx evalval evalvalctx evalcall evalcall2 eval-opt-var"
                           " make-stats"
                           " commands"
@@ -1259 +1259 @@
 #  endif
 #  if defined (CONFIG_WITH_EVALPLUS)
-  strcat (buf, " evalctx evalval evalvalctx evalcall evalcall2");
+  strcat (buf, " evalctx evalval evalvalctx evalcall evalcall2 eval-opt-var");
 #  endif
 #  if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)