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

Timestamp:

Feb 1, 2015, 9:48:36 PM (10 years ago)

Author:

bird

Message:

Optimizations, tuning and bug fixes for the 'compiled' string expansion code.

File:

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

trunk/src/kmk/function.c

@@ -2168 +2168 @@
           /* Compile the variable for evalval, evalctx and expansion. */
 
-          if (!v->evalprog)
-            kmk_cc_compile_variable_for_eval (v);
-          if (!v->expandprog)
-            kmk_cc_compile_variable_for_expand (v);
+          if (   v->recursive
+              && !IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR (v))
+                kmk_cc_compile_variable_for_expand (v);
+          kmk_cc_compile_variable_for_eval (v);
 # endif
         }
@@ -4122 +4122 @@
   if (var1->value == var2->value)
     return variable_buffer_output (o, "", 0);       /* eq */
-  if (!var1->recursive && !var2->recursive)
+  if (   (!var1->recursive || IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR (var1))
+      && (!var2->recursive || IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR (var2)) )
   {
     if (    var1->value_length == var2->value_length
@@ -6005 +6006 @@
       if (v && v->value_length)
         {
-          if (v->recursive)
+          if (v->recursive && !IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR (v))
             {
               v->exp_count = EXP_COUNT_MAX;