Changeset 36 for trunk/src/kmk

Timestamp:

Mar 18, 2003, 5:32:28 AM (22 years ago)

Author:

bird

Message:

emx is kind of working again...

Location:

trunk/src/kmk

Files:

• parse.c (modified) (2 diffs)
• testcase/nmakecond.mak (modified) (1 diff)
• testcase/nmakeinclude.mak (added)
• testcase/nmakevar.mak (added)
• var.c (modified) (4 diffs)

trunk/src/kmk/parse.c

@@ -2177 +2177 @@
         buf = Buf_Init(MAKE_BSIZE);
 
-        while (((c = ParseReadc ()) != '\n' || (lastc == '\\')) &&
-               (c != EOF))
+        #ifdef NMAKE
+        while (((c = ParseReadc ()) != '\n' || (lastc == '\\') || (lastc == '^')) && (c != EOF))
+        #else
+        while (((c = ParseReadc ()) != '\n' || (lastc == '\\')) && (c != EOF))
+        #endif
         {
 test_char:
@@ -2194 +2197 @@
                 lastc = ' ';
 #ifdef NMAKE
+                if (lastc == '^')
+                    lastc = '\n';
+
                 do {
                         while ((c = ParseReadc ()) == ' ' || c == '\t') {

trunk/src/kmk/testcase/nmakecond.mak

@@ -24 +24 @@
 !endif
 
+                        
+!ifdef MAKE
+!   include nmakeinclude.mak
+!else
+!   include nonexistinginclude.mak
+!endif                  
 
 

trunk/src/kmk/var.c

@@ -187 +187 @@
 #endif
 static Boolean VarMatch __P((char *, Boolean, Buffer, ClientData));
-#ifdef SYSVVARSUB
+#if defined(SYSVVARSUB) || defined(NMAKE)
 static Boolean VarSYSVMatch __P((char *, Boolean, Buffer, ClientData));
 #endif
@@ -894 +894 @@
 }
 
-#ifdef SYSVVARSUB
+#if defined(SYSVVARSUB) || defined(NMAKE)
 /*-
  *-----------------------------------------------------------------------
@@ -2242 +2242 @@
                 default:
                 {
-#ifdef SYSVVARSUB
+#if defined(SYSVVARSUB) || defined(NMAKE)
                     /*
                      * This can either be a bogus modifier or a System-V
@@ -2271 +2271 @@
                             cp++;
                     }
+fprintf(stderr, "debug: cp=\"%s\" endc=%c eqFound=%d tstr=\"%s\"\n", cp, endc, eqFound, tstr);
                     if (*cp == endc && eqFound) {