Skip to content

Commit 7eb0865

Browse files
author
mgricken
committed
Updating Mint compiler adapter.
git-svn-id: file:///tmp/test-svn/trunk@5340 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent a72aa0a commit 7eb0865

File tree

8 files changed

+39
-33
lines changed

8 files changed

+39
-33
lines changed

‎drjava/lib/platform.jar‎

113 Bytes
Binary file not shown.

‎drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ private static FullVersion guessVersion(File f) {
275275
try {
276276
jf = new JarFile(f);
277277
if (jf.getJarEntry("edu/rice/cs/mint/comp/TransStaging.class")!=null &&
278-
jf.getJarEntry("com/sun/source/tree/BracketExprTree.class")!=null &&
279-
jf.getJarEntry("com/sun/source/tree/BracketStatTree.class")!=null &&
280-
jf.getJarEntry("com/sun/source/tree/EscapeExprTree.class")!=null &&
281-
jf.getJarEntry("com/sun/source/tree/EscapeStatTree.class")!=null &&
282-
jf.getJarEntry("com/sun/tools/javac/util/DefaultFileManager.class")==null) {
278+
jf.getJarEntry("edu/rice/cs/mint/comp/com/sun/source/tree/BracketExprTree.class")!=null &&
279+
jf.getJarEntry("edu/rice/cs/mint/comp/com/sun/source/tree/BracketStatTree.class")!=null &&
280+
jf.getJarEntry("edu/rice/cs/mint/comp/com/sun/source/tree/EscapeExprTree.class")!=null &&
281+
jf.getJarEntry("edu/rice/cs/mint/comp/com/sun/source/tree/EscapeStatTree.class")!=null &&
282+
jf.getJarEntry("edu/rice/cs/mint/comp/com/sun/tools/javac/util/DefaultFileManager.class")==null) {
283283
vendor = "mint";
284284
}
285285
else if (jf.getJarEntry("com/sun/tools/javac/util/DefaultFileManager.class")==null) {

‎drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ private InterpreterJVM() {
114114
_classPathManager = new ClassPathManager(ReflectUtil.SYSTEM_CLASS_PATH);
115115
_interpreterLoader = _classPathManager.makeClassLoader(null);
116116
_junitTestManager = new JUnitTestManager(this, _classPathManager);
117+
118+
// set the thread context class loader, this way NextGen and Mint can use the interpreter's class loader
119+
Thread.currentThread().setContextClassLoader(_interpreterLoader);
117120

118121
// _interpreterOptions = Options.DEFAULT;
119122
_interpreterOptions = new InteractionsPaneOptions();
@@ -201,6 +204,9 @@ private InterpretResult interpret(String input, Interpreter interpreter) {
201204
boolean available = _busyInterpreters.add(interpreter);
202205
if (!available) { debug.logEnd(); return InterpretResult.busy(); }
203206

207+
// set the thread context class loader, this way NextGen and Mint can use the interpreter's class loader
208+
Thread.currentThread().setContextClassLoader(_interpreterLoader);
209+
204210
Option<Object> result = null;
205211
try { result = interpreter.interpret(input); }
206212
catch (InterpreterException e) { debug.logEnd(); return InterpretResult.exception(e); }

‎platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$2.class‎

22 Bytes
Binary file not shown.

‎platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$3.class‎

110 Bytes
Binary file not shown.

‎platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$CompilerErrorListener.class‎

418 Bytes
Binary file not shown.

‎platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.class‎

1.59 KB
Binary file not shown.

‎platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@
3535

3636
import java.util.MissingResourceException;
3737

38-
import com.sun.tools.javac.util.Options;
39-
import com.sun.tools.javac.util.Context;
40-
import com.sun.tools.javac.util.List;
41-
import com.sun.tools.javac.util.ListBuffer;
42-
import com.sun.tools.javac.util.Log;
43-
import com.sun.tools.javac.util.JavacMessages;
44-
import com.sun.tools.javac.util.PropagatedException;
45-
import com.sun.tools.javac.util.FatalError;
46-
import com.sun.tools.javac.util.ClientCodeException;
47-
import com.sun.tools.javac.processing.AnnotationProcessingError;
48-
49-
import com.sun.tools.javac.main.JavaCompiler;
38+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.Options;
39+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.Context;
40+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.List;
41+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.ListBuffer;
42+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.Log;
43+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.JavacMessages;
44+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.PropagatedException;
45+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.FatalError;
46+
import edu.rice.cs.mint.comp.com.sun.tools.javac.util.ClientCodeException;
47+
import edu.rice.cs.mint.comp.com.sun.tools.javac.processing.AnnotationProcessingError;
48+
49+
import edu.rice.cs.mint.comp.com.sun.tools.javac.main.JavaCompiler;
5050

51-
import com.sun.tools.javac.file.JavacFileManager;
52-
import com.sun.tools.javac.file.CacheFSInfo;
51+
import edu.rice.cs.mint.comp.com.sun.tools.javac.file.JavacFileManager;
52+
import edu.rice.cs.mint.comp.com.sun.tools.javac.file.CacheFSInfo;
5353

54-
import javax.tools.JavaFileObject;
55-
import javax.tools.JavaFileManager;
56-
import javax.tools.Diagnostic;
57-
import javax.tools.DiagnosticListener;
58-
import javax.annotation.processing.Processor;
54+
import edu.rice.cs.mint.comp.javax.tools.JavaFileObject;
55+
import edu.rice.cs.mint.comp.javax.tools.JavaFileManager;
56+
import edu.rice.cs.mint.comp.javax.tools.Diagnostic;
57+
import edu.rice.cs.mint.comp.javax.tools.DiagnosticListener;
58+
import edu.rice.cs.mint.comp.javax.annotation.processing.Processor;
5959

6060
import java.io.*;
6161

@@ -183,17 +183,17 @@ protected static String _transformMintCommand(String s) {
183183
public boolean isAvailable() {
184184
try {
185185
// Diagnostic was introduced in the Java 1.6 compiler
186-
Class<?> diagnostic = Class.forName("javax.tools.Diagnostic");
186+
Class<?> diagnostic = Class.forName("edu.rice.cs.mint.comp.javax.tools.Diagnostic");
187187
diagnostic.getMethod("getKind");
188188
// javax.tools.Diagnostic is also found in rt.jar; to test if tools.jar
189189
// is availble, we need to test for a class only found in tools.jar
190-
Class.forName("com.sun.tools.javac.main.JavaCompiler");
190+
Class.forName("edu.rice.cs.mint.comp.com.sun.tools.javac.main.JavaCompiler");
191191
// check for Mint classes
192192
Class.forName("edu.rice.cs.mint.comp.TransStaging");
193-
Class.forName("com.sun.source.tree.BracketExprTree");
194-
Class.forName("com.sun.source.tree.BracketStatTree");
195-
Class.forName("com.sun.source.tree.EscapeExprTree");
196-
Class.forName("com.sun.source.tree.EscapeStatTree");
193+
Class.forName("edu.rice.cs.mint.comp.com.sun.source.tree.BracketExprTree");
194+
Class.forName("edu.rice.cs.mint.comp.com.sun.source.tree.BracketStatTree");
195+
Class.forName("edu.rice.cs.mint.comp.com.sun.source.tree.EscapeExprTree");
196+
Class.forName("edu.rice.cs.mint.comp.com.sun.source.tree.EscapeStatTree");
197197
return true;
198198
}
199199
catch (Exception e) { return false; }
@@ -487,8 +487,8 @@ public int compile(String[] args,
487487
apMessage(ex);
488488
return EXIT_SYSERR;
489489
} catch (ClientCodeException ex) {
490-
// as specified by javax.tools.JavaCompiler#getTask
491-
// and javax.tools.JavaCompiler.CompilationTask#call
490+
// as specified by edu.rice.cs.mint.comp.javax.tools.JavaCompiler#getTask
491+
// and edu.rice.cs.mint.comp.javax.tools.JavaCompiler.CompilationTask#call
492492
throw new RuntimeException(ex.getCause());
493493
} catch (PropagatedException ex) {
494494
throw ex.getCause();
@@ -579,7 +579,7 @@ public String getLocalizedString(String key, Object... args) {
579579
}
580580

581581
private static final String javacBundleName =
582-
"com.sun.tools.javac.resources.javac";
582+
"edu.rice.cs.mint.comp.com.sun.tools.javac.resources.javac";
583583

584584
private static JavacMessages messages;
585585
}

0 commit comments

Comments
 (0)