Merge branch 'es/chain-lint-more'
The test linter code has learned that the end of here-doc mark "EOF" can be quoted in a double-quote pair, not just in a single-quote pair. * es/chain-lint-more: chainlint: match "quoted" here-doc tags
This commit is contained in:
commit
e9983f8965
@ -94,8 +94,8 @@
|
|||||||
|
|
||||||
# here-doc -- swallow it to avoid false hits within its body (but keep the
|
# here-doc -- swallow it to avoid false hits within its body (but keep the
|
||||||
# command to which it was attached)
|
# command to which it was attached)
|
||||||
/<<[ ]*[-\\']*[A-Za-z0-9_]/ {
|
/<<[ ]*[-\\'"]*[A-Za-z0-9_]/ {
|
||||||
s/^\(.*\)<<[ ]*[-\\']*\([A-Za-z0-9_][A-Za-z0-9_]*\)'*/<\2>\1<</
|
s/^\(.*\)<<[ ]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
|
||||||
s/[ ]*<<//
|
s/[ ]*<<//
|
||||||
:hered
|
:hered
|
||||||
N
|
N
|
||||||
@ -158,7 +158,7 @@ s/.*\n//
|
|||||||
}
|
}
|
||||||
:folded
|
:folded
|
||||||
# here-doc -- swallow it
|
# here-doc -- swallow it
|
||||||
/<<[ ]*[-\\']*[A-Za-z0-9_]/bheredoc
|
/<<[ ]*[-\\'"]*[A-Za-z0-9_]/bheredoc
|
||||||
# comment or empty line -- discard since final non-comment, non-empty line
|
# comment or empty line -- discard since final non-comment, non-empty line
|
||||||
# before closing ")", "done", "elsif", "else", or "fi" will need to be
|
# before closing ")", "done", "elsif", "else", or "fi" will need to be
|
||||||
# re-visited to drop "suspect" marking since final line of those constructs
|
# re-visited to drop "suspect" marking since final line of those constructs
|
||||||
@ -280,7 +280,7 @@ bfolded
|
|||||||
# found here-doc -- swallow it to avoid false hits within its body (but keep
|
# found here-doc -- swallow it to avoid false hits within its body (but keep
|
||||||
# the command to which it was attached)
|
# the command to which it was attached)
|
||||||
:heredoc
|
:heredoc
|
||||||
s/^\(.*\)<<[ ]*[-\\']*\([A-Za-z0-9_][A-Za-z0-9_]*\)'*/<\2>\1<</
|
s/^\(.*\)<<[ ]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
|
||||||
s/[ ]*<<//
|
s/[ ]*<<//
|
||||||
:heredsub
|
:heredsub
|
||||||
N
|
N
|
||||||
|
@ -4,4 +4,6 @@ cat >foo &&
|
|||||||
|
|
||||||
cat >bar &&
|
cat >bar &&
|
||||||
|
|
||||||
|
cat >boo &&
|
||||||
|
|
||||||
horticulture
|
horticulture
|
||||||
|
@ -21,6 +21,13 @@ boz
|
|||||||
woz
|
woz
|
||||||
FUMP
|
FUMP
|
||||||
|
|
||||||
|
# LINT: swallow "quoted" here-doc
|
||||||
|
cat <<"zump" >boo &&
|
||||||
|
snoz
|
||||||
|
boz
|
||||||
|
woz
|
||||||
|
zump
|
||||||
|
|
||||||
# LINT: swallow here-doc (EOF is last line of test)
|
# LINT: swallow here-doc (EOF is last line of test)
|
||||||
horticulture <<\EOF
|
horticulture <<\EOF
|
||||||
gomez
|
gomez
|
||||||
|
@ -6,5 +6,6 @@
|
|||||||
(
|
(
|
||||||
cat >bup &&
|
cat >bup &&
|
||||||
cat >bup2 &&
|
cat >bup2 &&
|
||||||
|
cat >bup3 &&
|
||||||
meep
|
meep
|
||||||
>)
|
>)
|
||||||
|
@ -31,5 +31,9 @@
|
|||||||
glink
|
glink
|
||||||
FIZZ
|
FIZZ
|
||||||
ARBITRARY2
|
ARBITRARY2
|
||||||
|
cat <<-"ARBITRARY3" >bup3 &&
|
||||||
|
glink
|
||||||
|
FIZZ
|
||||||
|
ARBITRARY3
|
||||||
meep
|
meep
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user