Changeset 2532 in kBuild for trunk/src

Timestamp:

Aug 2, 2011 1:05:37 PM (13 years ago)

Author:

bird

Message:

kmk: Implemented the where function. Fixes #108.

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

@@ -143 +143 @@
         -DCONFIG_WITH_STACK \
         -DCONFIG_WITH_STRING_FUNCTIONS \
+        -DCONFIG_WITH_WHERE_FUNCTION \
         -DCONFIG_WITH_WHICH \
         -DCONFIG_WITH_XARGS \

trunk/src/kmk/Makefile.kmk

@@ -168 +168 @@
         CONFIG_WITH_STACK \
         CONFIG_WITH_STRING_FUNCTIONS \
+        CONFIG_WITH_WHERE_FUNCTION \
         CONFIG_WITH_WHICH \
         CONFIG_WITH_XARGS \

trunk/src/kmk/function.c

@@ -684 +684 @@
 }
 
+#ifdef CONFIG_WITH_WHERE_FUNCTION
+static char *
+func_where (char *o, char **argv, const char *funcname UNUSED)
+{
+  struct variable *v = lookup_variable (argv[0], strlen (argv[0]));
+  char buf[64];
+
+  if (v == 0)
+    o = variable_buffer_output (o, "undefined", 9);
+  else
+    if (v->fileinfo.filenm)
+      {
+        o = variable_buffer_output (o, v->fileinfo.filenm, strlen(v->fileinfo.filenm));
+        sprintf (buf, ":%lu", v->fileinfo.lineno);
+        o = variable_buffer_output (o, buf, strlen(buf));
+      }
+    else
+      o = variable_buffer_output (o, "no-location", 11);
+
+  return o;
+}
+#endif /* CONFIG_WITH_WHERE_FUNCTION */
+
 #ifdef VMS
 # define IS_PATHSEP(c) ((c) == ']')
@@ -5286 +5309 @@
   { STRING_SIZE_TUPLE("sort"),          0,  1,  1,  func_sort},
   { STRING_SIZE_TUPLE("strip"),         0,  1,  1,  func_strip},
+#ifdef CONFIG_WITH_WHERE_FUNCTION
+  { STRING_SIZE_TUPLE("where"),         0,  1,  1,  func_where},
+#endif
   { STRING_SIZE_TUPLE("wildcard"),      0,  1,  1,  func_wildcard},
   { STRING_SIZE_TUPLE("word"),          2,  2,  1,  func_word},

trunk/src/kmk/variable.c

@@ -1289 +1289 @@
   && defined (CONFIG_WITH_DATE) \
   && defined (CONFIG_WITH_FILE_SIZE) \
+  && defined (CONFIG_WITH_WHERE_FUNCTION) \
   && defined (CONFIG_WITH_WHICH) \
   && defined (CONFIG_WITH_EVALPLUS) \
@@ -1316 +1317 @@
                           " file-size"
                           " expr if-expr select"
+                          " where"
                           " which"
                           " evalctx evalval evalvalctx evalcall evalcall2 eval-opt-var"
@@ -1375 +1377 @@
   strcat (buf, " expr if-expr select");
 #  endif
+#  if defined (CONFIG_WITH_WHERE_FUNCTION)
+  strcat (buf, " where");
+#  endif
 #  if defined (CONFIG_WITH_WHICH)
   strcat (buf, " which");