Skip to content

feat(parser): handle inline comments in PEG command substitution #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lu-zero wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(parser): handle inline comments in PEG command substitution #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions brush-parser/src/word.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,8 @@ peg::parser! {
rule unquoted_literal_text_piece<T>(stop_condition: rule<T>, in_command: bool) =
is_true(in_command) extglob_pattern() /
is_true(in_command) subshell_command() /
!stop_condition() !normal_escape_sequence() !enabled_tilde_expr_after_colon() [^'\'' | '\"' | '$' | '`'] {}
is_true(in_command) !stop_condition() !normal_escape_sequence() !enabled_tilde_expr_after_colon() [^'\'' | '\"' | '$' | '`' | '#'] {} /
is_false(in_command) !stop_condition() !normal_escape_sequence() !enabled_tilde_expr_after_colon() [^'\'' | '\"' | '$' | '`'] {}

rule enabled_tilde_expr_after_colon() -> WordPiece =
tilde_exprs_after_colon_enabled() last_char_is_colon() piece:tilde_expression_piece() { piece }
Expand All @@ -821,6 +822,7 @@ peg::parser! {
}}

rule is_true(value: bool) = &[_] {? if value { Ok(()) } else { Err("not true") } }
rule is_false(value: bool) = &[_] {? if !value { Ok(()) } else { Err("not false") } }

rule extglob_pattern() =
("@" / "!" / "?" / "+" / "*") "(" extglob_body_piece()* ")" {}
Expand Down Expand Up @@ -1033,7 +1035,8 @@ peg::parser! {

pub(crate) rule command_piece() -> () =
word_piece(<[')']>, true /*in_command*/) {} /
([' ' | '\t'])+ {}
([' ' | '\t' | '\n'])+ {} /
"#" [^'\n']* {}

rule backquoted_command() -> String =
chars:(backquoted_char()*) { chars.into_iter().collect() }
Expand Down
13 changes: 13 additions & 0 deletions brush-shell/tests/cases/compat/word_expansion/command_substitution.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,16 @@ cases:

$($(:))
echo "exit code: $?"

- name: "Comment in command substitution without newline fails"
known_failure: true
stdin: |
x=$(echo # must fail)

- name: "Comment in command substitution with newline"
stdin: |
x=$(
echo "a" # comment with "quote
echo "b"
)
echo "$x"
Loading