Changeset 2159 in kBuild for trunk

Timestamp:

Dec 29, 2008 4:08:15 PM (16 years ago)

Author:

bird

Message:

kmk: extended call, evalcall and evalcall2 with a local .ARGC automatic variable holding the argument count.

Location:

trunk/src/kmk

Files:

• function.c (modified) (4 diffs)
• tests/scripts/functions/evalcall (modified) (3 diffs)

trunk/src/kmk/function.c

@@ -5175 +5175 @@
   unsigned int len;
 #endif
+#if defined (CONFIG_WITH_EVALPLUS) || defined (CONFIG_WITH_VALUE_LENGTH)
+  char num[11];
+#endif
 
   /* There is no way to define a variable with a space in the name, so strip
@@ -5230 +5233 @@
 
   for (i=0; *argv; ++i, ++argv)
+#ifdef CONFIG_WITH_VALUE_LENGTH
+    define_variable (num, sprintf (num, "%d", i), *argv, o_automatic, 0);
+#else
     {
       char num[11];
@@ -5236 +5242 @@
       define_variable (num, strlen (num), *argv, o_automatic, 0);
     }
+#endif
+
+#ifdef CONFIG_WITH_EVALPLUS
+  /* $(.ARGC) is the argument count. */
+
+  len = sprintf (num, "%d", i - 1);
+  define_variable_vl (".ARGC", sizeof (".ARGC") - 1, num, len,
+                      1 /* dup val */, o_automatic, 0);
+  define_variable (".ARGC", sizeof (".ARGC") - 1, num, o_automatic, 0);
+#endif
 
   /* If the number of arguments we have is < max_args, it means we're inside
@@ -5243 +5259 @@
 
   for (; i < max_args; ++i)
+#ifdef CONFIG_WITH_VALUE_LENGTH
+    define_variable (num, sprintf (num, "%d", i), "", o_automatic, 0);
+#else
     {
       char num[11];
 
-#ifndef CONFIG_WITH_VALUE_LENGTH
       sprintf (num, "%d", i);
       define_variable (num, strlen (num), "", o_automatic, 0);
-#else
-      define_variable (num, sprintf (num, "%d", i), "", o_automatic, 0);
-#endif
-    }
+    }
+#endif
 
   saved_args = max_args;

trunk/src/kmk/tests/scripts/functions/evalcall

@@ -77 +77 @@
 endif
 
-# negative tests:
+
+# Negative tests:
 
 .RETURN = $2 $1
@@ -91 +92 @@
 endif
 
+
+# Test .ARGC:
+
+FUNC = local .RETURN = $(.ARGC)
+ifneq ($(evalcall FUNC,a,b),2)
+$(error sub-test 20 failed)
+endif
+ifneq ($(evalcall FUNC),0)
+$(error sub-test 21 failed)
+endif
+ifneq ($(evalcall FUNC,aasdfasdf),1)
+$(error sub-test 22 failed)
+endif
+
+
 .PHONY: all
 all: ; @:
@@ -99 +115 @@
 
 
-
 # Indicate that we're done.
 1;