BUG: Parser unwinding (lack thereof)

BUG: Parser unwinding (lack thereof)

[Bart Schaefer]

This probably needs to be fixed before we release 5.0.8:

torch% print -l ${            
braceparam> ^C
torch% print -l ${
braceparam braceparam> ^C
torch% print -l ${
braceparam braceparam braceparam> ^C
torch% print -l ${
braceparam braceparam braceparam braceparam> ^C
torch% (    
braceparam braceparam braceparam braceparam subsh> 

Re: BUG: Parser unwinding (lack thereof)

[Bart Schaefer]

On May 6, 12:08am, Bart Schaefer wrote:
} Subject: BUG:  Parser unwinding (lack thereof)
}
} torch% print -l ${            
} braceparam> ^C
} torch% print -l ${
} braceparam braceparam> 

This seems to handle it:


diff --git a/Src/lex.c b/Src/lex.c
index c929bb9..5b6d3a6 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1345,8 +1345,11 @@ gettokstr(int c, int sub)
 	    break;
     }
   brk:
-    if (errflag)
+    if (errflag) {
+	while(bct-- >= in_brace_param)
+	    cmdpop();
 	return LEXERR;
+    }
     hungetc(c);
     if (unmatched)
 	zerr("unmatched %c", unmatched);

Re: BUG: Parser unwinding (lack thereof)

[Peter Stephenson]

On Wed, 6 May 2015 07:42:21 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> On May 6, 12:08am, Bart Schaefer wrote:
> } Subject: BUG:  Parser unwinding (lack thereof)
> }
> } torch% print -l ${            
> } braceparam> ^C
> } torch% print -l ${
> } braceparam braceparam> 
>
> This seems to handle it:

That's obviously the effect of returning earlier on an error,
at which point stuff like hungetc() is unnecessary and bug-prone,
since 34817 / f1c702f2a4.

I don't see anything else that might need moving up --- I presume the
state of lexbuf is irrelevant, too.

pws