exponentional operator support

.gitignore

@@ -22,3 +22,6 @@ testSuiteGenerated/
 
 # ignore user related gradle.properties
 gradle.properties
+
+# ignore generated antlr files
+src/main/antlr/grammar/.antlr/

src/main/antlr/grammar/crml.g4

@@ -85,7 +85,7 @@ tick : 'tick';
 
 if_exp : 'if' if_e=exp 'then' then_e=exp ('else' else_e=exp);
 
-constructor : 'new' type exp?;
+constructor : 'new' type exp;
 
 user_operator_call : (user_keyword exp)+; 
 
@@ -96,7 +96,7 @@ op : builtin_op | user_keyword
 
 builtin_op : 'and' | '*' | '+' | '-' | '/' | 'with' | 'master' | 'on' | 'filter'
 				| '<=' | '<' | '>=' | '>' | '<>' | 'par' | '==' |
-				'pre' | 'not'| '-' | 'card' | 'and' | 'or' | 
+				'pre' | 'not'| '-' | 'card' | 'and' | 'or' | '^' |
 				'start' | 'end' | 'mod' |
 				'exp' | 'log' | 'log10' |
 				'cos' |'acos' | 'sin' | 'asin'  ;

src/main/java/crml/translator/OperatorMapping.java

@@ -36,6 +36,12 @@ public static HashMap<String, List<Signature>> get_operator_map (){
 
 		// String signatures
 		List<String> string2 = Arrays.asList("String", "String");
+
+		// string + int/real mix and match
+		List<String> stringint = Arrays.asList("String", "Integer");
+		List<String> intstring = Arrays.asList("Integer", "String");
+		List<String> stringreal = Arrays.asList("String", "Real");
+		List<String> realstring = Arrays.asList("Real", "String");
 
 		// Period mix and match signatures
 		List<String> periodReal = Arrays.asList("Period", "Real");
@@ -59,6 +65,10 @@ public static HashMap<String, List<Signature>> get_operator_map (){
 						new Signature("+", real2, "Real", Type.OPERATOR),
 						new Signature(" ", real1, "Real", Type.OPERATOR),
 						new Signature("+", string2, "String", Type.OPERATOR),
+						new Signature("+", stringint, "String", Type.OPERATOR),
+						new Signature("+", intstring, "String", Type.OPERATOR),
+						new Signature("+", stringreal, "String", Type.OPERATOR),
+						new Signature("+", realstring, "String", Type.OPERATOR),
 						new Signature("CRMLtoModelica.Functions.add4", bool2, params, "Boolean", Type.FUNCTION));
 
 
@@ -92,6 +102,12 @@ public static HashMap<String, List<Signature>> get_operator_map (){
 
 				built_in_operators.put("/", div_sigs);
 
+		// ^ operators
+		List<Signature> expo_sigs = 
+				Arrays.asList(new Signature("^", int2, "Integer", Type.OPERATOR),
+						new Signature("^", realint, "Real", Type.OPERATOR));
+		built_in_operators.put("^", expo_sigs);
+
 		// <= operators
 		List<Signature> leq_sigs = 
 				Arrays.asList(new Signature("<=", int2,  "Boolean", Type.OPERATOR),