diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2021-09-09 20:05:39 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2021-09-09 20:05:39 +0100 |
| commit | db46c9cd5844240fb6015666c8e2a12a0a3a6ead (patch) | |
| tree | 096490f0615dea304e29a2d8b03115b0ecc6b4f3 | |
| parent | 014fbfa46b3550a74f1e414d56d1faddd2d9dff5 (diff) | |
| download | zsh-db46c9cd5844240fb6015666c8e2a12a0a3a6ead.tar.gz zsh-db46c9cd5844240fb6015666c8e2a12a0a3a6ead.tar.xz zsh-db46c9cd5844240fb6015666c8e2a12a0a3a6ead.zip | |
49353: Fix comments in sourced file.
If the file was sourced from an interactive shell with INTERACTIVE_COMMENTS not set, comments were not parsed. Note there is a remaining edge case where the sourced file is in fact entered at the comment line.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Test/A01grammar.ztst | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b295af2c9..878299d12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-09-09 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 49353: Src/exe.c, Test/A01grammar.ztst: In sourced file, + always parse comments normally, ignoring INTERACTIVE_COMMENTS. + 2021-09-08 Bart Schaefer <schaefer@zsh.org> * 49391: Doc/Zsh/zle.yo: document default bracketed-paste bindings diff --git a/Src/exec.c b/Src/exec.c index 79d8064b6..1f23a862d 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -4622,7 +4622,7 @@ getoutput(char *cmd, int qt) char *s; int onc = nocomments; - nocomments = (interact && unset(INTERACTIVECOMMENTS)); + nocomments = (interact && !sourcelevel && unset(INTERACTIVECOMMENTS)); prog = parse_string(cmd, 0); nocomments = onc; diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst index 88fc8606e..c114ff103 100644 --- a/Test/A01grammar.ztst +++ b/Test/A01grammar.ztst @@ -944,3 +944,12 @@ F:Note that the behaviour of 'exit' inside try-list inside a function is unspeci if : ${(e)a}; then echo x; fi 1:Status on bad substitution in if without else ?(eval):2: bad substitution + + echo 'echo foo # comment + echo $( + echo bar # comment + )' >source_comments.zsh + $ZTST_testdir/../Src/zsh -f -o extendedglob -is -c '. ./source_comments.zsh' +0:Comments should be handled in command subst in interactively sourced files +>foo +>bar |