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

Timestamp:

Mar 18, 2003, 4:58:49 AM (22 years ago)

Author:

bird

Message:

emx is kind of working again...

File:

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

trunk/src/kmk/parse.c

@@ -252 +252 @@
 static void ParseUnreadc __P((int));
 static void ParseHasCommands __P((ClientData));
-static void ParseDoInclude __P((char *));
+static void ParseDoInclude __P((char *, char));
 static void ParseDoError __P((char *));
 #ifdef SYSVINCLUDE
@@ -540 +540 @@
          * If we have noted the existence of a .MAIN, it means we need
          * to add the sources of said target to the list of things
-         * to create. The string 'src' is likely to be free, so we
+         * to create. The string 'src' is likely to be efree, so we
          * must make a new copy of it. Note that this will only be
          * invoked if the user didn't specify a target on the command
@@ -765 +765 @@
 
                 if (freeIt) {
-                    free(result);
+                    efree(result);
                 }
                 cp += length-1;
@@ -1454 +1454 @@
 
         Var_Set(line, cp, ctxt);
-        free(cp);
+        efree(cp);
     } else if (type == VAR_SHELL) {
         Boolean freeCmd = FALSE; /* TRUE if the command needs to be freed, i.e.
@@ -1472 +1472 @@
         res = Cmd_Exec(cp, &err);
         Var_Set(line, res, ctxt);
-        free(res);
+        efree(res);
 
         if (err)
@@ -1478 +1478 @@
 
         if (freeCmd)
-            free(cp);
+            efree(cp);
     } else {
         /*
@@ -1605 +1605 @@
  */
 static void
-ParseDoInclude (file)
+ParseDoInclude (file, chPre)
     char          *file;        /* file specification */
+    char           chPre;       /* Preprocessor char */
 {
     char          *fullname;    /* full pathname of file */
@@ -1621 +1622 @@
     }
 
+    #ifndef NMAKE
     if ((*file != '"') && (*file != '<')) {
         Parse_Error (PARSE_FATAL,
-            ".include filename must be delimited by '\"' or '<'");
+            "%cinclude filename must be delimited by '\"' or '<'", chPre);
         return;
     }
+    #endif
 
     /*
@@ -1637 +1640 @@
     } else {
         isSystem = FALSE;
+        #ifdef NMAKE
+        if (*file == '"')
+            endc = '"';
+        else
+        {
+            endc = '\0';
+            file--;
+        }
+        #else
         endc = '"';
+        #endif
     }
 
@@ -1647 +1660 @@
     }
 
+    #ifdef NMAKE
+    if (endc && *cp != endc) {
+    #else
     if (*cp != endc) {
+    #endif
         Parse_Error (PARSE_FATAL,
                      "Unclosed %cinclude filename. '%c' expected",
-                     '.', endc);
+                     chPre, endc);
         return;
     }
@@ -1692 +1709 @@
                 fullname = Dir_FindFile(newName, dirSearchPath);
             }
-            free (newName);
+            efree (newName);
             *prefEnd = '/';
         } else {
             fullname = (char *)NULL;
         }
-        free (Fname);
+        efree (Fname);
     } else {
         fullname = (char *)NULL;
@@ -1725 +1742 @@
     if (fullname == (char *) NULL) {
         *cp = endc;
-        Parse_Error (PARSE_FATAL, "Could not find %s", file);
+        Parse_Error (PARSE_FATAL, "Could not find '%s'", file);
         return;
     }
 
-    free(file);
+    efree(file);
 
     /*
@@ -1882 +1899 @@
             fullname = Dir_FindFile(newName, dirSearchPath);
         }
-        free (newName);
+        efree (newName);
         *prefEnd = '/';
     } else {
@@ -1977 +1994 @@
 
     ifile = (IFile *) Lst_DeQueue (includes);
-    free ((Address) fname);
+    efree ((Address) fname);
     fname = ifile->fname;
     lineno = ifile->lineno;
@@ -1983 +2000 @@
         (void) fclose (curFILE);
     if (curPTR) {
-        free((Address) curPTR->str);
-        free((Address) curPTR);
+        efree((Address) curPTR->str);
+        efree((Address) curPTR);
     }
     curFILE = ifile->F;
     curPTR = ifile->p;
-    free ((Address)ifile);
+    efree ((Address)ifile);
     return (CONTINUE);
 }
@@ -2083 +2100 @@
         Buf_AddByte(buf, (Byte)'\0');
         line = (char *)Buf_GetAll(buf, &lineLength);
+    #ifdef NMAKE
+    } while (skip == 1 && line[0] != '.' && line[0] != '!');
+    #else
     } while (skip == 1 && line[0] != '.');
+    #endif
 
     Buf_Destroy(buf, FALSE);
@@ -2328 +2349 @@
                  */
                 do {
-                    free (line);
+                    efree (line);
                     line = ParseSkipLine(1);
                 } while (line && Cond_Eval(line) != COND_PARSE);
@@ -2335 +2356 @@
                 /*FALLTHRU*/
             case COND_PARSE:
-                free ((Address) line);
+                efree ((Address) line);
                 line = ParseReadLine();
                 break;
@@ -2341 +2362 @@
                 if (For_Eval(line)) {
                     int ok;
-                    free(line);
+                    efree(line);
                     do {
                         /*
@@ -2353 +2374 @@
                         }
                         ok = For_Eval(line);
-                        free(line);
+                        efree(line);
                     }
                     while (ok);
@@ -2430 +2451 @@
         while ((line = ParseReadLine ()) != NULL) {
 //debugkso: fprintf(stderr, "%s(%d): inLine=%d line=%s\n", fname, lineno, inLine, line);
+            #ifdef NMAKE
+            if (*line == '.' || *line == '!') {
+            #else
             if (*line == '.') {
+            #endif
                 /*
                  * Lines that begin with the special character are either
@@ -2439 +2464 @@
                 }
                 if (strncmp (cp, "include", 7) == 0) {
-                    ParseDoInclude (cp + 7);
+                    ParseDoInclude (cp + 7, *line);
                     goto nextLine;
                 } else if (strncmp (cp, "error", 5) == 0) {
@@ -2553 +2578 @@
 
                     cp = Var_Subst (NULL, line, VAR_CMD, TRUE);
-                    free (line);
+                    efree (line);
                     line = cp;
 
@@ -2573 +2598 @@
             nextLine:
 
-            free (line);
+            efree (line);
         }
         /*
@@ -2614 +2639 @@
 Parse_End()
 {
-    Lst_Destroy(targCmds, (void (*) __P((ClientData))) free);
+    Lst_Destroy(targCmds, (void (*) __P((ClientData))) efree);
     if (targets)
         Lst_Destroy(targets, NOFREE);