diff options
| author | Peter Stephenson <pws@zsh.org> | 2016-01-19 09:55:46 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2016-01-19 09:55:46 +0000 |
| commit | 8eb9070d6785f423dd9bdbbb0513aa47c8a08d62 (patch) | |
| tree | 412d2d74ceabd14860d313e9338de48e7b5d8291 /Src/lex.c | |
| parent | d0cd9032d8b46051b490790a30e87a1e87c86670 (diff) | |
| download | zsh-8eb9070d6785f423dd9bdbbb0513aa47c8a08d62.tar.gz zsh-8eb9070d6785f423dd9bdbbb0513aa47c8a08d62.tar.xz zsh-8eb9070d6785f423dd9bdbbb0513aa47c8a08d62.zip | |
37678: Now possible to quote "-" in pattern range
Diffstat (limited to 'Src/lex.c')
| -rw-r--r-- | Src/lex.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/Src/lex.c b/Src/lex.c index 0f260d08f..9a7e3b8fe 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -35,7 +35,7 @@ /* tokens */ /**/ -mod_export char ztokens[] = "#$^*(())$=|{}[]`<>>?~`,'\"\\\\"; +mod_export char ztokens[] = "#$^*(())$=|{}[]`<>>?~`,-'\"\\\\"; /* parts of the current token */ @@ -394,8 +394,9 @@ ctxtlex(void) #define LX2_DQUOTE 15 #define LX2_BQUOTE 16 #define LX2_COMMA 17 -#define LX2_OTHER 18 -#define LX2_META 19 +#define LX2_DASH 18 +#define LX2_OTHER 19 +#define LX2_META 20 static unsigned char lexact1[256], lexact2[256], lextok2[256]; @@ -405,7 +406,7 @@ initlextabs(void) { int t0; static char *lx1 = "\\q\n;!&|(){}[]<>"; - static char *lx2 = ";)|$[]~({}><=\\\'\"`,"; + static char *lx2 = ";)|$[]~({}><=\\\'\"`,-"; for (t0 = 0; t0 != 256; t0++) { lexact1[t0] = LX1_OTHER; @@ -919,7 +920,7 @@ gettok(void) static enum lextok gettokstr(int c, int sub) { - int bct = 0, pct = 0, brct = 0, fdpar = 0; + int bct = 0, pct = 0, brct = 0, seen_brct = 0, fdpar = 0; int intpos = 1, in_brace_param = 0; int inquote, unmatched = 0; enum lextok peek; @@ -1033,8 +1034,10 @@ gettokstr(int c, int sub) } break; case LX2_INBRACK: - if (!in_brace_param) + if (!in_brace_param) { brct++; + seen_brct = 1; + } c = Inbrack; break; case LX2_OUTBRACK: @@ -1346,6 +1349,21 @@ gettokstr(int c, int sub) c = Tick; SETPAREND break; + case LX2_DASH: + /* + * - shouldn't be treated as a special character unless + * we're in a pattern. Howeve,simply counting "[" doesn't + * work as []a-z] is a valid expression and we don't know + * down here what this "[" is for as $foo[stuff] is valid + * in zsh. So just detect an opening [, which is enough + * to turn this into a pattern; the Dash will be harmlessly + * untokenised if not wanted. + */ + if (seen_brct) + c = Dash; + else + c = '-'; + break; } add(c); c = hgetc(); |