diff options
| author |   Petteri Räty <petsku@petteriraty.eu> | 2011-06-09 15:06:57 +0300 |
|---|---|---|
| committer | Petteri Räty <petsku@petteriraty.eu> | 2011-06-09 15:06:57 +0300 |
| commit | 06f6705ed79411dfe9c08bbe0298b2b03c666ab5 (patch) | |
| tree | 70d8b95972c19cf0200690b6410be9e616b260b5 /bashast/bashast.g | |
| parent | Utility: fix error counting (diff) | |
| download | libbash-06f6705ed79411dfe9c08bbe0298b2b03c666ab5.tar.gz libbash-06f6705ed79411dfe9c08bbe0298b2b03c666ab5.tar.bz2 libbash-06f6705ed79411dfe9c08bbe0298b2b03c666ab5.zip | |
Parser: fix ${var:-public_html}
-p is no longer a special token. This makes things simpler as you don't
need to prepare for it. When the time functionality is implemented in
walker it can check the letter given.
Diffstat (limited to 'bashast/bashast.g')
| -rw-r--r-- | bashast/bashast.g | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bashast/bashast.g b/bashast/bashast.g index bea3740..9cd8ca1 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -123,7 +123,7 @@ pipeline : BLANK!* time? ((BANG) => (BANG BLANK!+))? command^ (BLANK!* PIPE^ BLANK!* command)*; time : TIME^ BLANK!+ ((time_posix) => time_posix)?; time_posix - : TIME_POSIX BLANK!+; + : MINUS! LETTER BLANK!+; //The structure of a command in bash command : compound_command @@ -417,7 +417,7 @@ ns_str_part | esc_char |OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|TEST_EXPR |TILDE|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN - |TIME_POSIX|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN + |LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN |OR_ASSIGN|CARET|POUND|POUNDPOUND|COMMA|EXPORT|LOCAL; //Generic strings/filenames. @@ -689,9 +689,6 @@ ESC_LPAREN : ESC LPAREN; ESC_LT : ESC'<'; ESC_GT : ESC'>'; -//For pipeline -TIME_POSIX - : '-p'; //Handle ANSI C escaped characters: escaped octal, escaped hex, escaped ctrl+ chars, then all others ESC : '\\'; UNDERSCORE : '_'; |