synching small chages

src/main/antlr/grammar/crml.g4

@@ -23,7 +23,7 @@ category : 'Category' id 'is' '{' category_pair (',' category_pair)* '}' ';';
 
 category_pair : '(' op ',' op ')';
 
-association : 'Category' empty_set id 'is' 'associate' id 'with' id;
+association : 'Category' empty_set c_set=id 'is' 'associate' c_name=id 'with' c_op_name=id;
 
 var_def : var_qualifier? type id  (arg_list | 'is' (exp | is_external = 'external'))? ';' ;
 

src/main/java/crml/translator/CategoryMapping.java

@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Vector;
 
+import grammar.crmlParser.Category_pairContext;
+
 public class CategoryMapping {
 
 	HashMap<String, List<Category>> categoryMap;
@@ -23,5 +25,11 @@ public void addAssociation(String name, String category_name, List<List<String>>
 		categoryMap.put(name, cs);
 	}
 
+    public void add_mapping(String text, List<Category_pairContext> category_pair) {
+    }
+
+    public void add_association(String text, String text2, String text3) {
+    }
+
 
 }

src/main/java/crml/translator/Signature.java

@@ -105,6 +105,5 @@ public Signature(String name, List<String> params, List<String> param_names, Str
 		this.is_return_set=returnSet;
 		this.temp_var_name = out_var_name;
 	}
-
 
 }

src/main/java/crml/translator/crmlVisitorImpl.java

@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Vector;
 
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
@@ -146,7 +145,6 @@ public crmlVisitorImpl (crmlParser parser) {
 			Boolean isSet=null;
 
 
-
 			if(ctx.static_qualifier().getText().contentEquals("parameter"))
 				var_prefix = "parameter ";
 			else{
@@ -158,9 +156,7 @@ public crmlVisitorImpl (crmlParser parser) {
 				// convert the type if it is a built in
 				if(ctx.type().builtin_type()!=null) {
 					var_type = ctx.type().builtin_type().getText();
-					var_modelica_type = types_mapping.get(var_type);
-
-
+					var_modelica_type = types_mapping.get(var_type);				 
 				}
 
 				else {
@@ -188,27 +184,21 @@ else if(ctx.structure_type()!=null)
 				i++;
 				if (i< ctx.id().size())
 					var_names.append(" ,");
-
-
+
 			}
 
-
-
 			return new Value(var_prefix + var_modelica_type + " " + var_names + ";\n", var_type);
 
-		}	
-
-
+		}	 
 
-		@Override public Value visitCategory(crmlParser.CategoryContext ctx) {
-
-			return new Value("", "Category");
-
+		@Override public Value visitCategory(crmlParser.CategoryContext ctx) {		
+			category_map.add_mapping(ctx.id().getText(), ctx.category_pair());
+			return new Value("", "Category");		
 		}	
 
 		@Override public Value visitAssociation(crmlParser.AssociationContext ctx) {
-			return new Value("", "Association");
-
+			category_map.add_association(ctx.c_set.getText(), ctx.c_op_name.getText(), ctx.c_name.getText());
+			return new Value("", "Association");	
 		}	
 
 		@Override public Value visitClass_def(crmlParser.Class_defContext ctx) {