exp: fix shift/reduce conflict complaints

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

diff --git a/exp/expression-parser.y b/exp/expression-parser.y
index f56ee6dea853c11b2fcd5e4ab4298d88b231046e..6ab6408874b829d2dffbf0ed6fa82ebc9558414d 100644 (file)
--- a/exp/expression-parser.y
+++ b/exp/expression-parser.y
@@ -57,6 +57,7 @@ extern void yyrestart(FILE *file);
 %token <v> BYE
 %token <v> SUFFIX 
 %left '-' '+'
+%right SUFFIX
 %left '*' '/'
 %right '^'
 %left '%'
@@ -163,8 +164,9 @@ expression: expression '+' expression {
                                                tmp = 1.0;
                                                $$.has_error = 1;
                                        } else {
-                                               tmp = pow((double) $1.ival,
-                                                               (double) $3.ival);
+                                               double x = (double) $1.ival;
+                                               double y = (double) $3.ival;
+                                               tmp = pow(x, y);
                                        }
                                        $$.ival = (long long) tmp;
                                }