Changeset 3140 for trunk/src/kmk/expreval.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• expreval.c (modified) (11 diffs)

trunk/src/kmk/expreval.c

@@ -28 +28 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "make.h"
+#include "makeint.h"
 #include <assert.h>
 
@@ -162 +162 @@
     const char *psz;
     /** The current file location, used for errors. */
-    const struct floc *pFileLoc;
+    const floc *pFileLoc;
     /** Pending binary operator. */
     PCEXPROP pPending;
@@ -213 +213 @@
     va_end(va);
 
-    fatal(pThis->pFileLoc, "%s", szTmp);
+    OS(fatal,pThis->pFileLoc, "%s", szTmp);
 }
 
@@ -284 +284 @@
      * Skip blanks.
      */
-    while (isblank(*psz))
+    while (ISBLANK(*psz))
         psz++;
 
@@ -305 +305 @@
      * Recognize some exsotic prefixes here in addition to the two standard ones.
      */
-    if (*psz != '0' || psz[1] == '\0' || isblank((unsigned int)psz[1]))
+    if (*psz != '0' || psz[1] == '\0' || ISBLANK(psz[1]))
         uBase = 10;
     else if (psz[1] == 'x' || psz[1] == 'X')
@@ -370 +370 @@
             default:
                 /* is the rest white space? */
-                while (isspace((unsigned int)*psz))
+                while (ISSPACE(*psz))
                     psz++;
                 if (*psz != '\0')
@@ -745 +745 @@
             EXPRINT64 iVal;
             char const *psz = pVar->uVal.psz;
-            while (isblank((unsigned char)*psz))
+            while (ISBLANK(*psz))
                 psz++;
             if (    *psz
@@ -1773 +1773 @@
 
         /* spaces */
-        while (isspace((unsigned int)*psz))
+        while (ISSPACE(*psz))
             psz++;
         /* see what we've got. */
@@ -1837 +1837 @@
      * Eat white space and make sure there is something after it.
      */
-    while (isspace((unsigned int)*psz))
+    while (ISSPACE(*psz))
         psz++;
     if (!*psz)
@@ -1935 +1935 @@
                             break;
                     }
-                    if (isspace((unsigned char)ch))
+                    if (ISSPACE(ch))
                         break;
                 }
@@ -2081 +2081 @@
  * @param   flocp   The file location, used for errors.
  */
-int expr_eval_if_conditionals(const char *line, const struct floc *flocp)
+int expr_eval_if_conditionals(const char *line, const floc *flocp)
 {
     /*