Changeset 1408 in kBuild for trunk/src/kmk

Timestamp:

Mar 17, 2008 10:21:36 PM (17 years ago)

Author:

bird

Message:

Implemented local variable definitions - CONFIG_WITH_LOCAL_VARIABLES.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• function.c (modified) (5 diffs)
• read.c (modified) (1 diff)
• variable.c (modified) (4 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/Makefile.am

@@ -100 +100 @@
         -DCONFIG_WITH_EXPLICIT_MULTITARGET \
         -DCONFIG_WITH_PREPEND_ASSIGNMENT \
+        -DCONFIG_WITH_LOCAL_VARIABLES \
         \
         -DKMK \

trunk/src/kmk/Makefile.kmk

@@ -100 +100 @@
         CONFIG_WITH_EXPLICIT_MULTITARGET \
         CONFIG_WITH_PREPEND_ASSIGNMENT \
+        CONFIG_WITH_LOCAL_VARIABLES \
         \
         KMK \
@@ -430 +431 @@
         $(MAKE) -f testcase-if1of.kmk
 
-test_all:       test_math test_stack test_shell test_if1of
-
+test_local:
+        $(MAKE) -f testcase-local.kmk
+
+test_all:       test_math test_stack test_shell test_if1of test_local
+

trunk/src/kmk/function.c

@@ -62 +62 @@
 #ifdef __OS2__
 # define CONFIG_WITH_OS2_LIBPATH 1
-#endif 
+#endif
 #ifdef CONFIG_WITH_OS2_LIBPATH
 # define INCL_BASE
@@ -571 +571 @@
         o = variable_buffer_output (o, "automatic", 9);
         break;
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+      case o_local:
+        o = variable_buffer_output (o, "local", 5);
+        break;
+#endif
       }
 
@@ -3338 +3343 @@
 /* Sets or gets the OS/2 libpath variables.
 
-   The first argument indicates which variable - BEGINLIBPATH, 
-   ENDLIBPATH, LIBPATHSTRICT or LIBPATH. 
-
-   The second indicates whether this is a get (not present) or 
+   The first argument indicates which variable - BEGINLIBPATH,
+   ENDLIBPATH, LIBPATHSTRICT or LIBPATH.
+
+   The second indicates whether this is a get (not present) or
    set (present) operation. When present it is the new value for
    the variable. */
@@ -3408 +3413 @@
       if (len >= len_max)
         {
-          error (NILF, _("$(libpath): The new `%s' value is too long (%d bytes, max %d)"), 
+          error (NILF, _("$(libpath): The new `%s' value is too long (%d bytes, max %d)"),
                  argv[0], len, len_max);
           return variable_buffer_output (o, "", 0);
@@ -3541 +3546 @@
 #ifdef CONFIG_WITH_OS2_LIBPATH
   { STRING_SIZE_TUPLE("libpath"),       1,  2,  1,  func_os2_libpath},
-#endif 
+#endif
 #ifdef KMK_HELPERS
   { STRING_SIZE_TUPLE("kb-src-tool"),   1,  1,  0,  func_kbuild_source_tool},

trunk/src/kmk/read.c

@@ -1168 +1168 @@
           continue;
         }
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+
+      if (word1eq ("local"))
+        {
+          if (*p2 == '\0')
+            error (fstart, _("empty `local' directive"));
+
+          if (strneq (p2, "define", 6)
+              && (isblank ((unsigned char)p2[6]) || p2[6] == '\0'))
+            {
+              if (ignoring)
+                in_ignored_define = 1;
+              else
+                {
+                  p2 = next_token (p2 + 6);
+                  if (*p2 == '\0')
+                    fatal (fstart, _("empty variable name"));
+
+                  /* Let the variable name be the whole rest of the line,
+                     with trailing blanks stripped (comments have already been
+                     removed), so it could be a complex variable/function
+                     reference that might contain blanks.  */
+                  p = strchr (p2, '\0');
+                  while (isblank ((unsigned char)p[-1]))
+                    --p;
+                  do_define (p2, p - p2, o_local, ebuf);
+                }
+            }
+          else if (!ignoring
+                   && !try_variable_definition (fstart, p2, o_local, 0))
+            error (fstart, _("invalid `local' directive"));
+
+          continue;
+        }
+#endif /* CONFIG_WITH_LOCAL_VARIABLES */
 
       if (ignoring)

trunk/src/kmk/variable.c

@@ -1536 +1536 @@
 #endif
 
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+          /* If we have += but we're in a target or local variable context,
+             we want to append only with other variables in the context of
+             this target.  */
+        if (target_var || origin == o_local)
+#else
         /* If we have += but we're in a target variable context, we want to
            append only with other variables in the context of this target.  */
         if (target_var)
+#endif
           {
             append = 1;
@@ -1734 +1741 @@
 #endif
                               origin, flavor == f_recursive,
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+                              (target_var || origin == o_local
+#else
                               (target_var
+#endif
                                ? current_variable_set_list->set : NULL),
                               flocp);
@@ -1868 +1879 @@
 /* Try to interpret LINE (a null-terminated string) as a variable definition.
 
-   ORIGIN may be o_file, o_override, o_env, o_env_override,
+   ORIGIN may be o_file, o_override, o_env, o_env_override, o_local,
    or o_command specifying that the variable definition comes
    from a makefile, an override directive, the environment with
@@ -1935 +1946 @@
       origin = _("automatic");
       break;
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+    case o_local:
+      origin = _("`local' directive");
+      break;
+#endif
     case o_invalid:
     default:

trunk/src/kmk/variable.h

@@ -25 +25 @@
     o_default,          /* Variable from the default set.  */
     o_env,              /* Variable from environment.  */
+#ifdef CONFIG_WITH_LOCAL_VARIABLES /** @todo Correct priority? */
+    o_local,            /* Variable from an 'local' directive.  */
+#endif
     o_file,             /* Variable given in a makefile.  */
     o_env_override,     /* Variable from environment, if -e.  */