Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
with:
generate: false
test-rust: true
test-node: true
test-node: false
test-python: true
test-go: true
test-swift: false
Expand Down
28 changes: 20 additions & 8 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,22 @@ module.exports = grammar({
field('redirect', optional($._redirect)),
)),

compound_statement: $ => seq(
'{',
optional($._terminated_statement),
token(prec(-1, '}')),
compound_statement: $ => choice(
seq(
'{',
optional($._terminated_statement),
token(prec(-1, '}')),
),
seq(
'((',
repeat(
seq(
$._arithmetic_expression,
',',
),
),
$._arithmetic_expression,
'))'),
),

subshell: $ => seq(
Expand Down Expand Up @@ -435,7 +447,6 @@ module.exports = grammar({
),
']]',
),
seq('((', optional($._expression), '))'),
),
),

Expand Down Expand Up @@ -508,7 +519,7 @@ module.exports = grammar({
subscript: $ => seq(
field('name', $.variable_name),
'[',
field('index', choice($._literal, $.binary_expression, $.unary_expression, $.parenthesized_expression)),
field('index', choice($._literal, $.binary_expression, $.unary_expression, $.compound_statement, $.subshell)),
optional($._concat),
']',
optional($._concat),
Expand Down Expand Up @@ -701,7 +712,7 @@ module.exports = grammar({
),

arithmetic_expansion: $ => choice(
seq(choice('$((', '(('), commaSep1($._arithmetic_expression), '))'),
seq('$((', commaSep1($._arithmetic_expression), '))'),
seq('$[', $._arithmetic_expression, ']'),
),

Expand Down Expand Up @@ -731,6 +742,7 @@ module.exports = grammar({
$._simple_variable_name,
$.variable_name,
$.string,
$.raw_string,
)),

_arithmetic_binary_expression: $ => {
Expand Down Expand Up @@ -1108,7 +1120,7 @@ module.exports = grammar({
$.variable_name,
),

_special_variable_name: $ => alias(choice('*', '@', '?', '!', '#', '-', '$', '0', '_'), $.special_variable_name),
_special_variable_name: $ => alias(choice('*', '@', '?', '!', '#', '-', '$', '_'), $.special_variable_name),

word: _ => token(seq(
choice(
Expand Down
40 changes: 23 additions & 17 deletions script/known-failures.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
examples/bash-it/completion/available/aliases.completion.bash
examples/bash-it/completion/available/bundler.completion.bash
examples/bash-it/completion/available/sqlmap.completion.bash
examples/bash-it/plugins/available/colors.plugin.bash
examples/bash-it/plugins/available/history-eternal.plugin.bash
examples/bash-it/themes/hawaii50/hawaii50.theme.bash
examples/bash/examples/functions/notify.bash
examples/bash/examples/shellmath/shellmath.sh
examples/bash/tests/arith-for.tests
examples/bash/tests/arith.tests
examples/bash/tests/array.tests
examples/bash/tests/assoc.tests
examples/bash/tests/braces.tests
examples/bash/tests/case.tests
examples/bash/tests/casemod.tests
examples/bash/tests/comsub-posix.tests
examples/bash/tests/comsub.tests
examples/bash/tests/comsub2.tests
examples/bash/tests/cond.tests
examples/bash/tests/errors.tests
examples/bash/tests/extglob.tests
Expand All @@ -20,6 +24,7 @@ examples/bash/tests/histexp.tests
examples/bash/tests/misc/dev-tcp.tests
examples/bash/tests/more-exp.tests
examples/bash/tests/new-exp.tests
examples/bash/tests/parser.tests
examples/bash/tests/posixexp.tests
examples/bash/tests/posixexp2.tests
examples/bash/tests/printf.tests
Expand All @@ -29,23 +34,29 @@ examples/bash/tests/redir.tests
examples/bash/tests/test.tests
examples/gentoo/app-misc/editor-wrapper/files/editor-wrapper-4.sh
examples/gentoo/dev-lang/rust/rust-1.74.1-r101.ebuild
examples/gentoo/dev-libs/libffi/libffi-3.5.1.ebuild
examples/gentoo/dev-libs/libffi/libffi-3.5.2.ebuild
examples/gentoo/dev-libs/libffi/libffi-9999.ebuild
examples/gentoo/eclass/rust.eclass
examples/gentoo/eclass/tests/toolchain-funcs.sh
examples/gentoo/eclass/texlive-common.eclass
examples/gentoo/eclass/toolchain-funcs.eclass
examples/gentoo/mail-client/thunderbird-bin/files/thunderbird-bin-r1.sh
examples/gentoo/mail-client/thunderbird/files/thunderbird-r1.sh
examples/gentoo/net-misc/asterisk/asterisk-18.26.1-r1.ebuild
examples/gentoo/net-misc/asterisk/asterisk-20.12.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-20.13.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-21.7.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-21.8.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-22.2.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-22.3.0.ebuild
examples/gentoo/net-misc/asterisk/asterisk-18.26.2.ebuild
examples/gentoo/net-misc/asterisk/asterisk-18.26.4.ebuild
examples/gentoo/net-misc/asterisk/asterisk-20.15.2.ebuild
examples/gentoo/net-misc/asterisk/asterisk-21.10.2.ebuild
examples/gentoo/net-misc/asterisk/asterisk-22.5.2.ebuild
examples/gentoo/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
examples/gentoo/sys-apps/dcfldd/dcfldd-1.9.3.ebuild
examples/gentoo/sys-apps/less/files/lesspipe-r3.sh
examples/gentoo/sys-apps/less/files/lesspipe-r4.sh
examples/gentoo/sys-apps/locale-gen/locale-gen-3.8.ebuild
examples/gentoo/sys-apps/locale-gen/locale-gen-3.9-r1.ebuild
examples/gentoo/sys-apps/locale-gen/locale-gen-9999.ebuild
examples/gentoo/sys-fs/bcachefs-tools/bcachefs-tools-1.25.3.ebuild
examples/gentoo/sys-fs/bcachefs-tools/bcachefs-tools-1.31.5.ebuild
examples/gentoo/www-client/firefox-bin/files/firefox-bin-r1.sh
examples/gentoo/www-client/firefox/files/firefox-r1.sh
examples/wild-corpus/cloud/chef-bcpc/legacy_scripts/make_databag.sh
Expand Down Expand Up @@ -79,8 +90,6 @@ examples/wild-corpus/distro/woof-CE/woof-code/rootfs-skeleton/usr/local/petget/i
examples/wild-corpus/distro/woof-CE/woof-code/rootfs-skeleton/usr/local/petget/pkg_chooser.sh
examples/wild-corpus/esoteric/CmdlineGL/share/examples/FlightSim.sh
examples/wild-corpus/esoteric/CmdlineGL/share/examples/Robot.sh
examples/wild-corpus/esoteric/lishp/callable.lambda.sh
examples/wild-corpus/esoteric/lishp/parser.sh
examples/wild-corpus/esoteric/make-a-lisp-bash/core.sh
examples/wild-corpus/esoteric/shasm/shasm.sh
examples/wild-corpus/exp/shootout/timing.sh
Expand All @@ -97,8 +106,6 @@ examples/wild-corpus/freebsd-11.1/crypto/openssl/util/bat.sh
examples/wild-corpus/freebsd-11.1/gnu/usr.bin/binutils/ld/genscripts.sh
examples/wild-corpus/freebsd-11.1/share/examples/drivers/make_device_driver.sh
examples/wild-corpus/freebsd-11.1/share/examples/drivers/make_pseudo_driver.sh
examples/wild-corpus/freebsd-11.1/sys/dev/bhnd/tools/bus_macro.sh
examples/wild-corpus/freebsd-11.1/sys/tools/bus_macro.sh
examples/wild-corpus/freebsd-11.1/tools/tools/mctest/mctest_run.sh
examples/wild-corpus/freebsd-11.1/tools/tools/nanobsd/fill_pkg.sh
examples/wild-corpus/freebsd-11.1/tools/tools/shlib-compat/test/regress.sh
Expand Down Expand Up @@ -276,17 +283,17 @@ examples/wild-corpus/oil/test/smoke.sh
examples/wild-corpus/sdk/tools/clang/scripts/update.sh
examples/wild-corpus/shell/ast/src/cmd/3d/3d.sh
examples/wild-corpus/shell/ast/src/cmd/3d/features/syscall.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2bb.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2html.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2twiki.sh
examples/wild-corpus/shell/ast/src/cmd/ie/ie.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/ditto.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/hurl.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/iffe.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/mktest.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/package.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/regress.sh
examples/wild-corpus/shell/ast/src/cmd/INIT/rt.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2bb.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2html.sh
examples/wild-corpus/shell/ast/src/cmd/html/mm2twiki.sh
examples/wild-corpus/shell/ast/src/cmd/ie/ie.sh
examples/wild-corpus/shell/ast/src/cmd/ksh93/data/bash_pre_rc.sh
examples/wild-corpus/shell/ast/src/cmd/ksh93/tests/append.sh
examples/wild-corpus/shell/ast/src/cmd/ksh93/tests/arith.sh
Expand Down Expand Up @@ -353,5 +360,4 @@ examples/wild-corpus/shell/mksh/Build.sh
examples/wild-corpus/shell/mksh/test.sh
examples/wild-corpus/shell/modernish/install.sh
examples/wild-corpus/shell/mwc-sh/shql.sh
examples/wild-corpus/shell/posixcube/posixcube.sh
examples/wild-corpus/shell/posixcube/test.sh
122 changes: 65 additions & 57 deletions src/grammar.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading