remove unused bye symbol from arithmetic parser

[fio.git] / exp / expression-parser.y

diff --git a/exp/expression-parser.y b/exp/expression-parser.y
index 1cc07918df9ceb970e1d279d52ad4fef536ad260..e4373d4db53d4ee2efe90367c61e0c842e36733b 100644 (file)
--- a/exp/expression-parser.y
+++ b/exp/expression-parser.y
@@ -38,7 +38,7 @@ int yyerror(__attribute__((unused)) long long *result,
                __attribute__((unused)) double *dresult,
                __attribute__((unused)) int *has_error,
                __attribute__((unused)) int *units_specified,
-               __attribute__((unused)) int *bye, const char *msg);
+               __attribute__((unused)) const char *msg);
 
 extern int yylex(void);
 extern void yyrestart(FILE *file);
@@ -67,7 +67,6 @@ extern void yyrestart(FILE *file);
 %parse-param { double *dresult }
 %parse-param { int *has_error }
 %parse-param { int *units_specified }
-%parse-param { int *bye }
 
 %type <v> expression
 %%
@@ -108,11 +107,11 @@ expression:       expression '+' expression {
                }
        |       expression '/' expression {
                        if ($3.ival == 0)
-                               yyerror(0, 0, 0, 0, 0, "divide by zero");
+                               yyerror(0, 0, 0, 0, "divide by zero");
                        else
                                $$.ival = $1.ival / $3.ival;
                        if ($3.dval < 1e-20 && $3.dval > -1e-20)
-                               yyerror(0, 0, 0, 0, 0, "divide by zero");
+                               yyerror(0, 0, 0, 0, "divide by zero");
                        else
                                $$.dval = $1.dval / $3.dval;
                        if ($3.has_dval || $1.has_dval)
@@ -139,9 +138,9 @@ expression: expression '+' expression {
                }
        |       expression '%' expression {
                        if ($1.has_dval || $3.has_dval)
-                               yyerror(0, 0, 0, 0, 0, "modulo on floats");
+                               yyerror(0, 0, 0, 0, "modulo on floats");
                        if ($3.ival == 0)
-                               yyerror(0, 0, 0, 0, 0, "divide by zero");
+                               yyerror(0, 0, 0, 0, "divide by zero");
                        else {
                                $$.ival = $1.ival % $3.ival;
                                $$.dval = $$.ival;
@@ -179,8 +178,7 @@ expression: expression '+' expression {
                                $$.ival = (long long) $$.dval;
                        }
                }
-       |       NUMBER { $$ = $1; }
-       |       BYE { $$ = $1; *bye = 1; };
+       |       NUMBER { $$ = $1; };
 %%
 #include <stdio.h>
 
@@ -217,12 +215,12 @@ static void setup_to_parse_string(const char *string)
 int evaluate_arithmetic_expression(const char *buffer, long long *ival, double *dval,
                                        double implied_units)
 {
-       int rc, units_specified = 0, bye = 0, has_error = 0;
+       int rc, units_specified = 0, has_error = 0;
 
        setup_to_parse_string(buffer);
-       rc = yyparse(ival, dval, &has_error, &units_specified, &bye);
+       rc = yyparse(ival, dval, &has_error, &units_specified);
        yyrestart(NULL);
-       if (rc || bye || has_error) {
+       if (rc || has_error) {
                *ival = 0;
                *dval = 0;
                has_error = 1;
@@ -238,7 +236,6 @@ int yyerror(__attribute__((unused)) long long *result,
                __attribute__((unused)) double *dresult,
                __attribute__((unused)) int *has_error,
                __attribute__((unused)) int *units_specified,
-               __attribute__((unused)) int *bye,
                __attribute__((unused)) const char *msg)
 {
        /* We do not need to do anything here. */