CVS commit: src/usr.bin/make

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    src
Committed By:   rillig
Date:           Thu Aug 29 20:20:37 UTC 2024

Modified Files:
        src/usr.bin/make: make.h parse.c var.c
        src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk
            cmd-errors-lint.exp cmd-errors-lint.mk cmd-errors.exp cmd-errors.mk
            cond-late.exp cond-late.mk cond-token-string.exp
            cond-token-string.mk deptgt.exp deptgt.mk directive-for-errors.exp
            directive-for-errors.mk directive-for-escape.exp
            directive-for-escape.mk directive-for.exp directive-for.mk
            directive-include.exp directive-include.mk directive-undef.exp
            directive-undef.mk lint.exp moderrs.exp moderrs.mk
            opt-debug-lint.exp opt-debug-lint.mk var-eval-short.exp
            var-eval-short.mk var-op-expand.exp var-op-expand.mk
            var-recursive.exp var-recursive.mk vardebug.exp vardebug.mk
            varmisc.exp varmisc.mk varmod-assign-shell.exp
            varmod-assign-shell.mk varmod-assign.exp varmod-assign.mk
            varmod-edge.exp varmod-edge.mk varmod-gmtime.exp varmod-gmtime.mk
            varmod-hash.exp varmod-ifelse.exp varmod-ifelse.mk
            varmod-indirect.exp varmod-indirect.mk varmod-localtime.exp
            varmod-localtime.mk varmod-loop-delete.exp varmod-loop-delete.mk
            varmod-loop-varname.exp varmod-loop-varname.mk
            varmod-match-escape.exp varmod-match-escape.mk varmod-match.exp
            varmod-match.mk varmod-mtime.exp varmod-mtime.mk varmod-order.exp
            varmod-order.mk varmod-range.exp varmod-range.mk
            varmod-select-words.exp varmod-select-words.mk varmod-shell.exp
            varmod-shell.mk varmod-subst-regex.exp varmod-subst.exp
            varmod-subst.mk varmod-sun-shell.exp varmod-sun-shell.mk
            varmod-sysv.exp varmod-sysv.mk varmod-to-separator.exp
            varmod-to-separator.mk varmod.exp varmod.mk varparse-errors.exp
            varparse-errors.mk

Log Message:
make: reduce line length in error messages

The error messages for deeply nested parse errors were hard to decipher,
due to the large amount of text.  Split these messages into individual
lines, just as in the backtrace for .include files and .for loops.  This
unified backtrace makes the output more uniform.


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/usr.bin/make/make.h
cvs rdiff -u -r1.734 -r1.735 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1138 -r1.1139 src/usr.bin/make/var.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp \
    src/usr.bin/make/unit-tests/cmd-errors.exp \
    src/usr.bin/make/unit-tests/directive-for-errors.mk
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk \
    src/usr.bin/make/unit-tests/cond-token-string.mk \
    src/usr.bin/make/unit-tests/directive-undef.exp \
    src/usr.bin/make/unit-tests/var-recursive.exp \
    src/usr.bin/make/unit-tests/vardebug.mk \
    src/usr.bin/make/unit-tests/varmod-mtime.mk
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cmd-errors-lint.exp \
    src/usr.bin/make/unit-tests/var-recursive.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors-lint.mk \
    src/usr.bin/make/unit-tests/varmod-select-words.exp \
    src/usr.bin/make/unit-tests/varmod-select-words.mk \
    src/usr.bin/make/unit-tests/varmod-sun-shell.mk
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/cmd-errors.mk \
    src/usr.bin/make/unit-tests/varmod-loop-varname.mk \
    src/usr.bin/make/unit-tests/varmod-mtime.exp \
    src/usr.bin/make/unit-tests/varmod-shell.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-late.exp \
    src/usr.bin/make/unit-tests/cond-late.mk \
    src/usr.bin/make/unit-tests/directive-for-errors.exp \
    src/usr.bin/make/unit-tests/varmod-assign-shell.exp \
    src/usr.bin/make/unit-tests/varmod-assign-shell.mk \
    src/usr.bin/make/unit-tests/varmod-shell.exp \
    src/usr.bin/make/unit-tests/varmod-subst.exp
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/cond-token-string.exp \
    src/usr.bin/make/unit-tests/directive-include.mk \
    src/usr.bin/make/unit-tests/directive-undef.mk \
    src/usr.bin/make/unit-tests/var-eval-short.mk \
    src/usr.bin/make/unit-tests/varmod-order.exp \
    src/usr.bin/make/unit-tests/varmod-subst.mk \
    src/usr.bin/make/unit-tests/varmod-sysv.exp \
    src/usr.bin/make/unit-tests/varparse-errors.exp
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/deptgt.exp \
    src/usr.bin/make/unit-tests/varmod-match-escape.mk \
    src/usr.bin/make/unit-tests/varmod-to-separator.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/deptgt.mk \
    src/usr.bin/make/unit-tests/varmod-indirect.mk \
    src/usr.bin/make/unit-tests/varmod-sysv.mk
cvs rdiff -u -r1.30 -r1.31 \
    src/usr.bin/make/unit-tests/directive-for-escape.exp \
    src/usr.bin/make/unit-tests/var-eval-short.exp \
    src/usr.bin/make/unit-tests/varmod-edge.mk
cvs rdiff -u -r1.28 -r1.29 \
    src/usr.bin/make/unit-tests/directive-for-escape.mk \
    src/usr.bin/make/unit-tests/varmod-assign.exp
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/directive-for.exp \
    src/usr.bin/make/unit-tests/varmod-gmtime.mk
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/directive-for.mk \
    src/usr.bin/make/unit-tests/varmod-edge.exp \
    src/usr.bin/make/unit-tests/varmod-match.mk
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/directive-include.exp \
    src/usr.bin/make/unit-tests/varmod-range.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/lint.exp \
    src/usr.bin/make/unit-tests/varmod-loop-delete.mk \
    src/usr.bin/make/unit-tests/varmod-sun-shell.exp
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/make/unit-tests/moderrs.mk
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/opt-debug-lint.exp \
    src/usr.bin/make/unit-tests/var-op-expand.mk \
    src/usr.bin/make/unit-tests/varmod-gmtime.exp \
    src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/opt-debug-lint.mk \
    src/usr.bin/make/unit-tests/varmod-to-separator.mk \
    src/usr.bin/make/unit-tests/varmod.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/var-op-expand.exp \
    src/usr.bin/make/unit-tests/varmod-loop-varname.exp \
    src/usr.bin/make/unit-tests/varmod-subst-regex.exp
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/varmisc.exp \
    src/usr.bin/make/unit-tests/varmod-assign.mk \
    src/usr.bin/make/unit-tests/varmod-ifelse.exp \
    src/usr.bin/make/unit-tests/varmod-match-escape.exp
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/make/unit-tests/varmisc.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-hash.exp \
    src/usr.bin/make/unit-tests/varmod-loop-delete.exp
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/make/unit-tests/varmod-ifelse.mk
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/make/unit-tests/varmod-indirect.exp
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varmod-localtime.exp \
    src/usr.bin/make/unit-tests/varmod-localtime.mk \
    src/usr.bin/make/unit-tests/varparse-errors.mk
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-order.mk \
    src/usr.bin/make/unit-tests/varmod-range.exp \
    src/usr.bin/make/unit-tests/varmod.exp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.