Changeset 2489 in kBuild

Timestamp:

Jul 22, 2011 11:12:06 AM (14 years ago)

Author:

bird

Message:

kmk: added $(firstdefined ) and $(lastdefined ).

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• function.c (modified) (2 diffs)
• variable.c (modified) (3 diffs)

trunk/src/kmk/Makefile.am

@@ -129 +129 @@
         -DCONFIG_WITHOUT_THREADS \
         -DCONFIG_WITH_VALUE_LENGTH \
+        \
+        -DCONFIG_WITH_ABSPATHEX \
+        -DCONFIG_WITH_COMMANDS_FUNC \
+        -DCONFIG_WITH_DATE \
+        -DCONFIG_WITH_DEFINED_FUNCTIONS \
+        -DCONFIG_WITH_EVALPLUS \
+        -DCONFIG_WITH_FILE_SIZE \
+        -DCONFIG_WITH_LOOP_FUNCTIONS \
+        -DCONFIG_WITH_MATH \
+        -DCONFIG_WITH_NANOTS \
+        -DCONFIG_WITH_ROOT_FUNC \
         -DCONFIG_WITH_RSORT \
-        -DCONFIG_WITH_ABSPATHEX \
+        -DCONFIG_WITH_STACK \
+        -DCONFIG_WITH_STRING_FUNCTIONS \
+        -DCONFIG_WITH_WHICH \
+        -DCONFIG_WITH_XARGS \
+        \
         -DCONFIG_WITH_COMPARE \
-        -DCONFIG_WITH_STACK \
-        -DCONFIG_WITH_MATH \
-        -DCONFIG_WITH_XARGS \
-        -DCONFIG_WITH_NANOTS \
         -DCONFIG_WITH_SET_CONDITIONALS \
         -DCONFIG_WITH_IF_CONDITIONALS \
-        -DCONFIG_WITH_DATE \
-        -DCONFIG_WITH_FILE_SIZE \
-        -DCONFIG_WITH_WHICH \
         -DCONFIG_WITH_PRINTF \
-        -DCONFIG_WITH_EVALPLUS \
         -DCONFIG_WITH_MINIMAL_STATS \
-        -DCONFIG_WITH_COMMANDS_FUNC \
-        -DCONFIG_WITH_STRING_FUNCTIONS \
-        -DCONFIG_WITH_LOOP_FUNCTIONS \
-        -DCONFIG_WITH_ROOT_FUNC \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         -DCONFIG_WITH_PRINT_STATS_SWITCH \

trunk/src/kmk/Makefile.kmk

@@ -154 +154 @@
         CONFIG_NO_DEFAULT_SUFFIX_RULES \
         CONFIG_NO_DEFAULT_VARIABLES \
+        \
+        CONFIG_WITH_ABSPATHEX \
+        CONFIG_WITH_COMMANDS_FUNC \
+        CONFIG_WITH_DATE \
+        CONFIG_WITH_DEFINED_FUNCTIONS \
+        CONFIG_WITH_EVALPLUS \
+        CONFIG_WITH_FILE_SIZE \
+        CONFIG_WITH_LOOP_FUNCTIONS \
+        CONFIG_WITH_MATH \
+        CONFIG_WITH_NANOTS \
+        CONFIG_WITH_ROOT_FUNC \
+        CONFIG_WITH_RSORT \
+        CONFIG_WITH_STACK \
+        CONFIG_WITH_STRING_FUNCTIONS \
+        CONFIG_WITH_WHICH \
+        CONFIG_WITH_XARGS \
+        \
         CONFIG_WITH_EXTENDED_NOTPARALLEL \
         CONFIG_WITH_INCLUDEDEP \
         CONFIG_WITH_VALUE_LENGTH \
-        CONFIG_WITH_RSORT \
-        CONFIG_WITH_ABSPATHEX \
         CONFIG_WITH_COMPARE \
-        CONFIG_WITH_STACK \
-        CONFIG_WITH_MATH \
-        CONFIG_WITH_XARGS \
-        CONFIG_WITH_NANOTS \
         CONFIG_WITH_SET_CONDITIONALS \
         CONFIG_WITH_IF_CONDITIONALS \
-        CONFIG_WITH_DATE \
-        CONFIG_WITH_FILE_SIZE \
-        CONFIG_WITH_WHICH \
         CONFIG_WITH_PRINTF \
-        CONFIG_WITH_EVALPLUS \
         CONFIG_WITH_MINIMAL_STATS \
-        CONFIG_WITH_COMMANDS_FUNC \
-        CONFIG_WITH_PRINTF \
-        CONFIG_WITH_STRING_FUNCTIONS \
-        CONFIG_WITH_LOOP_FUNCTIONS \
-        CONFIG_WITH_ROOT_FUNC \
+        \
         CONFIG_PRETTY_COMMAND_PRINTING \
         CONFIG_WITH_PRINT_STATS_SWITCH \
@@ -219 +222 @@
         version.c \
         vpath.c \
-        remote-stub.c 
+        remote-stub.c
 
 kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
@@ -408 +411 @@
         CONFIG_WITH_TOUPPER_TOLOWER \
         EXPERIMENTAL
-#       NO_ARCHIVES 
+#       NO_ARCHIVES
 
 kmk_gmake_SOURCES = \

trunk/src/kmk/function.c

@@ -1021 +1021 @@
 }
 
+#ifdef CONFIG_WITH_DEFINED_FUNCTIONS
+
+/* Used by func_firstdefined and func_lastdefined to parse the optional last
+   argument.  Returns 0 if the variable name is to be returned and 1 if it's
+   the variable value value. */
+static int
+parse_value_name_argument (const char *arg1, const char *funcname)
+{
+  const char *end;
+  int rc;
+
+  if (arg1 == NULL)
+    return 0;
+
+  end = strchr (arg1, '\0');
+  strip_whitespace (&arg1, &end);
+
+  if (!strncmp (arg1, "name", end - arg1))
+    rc = 0;
+  else if (!strncmp (arg1, "value", end - arg1))
+    rc = 1;
+  else
+    {
+#if 0 /* FIXME: later */
+      /* check the expanded form */
+      char *exp = expand_argument (arg1, strchr (arg1, '\0'));
+      arg1 = exp;
+      end = strchr (arg1, '\0');
+      strip_whitespace (&arg1, &end);
+
+      if (!strncmp (arg1, "name", end - arg1))
+        rc = 0;
+      else if (!strncmp (arg1, "value", end - arg1))
+        rc = 1;
+      else
+#endif
+        fatal (*expanding_var,
+               _("second argument to `%s' function must be `name' or `value', not `%s'"),
+               funcname, exp);
+#if 0
+      free (exp);
+#endif
+    }
+
+  return rc;
+}
+
+/* Given a list of variable names (ARGV[0]), returned the first variable which
+   is defined (i.e. value is not empty).  ARGV[1] indicates whether to return
+   the variable name or its value. */
+static char *
+func_firstdefined (char *o, char **argv, const char *funcname)
+{
+  unsigned int i;
+  const char *words = argv[0];    /* Use a temp variable for find_next_token */
+  const char *p;
+  int ret_value = parse_value_name_argument (argv[1], funcname);
+
+  /* FIXME: Optimize by not expanding the arguments, but instead expand them
+     one by one here.  This will require a find_next_token variant which
+     takes `$(' and `)' into account. */
+  while ((p = find_next_token (&words, &i)) != NULL)
+    {
+      struct variable *v = lookup_variable (p, i);
+      if (v && v->value_length)
+        {
+          if (ret_value)
+            variable_expand_string_2 (o, v->value, v->value_length, &o);
+          else
+            o = variable_buffer_output (o, p, i);
+          break;
+        }
+    }
+
+  return o;
+}
+
+/* Given a list of variable names (ARGV[0]), returned the last variable which
+   is defined (i.e. value is not empty).  ARGV[1] indicates whether to return
+   the variable name or its value. */
+static char *
+func_lastdefined (char *o, char **argv, const char *funcname)
+{
+  struct variable *last_v = NULL;
+  unsigned int i;
+  const char *words = argv[0];    /* Use a temp variable for find_next_token */
+  const char *p;
+  int ret_value = parse_value_name_argument (argv[1], funcname);
+
+  /* FIXME: Optimize this.  Walk from the end on unexpanded arguments. */
+  while ((p = find_next_token (&words, &i)) != NULL)
+    {
+      struct variable *v = lookup_variable (p, i);
+      if (v && v->value_length)
+        {
+          last_v = v;
+          break;
+        }
+    }
+
+  if (last_v != NULL)
+    {
+      if (ret_value)
+        variable_expand_string_2 (o, last_v->value, last_v->value_length, &o);
+      else
+        o = variable_buffer_output (o, last_v->name, last_v->length);
+    }
+  return o;
+}
+
+#endif /* CONFIG_WITH_DEFINED_FUNCTIONS */
 
 static char *
@@ -5154 +5265 @@
   { STRING_SIZE_TUPLE("filter-out"),    2,  2,  1,  func_filter_filterout},
   { STRING_SIZE_TUPLE("findstring"),    2,  2,  1,  func_findstring},
+#ifdef CONFIG_WITH_DEFINED_FUNCTIONS
+  { STRING_SIZE_TUPLE("firstdefined"),  0,  2,  1,  func_firstdefined},
+#endif
   { STRING_SIZE_TUPLE("firstword"),     0,  1,  1,  func_firstword},
   { STRING_SIZE_TUPLE("flavor"),        0,  1,  1,  func_flavor},
   { STRING_SIZE_TUPLE("join"),          2,  2,  1,  func_join},
+#ifdef CONFIG_WITH_DEFINED_FUNCTIONS
+  { STRING_SIZE_TUPLE("lastdefined"),   0,  2,  1,  func_lastdefined},
+#endif
   { STRING_SIZE_TUPLE("lastword"),      0,  1,  1,  func_lastword},
   { STRING_SIZE_TUPLE("patsubst"),      3,  3,  1,  func_patsubst},

trunk/src/kmk/variable.c

@@ -1297 +1297 @@
   && defined (CONFIG_WITH_ROOT_FUNC) \
   && defined (CONFIG_WITH_STRING_FUNCTIONS) \
+  && defined (CONFIG_WITH_DEFINED_FUNCTIONS) \
   && defined (KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
@@ -1324 +1325 @@
                           " length insert pos lastpos substr translate"
                           " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one kb-exp-tmpl "
+                          " firstdefined lastdefined "
                           , o_default, 0);
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
@@ -1397 +1399 @@
   strcat (buf, " length insert pos lastpos substr translate");
 #  endif
+#  if defined (CONFIG_WITH_DEFINED_FUNCTIONS)
+  strcat (buf, " firstdefined lastdefined");
+#  endif
 #  if defined (KMK_HELPERS)
   strcat (buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one kb-exp-tmpl");