added modulo

git-svn-id: https://cobra.cs.uni-duesseldorf.de/prob/trunk/experimental/plagge/probkodkod@13148 7aec93f6-bc54-0410-ac70-7d7c9efa889a

src/de/stups/probkodkod/KodkodAnalysis.java

@@ -72,6 +72,7 @@ import de.stups.probkodkod.parser.node.ALesserIntCompOp;
 import de.stups.probkodkod.parser.node.ALesserequalIntCompOp;
 import de.stups.probkodkod.parser.node.AList;
 import de.stups.probkodkod.parser.node.ALoneMultiplicity;
+import de.stups.probkodkod.parser.node.AModIntexprBinop;
 import de.stups.probkodkod.parser.node.AMulIntexprBinop;
 import de.stups.probkodkod.parser.node.AMultInnerformula;
 import de.stups.probkodkod.parser.node.AMultiInnerexpression;
@@ -197,6 +198,7 @@ public class KodkodAnalysis extends DepthFirstAdapter {
 		BININTEXPROPS.put(AMulIntexprBinop.class.getName(),
 				IntOperator.MULTIPLY);
 		BININTEXPROPS.put(ADivIntexprBinop.class.getName(), IntOperator.DIVIDE);
+		BININTEXPROPS.put(AModIntexprBinop.class.getName(), IntOperator.MODULO);
 
 		BININTCOMPS.put(AEqualsIntCompOp.class.getName(), IntCompOperator.EQ);
 		BININTCOMPS.put(AGreaterIntCompOp.class.getName(), IntCompOperator.GT);

src/problem.grammar

@@ -68,6 +68,7 @@ Tokens
   keyword_subtraction = 'sub';
   keyword_multiplication = 'mul';
   keyword_division = 'div';
+  keyword_modulo = 'mod';
   keyword_greater = 'gt';
   keyword_greater_equal = 'gte';
   keyword_lesser = 'lt';
@@ -201,7 +202,8 @@ Productions
       {add}       keyword_addition
     | {sub}       keyword_subtraction
     | {mul}       keyword_multiplication
-    | {div}       keyword_division;  
+    | {div}       keyword_division
+    | {mod}       keyword_modulo;  
 
   request = keyword_request [problem]:identifier [size]:number reqtype [al]:parenl [arguments]:argument* [ar]:parenr;
   argument = parenl identifier [tuples]:tuple* parenr;