Added missing case for field update on ADTs

usethesource · Dec 23, 2013 · caf33da · caf33da
1 parent ee43f53
commit caf33da
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/org/rascalmpl/library/experiments/Compiler/Rascal2muRascal/RascalExpression.rsc b/src/org/rascalmpl/library/experiments/Compiler/Rascal2muRascal/RascalExpression.rsc
@@ -490,20 +490,23 @@ MuExp translate (e:(Expression) `<Expression expression> . <Name field>`) {
 
 // Field update
 MuExp translate (e:(Expression) `<Expression expression> [ <Name key> = <Expression replacement> ]`) {
-    tp = getType(expression@\loc);   
+    tp = getType(expression@\loc);  
+ 
     list[str] fieldNames = [];
     if(isRelType(tp)){
        tp = getSetElementType(tp);
     } else if(isListType(tp)){
        tp = getListElementType(tp);
     } else if(isMapType(tp)){
        tp = getMapFieldsAsTuple(tp);
+    } else if(isADTType(tp)){
+       println("tp = <tp>"); 
+        return muCallPrim("adt_field_update", [ translate(expression), muCon("<key>"), translate(replacement) ]);
     }
     if(tupleHasFieldNames(tp)){
-    	fieldNames = getTupleFieldNames(tp);
+    	  fieldNames = getTupleFieldNames(tp);
     }	
     return muCallPrim("<getOuterType(expression)>_update", [ translate(expression), muCon(indexOf(fieldNames, "<key>")), translate(replacement) ]);
-        //muCallPrim("<getOuterType(expression)>_field_update", [ translate(expression), muCon("<key>"), translate(replacement) ]);
 }
 
 // Field project
@@ -518,7 +521,7 @@ MuExp translate (e:(Expression) `<Expression expression> \< <{Field ","}+ fields
        tp = getMapFieldsAsTuple(tp);
     }
     if(tupleHasFieldNames(tp)){
-    	fieldNames = getTupleFieldNames(tp);
+       	fieldNames = getTupleFieldNames(tp);
     }	
     fcode = [(f is index) ? muCon(toInt("<f>")) : muCon(indexOf(fieldNames, "<f>")) | f <- fields];
     //fcode = [(f is index) ? muCon(toInt("<f>")) : muCon("<f>") | f <- fields];