diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2020-03-17 19:11:53 +0100 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2020-03-17 19:21:07 +0100 |
| commit | cbb967dbad1a27c8f0bc9d335d319fed78a2a366 (patch) | |
| tree | adade9a16c56d2ff8fbed38136c565dd9922b8d2 /data | |
| parent | 44ac18d13681e05f38626427783bb5aad7d08020 (diff) | |
| download | bison-cbb967dbad1a27c8f0bc9d335d319fed78a2a366.tar.gz | |
yacc.c: style: prefer switch to if
* data/skeletons/yacc.c: Prefer switch to decode yy_lac's return value.
Diffstat (limited to 'data')
| -rw-r--r-- | data/skeletons/yacc.c | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/data/skeletons/yacc.c b/data/skeletons/yacc.c index 5a2b17ce..b9adb84f 100644 --- a/data/skeletons/yacc.c +++ b/data/skeletons/yacc.c @@ -960,23 +960,22 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd, current lookahead, then check if that lookahead can eventually be shifted if syntactic actions continue from the current context. Report a syntax error if it cannot. */ -#define YY_LAC_ESTABLISH \ -do { \ - if (!yy_lac_established) \ - { \ - YYDPRINTF ((stderr, \ - "LAC: initial context established for %s\n", \ - yysymbol_name (yytoken))); \ - yy_lac_established = 1; \ - { \ - int yy_lac_status = \ - yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken); \ - if (yy_lac_status == 2) \ - goto yyexhaustedlab; \ - if (yy_lac_status == 1) \ - goto yyerrlab; \ - } \ - } \ +#define YY_LAC_ESTABLISH \ +do { \ + if (!yy_lac_established) \ + { \ + YYDPRINTF ((stderr, \ + "LAC: initial context established for %s\n", \ + yysymbol_name (yytoken))); \ + yy_lac_established = 1; \ + switch (yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken)) \ + { \ + case 2: \ + goto yyexhaustedlab; \ + case 1: \ + goto yyerrlab; \ + } \ + } \ } while (0) /* Discard any previous initial lookahead context because of Event, @@ -1147,23 +1146,21 @@ yyexpected_tokens (const yyparse_context_t *yyctx, int yyx; for (yyx = 0; yyx < YYNTOKENS; ++yyx) if (yyx != YYTERROR && yyx != YYUNDEFTOK) - { + switch (yy_lac (]b4_push_if([[yyps->yyesa, &yyps->yyes, &yyps->yyes_capacity, yyps->yyssp, yyx]], + [[yyctx->yyesa, yyctx->yyes, yyctx->yyes_capacity, yyctx->yyssp, yyx]])[)) { - int yy_lac_status - = yy_lac (]b4_push_if([[yyps->yyesa, &yyps->yyes, &yyps->yyes_capacity, yyps->yyssp, yyx]], - [[yyctx->yyesa, yyctx->yyes, yyctx->yyes_capacity, yyctx->yyssp, yyx]])[); - if (yy_lac_status == 2) - return -2; - if (yy_lac_status == 1) - continue; - } - if (!yyarg) - ++yycount; - else if (yycount == yyargn) - return 0; - else - yyarg[yycount++] = yyx; - }]], + case 2: + return -2; + case 1: + continue; + default: + if (!yyarg) + ++yycount; + else if (yycount == yyargn) + return 0; + else + yyarg[yycount++] = yyx; + }]], [[ int yyn = yypact@{+*]b4_push_if([yyps], [yyctx])[->yyssp@}; if (!yypact_value_is_default (yyn)) { |