X-Git-Url: http://plrg.eecs.uci.edu/git/?p=repair.git;a=blobdiff_plain;f=Repair%2FRepairCompiler%2FMCC%2FCDL.cup;h=6de3880a3f33ca5904d88a389df83e432477d0dd;hp=12b94a4b3ede49f20dc9d8542bde3871efb8798f;hb=312a3d1c3b3dddc26a8a5a7e2ec0e0c393d80814;hpb=73e005ea3b2747a4f3008c3dcdc24c4bbcef3add

diff --git a/Repair/RepairCompiler/MCC/CDL.cup b/Repair/RepairCompiler/MCC/CDL.cup
index 12b94a4..6de3880 100755
--- a/Repair/RepairCompiler/MCC/CDL.cup
+++ b/Repair/RepairCompiler/MCC/CDL.cup
@@ -213,7 +213,8 @@ nonterminal	ParseNode		setexpr;
 
 nonterminal	ParseNode		compare;
 nonterminal	ParseNode		expr;
-nonterminal	ParseNode		operator;
+nonterminal	ParseNode		addsuboperator;
+nonterminal	ParseNode		multdivoperator;
 
 
 
@@ -530,7 +531,7 @@ expr ::=
      	RESULT = relation.getRoot();
      	:}
 	     
-	| expr:expr1 operator:operator expr:expr2
+	| expr:expr1 addsuboperator:operator expr:expr2
 	{:
 	debugMessage(PRODSTRING);
 	ParseNode op = (new ParseNode("expr", parser.curLine(3))).addChild("operator");
@@ -539,7 +540,17 @@ expr ::=
 	op.addChild("right", parser.curLine(1)).addChild(expr2);
 	RESULT = op.getRoot();
 	:}
-
+	%prec ADD
+	| expr:expr1 multdivoperator:operator expr:expr2
+	{:
+	debugMessage(PRODSTRING);
+	ParseNode op = (new ParseNode("expr", parser.curLine(3))).addChild("operator");
+	op.addChild("op").addChild(operator);
+	op.addChild("left", parser.curLine(3)).addChild(expr1);
+	op.addChild("right", parser.curLine(1)).addChild(expr2);
+	RESULT = op.getRoot();
+	:}
+	%prec MULT
 	| SIZEOF OPENPAREN setexpr:setexpr CLOSEPAREN
 	{:
 	ParseNode sizeof = (new ParseNode("expr", parser.curLine(4))).addChild("sizeof");
@@ -548,7 +559,7 @@ expr ::=
 	:}
 	;
 
-operator ::=
+addsuboperator ::=
 	  
 	ADD 
 	{:
@@ -561,13 +572,13 @@ operator ::=
 	debugMessage(PRODSTRING);
 	RESULT = new ParseNode("sub", parser.curLine(1));
 	:}
-	  
-	| MULT
+	;
+multdivoperator ::=
+	MULT
 	{:
 	debugMessage(PRODSTRING);
 	RESULT = new ParseNode("mult", parser.curLine(1));
 	:}
-	  
 	| DIV
 	{:
 	debugMessage(PRODSTRING);