Mercurial > hg > octave-lojdl
changeset 924:8b0920cc1d64
[project @ 1994-11-15 00:40:50 by jwe]
author | jwe |
---|---|
date | Tue, 15 Nov 1994 00:41:30 +0000 |
parents | 8eb9bb511f2a |
children | 567eb9703478 |
files | src/lex.l src/parse.y |
diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lex.l +++ b/src/lex.l @@ -894,6 +894,8 @@ { static char *plot_styles[] = { + "boxes" + "boxerrorbars", "dots", "errorbars", "impulses", @@ -1115,13 +1117,13 @@ promptflag--; yylval.tok_val = new token (l, c); token_stack.push (yylval.tok_val); - return UNWIND_PROTECT; + return UNWIND; } else if (strcmp ("unwind_protect_cleanup", s) == 0) { yylval.tok_val = new token (l, c); token_stack.push (yylval.tok_val); - return UNWIND_PROTECT_CLEANUP; + return CLEANUP; } else if (strcmp ("end_unwind_protect", s) == 0) {
--- a/src/parse.y +++ b/src/parse.y @@ -223,7 +223,7 @@ %token <tok_val> PLOT %token <tok_val> TEXT STYLE %token <tok_val> FOR WHILE IF ELSEIF ELSE BREAK CONTINUE FUNC_RET -%token <tok_val> UNWIND_PROTECT UNWIND_PROTECT_CLEANUP +%token <tok_val> UNWIND CLEANUP %token <tok_val> GLOBAL %token <tok_val> TEXT_ID @@ -604,12 +604,12 @@ $$ = $1; } - | UNWIND_PROTECT opt_list UNWIND_PROTECT_CLEANUP opt_list END + | UNWIND optsep opt_list CLEANUP optsep opt_list END { - if (check_end ($5, token::unwind_protect_end)) + if (check_end ($7, token::unwind_protect_end)) ABORT_PARSE; - $$ = new tree_unwind_protect_command ($2, $4, $1->line (), + $$ = new tree_unwind_protect_command ($3, $6, $1->line (), $1->column ()); } | WHILE expression optsep opt_list END