[DAG-copy] Make ASTElements cloneable

Author: Steffen Märcker

prism/src/parser/ast/ASTElement.java

@@ -35,7 +35,7 @@
 
 // Abstract class for PRISM language AST elements
 
-public abstract class ASTElement
+public abstract class ASTElement implements Cloneable
 {
 	// Type - default to null (unknown)
 	protected Type type = null;
@@ -188,6 +188,20 @@ public String getEndString()
 	 */
 	public abstract ASTElement deepCopy();
 
+	/**
+	 * Perform a shallow copy of the receiver and
+	 * clone all internal container, e.g., lists and vectors, too.
+	 */
+	@Override
+	public ASTElement clone()
+	{
+		try {
+			return (ASTElement) super.clone();
+		} catch (CloneNotSupportedException e) {
+			throw new InternalError("Object#clone is expected to work for Cloneable objects.", e);
+		}
+	}
+
 	// Various methods based on AST traversals (implemented using the visitor
 	// pattern):
 

prism/src/parser/ast/Command.java

@@ -151,6 +151,12 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public Command clone()
+	{
+		return (Command) super.clone();
+	}
 }
 
 //------------------------------------------------------------------------------

prism/src/parser/ast/ConstantList.java

@@ -80,7 +80,7 @@ public void addConstant(ExpressionIdent n, Expression c, Type t)
 		types.addElement(t);
 		nameIdents.addElement(n);
 	}
-	
+
 	public void setConstant(int i, Expression c)
 	{
 		constants.setElementAt(c, i);
@@ -445,6 +445,20 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+@SuppressWarnings("unchecked")
+	@Override
+	public ConstantList clone()
+	{
+		ConstantList clone = (ConstantList) super.clone();
+
+		clone.constants  = (Vector<Expression>)      constants.clone();
+		clone.nameIdents = (Vector<ExpressionIdent>) nameIdents.clone();
+		clone.names      = (Vector<String>)          names.clone();
+		clone.types      = (Vector<Type>)            types.clone();
+
+		return clone;
+	}
 }
 
 //------------------------------------------------------------------------------

prism/src/parser/ast/Declaration.java

@@ -150,6 +150,12 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public Declaration clone()
+	{
+		return (Declaration) super.clone();
+	}
 }
 
 // ------------------------------------------------------------------------------

prism/src/parser/ast/DeclarationArray.java

@@ -134,4 +134,10 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public DeclarationArray clone()
+	{
+		return (DeclarationArray) super.clone();
+	}
 }

prism/src/parser/ast/DeclarationBool.java

@@ -84,4 +84,10 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public DeclarationBool clone()
+	{
+		return (DeclarationBool) super.clone();
+	}
 }

prism/src/parser/ast/DeclarationClock.java

@@ -88,4 +88,10 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public DeclarationClock clone()
+	{
+		return (DeclarationClock) super.clone();
+	}
 }

prism/src/parser/ast/DeclarationInt.java

@@ -118,4 +118,10 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public DeclarationInt clone()
+	{
+		return (DeclarationInt) super.clone();
+	}
 }

prism/src/parser/ast/DeclarationIntUnbounded.java

@@ -88,4 +88,10 @@ public ASTElement deepCopy()
 		ret.setPosition(this);
 		return ret;
 	}
+
+	@Override
+	public DeclarationIntUnbounded clone()
+	{
+		return (DeclarationIntUnbounded) super.clone();
+	}
 }

prism/src/parser/ast/Expression.java

@@ -76,7 +76,7 @@ public String getResultName()
 	 */
 	public abstract boolean returnsSingleValue();
 
-	// Overrided version of deepCopy() from superclass ASTElement (to reduce casting).
+	// Override version of deepCopy() from superclass ASTElement (to reduce casting).
 
 	/**
 	 * Perform a deep copy.