Changeset 937 in kBuild

Timestamp:

May 26, 2007 6:43:44 PM (18 years ago)

Author:

bird

Message:

Implemented the prepend assignment operator '<='.

Location:

trunk/src/gmakenew

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• read.c (modified) (3 diffs)
• variable.c (modified) (8 diffs)
• variable.h (modified) (1 diff)

trunk/src/gmakenew/Makefile.am

@@ -90 +90 @@
         -DCONFIG_WITH_TOUPPER_TOLOWER \
         -DCONFIG_WITH_EXPLICIT_MULTITARGET \
+        -DCONFIG_WITH_PREPEND_ASSIGNMENT \
         \
         -DKMK \

trunk/src/gmakenew/Makefile.kmk

@@ -95 +95 @@
         CONFIG_WITH_TOUPPER_TOLOWER \
         CONFIG_WITH_EXPLICIT_MULTITARGET \
+        CONFIG_WITH_PREPEND_ASSIGNMENT \
         \
         KMK \

trunk/src/gmakenew/read.c

@@ -2896 +2896 @@
      w_dcolon       A double-colon
      w_semicolon    A semicolon
-     w_varassign    A variable assignment operator (=, :=, +=, or ?=)
+     w_varassign    A variable assignment operator (=, :=, +=, >=, or ?=)
 
    Note that this function is only used when reading certain parts of the
@@ -2947 +2947 @@
     case '+':
     case '?':
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+    case '>':
+#endif
       if (*p == '=')
         {
@@ -3028 +3031 @@
         case '?':
         case '+':
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+        case '>':
+#endif
           if (*p == '=')
             goto done_word;

trunk/src/gmakenew/variable.c

@@ -1361 +1361 @@
 static struct variable *
 do_variable_definition_append (const struct floc *flocp, struct variable *v, const char *value,
-                               enum variable_origin origin)
+                               enum variable_origin origin, int append)
 {
   if (env_overrides && origin == o_env)
@@ -1390 +1390 @@
       unsigned int value_len = strlen (value);
       unsigned int new_value_len = value_len + (v->value_length != 0 ? 1 + v->value_length : 0);
+      int done_1st_prepend_copy = 0;
 
       /* adjust the size. */
       if ((unsigned)v->value_alloc_len <= new_value_len)
         {
-          v->value_alloc_len = (new_value_len + 0x80) + 0x7f;
-          v->value = xrealloc (v->value, v->value_alloc_len);
+          /* XXX: anticipating further appends/prepends. */
+          if (value_len > v->value_alloc_len)
+            v->value_alloc_len = (new_value_len + 0x80) + 0x7f;
+          else
+            v->value_alloc_len = (new_value_len + value_len + 0x80) + 0x7f;
+          if (append || !v->value_length)
+            v->value = xrealloc (v->value, v->value_alloc_len);
+          else
+            {
+              /* avoid the extra memcpy the xrealloc may have to do */
+              char *new_buf = xmalloc (v->value_alloc_len);
+              memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
+              done_1st_prepend_copy = 1;
+              free (v->value);
+              v->value = new_buf;
+            }
         }
 
@@ -1401 +1416 @@
       if (v->value_length != 0)
         {
-          v->value[v->value_length] = ' ';
-          memcpy (&v->value[v->value_length + 1], value, value_len + 1);
+          if (append)
+            {
+              v->value[v->value_length] = ' ';
+              memcpy (&v->value[v->value_length + 1], value, value_len + 1);
+            }
+          else
+            {
+              if (!done_1st_prepend_copy)
+                memmove (&v->value[value_len + 1], v->value, v->value_length + 1);
+              v->value[value_len] = ' ';
+              memcpy (v->value, value, value_len);
+            }
         }
       else
-          memcpy (v->value, value, value_len + 1);
+        memcpy (v->value, value, value_len + 1);
       v->value_length = new_value_len;
     }
@@ -1436 +1461 @@
   int conditional = 0;
   const size_t varname_len = strlen (varname); /* bird */
-# ifdef CONFIG_WITH_VALUE_LENGTH
+#ifdef CONFIG_WITH_VALUE_LENGTH
   unsigned int value_len = ~0U;
-# endif
+#endif
 
   /* Calculate the variable's new value in VALUE.  */
@@ -1470 +1495 @@
       p = value;
       break;
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+    case f_append:
+    case f_prepend:
+      {
+        const enum variable_flavor org_flavor = flavor;
+#else
     case f_append:
       {
+#endif
+
         /* 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.  */
@@ -1499 +1532 @@
 #ifdef CONFIG_WITH_VALUE_LENGTH
             v->append = append;
-            return do_variable_definition_append (flocp, v, value, origin);
+# ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+            return do_variable_definition_append (flocp, v, value, origin, org_flavor == f_append);
+# else
+            return do_variable_definition_append (flocp, v, value, origin, 1);
+# endif
 #else /* !CONFIG_WITH_VALUE_LENGTH */
 
@@ -1524 +1561 @@
             vallen = strlen (val);
             tp = alloca (oldlen + 1 + vallen + 1);
-            memcpy (tp, v->value, oldlen);
-            tp[oldlen] = ' ';
-            memcpy (&tp[oldlen + 1], val, vallen + 1);
+# ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+            if (org_flavor == f_prepend)
+              {
+                memcpy (tp, val, vallen);
+                tp[oldlen] = ' ';
+                memcpy (&tp[oldlen + 1], v->value, oldlen + 1);
+              }
+            else
+# endif /* CONFIG_WITH_PREPEND_ASSIGNMENT */
+              {
+                memcpy (tp, v->value, oldlen);
+                tp[oldlen] = ' ';
+                memcpy (&tp[oldlen + 1], val, vallen + 1);
+              }
             p = tp;
 #endif /* !CONFIG_WITH_VALUE_LENGTH */
@@ -1724 +1772 @@
           break;
         }
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+      else if (c == '<' && *p == '=')
+        {
+          end = p++ - 1;
+          flavor = f_prepend;
+          break;
+        }
+#endif
       else if (c == '?' && *p == '=')
         {

trunk/src/gmakenew/variable.h

@@ -39 +39 @@
     f_recursive,        /* Recursive definition (=) */
     f_append,           /* Appending definition (+=) */
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+    f_prepend,          /* Prepending definition (>=) */
+#endif
     f_conditional       /* Conditional definition (?=) */
   };