@@ -358,11 +358,11 @@ module.exports = grammar({
358358 ) ,
359359 $ . _shell ,
360360 ) ,
361- variable_name : ( _ ) => / [ A - Z a - z _ ] [ A - Z a - z 0 - 9 _ ] * / ,
361+ _variable_name : ( _ ) => / [ A - Z a - z _ ] [ A - Z a - z 0 - 9 _ ] * / ,
362362 environment_assignment : ( $ ) =>
363363 prec . right (
364364 seq (
365- field ( "name" , alias ( $ . variable_name , $ . name ) ) ,
365+ field ( "name" , alias ( $ . _variable_name , $ . name ) ) ,
366366 "=" ,
367367 field ( "value" , alias ( $ . _string , $ . value ) ) ,
368368 ) ,
@@ -372,7 +372,7 @@ module.exports = grammar({
372372 seq (
373373 alias ( / \% h i d d e n / , $ . hidden_keyword ) ,
374374 / \s + / ,
375- field ( "name" , alias ( $ . variable_name , $ . name ) ) ,
375+ field ( "name" , alias ( $ . _variable_name , $ . name ) ) ,
376376 "=" ,
377377 field ( "value" , alias ( $ . _string , $ . value ) ) ,
378378 ) ,
@@ -889,8 +889,8 @@ module.exports = grammar({
889889 _hash : ( _ ) => token . immediate ( prec ( 1 , / # [ ^ # , { } " ' H h D P T S F I W ] / ) ) ,
890890 backslash_escape : ( _ ) =>
891891 / \\ ( u [ \d a - f A - F ] { 4 } | u [ \d a - f A - F ] { 8 } | [ 0 - 7 ] { 3 } | [ ^ ; \n ] ) / ,
892- expr_variable_name : ( _ ) => / @ ? [ a - z - _ \d] + / ,
893- variable_name_short : ( _ ) => / [ H h D P T S F I W ] / ,
892+ _expr_variable_name : ( _ ) => / @ ? [ a - z - _ \d] + / ,
893+ _variable_name_short : ( _ ) => / [ H h D P T S F I W ] / ,
894894 expr_single_quotes : ( $ ) => expr_rule ( $ , "'" ) ,
895895 expr_double_quotes : ( $ ) => expr_rule ( $ , '"' ) ,
896896 operator : ( _ ) => / = = | ! = | < | > | < = | > = | \| \| | & & / ,
@@ -1001,15 +1001,15 @@ function cmd_opts(...args) {
10011001function expr_rule ( $ , quote ) {
10021002 const expr = quote == '"' ? $ . expr_double_quotes : $ . expr_single_quotes ;
10031003 return choice (
1004- seq ( token . immediate ( prec ( 1 , "#" ) ) , $ . variable_name_short ) ,
1004+ seq ( token . immediate ( prec ( 1 , "#" ) ) , alias ( $ . _variable_name_short , $ . name ) ) ,
10051005 seq (
10061006 token . immediate ( prec ( 1 , "#{" ) ) ,
10071007 choice (
1008- $ . expr_variable_name ,
1008+ alias ( $ . _expr_variable_name , $ . name ) ,
10091009 seq (
10101010 choice (
1011- seq ( "?" , choice ( expr , $ . expr_variable_name ) ) ,
1012- seq ( alias ( $ . expr_variable_name , $ . function_name ) , ":" ) ,
1011+ seq ( "?" , choice ( expr , alias ( $ . _expr_variable_name , $ . name ) ) ) ,
1012+ seq ( alias ( $ . _expr_variable_name , $ . function_name ) , ":" ) ,
10131013 seq ( $ . operator , ":" ) ,
10141014 ) ,
10151015 commaSep1 (
0 commit comments