* PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors
@ 1999-11-25 19:02 Bart Schaefer
1999-11-25 19:16 ` Bart Schaefer
0 siblings, 1 reply; 2+ messages in thread
From: Bart Schaefer @ 1999-11-25 19:02 UTC (permalink / raw)
To: zsh-workers
The ideal thing here would be to print the error message *AFTER* the
hungetc(c); at the "brk:" label, but that requires too much rewriting.
Index: Src/lex.c
===================================================================
@@ -1119,7 +1119,9 @@
}
ALLOWHIST
if (c != '\'') {
+ lineno -= (c == '\n');
zerr("unmatched \'", NULL, 0);
+ lineno += (c == '\n');
peek = LEXERR;
cmdpop();
goto brk;
@@ -1141,7 +1143,9 @@
c = dquote_parse('"', sub);
cmdpop();
if (c) {
+ lineno -= (c == '\n');
zerr("unmatched \"", NULL, 0);
+ lineno += (c == '\n');
peek = LEXERR;
goto brk;
}
@@ -1178,7 +1182,9 @@
ALLOWHIST
cmdpop();
if (c != '`') {
+ lineno -= (c == '\n');
zerr("unmatched `", NULL, 0);
+ lineno += (c == '\n');
peek = LEXERR;
goto brk;
}
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors
1999-11-25 19:02 PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors Bart Schaefer
@ 1999-11-25 19:16 ` Bart Schaefer
0 siblings, 0 replies; 2+ messages in thread
From: Bart Schaefer @ 1999-11-25 19:16 UTC (permalink / raw)
To: zsh-workers
On Nov 25, 7:02pm, Bart Schaefer wrote:
} Subject: PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors
}
} The ideal thing here would be to print the error message *AFTER* the
} hungetc(c); at the "brk:" label, but that requires too much rewriting.
Immediately after I sent that, I thought of the obvious way to do it.
This goes on top of the previous patch, though only to back it out.
Index: Src/lex.c
===================================================================
@@ -805,7 +805,7 @@
{
int bct = 0, pct = 0, brct = 0, fdpar = 0;
int intpos = 1, in_brace_param = 0;
- int peek, inquote;
+ int peek, inquote, unmatched = 0;
#ifdef DEBUG
int ocmdsp = cmdsp;
#endif
@@ -1119,9 +1119,7 @@
}
ALLOWHIST
if (c != '\'') {
- lineno -= (c == '\n');
- zerr("unmatched \'", NULL, 0);
- lineno += (c == '\n');
+ unmatched = '\'';
peek = LEXERR;
cmdpop();
goto brk;
@@ -1143,9 +1141,7 @@
c = dquote_parse('"', sub);
cmdpop();
if (c) {
- lineno -= (c == '\n');
- zerr("unmatched \"", NULL, 0);
- lineno += (c == '\n');
+ unmatched = '"';
peek = LEXERR;
goto brk;
}
@@ -1182,9 +1178,7 @@
ALLOWHIST
cmdpop();
if (c != '`') {
- lineno -= (c == '\n');
- zerr("unmatched `", NULL, 0);
- lineno += (c == '\n');
+ unmatched = '`';
peek = LEXERR;
goto brk;
}
@@ -1201,6 +1195,8 @@
}
brk:
hungetc(c);
+ if (unmatched)
+ zerr("unmatched %c", NULL, unmatched);
if (in_brace_param) {
while(bct-- >= in_brace_param)
cmdpop();
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~1999-11-25 19:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1999-11-25 19:02 PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors Bart Schaefer
1999-11-25 19:16 ` Bart Schaefer
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).