Changeset 1716

Timestamp:

Sep 3, 2008, 3:40:13 AM (17 years ago)

Author:

bird

Message:

kmk: Added a new function $(defined var) which check whether var is defined and returns a make boolean result ("1" or "").

Location:

trunk/src/kmk

Files:

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

trunk/src/kmk/Makefile.am

@@ -101 +101 @@
         -DEXPERIMENTAL \
         -DCONFIG_WITH_TOUPPER_TOLOWER \
+        -DCONFIG_WITH_DEFINED \
         -DCONFIG_WITH_EXPLICIT_MULTITARGET \
         -DCONFIG_WITH_PREPEND_ASSIGNMENT \

trunk/src/kmk/Makefile.kmk

@@ -134 +134 @@
         EXPERIMENTAL \
         CONFIG_WITH_TOUPPER_TOLOWER \
+        CONFIG_WITH_DEFINED \
         CONFIG_WITH_EXPLICIT_MULTITARGET \
         CONFIG_WITH_PREPEND_ASSIGNMENT \

trunk/src/kmk/function.c

@@ -2088 +2088 @@
 
 
+#ifdef CONFIG_WITH_DEFINED
+/* Similar to ifdef. */
+static char *
+func_defined (char *o, char **argv, const char *funcname)
+{
+  struct variable *v = lookup_variable (argv[0], strlen (argv[0]));
+  int result = v != NULL && *v->value != '\0';
+  o = variable_buffer_output (o,  result ? "1" : "", result);
+  return o;
+}
+#endif /* CONFIG_WITH_DEFINED*/
+
+
+
 /* Return the absolute name of file NAME which does not contain any `.',
    `..' components nor any repeated path separators ('/').   */
@@ -3917 +3931 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
+#ifdef CONFIG_WITH_DEFINED
+  { STRING_SIZE_TUPLE("defined"),       1,  1,  1,  func_defined},
+#endif 
 #ifdef CONFIG_WITH_TOUPPER_TOLOWER
   { STRING_SIZE_TUPLE("toupper"),       0,  1,  1,  func_toupper_tolower},

trunk/src/kmk/variable.c

@@ -1216 +1216 @@
   && defined (CONFIG_WITH_ABSPATHEX) \
   && defined (CONFIG_WITH_TOUPPER_TOLOWER) \
+  && defined (CONFIG_WITH_DEFINED) \
   && defined (CONFIG_WITH_VALUE_LENGTH) && defined (CONFIG_WITH_COMPARE) \
   && defined (CONFIG_WITH_STACK) \
@@ -1235 +1236 @@
                           " abspathex"
                           " toupper tolower"
+                          " defined"
                           " comp-vars comp-cmds comp-cmds-ex"
                           " stack"
@@ -1261 +1263 @@
 #  if defined (CONFIG_WITH_TOUPPER_TOLOWER)
   strcat (buf, " toupper tolower");
+#  endif
+#  if defined (CONFIG_WITH_DEFINED)
+  strcat (buf, " defined");
 #  endif
 #  if defined (CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)