Module Name: src
Committed By: rillig
Date: Thu Dec 9 20:27:01 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: var-eval-short.exp varmod-gmtime.exp
varmod-localtime.exp varmod-to-separator.exp
Log Message:
make: in parse errors, mark whitespace more clearly
This prevents any trailing whitespace from going unnoticed. It also
marks leading whitespace more clearly, as in the examples with the time
value " 1".
To generate a diff of this commit:
cvs rdiff -u -r1.969 -r1.970 src/usr.bin/make/var.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/var-eval-short.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod-gmtime.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/varmod-localtime.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-to-separator.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.969 src/usr.bin/make/var.c:1.970
--- src/usr.bin/make/var.c:1.969 Thu Dec 9 20:13:10 2021
+++ src/usr.bin/make/var.c Thu Dec 9 20:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $ */
+/* $NetBSD: var.c,v 1.970 2021/12/09 20:27:01 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.970 2021/12/09 20:27:01 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2587,7 +2587,7 @@ ApplyModifier_Gmtime(const char **pp, Mo
const char *p = mod + 7;
if (!TryParseTime(&p, &utc)) {
Parse_Error(PARSE_FATAL,
- "Invalid time value: %s", mod + 7);
+ "Invalid time value at \"%s\"", mod + 7);
return AMR_CLEANUP;
}
*pp = p;
@@ -2619,7 +2619,7 @@ ApplyModifier_Localtime(const char **pp,
const char *p = mod + 10;
if (!TryParseTime(&p, &utc)) {
Parse_Error(PARSE_FATAL,
- "Invalid time value: %s", mod + 10);
+ "Invalid time value at \"%s\"", mod + 10);
return AMR_CLEANUP;
}
*pp = p;
@@ -3092,7 +3092,7 @@ ApplyModifier_ToSep(const char **pp, Mod
if (!TryParseChar(&p, base, &ch->sep)) {
Parse_Error(PARSE_FATAL,
- "Invalid character number: %s", p);
+ "Invalid character number at \"%s\"", p);
return AMR_CLEANUP;
}
if (!IsDelimiter(*p, ch)) {
Index: src/usr.bin/make/unit-tests/var-eval-short.exp
diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.15 src/usr.bin/make/unit-tests/var-eval-short.exp:1.16
--- src/usr.bin/make/unit-tests/var-eval-short.exp:1.15 Thu Dec 9 20:13:10 2021
+++ src/usr.bin/make/unit-tests/var-eval-short.exp Thu Dec 9 20:27:01 2021
@@ -1,8 +1,8 @@
make: "var-eval-short.mk" line 41: In the :@ modifier of "", the variable name "${FAIL}" must not contain a dollar
make: "var-eval-short.mk" line 41: Malformed conditional (0 && ${:Uword:@${FAIL}@expr@})
-make: "var-eval-short.mk" line 81: Invalid time value: ${FAIL}}
+make: "var-eval-short.mk" line 81: Invalid time value at "${FAIL}}"
make: "var-eval-short.mk" line 81: Malformed conditional (0 && ${:Uword:gmtime=${FAIL}})
-make: "var-eval-short.mk" line 95: Invalid time value: ${FAIL}}
+make: "var-eval-short.mk" line 95: Invalid time value at "${FAIL}}"
make: "var-eval-short.mk" line 95: Malformed conditional (0 && ${:Uword:localtime=${FAIL}})
CondParser_Eval: 0 && ${0:?${FAIL}then:${FAIL}else}
Var_Parse: ${0:?${FAIL}then:${FAIL}else} (parse-only)
Index: src/usr.bin/make/unit-tests/varmod-gmtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.11 src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.12
--- src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.11 Tue Jan 19 05:26:34 2021
+++ src/usr.bin/make/unit-tests/varmod-gmtime.exp Thu Dec 9 20:27:01 2021
@@ -1,12 +1,12 @@
-make: "varmod-gmtime.mk" line 57: Invalid time value: ${:U1593536400}} != "mtime=11593536400}"
+make: "varmod-gmtime.mk" line 57: Invalid time value at "${:U1593536400}} != "mtime=11593536400}""
make: "varmod-gmtime.mk" line 57: Malformed conditional (${%Y:L:gmtime=${:U1593536400}} != "mtime=11593536400}")
-make: "varmod-gmtime.mk" line 67: Invalid time value: -1} != ""
+make: "varmod-gmtime.mk" line 67: Invalid time value at "-1} != """
make: "varmod-gmtime.mk" line 67: Malformed conditional (${:L:gmtime=-1} != "")
-make: "varmod-gmtime.mk" line 76: Invalid time value: 1} != ""
+make: "varmod-gmtime.mk" line 76: Invalid time value at " 1} != """
make: "varmod-gmtime.mk" line 76: Malformed conditional (${:L:gmtime= 1} != "")
-make: "varmod-gmtime.mk" line 119: Invalid time value: 10000000000000000000000000000000} != ""
+make: "varmod-gmtime.mk" line 119: Invalid time value at "10000000000000000000000000000000} != """
make: "varmod-gmtime.mk" line 119: Malformed conditional (${:L:gmtime=10000000000000000000000000000000} != "")
-make: "varmod-gmtime.mk" line 130: Invalid time value: error} != ""
+make: "varmod-gmtime.mk" line 130: Invalid time value at "error} != """
make: "varmod-gmtime.mk" line 130: Malformed conditional (${:L:gmtime=error} != "")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
Index: src/usr.bin/make/unit-tests/varmod-localtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-localtime.exp:1.8 src/usr.bin/make/unit-tests/varmod-localtime.exp:1.9
--- src/usr.bin/make/unit-tests/varmod-localtime.exp:1.8 Tue Jan 19 05:26:34 2021
+++ src/usr.bin/make/unit-tests/varmod-localtime.exp Thu Dec 9 20:27:01 2021
@@ -1,12 +1,12 @@
-make: "varmod-localtime.mk" line 57: Invalid time value: ${:U1593536400}} != "mtime=11593536400}"
+make: "varmod-localtime.mk" line 57: Invalid time value at "${:U1593536400}} != "mtime=11593536400}""
make: "varmod-localtime.mk" line 57: Malformed conditional (${%Y:L:localtime=${:U1593536400}} != "mtime=11593536400}")
-make: "varmod-localtime.mk" line 67: Invalid time value: -1} != ""
+make: "varmod-localtime.mk" line 67: Invalid time value at "-1} != """
make: "varmod-localtime.mk" line 67: Malformed conditional (${:L:localtime=-1} != "")
-make: "varmod-localtime.mk" line 76: Invalid time value: 1} != ""
+make: "varmod-localtime.mk" line 76: Invalid time value at " 1} != """
make: "varmod-localtime.mk" line 76: Malformed conditional (${:L:localtime= 1} != "")
-make: "varmod-localtime.mk" line 119: Invalid time value: 10000000000000000000000000000000} != ""
+make: "varmod-localtime.mk" line 119: Invalid time value at "10000000000000000000000000000000} != """
make: "varmod-localtime.mk" line 119: Malformed conditional (${:L:localtime=10000000000000000000000000000000} != "")
-make: "varmod-localtime.mk" line 130: Invalid time value: error} != ""
+make: "varmod-localtime.mk" line 130: Invalid time value at "error} != """
make: "varmod-localtime.mk" line 130: Malformed conditional (${:L:localtime=error} != "")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
Index: src/usr.bin/make/unit-tests/varmod-to-separator.exp
diff -u src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.7 src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.8
--- src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.7 Tue Feb 23 16:07:14 2021
+++ src/usr.bin/make/unit-tests/varmod-to-separator.exp Thu Dec 9 20:27:01 2021
@@ -1,6 +1,6 @@
-make: "varmod-to-separator.mk" line 107: Invalid character number: 400:tu}
+make: "varmod-to-separator.mk" line 107: Invalid character number at "400:tu}"
make: "varmod-to-separator.mk" line 107: Malformed conditional (${WORDS:[1..3]:ts\400:tu})
-make: "varmod-to-separator.mk" line 121: Invalid character number: 100:tu}
+make: "varmod-to-separator.mk" line 121: Invalid character number at "100:tu}"
make: "varmod-to-separator.mk" line 121: Malformed conditional (${WORDS:[1..3]:ts\x100:tu})
make: Bad modifier ":ts\-300" for variable "WORDS"
make: "varmod-to-separator.mk" line 128: Malformed conditional (${WORDS:[1..3]:ts\-300:tu})
