Changeset 2548 in kBuild for trunk/src

Timestamp:

Nov 8, 2011 9:28:16 PM (13 years ago)

Author:

bird

Message:

kmk: hacking on a new kmk/kBuild language extension.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• expand.c (modified) (1 diff)
• kbuild-read.c (added)
• kbuild.h (modified) (1 diff)
• make.h (modified) (1 diff)
• misc.c (modified) (1 diff)
• read.c (modified) (3 diffs)
• testcase-kBuild-define.kmk (added)
• variable.c (modified) (3 diffs)

trunk/src/kmk/Makefile.am

@@ -53 +53 @@
                 alloccache.c \
                 kbuild.c \
+                kbuild-read.c \
                 electric.c \
                 ../lib/md5.c \

trunk/src/kmk/Makefile.kmk

@@ -205 +205 @@
         main.c \
         kbuild.c \
+        kbuild-read.c \
         read.c \
         expreval.c \

trunk/src/kmk/expand.c

@@ -1116 +1116 @@
 #ifdef CONFIG_WITH_VALUE_LENGTH
 /* Handle the most common case in allocated_variable_expand_for_file
-   specially and provide some additional string lenght features. */
+   specially and provide some additional string length features. */
 
 char *

trunk/src/kmk/kbuild.h

@@ -39 +39 @@
 const char *get_default_kbuild_shell(void);
 
+struct kbuild_eval_data;
+
+int eval_kbuild_define(struct kbuild_eval_data **kdata, const struct floc *flocp,
+                       const char *word, unsigned int wlen, const char *line, const char *eos, int ignoring);
+int eval_kbuild_endef(struct kbuild_eval_data **kdata, const struct floc *flocp,
+                      const char *word, unsigned int wlen, const char *line, const char *eos, int ignoring);
+
 #endif
 

trunk/src/kmk/make.h

@@ -502 +502 @@
 char *next_token (const char *);
 char *end_of_token (const char *);
+#ifdef KMK
+char *find_next_token_eos (const char **ptr, const char *eos, unsigned int *lengthptr);
+#endif
 #ifndef CONFIG_WITH_VALUE_LENGTH
 void collapse_continuations (char *);

trunk/src/kmk/misc.c

@@ -727 +727 @@
 #endif
 }
+#ifdef KMK
+
+/* Same as find_next_token with two exception:
+      - The string ends at EOS or '\0'.
+      - We keep track of $() and ${}, allowing functions to be used. */
+
+char *
+find_next_token_eos (const char **ptr, const char *eos, unsigned int *lengthptr)
+{
+  const char *p = *ptr;
+  const char *e;
+  int level = 0;
+
+  /* skip blanks */
+  for (; p != eos; p++)
+    {
+      unsigned char ch = *p;
+      if (!MY_IS_BLANK(ch))
+        {
+          if (!ch)
+            return NULL;
+          break;
+        }
+    }
+  if (p == eos)
+    return NULL;
+
+  /* skip ahead until EOS or blanks. */
+  for (e = p; e != eos; e++)
+    {
+      unsigned char ch = *e;
+      if (MY_IS_BLANK_OR_EOS(ch))
+        {
+          if (!ch || level == 0)
+            break;
+        }
+      else if (ch == '$')
+        {
+          if (&e[1] != eos && (e[1] == '(' || e[1] == '{'))
+            {
+              level++;
+              e++;
+            }
+        }
+      else if ((ch == ')' || ch == '}') &&  level > 0)
+        level--;
+    }
+
+  *ptr = e;
+  if (lengthptr != 0)
+    *lengthptr = e - p;
+
+  return (char *)p;
+}
+
+#endif /* KMK */
 
 

trunk/src/kmk/read.c

@@ -593 +593 @@
   unsigned int tmp_len;
 #endif
+#ifdef KMK
+  struct kbuild_eval_data *kdata = 0;
+  int krc;
+#endif
 
 #define record_waiting_files()                                                \
@@ -896 +900 @@
         continue;
 
+#ifdef KMK
+      /* Check for the kBuild language extensions. */
+      if (   wlen >= sizeof("kBuild-define") - 1
+          && strneq (p, "kBuild-define", sizeof("kBuild-define") - 1))
+        krc = eval_kbuild_define (&kdata, fstart, p, wlen, p2, eol, ignoring);
+      else if (   wlen >= sizeof("kBuild-endef") - 1
+               && strneq (p, "kBuild-endef", sizeof("kBuild-endef") - 1))
+        krc = eval_kbuild_endef (&kdata, fstart, p, wlen, p2, eol, ignoring);
+      else
+        krc = 42;
+      if (krc != 42)
+        {
+          if (krc != 0)
+            error (fstart, _("krc=%d"), krc);
+          continue;
+        }
+
+#endif /* KMK */
       if (word1eq ("export"))
         {
@@ -1646 +1668 @@
   if (conditionals->if_cmds)
     fatal (fstart, _("missing `endif'"));
+#ifdef KMK
+
+  if (kdata != NULL)
+    fatal (fstart, _("missing `kBuild-endef-*'"));
+#endif
 
   /* At eof, record the last rule.  */

trunk/src/kmk/variable.c

@@ -1279 +1279 @@
   && defined (CONFIG_WITH_TOUPPER_TOLOWER) \
   && defined (CONFIG_WITH_DEFINED) \
-  && defined (CONFIG_WITH_VALUE_LENGTH) && defined (CONFIG_WITH_COMPARE) \
+  && defined (CONFIG_WITH_VALUE_LENGTH) \
+  && defined (CONFIG_WITH_COMPARE) \
   && defined (CONFIG_WITH_STACK) \
   && defined (CONFIG_WITH_MATH) \
@@ -1302 +1303 @@
   (void) define_variable ("KMK_FEATURES", 12,
                           "append-dash-n abspath includedep-queue install-hard-linking"
+                          " kBuild-define"
                           " rsort"
                           " abspathex"
@@ -1331 +1333 @@
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
 #  error "All features should be enabled by default!"
-  strcpy (buf, "append-dash-n abspath includedep-queue install-hard-linking");
+  strcpy (buf, "append-dash-n abspath includedep-queue install-hard-linking"
+               " kBuild-define");
 #  if defined (CONFIG_WITH_RSORT)
   strcat (buf, " rsort");