Module Name: src
Committed By: rillig
Date: Tue Feb 23 00:15:22 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: varmod-range.exp
Log Message:
make: add context information to error message about ':range' modifier
To generate a diff of this commit:
cvs rdiff -u -r1.843 -r1.844 src/usr.bin/make/var.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-range.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.843 src/usr.bin/make/var.c:1.844
--- src/usr.bin/make/var.c:1.843 Tue Feb 23 00:11:07 2021
+++ src/usr.bin/make/var.c Tue Feb 23 00:15:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.843 2021/02/23 00:11:07 rillig Exp $ */
+/* $NetBSD: var.c,v 1.844 2021/02/23 00:15:22 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.843 2021/02/23 00:11:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.844 2021/02/23 00:15:22 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -2666,7 +2666,8 @@ ApplyModifier_Range(const char **pp, App
const char *p = mod + 6;
if (!TryParseSize(&p, &n)) {
Parse_Error(PARSE_FATAL,
- "Invalid number: %s", mod + 6);
+ "Invalid number \"%s\" for ':range' modifier",
+ mod + 6);
return AMR_CLEANUP;
}
*pp = p;
Index: src/usr.bin/make/unit-tests/varmod-range.exp
diff -u src/usr.bin/make/unit-tests/varmod-range.exp:1.7 src/usr.bin/make/unit-tests/varmod-range.exp:1.8
--- src/usr.bin/make/unit-tests/varmod-range.exp:1.7 Mon Dec 21 21:04:18 2020
+++ src/usr.bin/make/unit-tests/varmod-range.exp Tue Feb 23 00:15:22 2021
@@ -1,4 +1,4 @@
-make: "varmod-range.mk" line 53: Invalid number: x}Rest" != "Rest"
+make: "varmod-range.mk" line 53: Invalid number "x}Rest" != "Rest"" for ':range' modifier
make: "varmod-range.mk" line 53: Malformed conditional ("${:U:range=x}Rest" != "Rest")
make: "varmod-range.mk" line 62: Unknown modifier 'x'
make: "varmod-range.mk" line 62: Malformed conditional ("${:U:range=0x0}Rest" != "Rest")
