Changeset 2771 for trunk/src/kmk/variable.h

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/variable.h (modified) (3 diffs)

trunk/src/kmk/variable.h

@@ -18 +18 @@
 
 #include "hash.h"
+#ifdef CONFIG_WITH_COMPILER
+# include "kmk_cc_exec.h"
+#endif
 
 /* Codes in a variable definition saying where the definition came from.
@@ -109 +112 @@
         v_default               /* Decide in target_environment.  */
       } export ENUM_BITFIELD (2);
+#ifdef CONFIG_WITH_COMPILER
+    int recursive_without_dollar : 2; /* 0 if undetermined, 1 if value has no '$' chars, -1 if it has. */
+#endif
 #ifdef CONFIG_WITH_MAKE_STATS
     unsigned int changes;      /* Variable modification count.  */
@@ -133 +139 @@
       (v)->expand_count = 0; \
       (v)->evalval_count = 0; \
+      (v)->recursive_without_dollar = 0; \
     } while (0)
 #else
 # define VARIABLE_CHANGED(v) MAKE_STATS_2((v)->changes++)
+#endif
+
+/* Macro that avoids a lot of CONFIG_WITH_COMPILER checks when
+   accessing recursive_without_dollar. */
+#ifdef CONFIG_WITH_COMPILER
+# define IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR(v) ((v)->recursive_without_dollar > 0)
+#else
+# define IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR(v) 0
 #endif