mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-06 09:01:13 +02:00
Code Releases Activity

zsh-workers/8783

Browse source
This commit is contained in:
Tanaka Akira 1999-11-26 01:12:26 +00:00
parent 121c60b9d6
commit e7feca18d5
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Src/lex.c
View file

@ -805,7 +805,7 @@ gettokstr(int c, int sub)
{ {
int bct = 0, pct = 0, brct = 0, fdpar = 0; int bct = 0, pct = 0, brct = 0, fdpar = 0;
int intpos = 1, in_brace_param = 0; int intpos = 1, in_brace_param = 0;
int peek, inquote; int peek, inquote, unmatched = 0;
#ifdef DEBUG #ifdef DEBUG
int ocmdsp = cmdsp; int ocmdsp = cmdsp;
#endif #endif
@ -1119,9 +1119,7 @@ gettokstr(int c, int sub)
} }
ALLOWHIST ALLOWHIST
if (c != '\'') { if (c != '\'') {
lineno -= (c == '\n'); unmatched = '\'';
zerr("unmatched \'", NULL, 0);
lineno += (c == '\n');
peek = LEXERR; peek = LEXERR;
cmdpop(); cmdpop();
goto brk; goto brk;
@ -1143,9 +1141,7 @@ gettokstr(int c, int sub)
c = dquote_parse('"', sub); c = dquote_parse('"', sub);
cmdpop(); cmdpop();
if (c) { if (c) {
lineno -= (c == '\n'); unmatched = '"';
zerr("unmatched \"", NULL, 0);
lineno += (c == '\n');
peek = LEXERR; peek = LEXERR;
goto brk; goto brk;
} }
@ -1182,9 +1178,7 @@ gettokstr(int c, int sub)
ALLOWHIST ALLOWHIST
cmdpop(); cmdpop();
if (c != '`') { if (c != '`') {
lineno -= (c == '\n'); unmatched = '`';
zerr("unmatched `", NULL, 0);
lineno += (c == '\n');
peek = LEXERR; peek = LEXERR;
goto brk; goto brk;
} }
@ -1201,6 +1195,8 @@ gettokstr(int c, int sub)
} }
brk: brk:
hungetc(c); hungetc(c);
if (unmatched)
zerr("unmatched %c", NULL, unmatched);
if (in_brace_param) { if (in_brace_param) {
while(bct-- >= in_brace_param) while(bct-- >= in_brace_param)
cmdpop(); cmdpop();