73c768dae9
When chainlint detects problems in a test, such as a broken &&-chain, it prints out the test with "?!FOO?!" annotations inserted at each problem location. However, rather than annotating the original test definition, it instead dumps out a parsed token representation of the test. Since it lacks comments, indentations, here-doc bodies, and so forth, this tokenized representation can be difficult for the test author to digest and relate back to the original test definition. However, now that each parsed token carries positional information, the location of a detected problem can be pinpointed precisely in the original test definition. Therefore, take advantage of this information to annotate the test definition itself rather than annotating the parsed token stream, thus making it easier for a test author to relate a problem back to the source. Maintaining the positional meta-information associated with each detected problem requires a slight change in how the problems are managed internally. In particular, shell syntax such as: msg="total: $(cd data; wc -w *.txt) words" requires the lexical analyzer to recursively invoke the parser in order to detect problems within the $(...) expression inside the double-quoted string. In this case, the recursive parse context will detect the broken &&-chain between the `cd` and `wc` commands, returning the token stream: cd data ; ?!AMP?! wc -w *.txt However, the parent parse context will see everything inside the double-quotes as a single string token: "total: $(cd data ; ?!AMP?! wc -w *.txt) words" losing whatever positional information was attached to the ";" token where the problem was detected. One way to preserve the positional information of a detected problem in a recursive parse context within a string would be to attach the positional information to the annotation textually; for instance: "total: $(cd data ; ?!AMP:21:22?! wc -w *.txt) words" and then extract the positional information when annotating the original test definition. However, a cleaner and much simpler approach is to maintain the list of detected problems separately rather than embedding the problems as annotations directly in the parsed token stream. Not only does this ensure that positional information within recursive parse contexts is not lost, but it keeps the token stream free from non-token pollution, which may simplify implementation of validations added in the future since they won't have to handle non-token "?!FOO!?" items specially. Finally, the chainlint self-test "expect" files need a few mechanical adjustments now that the original test definitions are emitted rather than the parsed token stream. In particular, the following items missing from the historic parsed-token output are now preserved verbatim: * indentation (and whitespace, in general) * comments * here-doc bodies * here-doc tag quoting (i.e. "\EOF") * line-splices (i.e. "\" at the end of a line) Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> |
||
---|---|---|
.. | ||
arithmetic-expansion.expect | ||
arithmetic-expansion.test | ||
bash-array.expect | ||
bash-array.test | ||
blank-line-before-esac.expect | ||
blank-line-before-esac.test | ||
blank-line.expect | ||
blank-line.test | ||
block-comment.expect | ||
block-comment.test | ||
block.expect | ||
block.test | ||
broken-chain.expect | ||
broken-chain.test | ||
case-comment.expect | ||
case-comment.test | ||
case.expect | ||
case.test | ||
chain-break-background.expect | ||
chain-break-background.test | ||
chain-break-continue.expect | ||
chain-break-continue.test | ||
chain-break-false.expect | ||
chain-break-false.test | ||
chain-break-return-exit.expect | ||
chain-break-return-exit.test | ||
chain-break-status.expect | ||
chain-break-status.test | ||
chained-block.expect | ||
chained-block.test | ||
chained-subshell.expect | ||
chained-subshell.test | ||
close-nested-and-parent-together.expect | ||
close-nested-and-parent-together.test | ||
close-subshell.expect | ||
close-subshell.test | ||
command-substitution-subsubshell.expect | ||
command-substitution-subsubshell.test | ||
command-substitution.expect | ||
command-substitution.test | ||
comment.expect | ||
comment.test | ||
complex-if-in-cuddled-loop.expect | ||
complex-if-in-cuddled-loop.test | ||
cuddled-if-then-else.expect | ||
cuddled-if-then-else.test | ||
cuddled-loop.expect | ||
cuddled-loop.test | ||
cuddled.expect | ||
cuddled.test | ||
double-here-doc.expect | ||
double-here-doc.test | ||
dqstring-line-splice.expect | ||
dqstring-line-splice.test | ||
dqstring-no-interpolate.expect | ||
dqstring-no-interpolate.test | ||
empty-here-doc.expect | ||
empty-here-doc.test | ||
exclamation.expect | ||
exclamation.test | ||
exit-loop.expect | ||
exit-loop.test | ||
exit-subshell.expect | ||
exit-subshell.test | ||
for-loop-abbreviated.expect | ||
for-loop-abbreviated.test | ||
for-loop.expect | ||
for-loop.test | ||
function.expect | ||
function.test | ||
here-doc-close-subshell.expect | ||
here-doc-close-subshell.test | ||
here-doc-indent-operator.expect | ||
here-doc-indent-operator.test | ||
here-doc-multi-line-command-subst.expect | ||
here-doc-multi-line-command-subst.test | ||
here-doc-multi-line-string.expect | ||
here-doc-multi-line-string.test | ||
here-doc.expect | ||
here-doc.test | ||
if-condition-split.expect | ||
if-condition-split.test | ||
if-in-loop.expect | ||
if-in-loop.test | ||
if-then-else.expect | ||
if-then-else.test | ||
incomplete-line.expect | ||
incomplete-line.test | ||
inline-comment.expect | ||
inline-comment.test | ||
loop-detect-failure.expect | ||
loop-detect-failure.test | ||
loop-detect-status.expect | ||
loop-detect-status.test | ||
loop-in-if.expect | ||
loop-in-if.test | ||
loop-upstream-pipe.expect | ||
loop-upstream-pipe.test | ||
multi-line-nested-command-substitution.expect | ||
multi-line-nested-command-substitution.test | ||
multi-line-string.expect | ||
multi-line-string.test | ||
negated-one-liner.expect | ||
negated-one-liner.test | ||
nested-cuddled-subshell.expect | ||
nested-cuddled-subshell.test | ||
nested-here-doc.expect | ||
nested-here-doc.test | ||
nested-loop-detect-failure.expect | ||
nested-loop-detect-failure.test | ||
nested-subshell-comment.expect | ||
nested-subshell-comment.test | ||
nested-subshell.expect | ||
nested-subshell.test | ||
not-heredoc.expect | ||
not-heredoc.test | ||
one-liner-for-loop.expect | ||
one-liner-for-loop.test | ||
one-liner.expect | ||
one-liner.test | ||
p4-filespec.expect | ||
p4-filespec.test | ||
pipe.expect | ||
pipe.test | ||
return-loop.expect | ||
return-loop.test | ||
semicolon.expect | ||
semicolon.test | ||
sqstring-in-sqstring.expect | ||
sqstring-in-sqstring.test | ||
subshell-here-doc.expect | ||
subshell-here-doc.test | ||
subshell-one-liner.expect | ||
subshell-one-liner.test | ||
t7900-subtree.expect | ||
t7900-subtree.test | ||
token-pasting.expect | ||
token-pasting.test | ||
while-loop.expect | ||
while-loop.test |