From 6a80037dae54a9e6c85a2bde83450c0952ef6f29 Mon Sep 17 00:00:00 2001 From: sebastien Date: Mon, 8 Dec 2008 14:42:43 +0000 Subject: [PATCH] trunk: fixed bug in operator precedence in macro-processor (+ and - had highest precedence than * and /, colon (:) precedence was too high) git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2298 ac1d8469-bf42-47a9-8791-bf33cf982152 --- macro/MacroBison.yy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/macro/MacroBison.yy b/macro/MacroBison.yy index 06465c48..e44f5bfc 100644 --- a/macro/MacroBison.yy +++ b/macro/MacroBison.yy @@ -85,13 +85,12 @@ class MacroDriver; %left LOGICAL_OR %left LOGICAL_AND %left LESS GREATER LESS_EQUAL GREATER_EQUAL EQUAL_EQUAL EXCLAMATION_EQUAL -%left TIMES DIVIDE +%nonassoc COLON %left PLUS MINUS +%left TIMES DIVIDE %left UMINUS UPLUS EXCLAMATION %left LBRACKET -%nonassoc COLON - %type expr array_expr %%