update to category syntax

resources/crml_tutorial/traffic_light/Spec_simplified.crml

@@ -73,7 +73,7 @@ model Spec is {
 			Operator [ Boolean ] Periods P 'check anytime' Boolean b =  apply varying2 'check' 'id' b 'over' P;
 
 			// Checking that a requirement is satisfied at the end of a time period
-			Operator [ Boolean ] Periods P 'check at end' Boolean b = 'check' varying1 'id' b 'over' P;
+			Operator [ Boolean ] Periods P 'check at end' Boolean b = apply varying1 'check'  'id' b 'over' P;
 
 	// List of external variables
 	Boolean red is external;

src/main/antlr/grammar/crml.g4

@@ -33,7 +33,7 @@ template : 'Template' (id | user_keyword)+ '=' exp ';' ;
 
 class_params : '(' (id '=' exp)+ ')';
 
-operator_def :  (type id | user_keyword)+ '=' ('apply' assoc=id)? exp ;
+operator_def :  (type id | user_keyword)+ '=' ('apply' assoc=id 'on')? exp ;
 
 type_def : 'type' id ('extends' type  arg_list? id?)?  ('{' class_var_def * '}' )? ;
 

src/test/resources/testModels/spec-doc-examples/CategoryAssociationExample1.crml

@@ -1,25 +1,26 @@
 model CategoryAssociationExample1 is {	
 	// Operators' definition
-	Operator 'decide' is 
-		Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end));
+	Template b1 'or' b2 = not (not b1 and not b2);
+
+	Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end);
 	Operator [ Boolean ] 'id' Boolean b = b;
 	Operator [ Boolean ] 'cte_false' Boolean b = false;
 	Operator [ Boolean ] 'cte_true' Boolean b = true;
 
 	// Category definition as an operator on the operators previously defined
-	Category c3 is Category varying1 = { ('id', 'cte_false') };
-	Category c4 is Category varying1 = { ('id', 'cte_true') };
+	Category varying1 = { ('id', 'cte_false') };
+	Category varying2 = { ('id', 'cte_true') };
 
 	// Association of categories with operators
-	Category {} C3 is associate varying1 with 'decide';
-	Category {} C4 is associate varying2 with 'decide';
+	//Category {} C3 is associate varying1 with 'decide';
+	//Category {} C4 is associate varying2 with 'decide';
 
 	// Definition of new operators using association previously defined
 	// Decide that decision event to evaluate requirement is the end of a time period
-	Operator [ Boolean ] Period P 'decide at end' Boolean b = 'decide' varying1 'id' b 'over' P;
+	Operator [ Boolean ] Period P 'decide at end' Boolean b = apply varying1 on 'decide' 'id' b 'over' P;
 
 	// Decide that decision event to evaluate requirement is any time instant of a time period
-	Operator [ Boolean ] Periods P 'decide anytime' Boolean b = 'decide' varying2 'id' b 'over' P;
+	Operator [ Boolean ] Periods P 'decide anytime' Boolean b = apply varying2 on 'decide' 'id' b 'over' P;
 
 	// Example of operator calls	
 	Boolean b1 is time > 1.0;