DrJavaAtRice · vuphan314 · Jan 21, 2016 · Jan 22, 2016 · Sep 21, 2016 · Jan 21, 2016
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@ drjava/classes
 drjava/drjava.jar
 drjava/build.xml.*
 drjava/coverage_report
-scratch
+scratch
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "java-repl"]
+	path = java-repl
+	url = git://github.com/albertlatacz/java-repl
diff --git a/djapp/nextgen2/MANIFEST.MF b/djapp/nextgen2/MANIFEST.MF
diff --git a/djapp/nextgen2/nextgen2.djapp b/djapp/nextgen2/nextgen2.djapp
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ByteCodeClassLoader.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ByteCodeClassLoader.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ConstantChanger$ConstantFixer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ConstantChanger$ConstantFixer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ConstantChanger.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/ConstantChanger.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$AnyWildVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$AnyWildVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ArrayVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ArrayVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ClassSignature.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ClassSignature.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ClassType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ClassType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ExtendWildVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$ExtendWildVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$MethodSignature.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$MethodSignature.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$SuperWildVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$SuperWildVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$Type.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$Type.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$TypeVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$TypeVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$WildVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature$WildVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/GenericSignature.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor$AttributeVisitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor$AttributeVisitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor$ReflectionChecker.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor$ReflectionChecker.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/SnippetProcessor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/TypeArgInfo.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/TypeArgInfo.class
diff --git a/...xtgen2/src/edu/rice/cs/nextgen2/bytecode/VarianceSupporter$ClassNotGenericException.class b/...xtgen2/src/edu/rice/cs/nextgen2/bytecode/VarianceSupporter$ClassNotGenericException.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/VarianceSupporter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/bytecode/VarianceSupporter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ClassLoadChecker.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ClassLoadChecker.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ClassLoadCheckerTest.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ClassLoadCheckerTest.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ConstantToReplace.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ConstantToReplace.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ConstantToReplaceTest.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/ConstantToReplaceTest.class
diff --git a/...p/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationName$LocationAndLength.class b/...p/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationName$LocationAndLength.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationName.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationName.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationNameTest.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InstantiationNameTest.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InvalidClassNameException.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/InvalidClassNameException.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$MyClassWriter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$MyClassWriter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$MyMethodAdapter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer$MyMethodAdapter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MixinFixer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MyTempParamClass.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/MyTempParamClass.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/NextGenLoader.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/NextGenLoader.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Pair.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Pair.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Runner.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Runner.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/TemplateCache.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/TemplateCache.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/TemplateClass.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/TemplateClass.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Trio.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Trio.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Variance.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/classloader/Variance.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/Main.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/Main.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Array.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Array.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Class.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Class.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Compound.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Compound.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Constant.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Constant.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Enum.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Enum.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Error.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Error.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Visitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute$Visitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Attribute.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/BoundKind.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/BoundKind.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Flags.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Flags.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Kinds.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Kinds.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$DelegatedScope.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$DelegatedScope.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$Entry.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$Entry.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ErrorScope.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ErrorScope.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ImportScope$ImportEntry.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ImportScope$ImportEntry.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ImportScope.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope$ImportScope.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Scope.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Source.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Source.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$AliasSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$AliasSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$ClassSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$ClassSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$Completer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$Completer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$CompletionFailure.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$CompletionFailure.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$DelegatedSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$DelegatedSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$MethodSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$MethodSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$OperatorSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$OperatorSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$PackageSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$PackageSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$TypeSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$TypeSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$VarSymbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol$VarSymbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symbol.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symtab$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symtab$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symtab.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Symtab.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$AliasType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$AliasType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ArgumentType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ArgumentType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ArrayType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ArrayType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$CapturedType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$CapturedType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ClassType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ClassType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$DelegatedType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$DelegatedType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ErrorType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ErrorType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ForAll.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$ForAll.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$Mapping.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$Mapping.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$MethodType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$MethodType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$PackageType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$PackageType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$TypeVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$TypeVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$UndetVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$UndetVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$Visitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type$Visitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Type.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/TypeTags.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/TypeTags.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$3.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$3.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$4.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$4.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$5.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$5.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$6.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$6.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$AsSubFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$AsSubFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$AsSuperFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$AsSuperFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ClassBoundFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ClassBoundFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ContainsTypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ContainsTypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$DisjointTypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$DisjointTypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ErasureFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$ErasureFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$HasSameArgsFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$HasSameArgsFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$HashCodeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$HashCodeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$InterfacesFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$InterfacesFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsCastableFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsCastableFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsReifiableFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsReifiableFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsSameTypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsSameTypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsSubTypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsSubTypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsUnboundedFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$IsUnboundedFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$LowerBoundFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$LowerBoundFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$MemberTypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$MemberTypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SingletonType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SingletonType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SubstFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SubstFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SupertypeFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$SupertypeFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$TypePair.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$TypePair.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$UpperBoundFcn.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types$UpperBoundFcn.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/code/Types.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Annotate$Annotator.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Annotate$Annotator.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Annotate.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Annotate.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Attr.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Attr.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/AttrContext.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/AttrContext.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/AttrContextEnv.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/AttrContextEnv.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$1SpecialTreeVisitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$1SpecialTreeVisitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$ConversionWarner.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$ConversionWarner.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$Validator.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check$Validator.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Check.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/ConstFold.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/ConstFold.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Enter$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Enter$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Enter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Enter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Env.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Env.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Flow$PendingExit.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Flow$PendingExit.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Flow.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Flow.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$NoInstanceException.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer$NoInstanceException.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Infer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$1Patcher.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$1Patcher.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$2$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$2$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$3.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$3.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$4.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$4.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$5$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$5$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$5.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$5.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$6.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$6.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$ClassMap.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$ClassMap.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$EnumMapping.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$EnumMapping.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$FreeVarCollector.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$FreeVarCollector.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$TreeBuilder.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower$TreeBuilder.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Lower.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$3.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$3.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$4.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$4.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$5.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$5.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$6.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter$6.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/MemberEnter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$AccessError.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$AccessError.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$AmbiguityError.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$AmbiguityError.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$ResolveError.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$ResolveError.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$StaticError.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve$StaticError.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Resolve.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Todo.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/Todo.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/TransTypes.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/comp/TransTypes.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/AllParamCollector.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/AllParamCollector.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ClassVisitorEnv.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ClassVisitorEnv.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$MixinFixer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$MixinFixer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$TypeTranslator.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat$TypeTranslator.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Flat.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ListHash.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ListHash.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/MethodEnvSnippetClosure.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/MethodEnvSnippetClosure.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/MethodVisitorEnv.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/MethodVisitorEnv.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ModuleAnalyzer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ModuleAnalyzer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ParamCollector.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/ParamCollector.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/SnippetClosure.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/SnippetClosure.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeChecker.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeChecker.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreePrinter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreePrinter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$ApplySnippeter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$ApplySnippeter.class
diff --git a/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$NewArraySnippeter.class b/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$NewArraySnippeter.class
diff --git a/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$NewClassSnippeter.class b/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$NewClassSnippeter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$SelectSnippeter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$SelectSnippeter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$Snippeter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$Snippeter.class
diff --git a/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$TypeCastSnippeter.class b/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$TypeCastSnippeter.class
diff --git a/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$TypeTestSnippeter.class b/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter$TypeTestSnippeter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TreeSnippeter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener$TreeFlattener.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener$TreeFlattener.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/TypeFlattener.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Util.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/Util.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/VisitorEnv.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/flatten/VisitorEnv.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ByteCodes.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ByteCodes.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTFlags.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTFlags.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$CRTEntry.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$CRTEntry.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$SourceComputer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$SourceComputer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$SourceRange.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable$SourceRange.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/CRTable.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassFile$NameAndType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassFile$NameAndType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassFile.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassFile.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationCompleter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationCompleter.class
diff --git a/...xtgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationDefaultCompleter.class b/...xtgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationDefaultCompleter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationDeproxy.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$AnnotationDeproxy.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$Archive.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$Archive.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$ArrayAttributeProxy.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$ArrayAttributeProxy.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$BadClassFile.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$BadClassFile.class
diff --git a/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$CompoundAnnotationProxy.class b/.../nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$CompoundAnnotationProxy.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$EnumAttributeProxy.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$EnumAttributeProxy.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$ProxyVisitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$ProxyVisitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$SourceCompleter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader$SourceCompleter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassReader.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$AttributeWriter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$AttributeWriter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$PoolOverflow.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$PoolOverflow.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$RetentionPolicy.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$RetentionPolicy.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$StringOverflow.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter$StringOverflow.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ClassWriter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$Chain.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$Chain.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$LocalVar.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$LocalVar.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$Mneumonics.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$Mneumonics.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$StackMapFrame.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$StackMapFrame.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$State.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code$State.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Code.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$1ComplexityScanner.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$1ComplexityScanner.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$GenContext.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$GenContext.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$GenFinalizer.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen$GenFinalizer.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Gen.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$AssignItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$AssignItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$CondItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$CondItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$ImmediateItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$ImmediateItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$IndexedItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$IndexedItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$Item.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$Item.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$LocalItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$LocalItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$MemberItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$MemberItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$SelfItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$SelfItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$StackItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$StackItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$StaticItem.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items$StaticItem.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Items.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter$TypeCopier.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter$TypeCopier.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/ModuleCompleter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool$Method.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool$Method.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool$Variable.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool$Variable.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Pool.class
diff --git a/...gen2/src/edu/rice/cs/nextgen2/compiler/jvm/SignatureReader$SignatureReaderException.class b/...gen2/src/edu/rice/cs/nextgen2/compiler/jvm/SignatureReader$SignatureReaderException.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/SignatureReader.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/SignatureReader.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Target.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/Target.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/UninitializedType.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/jvm/UninitializedType.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/CommandLine.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/CommandLine.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler$1MethodBodyRemover.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler$1MethodBodyRemover.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler$TreePrinter.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler$TreePrinter.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/JavaCompiler.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$10.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$10.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$11.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$11.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$12.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$12.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$13.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$13.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$14.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$14.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$15.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$15.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$16.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$16.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$17.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$17.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$18.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$18.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$19.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$19.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$2.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$2.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$20.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$20.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$3.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$3.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$4.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$4.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$5.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$5.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$6.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$6.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$7.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$7.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$8.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$8.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$9.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$9.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$HiddenOption.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$HiddenOption.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$Option.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$Option.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$XOption.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main$XOption.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/main/Main.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Keywords$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Keywords$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Keywords.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Keywords.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser$1.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser$1.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser$Factory.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser$Factory.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Parser.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner$ByteBufferCache.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner$ByteBufferCache.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner$Factory.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner$Factory.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Scanner.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Tokens.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/parser/Tokens.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/compiler.properties b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/compiler.properties
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/compiler_ja.properties b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/compiler_ja.properties
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/javac.properties b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/javac.properties
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/javac_ja.properties b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/resources/javac_ja.properties
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Pretty$1UsedVisitor.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Pretty$1UsedVisitor.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Pretty.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Pretty.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Alias.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Alias.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Annotation.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Annotation.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Apply.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Apply.class
diff --git a/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Assert.class b/djapp/nextgen2/src/edu/rice/cs/nextgen2/compiler/tree/Tree$Assert.class