Java REPL?#12
Closed
vuphan314 wants to merge 32 commits into
DrJavaAtRice:masterDrJavaAtRice/drjava:masterfrom
vuphan314:masterCopy head branch name to clipboard
Closed
Java REPL?#12vuphan314 wants to merge 32 commits intoDrJavaAtRice:masterDrJavaAtRice/drjava:masterfrom vuphan314:masterCopy head branch name to clipboard
vuphan314 wants to merge 32 commits into
DrJavaAtRice:masterDrJavaAtRice/drjava:masterfrom
vuphan314:masterCopy head branch name to clipboard
Conversation
completely handle programs with both language levels files and
ordinary files. It also updates the jar files in the drjava/lib
directory so that they are consistent with the jar files corresponding
to subsidiary code bases.
The following files have been added, deleted, or modified:
(paths are relative to javalanglevels directory)
modified: ../drjava/build.xml
modified: ../drjava/lib/javalanglevels-base.jar
modified: ../drjava/lib/plt.jar
modified: ../drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java
modified: ../drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
modified: ../drjava/src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java
modified: ../drjava/src/edu/rice/cs/drjava/model/GlobalModelCompileTest.java
modified: ../drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
modified: ../drjava/src/edu/rice/cs/drjava/model/MultiThreadedTestCase.java
modified: ../drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
modified: ../drjava/src/edu/rice/cs/drjava/model/repl/DrJavaRepl.java
modified: ../drjava/src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
modified: ../drjava/src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
modified: ../drjava/src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
modified: ../drjava/src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java
modified: ../drjava/src/edu/rice/cs/util/newjvm/AbstractSlaveJVM.java
modified: build.xml
modified: lib/plt.jar
modified: src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java
modified: src/edu/rice/cs/javalanglevels/ArrayData.java
modified: src/edu/rice/cs/javalanglevels/Augmentor.java
modified: src/edu/rice/cs/javalanglevels/BlockData.java
modified: src/edu/rice/cs/javalanglevels/BodyBodyFullJavaVisitor.java
modified: src/edu/rice/cs/javalanglevels/BodyBodyIntermediateVisitor.java
modified: src/edu/rice/cs/javalanglevels/BodyData.java
modified: src/edu/rice/cs/javalanglevels/BodyTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/CharConverter.java
modified: src/edu/rice/cs/javalanglevels/ClassBodyFullJavaVisitor.java
modified: src/edu/rice/cs/javalanglevels/ClassBodyIntermediateVisitor.java
modified: src/edu/rice/cs/javalanglevels/ClassBodyTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/Command.java
modified: src/edu/rice/cs/javalanglevels/ConstructorBodyTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/Data.java
modified: src/edu/rice/cs/javalanglevels/ElementaryLevelTest.java
modified: src/edu/rice/cs/javalanglevels/ExpressionTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/FullJavaVisitor.java
modified: src/edu/rice/cs/javalanglevels/InstanceData.java
modified: src/edu/rice/cs/javalanglevels/InterfaceBodyFullJavaVisitor.java
modified: src/edu/rice/cs/javalanglevels/InterfaceBodyIntermediateVisitor.java
modified: src/edu/rice/cs/javalanglevels/InterfaceBodyTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/IntermediateLevelTest.java
modified: src/edu/rice/cs/javalanglevels/IntermediateVisitor.java
modified: src/edu/rice/cs/javalanglevels/JExprParseException.java
modified: src/edu/rice/cs/javalanglevels/JExprParserTest.java
modified: src/edu/rice/cs/javalanglevels/JExpressionIFPrunableDepthFirstVisitor.java
modified: src/edu/rice/cs/javalanglevels/LValueTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/LValueWithValueTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
modified: src/edu/rice/cs/javalanglevels/LanguageLevelVisitor.java
modified: src/edu/rice/cs/javalanglevels/MethodData.java
modified: src/edu/rice/cs/javalanglevels/Options.java
modified: src/edu/rice/cs/javalanglevels/PackageData.java
modified: src/edu/rice/cs/javalanglevels/Pair.java
modified: src/edu/rice/cs/javalanglevels/PrimitiveData.java
modified: src/edu/rice/cs/javalanglevels/SourceInfo.java
modified: src/edu/rice/cs/javalanglevels/SpecialTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/SymbolData.java
modified: src/edu/rice/cs/javalanglevels/Symboltable.java
modified: src/edu/rice/cs/javalanglevels/Triple.java
modified: src/edu/rice/cs/javalanglevels/TryCatchBodyTypeChecker.java
modified: src/edu/rice/cs/javalanglevels/TypeChecker.java
modified: src/edu/rice/cs/javalanglevels/TypeData.java
modified: src/edu/rice/cs/javalanglevels/VariableData.java
modified: src/edu/rice/cs/javalanglevels/jexpr.ast
modified: src/edu/rice/cs/javalanglevels/jexpr.jj
modified: src/edu/rice/cs/javalanglevels/util/BorderlessScrollPane.java
modified: src/edu/rice/cs/javalanglevels/util/Log.java
modified: src/edu/rice/cs/javalanglevels/util/ScrollableDialog.java
modified: src/edu/rice/cs/javalanglevels/util/UnexpectedException.java
modified: src/edu/rice/cs/javalanglevels/util/Utilities.java
The master includes changes in the main DrJava repository (DrJavaAtRice/drjava)
The following files were modified, added, or removed: modified: ../.gitignore modified: build.xml modified: lib/asm-all-5.0.1.jar modified: lib/buildlib/junit.jar modified: lib/concutest-junit-4.7-withrt-nodep.jar modified: lib/docs.jar modified: lib/dynamicjava-base.jar modified: lib/ecj-4.5.1.jar modified: lib/jacocoant.jar modified: lib/javalanglevels-base.jar modified: lib/javarepl-dev.build.jar modified: lib/jgoodies-common-1.8.1.jar modified: lib/jgoodies-forms-1.9.0.jar modified: lib/jgoodies-looks-2.7.0.jar modified: lib/jsoup-1.8.1.jar modified: lib/org.jacoco.core-0.7.3.201409180205.jar modified: lib/org.jacoco.report-0.7.3.201409180205.jar modified: lib/platform.jar modified: lib/plt.jar modified: lib/readme.txt modified: lib/seaglasslookandfeel-0.2.jar modified: src/edu/rice/cs/drjava/model/AbstractGlobalModel.java modified: src/edu/rice/cs/drjava/model/DefaultGlobalModel.java modified: src/edu/rice/cs/drjava/model/GlobalModelIOTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelTestCase.java modified: src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java modified: ../javalanglevels/build.xml modified: ../javalanglevels/javalanglevels-base.jar
Conflicts: .gitignore README drjava/packaging/mac/DrJava.app/Contents/Info.plist drjava/packaging/mac/DrJava.app/Contents/PkgInfo drjava/packaging/mac/DrJava.app/Contents/Resources/Java/DrJava.jar-goes-here drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java drjava/src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java drjava/src/edu/rice/cs/drjava/model/MultiThreadedTestCase.java drjava/src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java drjava/src/edu/rice/cs/drjava/model/repl/InteractionsModel.java drjava/src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
Author
|
replacing #11 |
Closed
Author
|
will merge to branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
merge from
https://github.com/maladat/drjava