From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: zsh-workers@sunsite.auc.dk
Subject: Re: PATCH: 3.1.6-pws-9: Line numbers wrong on "unmatched" errors
Date: Thu, 25 Nov 1999 19:16:41 +0000 [thread overview]
Message-ID: <991125191641.ZM7582@candle.brasslantern.com> (raw)
In-Reply-To: <991125190258.ZM7311@candle.brasslantern.com>
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
prev parent reply other threads:[~1999-11-25 19:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-11-25 19:02 Bart Schaefer
1999-11-25 19:16 ` Bart Schaefer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=991125191641.ZM7582@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).