[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] yacc.c, glr.c: style: rename yyreturn and yyreturnlab
From: |
Akim Demaille |
Subject: |
[PATCH 3/5] yacc.c, glr.c: style: rename yyreturn and yyreturnlab |
Date: |
Sat, 16 Jan 2021 12:59:03 +0100 |
* data/skeletons/glr.c, data/skeletons/yacc.c: here.
---
data/skeletons/glr.c | 8 ++++----
data/skeletons/yacc.c | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/data/skeletons/glr.c b/data/skeletons/glr.c
index dfa1ed83..ab398101 100644
--- a/data/skeletons/glr.c
+++ b/data/skeletons/glr.c
@@ -2606,7 +2606,7 @@ b4_dollar_popdef])[]dnl
yyacceptlab:
yyresult = 0;
- goto yyreturn;
+ goto yyreturnlab;
yybuglab:
YY_ASSERT (yyfalse);
@@ -2614,14 +2614,14 @@ b4_dollar_popdef])[]dnl
yyabortlab:
yyresult = 1;
- goto yyreturn;
+ goto yyreturnlab;
yyexhaustedlab:
yyerror (]b4_lyyerror_args[YY_("memory exhausted"));
yyresult = 2;
- goto yyreturn;
+ goto yyreturnlab;
- yyreturn:
+ yyreturnlab:
if (yychar != ]b4_symbol(empty, id)[)
yydestruct ("Cleanup: discarding lookahead",
YYTRANSLATE (yychar), &yylval]b4_locuser_args([&yylloc])[);
diff --git a/data/skeletons/yacc.c b/data/skeletons/yacc.c
index 09b8c251..56a050b3 100644
--- a/data/skeletons/yacc.c
+++ b/data/skeletons/yacc.c
@@ -2121,7 +2121,7 @@ yyerrlab1:
`-------------------------------------*/
yyacceptlab:
yyresult = 0;
- goto yyreturn;
+ goto yyreturnlab;
/*-----------------------------------.
@@ -2129,7 +2129,7 @@ yyacceptlab:
`-----------------------------------*/
yyabortlab:
yyresult = 1;
- goto yyreturn;
+ goto yyreturnlab;
#if ]b4_lac_if([[1]], [b4_parse_error_case([simple], [[!defined yyoverflow]],
[[1]])])[
@@ -2139,14 +2139,14 @@ yyabortlab:
yyexhaustedlab:
yyerror (]b4_yyerror_args[YY_("memory exhausted"));
yyresult = 2;
- goto yyreturn;
+ goto yyreturnlab;
#endif
-/*-------------------------------------------------------.
-| yyreturn -- parsing is finished, clean up and return. |
-`-------------------------------------------------------*/
-yyreturn:
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return. |
+`----------------------------------------------------------*/
+yyreturnlab:
if (yychar != ]b4_symbol(empty, id)[)
{
/* Make sure we have latest lookahead translation. See comments at
--
2.30.0
- [PATCH 0/5] Introduce YYNOMEM in C skeletons, Akim Demaille, 2021/01/16
- [PATCH 1/5] tests: check YYACCEPT and YYABORT, Akim Demaille, 2021/01/16
- [PATCH 2/5] glr.c: style: formatting changes, Akim Demaille, 2021/01/16
- [PATCH 3/5] yacc.c, glr.c: style: rename yyreturn and yyreturnlab,
Akim Demaille <=
- [PATCH 4/5] doc: spell check, Akim Demaille, 2021/01/16
- [PATCH 5/5] c: add support for YYNOMEM, Akim Demaille, 2021/01/16