category type update, change in grammar to separate apply out

lenaRB · May 23, 2024 · 300a06c · 300a06c
1 parent c80d908
commit 300a06c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/src/main/antlr/grammar/crml.g4 b/src/main/antlr/grammar/crml.g4
@@ -33,7 +33,9 @@ template : 'Template' (id | user_keyword)+ '=' exp ';' ;
 
 class_params : '(' (id '=' exp)+ ')';
 
-operator_def :  (type id | user_keyword)+ '=' ('apply' assoc=id 'on')? exp ;
+operator_def :  (type id | user_keyword)+ '=' apply_category? exp ;
+
+apply_category : 'apply' assoc=id 'on';
 
 type_def : 'type' id ('extends' type  arg_list? id?)?  ('{' class_var_def * '}' )? ;
 
@@ -79,6 +81,7 @@ integrate : 'integrate' exp 'on' exp;
 tick : 'tick' id;
 
  exp : sub_exp | id | constant | constructor | sum |trim |  proj | period_op 
+	 //| 'apply' cat=id 'on' '(' exp ')'
 	 | right=exp runary=right_op 
 	 | lunary=builtin_op left=exp 
 	 | left=exp binary=builtin_op right=exp

diff --git a/src/main/java/crml/compiler/CategoryMapping.java b/src/main/java/crml/compiler/CategoryMapping.java
@@ -1,14 +1,14 @@
 package crml.compiler;
 
 import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
-
-import grammar.crmlParser.Category_pairContext;
 
 public class CategoryMapping {
 
 	HashMap<String, HashMap <String, String>> categoryMap;
+
+	public CategoryMapping(){
+		categoryMap = new HashMap<>();
+	}
 
 	public void addCategory(String name, HashMap <String, String> operator_mapping) {
 

diff --git a/src/main/java/crml/compiler/crmlVisitorImpl.java b/src/main/java/crml/compiler/crmlVisitorImpl.java
@@ -9,8 +9,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.aventstack.extentreports.model.Category;
-
 import grammar.crmlBaseVisitor;
 import grammar.crmlParser;
 import grammar.crmlParser.Category_pairContext;
@@ -321,7 +319,12 @@ else if (ctx.uninstantiated_def()!=null)
 
 			user_operators.put(modelName.toString(), sig);
 
-
+			//check for Category
+			if(ctx.operator_def().apply_category()!=null)
+				if(category_map.getCategory(ctx.operator_def().apply_category().id().getText())!= null)
+					current_category = ctx.operator_def().apply_category().id().getText();
+				else throw new ParseCancellationException ("Undefined Category " + ctx.operator_def().apply_category().id().getText());
+
 			// append body
 			Value exp = visit(ctx.operator_def().exp());
 			definition.append(localFunctionCalls + "\n");
@@ -335,6 +338,9 @@ else if (ctx.uninstantiated_def()!=null)
 
 			//restore local function calls
 			localFunctionCalls = store_localFunctionCalls;
+
+			// restore category
+			current_category = null;
 
 			return new Value (definition.toString(), "Operator");
 		}
@@ -446,21 +452,6 @@ else if (ctx.uninstantiated_def()!=null)
 
 		@Override public Value visitExp(crmlParser.ExpContext ctx) {
 			Value right, left;
-
-			// if the expression is a category operator 
-			if(ctx.cat!=null){
-				//check if the category exists
-				if(category_map.getCategory(ctx.cat.getText())!= null){
-					// set category
-					current_category = ctx.cat.getText();
-
-					Value res= visitExp(ctx.exp(0));
-
-					// unset category
-					current_category = null;
-					return res;
-				}
-			}
 
 			// if the expression is a constructor
 			if(ctx.constructor() != null) {