diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-09-20 17:04:50 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-10-06 19:53:45 +0200 |
| commit | 117c7942002c64b0a22079d983cd54d270f529b4 (patch) | |
| tree | ffef1eb145e35406b9279b70481176f5f7ab9bef /data | |
| parent | 88322b77b174bc1ebd85eef290e41fc001b21f07 (diff) | |
| download | bison-117c7942002c64b0a22079d983cd54d270f529b4.tar.gz | |
lalr1.cc: indentation fixes.
* data/lalr1.cc (yyparse): here.
Untabify a block of code.
Diffstat (limited to 'data')
| -rw-r--r-- | data/lalr1.cc | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/data/lalr1.cc b/data/lalr1.cc index 308290ad..846aea1b 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -712,20 +712,19 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; yyerror_range[1] = yylloc; if (yyerrstatus_ == 3) { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= yyeof_) - { - /* Return failure if at end of input. */ - if (yychar == yyeof_) - YYABORT; - } - else - { - yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc); - yychar = yyempty_; - } + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ + if (yychar <= yyeof_) + { + /* Return failure if at end of input. */ + if (yychar == yyeof_) + YYABORT; + } + else + { + yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc); + yychar = yyempty_; + } } /* Else will try to reuse lookahead token after shifting the error @@ -774,7 +773,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; /* Pop the current state because it cannot handle the error token. */ if (yystate_stack_.height () == 1) - YYABORT; + YYABORT; yyerror_range[1] = yylocation_stack_[0]; yydestruct_ ("Error: popping", @@ -824,11 +823,11 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; yypop_ (yylen); while (yystate_stack_.height () != 1) { - yydestruct_ ("Cleanup: popping", - yystos_[yystate_stack_[0]], - &yysemantic_stack_[0], - &yylocation_stack_[0]); - yypop_ (); + yydestruct_ ("Cleanup: popping", + yystos_[yystate_stack_[0]], + &yysemantic_stack_[0], + &yylocation_stack_[0]); + yypop_ (); } return yyresult; |