revert to original

Author: isaacmaffeis

asmetal2java_codegen/src/org/asmeta/asm2java/DomainToJavaSigDef.xtend

@@ -145,10 +145,7 @@ class DomainToJavaSigDef extends ReflectiveVisitor<String> {
 				sb.append('''«new ToString(res).visit(object.element.get(i))»}
 				''')
 		}
-		
-		sb.append(System.lineSeparator)
-		sb.append('''
-			List<«object.name»> «object.name»_elemsList = new ArrayList<>();''')
+
 		return sb.toString
 	}
 
@@ -165,27 +162,27 @@ class DomainToJavaSigDef extends ReflectiveVisitor<String> {
 			static class «object.name» {
 				static List<«object.name»> elems = new ArrayList<>();
 				«isStatic + " "»List<String> val = new ArrayList<>();
-			
+
 			«object.name» (String a) {
 			      elems.add(this);
 			      val.add(a);
 			      }
-			      
+
 			      String toString(«object.name» a) {
 			      if(elems.contains(a)) {
 			      return val.get(elems.lastIndexOf(a));
 			      }
 			      else return null;
 			      }
-			      
+
 			«object.name» get(String a) {
 			      if(val.contains(a)) {
 			      return elems.get(val.lastIndexOf(a));
 			      }
 			      else return null;
 			      }
 			      }
-			      
+
 			      List<String> «object.name»_elemsList = new ArrayList<>();
 			      List<«object.name»> «object.name»_Class = new ArrayList<>();
 		''')
@@ -200,52 +197,52 @@ class DomainToJavaSigDef extends ReflectiveVisitor<String> {
 		if (object.isDynamic) {
 			sb.append('''
 				class  «object.name»{
-				
-				List<«new ToString(res).visit(object.typeDomain)»> elems = new ArrayList<>();			      
-				«new ToString(res).visit(object.typeDomain)» value;			      
-				«object.name»(«new ToString(res).visit(object.typeDomain)» i) { 
+
+				List<«new ToString(res).visit(object.typeDomain)»> elems = new ArrayList<>();
+				«new ToString(res).visit(object.typeDomain)» value;
+				«object.name»(«new ToString(res).visit(object.typeDomain)» i) {
 				   value = i;
 				   }
 				   }
-				   
+
 				   List<«new ToString(res).visit(object.typeDomain)»> «object.name»_elems = new ArrayList<>();
 			''')
 
-		} // Static classes -> The list of elements is set after this definition 
+		} // Static classes -> The list of elements is set after this definition
 		else {
 			sb.append('''static class  «object.name» {
 				static List<«new ToString(res).visit(object.typeDomain)»> elems = new ArrayList<>();
                 «new ToString(res).visit(object.typeDomain)» value;
-                
+
                 static «object.name» valueOf(«new ToString(res).visit(object.typeDomain)» val) {
                 	«object.name» n = new «object.name»();
                 	n.value = val;
                 	return n;
 				}
-				
+
 				static «object.name» valueOf(«object.name» val) {
 				                	return val;
 								}
-				
+
 				@Override
 					public boolean equals(Object obj) {
 						if (!(obj instanceof «object.name»)) return false;
 						return value.equals(((«object.name»)obj).value);
 					}
-				
-				
+
+
 				@Override
 						public int hashCode() {
 							return value.hashCode();
 						}
-						
+
 				}
-				
+
 				«object.name» «object.name»_elem = new «object.name»();
 				List<«new ToString(res).visit(object.typeDomain)»> «object.name»_elems = new ArrayList<>();
 			''')
 		}
 		return sb.toString
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/FindMonitoredInControlledFunct.xtend

@@ -106,4 +106,4 @@ class FindMonitoredInControlledFunct extends ReflectiveVisitor<Boolean> {
 		return found
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/FunctionToJavaDef.xtend

@@ -511,4 +511,4 @@ class FunctionToJavaDef extends ReflectiveVisitor<String> {
 			return false
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/RuleToJava.xtend

@@ -408,4 +408,4 @@ class RuleToJava extends RuleVisitor<String> {
 
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/SeqRuleCollector.xtend

@@ -100,4 +100,4 @@ class SeqRuleCollector extends RuleVisitor<List<Rule>> {
 		return this.visit(rule.doRule)
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/TermToJava.xtend

@@ -757,4 +757,4 @@ class TermToJava extends ReflectiveVisitor<String> {
 			return false
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/TermToJavaInAssignments.xtend

@@ -169,4 +169,4 @@ class TermToJavaInAssignments extends TermToJava {
 		return functionTerm.toString
 	}
 
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/TermToJavaInUpdateRule.xtend

@@ -100,4 +100,4 @@ class TermToJavaInUpdateRule extends TermToJava {
 			return functionTerm.toString
 		}
 	}
-}
+}

asmetal2java_codegen/src/org/asmeta/asm2java/TermToJavaStandardLibrary.xtend

@@ -102,12 +102,11 @@ class TermToJavaStandardLibrary extends TermToJava {
 	override dispatch String caseFunctionTermSupp(MonitoredFunction fd, FunctionTerm ft) {
 		var StringBuffer functionTerm = new StringBuffer
 		if (ft.arguments === null)
-			if (leftHandSide){
+			if (leftHandSide)
 				functionTerm.append(".set(")
-			} else if(fd.codomain instanceof ConcreteDomain){
-					functionTerm.append(".get().value")
-			} else{
+			else {
 				functionTerm.append(".get()")
+
 			}
 
 		if (ft.arguments !== null) {
@@ -141,12 +140,12 @@ class TermToJavaStandardLibrary extends TermToJava {
 					// The domain is structured. Check whether the i-th parameter has the domain as expected
 					if ((ft.function.domain instanceof ProductDomain)) {
 						if ((ft.function.domain as ProductDomain).domains.get(i).equals(ft.arguments.terms.get(i).domain))
-							param = param.replaceAll("\\.value","")	
-					}					
+							param = param.replaceAll("\\.value","")
+					}
 				} else {
 					// The domain is not structured. Check whether the parameter has the domain as expected
 					if (ft.domain.equals(ft.arguments.terms.get(i).domain))
-							param = param.replaceAll("\\.value","")	
+							param = param.replaceAll("\\.value","")
 				}
 				functionTerm.append(param + ", ")
 			}
@@ -159,4 +158,4 @@ class TermToJavaStandardLibrary extends TermToJava {
 		return functionTerm.toString
 	}
 
-}
+}