[Swift-commit] r2070 - trunk/src/org/griphyn/vdl/engine

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-06-15 16:10:26 -0500 (Sun, 15 Jun 2008)
New Revision: 2070

Modified:
   trunk/src/org/griphyn/vdl/engine/Karajan.java
   trunk/src/org/griphyn/vdl/engine/VariableScope.java
Log:
remove old constructor that has been superceded

Modified: trunk/src/org/griphyn/vdl/engine/Karajan.java
===================================================================
--- trunk/src/org/griphyn/vdl/engine/Karajan.java	2008-06-15 21:03:09 UTC (rev 2069)
+++ trunk/src/org/griphyn/vdl/engine/Karajan.java	2008-06-15 21:10:26 UTC (rev 2070)
@@ -183,7 +183,7 @@
 
 	public void procedure(Procedure proc, VariableScope containingScope) throws CompilationException {
 		VariableScope outerScope = new VariableScope(this, null);
-		VariableScope innerScope = new VariableScope(this, outerScope, false);
+		VariableScope innerScope = new VariableScope(this, outerScope, VariableScope.ENCLOSURE_NONE);
 		StringTemplate procST = template("procedure");
 		containingScope.bodyTemplate.setAttribute("procedures", procST);
 		procST.setAttribute("name", proc.getName());

Modified: trunk/src/org/griphyn/vdl/engine/VariableScope.java
===================================================================
--- trunk/src/org/griphyn/vdl/engine/VariableScope.java	2008-06-15 21:03:09 UTC (rev 2069)
+++ trunk/src/org/griphyn/vdl/engine/VariableScope.java	2008-06-15 21:10:26 UTC (rev 2070)
@@ -42,39 +42,13 @@
 	public StringTemplate bodyTemplate;
 
 	public VariableScope(Karajan c, VariableScope parent) {
-		this(c,parent,true);
+		this(c,parent,ENCLOSURE_ALL);
 	}
 
-
 	/** Creates a new variable scope.
 		@param c the compiler scope in which this variable lives
 		@param parent the enclosing scope, or null if this is a
 			top level scope
-		@param a if true, assignments made in this scope
-			to variables in an enclosing scope will be permitted. if false,
-			this will be prohibited, which is desirable in loops to prohibit
-			multiple assignment
-		@deprecated use explicit upwards parameter rather than boolean
-	*/
-	public VariableScope(Karajan c, VariableScope parent, boolean a) {
-		if(parentScope!=null) {
-			logger.info("New scope "+hashCode()+" with parent scope "+parentScope.hashCode());
-		} else {
-			logger.info("New scope "+hashCode()+" with no parent.");
-		}
-		compiler = c;
-		parentScope = parent;
-		if(a) {
-			enclosureType = ENCLOSURE_ALL;
-		} else {
-			enclosureType = ENCLOSURE_NONE;
-		}
-	}
-
-	/** Creates a new variable scope.
-		@param c the compiler scope in which this variable lives
-		@param parent the enclosing scope, or null if this is a
-			top level scope
 		@param a specifies how assignments to variables made in enclosing
 			scopes will be handled.
 	*/