Restructured to get rid of unnecessary packages -- tree/tiger/generic moved into tree/tiger; interpreter/throwable moved into interpreter/error.

dlsmith · dlsmith · commit a86ba91f59a7 · 2006-04-19T17:52:42.000Z
git-svn-id: file:///tmp/test-svn/trunk@3805 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/AbstractTypeChecker.java b/dynamicjava/src/koala/dynamicjava/interpreter/AbstractTypeChecker.java
@@ -79,7 +79,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/EvaluationVisitor.java b/dynamicjava/src/koala/dynamicjava/interpreter/EvaluationVisitor.java
@@ -34,9 +34,8 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
-import koala.dynamicjava.tree.tiger.generic.*;
+import koala.dynamicjava.tree.tiger.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/EvaluationVisitorTest.java b/dynamicjava/src/koala/dynamicjava/interpreter/EvaluationVisitorTest.java
@@ -50,7 +50,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/ForEachNamingTest.java b/dynamicjava/src/koala/dynamicjava/interpreter/ForEachNamingTest.java
@@ -12,7 +12,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/ForEachTypingTest.java b/dynamicjava/src/koala/dynamicjava/interpreter/ForEachTypingTest.java
@@ -12,7 +12,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/InterpreterException.java b/dynamicjava/src/koala/dynamicjava/interpreter/InterpreterException.java
@@ -29,7 +29,6 @@
 package koala.dynamicjava.interpreter;
 
 import koala.dynamicjava.interpreter.error.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.parser.wrapper.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/InterpreterUtilities.java b/dynamicjava/src/koala/dynamicjava/interpreter/InterpreterUtilities.java
@@ -30,7 +30,7 @@
 
 import java.lang.reflect.*;
 
-import koala.dynamicjava.interpreter.throwable.*;
+import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.util.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/NameVisitor.java b/dynamicjava/src/koala/dynamicjava/interpreter/NameVisitor.java
@@ -33,7 +33,6 @@
 
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TreeInterpreter.java b/dynamicjava/src/koala/dynamicjava/interpreter/TreeInterpreter.java
@@ -35,7 +35,6 @@
 
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.parser.wrapper.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java
@@ -51,12 +51,11 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
 
-import koala.dynamicjava.tree.tiger.generic.GenericReferenceTypeName;
+import koala.dynamicjava.tree.tiger.GenericReferenceTypeName;
 
 
 
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker15.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker15.java
@@ -51,7 +51,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeCheckerTest.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeCheckerTest.java
@@ -51,7 +51,6 @@
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/context/GlobalContext.java b/dynamicjava/src/koala/dynamicjava/interpreter/context/GlobalContext.java
@@ -44,7 +44,6 @@
 import koala.dynamicjava.interpreter.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.parser.wrapper.*;
 import koala.dynamicjava.tree.visitor.*;
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/context/MethodContext.java b/dynamicjava/src/koala/dynamicjava/interpreter/context/MethodContext.java
@@ -34,7 +34,6 @@
 import koala.dynamicjava.classinfo.*;
 import koala.dynamicjava.interpreter.*;
 import koala.dynamicjava.interpreter.error.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.util.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/context/StaticContext.java b/dynamicjava/src/koala/dynamicjava/interpreter/context/StaticContext.java
@@ -35,7 +35,6 @@
 import koala.dynamicjava.interpreter.*;
 import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.interpreter.modifier.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.util.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/error/BreakException.java b/dynamicjava/src/koala/dynamicjava/interpreter/error/BreakException.java
@@ -26,7 +26,7 @@
  *
  */
 
-package koala.dynamicjava.interpreter.throwable;
+package koala.dynamicjava.interpreter.error;
 
 /**
  * Thrown to indicate that a break statement has been reached
@@ -47,7 +47,7 @@ public class BreakException extends RuntimeException {
      * @param m the detail message.
      */
     public BreakException(String m) {
-	super(m);
+ super(m);
     }
 
     /**
@@ -58,20 +58,20 @@ public BreakException(String m) {
      */
     public BreakException(String m, String l) {
         super(m);
-	label = l;
+ label = l;
     }
 
     /**
      * Tests whether the statement was labeled
      */
     public boolean isLabeled() {
-	return label != null;
+ return label != null;
     }
 
     /**
      * Returns the label of the statement that thrown the exception
      */
     public String getLabel() {
-	return label;
+ return label;
     }
 }
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/error/ContinueException.java b/dynamicjava/src/koala/dynamicjava/interpreter/error/ContinueException.java
@@ -26,7 +26,7 @@
  *
  */
 
-package koala.dynamicjava.interpreter.throwable;
+package koala.dynamicjava.interpreter.error;
 
 /**
  * Thrown to indicate that a continue statement has been reached
@@ -47,7 +47,7 @@ public class ContinueException extends RuntimeException {
      * @param m the detail message.
      */
     public ContinueException(String m) {
-	super(m);
+ super(m);
     }
 
     /**
@@ -58,20 +58,20 @@ public ContinueException(String m) {
      */
     public ContinueException(String m, String l) {
         super(m);
-	label = l;
+ label = l;
     }
 
     /**
      * Tests whether the statement was labeled
      */
     public boolean isLabeled() {
-	return label != null;
+ return label != null;
     }
 
     /**
      * Returns the label of the statement that thrown the exception
      */
     public String getLabel() {
-	return label;
+ return label;
     }
 }
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/error/ReturnException.java b/dynamicjava/src/koala/dynamicjava/interpreter/error/ReturnException.java
@@ -26,9 +26,8 @@
  *
  */
 
-package koala.dynamicjava.interpreter.throwable;
+package koala.dynamicjava.interpreter.error;
 
-import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.tree.*;
 
 /**
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/error/ThrownException.java b/dynamicjava/src/koala/dynamicjava/interpreter/error/ThrownException.java
@@ -26,9 +26,8 @@
  *
  */
 
-package koala.dynamicjava.interpreter.throwable;
+package koala.dynamicjava.interpreter.error;
 
-import koala.dynamicjava.interpreter.error.*;
 import koala.dynamicjava.tree.*;
 
 /**
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/error/WrongVersionException.java b/dynamicjava/src/koala/dynamicjava/interpreter/error/WrongVersionException.java
@@ -43,7 +43,7 @@
  * 
 END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.interpreter.throwable;
+package koala.dynamicjava.interpreter.error;
 
 /**
  * This exception is to be thrown whenever a feature of Java 1.5 is used
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/throwable/package.html b/dynamicjava/src/koala/dynamicjava/interpreter/throwable/package.html
diff --git a/dynamicjava/src/koala/dynamicjava/parser/ForEachParsingTest.java b/dynamicjava/src/koala/dynamicjava/parser/ForEachParsingTest.java
@@ -10,7 +10,6 @@
 
 import koala.dynamicjava.interpreter.context.*;
 import koala.dynamicjava.interpreter.error.*;
-import koala.dynamicjava.interpreter.throwable.*;
 import koala.dynamicjava.parser.wrapper.*;
 import koala.dynamicjava.parser.impl.*;
 import koala.dynamicjava.tree.*;
diff --git a/dynamicjava/src/koala/dynamicjava/parser/grammar.jj b/dynamicjava/src/koala/dynamicjava/parser/grammar.jj
@@ -18,7 +18,7 @@ import koala.dynamicjava.parser.wrapper.*;
 import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 import koala.dynamicjava.util.*;
-import koala.dynamicjava.tree.tiger.generic.*;
+import koala.dynamicjava.tree.tiger.*;
 
 /**
  * This class represents a (interpreted) Java 1.1 language parser
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/ConsEnv.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/ConsEnv.java
@@ -1,4 +1,4 @@
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.Map;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/EmptyEnv.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/EmptyEnv.java
@@ -1,4 +1,4 @@
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.Map;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/Environment.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/Environment.java
@@ -1,4 +1,4 @@
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.Map;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/EnvironmentTest.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/EnvironmentTest.java
@@ -1,4 +1,4 @@
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.*;
 import junit.framework.*;
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericClassDeclaration.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericClassDeclaration.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 
 import koala.dynamicjava.tree.*;
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericInterfaceDeclaration.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericInterfaceDeclaration.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 
 import koala.dynamicjava.tree.*;
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericReferenceTypeName.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericReferenceTypeName.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 
 import koala.dynamicjava.tree.*;
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericTreeTest.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/GenericTreeTest.java
@@ -1,4 +1,4 @@
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.*;
 import junit.framework.*;
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/HookTypeName.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/HookTypeName.java
@@ -1,8 +1,9 @@
 
-package koala.dynamicjava.tree;
+package koala.dynamicjava.tree.tiger;
 
 import java.util.*;
 
+import koala.dynamicjava.tree.*;
 import koala.dynamicjava.tree.visitor.*;
 
 /**
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicClassAllocation.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicClassAllocation.java
@@ -26,7 +26,7 @@
  *
  */
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicConstructorDeclaration.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicConstructorDeclaration.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicInnerAllocation.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicInnerAllocation.java
@@ -26,7 +26,7 @@
  *
  */
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicInnerClassAllocation.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicInnerClassAllocation.java
@@ -26,7 +26,7 @@
  *
  */
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicMethodDeclaration.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicMethodDeclaration.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicObjectMethodCall.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicObjectMethodCall.java
@@ -43,7 +43,7 @@
  *
  END_COPYRIGHT_BLOCK*/
 
-package koala.dynamicjava.tree.tiger.generic;
+package koala.dynamicjava.tree.tiger;
 
 import koala.dynamicjava.tree.*;
 
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicSimpleAllocation.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicSimpleAllocation.java
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicSuperMethodCall.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/PolymorphicSuperMethodCall.java
diff --git a/dynamicjava/src/koala/dynamicjava/tree/tiger/TypeParameter.java b/dynamicjava/src/koala/dynamicjava/tree/tiger/TypeParameter.java
diff --git a/dynamicjava/src/koala/dynamicjava/util/Distinction1415Test.java b/dynamicjava/src/koala/dynamicjava/util/Distinction1415Test.java
diff --git a/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilities.java b/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilities.java
diff --git a/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilitiesTest.java b/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilitiesTest.java
diff --git a/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java b/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java
diff --git a/dynamicjava/src/koala/dynamicjava/util/TigerUtilitiesTest.java b/dynamicjava/src/koala/dynamicjava/util/TigerUtilitiesTest.java
