Changeset 46 for trunk/src/kmk/parse.c

Timestamp:

Apr 4, 2003, 2:03:50 AM (22 years ago)

Author:

bird

Message:

kMk changes. Made extensions configurable from config.h. fixed parents.

File:

• trunk/src/kmk/parse.c (modified) (30 diffs)

trunk/src/kmk/parse.c

@@ -103 +103 @@
 #include "pathnames.h"
 
-#if defined(NMAKE) || defined(KMK)
-#define SUPPORT_INLINEFILES     1
-#endif
 
 /*
@@ -118 +115 @@
 static Boolean      inLine;     /* true if currently in a dependency
                                  * line or its commands */
-#if defined(NMAKE) || defined(KMK)
+#if defined(USE_INLINEFILES)
 static Boolean      inInlineFile; /* true if currently in a inline file.*/
 #endif
@@ -165 +162 @@
     Includes,       /* .INCLUDES */
     Interrupt,      /* .INTERRUPT */
+#ifdef USE_ARCHIVES
     Libs,           /* .LIBS */
+#endif
     MFlags,         /* .MFLAGS or .MAKEFLAGS */
     Main,           /* .MAIN and we don't have anything user-specified to
@@ -219 +218 @@
 { ".INVISIBLE",   Attribute,    OP_INVISIBLE },
 { ".JOIN",        Attribute,    OP_JOIN },
+#ifdef USE_ARCHIVES
 { ".LIBS",        Libs,         0 },
+#endif
 { ".MAIN",        Main,         0 },
 { ".MAKE",        Attribute,    OP_MAKE },
@@ -256 +257 @@
 static void ParseDoDependency __P((char *));
 static int ParseAddCmd __P((ClientData, ClientData));
-#ifdef SUPPORT_INLINEFILES
+#ifdef USE_INLINEFILES
 static int ParseAppendInline __P((ClientData, ClientData));
 static Boolean ParseCmdIsComponent __P((const char *, const char *));
@@ -740 +741 @@
                                  * a list of .PATH targets */
     int             tOp;        /* operator from special target */
+#ifdef USE_ARCHIVES
     Lst             sources;    /* list of archive source names after
                                  * expansion */
+#endif
     Lst             curTargs;   /* list of target names to be found and added
                                  * to the targets list */
@@ -783 +786 @@
         }
         if (*cp == '(') {
+#ifdef USE_ARCHIVES
             /*
              * Archives must be handled specially to make sure the OP_ARCHV
@@ -797 +801 @@
                              "Error in archive specification: \"%s\"", line);
                 return;
-            } else {
+            } else
                 continue;
-            }
+#else
+            Parse_Error(PARSE_FATAL, "Archives are not supported!", line);
+            return;
+#endif /* USE_ARCHIVES */
         }
         savec = *cp;
@@ -1089 +1096 @@
     } else if (specType == ExShell) {
     #ifdef KMK
-        Parse_Error(PARSE_FATAL, "specification not supported by kMk!");
+        Parse_Error(PARSE_FATAL, "shell specification not supported by kMk!");
         return;
     #else
@@ -1106 +1113 @@
      */
     if ((specType == Suffixes) || (specType == ExPath) ||
-        (specType == Includes) || (specType == Libs) ||
+        (specType == Includes) ||
+#ifdef USE_ARCHIVES
+        (specType == Libs) ||
+#endif
         (specType == Null))
     {
@@ -1150 +1160 @@
                     Suff_AddInclude (line);
                     break;
+#ifdef USE_ARCHIVES
                 case Libs:
                     Suff_AddLib (line);
                     break;
+#endif
                 case Null:
                     Suff_SetNull (line);
@@ -1193 +1205 @@
 
             if (*cp == '(') {
+#ifdef USE_ARCHIVES
                 GNode     *gn;
 
@@ -1208 +1221 @@
                 Lst_Destroy (sources, NOFREE);
                 cp = line;
+#else
+                Parse_Error(PARSE_FATAL, "Archives are not supported!", line);
+                return;
+#endif /* USE_ARCHIVES */
             } else {
                 if (*cp) {
@@ -1528 +1545 @@
 
 
-#ifdef SUPPORT_INLINEFILES
+#ifdef USE_INLINEFILES
 /*-
  * ParseAppendInline  --
@@ -2256 +2273 @@
     semiNL = FALSE;
     ignDepOp = FALSE;
-    #ifdef SUPPORT_INLINEFILES
+    #ifdef USE_INLINEFILES
     ignComment = inInlineFile;
     #else
@@ -2271 +2288 @@
     for (;;) {
         c = ParseReadc();
-        #ifdef SUPPORT_INLINEFILES
+        #ifdef USE_INLINEFILES
         if (inInlineFile)
             break;
@@ -2306 +2323 @@
             switch(c) {
             case '\n':
-                #ifdef SUPPORT_INLINEFILES
+                #ifdef USE_INLINEFILES
                 /* No newline escaping in inline files, unless it's a directive. */
                 if (inInlineFile) {
@@ -2367 +2384 @@
 #ifndef KMK
             case ';':
-                #ifdef SUPPORT_INLINEFILES
+                #ifdef USE_INLINEFILES
                 if (inInlineFile)
                     break;
@@ -2389 +2406 @@
                 break;
             case '=':
-                #ifdef SUPPORT_INLINEFILES
+                #ifdef USE_INLINEFILES
                 if (inInlineFile)
                     break;
@@ -2442 +2459 @@
             case ':':
             case '!':
-                #ifdef SUPPORT_INLINEFILES
+                #ifdef USE_INLINEFILES
                 if (inInlineFile)
                     break;
@@ -2479 +2496 @@
          * a '\'
          */
-#ifdef SUPPORT_INLINEFILES
+#ifdef USE_INLINEFILES
       if (!inInlineFile) {
 #endif
@@ -2491 +2508 @@
         }
         *ep = 0;
-#ifdef SUPPORT_INLINEFILES
+#ifdef USE_INLINEFILES
       }
 #endif
@@ -2604 +2621 @@
 
     inLine = FALSE;
-    #if defined(NMAKE) || defined(KMK)
+    #if defined(USE_INLINEFILES)
     inInlineFile = FALSE;
     #endif
@@ -2652 +2669 @@
             }
 
-            #ifdef SUPPORT_INLINEFILES
+            #ifdef USE_INLINEFILES
             if (inInlineFile)
             {
@@ -2702 +2719 @@
                  * a creation command.
                  */
-#if !defined(POSIX) || defined(NMAKE)
+#if !defined(POSIX) || defined(USE_NO_STUPID_TABS)
             shellCommand:
 #endif
@@ -2710 +2727 @@
                 if (*cp) {
                     if (inLine) {
-                        #ifdef SUPPORT_INLINEFILES
+                        #ifdef USE_INLINEFILES
                         if (ParseCmdIsComponent(cp, "<<"))
                         {
@@ -2757 +2774 @@
                  * and add it to the current list of targets.
                  */
-#if !defined(POSIX) || defined(NMAKE) || defined(KMK)
+#if !defined(POSIX) || defined(USE_NO_STUPID_TABS)
                 Boolean nonSpace = FALSE;
 #endif
@@ -2769 +2786 @@
                         goto nextLine;
                     }
-#if !defined(POSIX) || defined(NMAKE) || defined(KMK)
+#if !defined(POSIX) || defined(USE_NO_STUPID_TABS)
                     while ((*cp != ':') && (*cp != '!') && (*cp != '\0')) {
                         nonSpace = TRUE;
@@ -2777 +2794 @@
                 }
 
-#if !defined(POSIX) || defined(NMAKE) || defined(KMK)
+#if !defined(POSIX) || defined(USE_NO_STUPID_TABS)
                 if (*cp == '\0') {
                     if (inLine) {
-#if !defined(NMAKE) && !defined(KMK)
+#if !defined(USE_NO_STUPID_TABS)
                         Parse_Error (PARSE_WARNING,
                                      "Shell command needs a leading tab");
@@ -2806 +2823 @@
 
                     ParseDoDependency (line);
-#if !defined(POSIX) || defined(NMAKE) || defined(KMK)
+#if !defined(POSIX) || defined(USE_NO_STUPID_TABS)
                 }
 #endif