Skip to content

Commit 85fecb5

Browse files
ponderosaTXponderosaTX
committed
This commit cleans up code in the Scala part of platform and in some
test cases tht perform compilation. The following files were modified: modified: platform.jar modified: ../src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java modified: ../src/edu/rice/cs/drjava/model/GlobalModelCompileSuccessTest.java modified: ../src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java modified: ../src/edu/rice/cs/drjava/model/GlobalModelTestCase.java modified: ../src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java modified: ../src/edu/rice/cs/drjava/model/compiler/Javac160FilteringCompiler.java modified: ../../platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java
1 parent c1288cf commit 85fecb5

File tree

8 files changed

+62
-39
lines changed

8 files changed

+62
-39
lines changed

‎drjava/lib/platform.jar‎

374 Bytes
Binary file not shown.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,15 @@ public void testCompileAllFailsDifferentSourceRoots() throws BadLocationExceptio
151151

152152
assertCompileErrorsPresent(_name(), true);
153153
// System.err.println(cm.getCompilerErrorModel());
154-
assertEquals("Should have 1 compiler error", 1, cm.getNumErrors());
154+
assertEquals("Should have 2 compiler errors", 2, cm.getNumErrors());
155155
listener.checkCompileOccurred();
156156

157157
// Make sure .class does not exist for both files
158158
File compiled1 = classForScala(file1, "DrScalaTestFoo");
159159
assertEquals(_name() + "Class file exists after failing compile (1)", false, compiled1.exists());
160-
File compiled2 = classForScala(file2, "DrScalaTestBar");
161-
assertEquals(_name() + "Class file exists after failing compile (2)", false, compiled2.exists());
160+
/* Scalac does not respond toa null destination by placing all class files in corresponding source location. */
161+
// File compiled2 = classForScala(file2, "DrScalaTestBar");
162+
// assertEquals(_name() + "Class file exists after failing compile (2)", false, compiled2.exists());
162163
_model.removeListener(listener);
163164

164165
// System.err.println("testCompileAllFailsDifferentSourceRoots completed");

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public void testCompileAllDifferentSourceRoots() throws BadLocationException, IO
5858
aDir.mkdir();
5959
bDir.mkdir();
6060
OpenDefinitionsDocument doc = setupDocument(FOO_TEXT);
61-
final File file = new File(aDir, "DrScalaTestFoo.scala");
62-
saveFile(doc, new FileSelector(file));
61+
final File file1 = new File(aDir, "DrScalaTestFoo.scala");
62+
saveFile(doc, new FileSelector(file1));
6363
OpenDefinitionsDocument doc2 = setupDocument(BAR_TEXT);
6464
final File file2 = new File(bDir, "DrScalaTestBar.scala");
6565
saveFile(doc2, new FileSelector(file2));
@@ -70,17 +70,18 @@ public void testCompileAllDifferentSourceRoots() throws BadLocationException, IO
7070

7171
Utilities.clearEventQueue();
7272

73-
if (_model.getCompilerModel().getNumErrors() == 0) {
74-
fail("compile succeeded despite multiple source roots");
75-
}
76-
assertCompileErrorsPresent(_name(), true);
73+
// Compile should succeed with multiple source roots
74+
assertEquals("compile succeeded despite multiple source roots", 0, _model.getCompilerModel().getNumErrors());
75+
assertCompileErrorsPresent(_name(), false);
7776
listener.checkCompileOccurred();
7877

79-
// Make sure .class files do not exist for the two files
80-
File compiled = classForScala(file, "DrScalaTestFoo");
81-
assertTrue(_name() + "Foo Class file doesn't exist after compile", ! compiled.exists());
82-
File compiled2 = classForScala(file2, "DrSclaTestBar");
83-
assertTrue(_name() + "Bar Class file doesn't exist after compile", ! compiled2.exists());
78+
// Make sure .class files exist for the first file in expected place
79+
File compiled = classForScala(file2, "DrScalaTestBar");
80+
System.err.println("Class file for DrScalaTestBar = " + compiled);
81+
assertTrue(_name() + "Bar Class file exists after compile", compiled.exists());
82+
// Scalac does not respond to null destination by placing each class file in corresponding source file's folder
83+
// File compiled2 = classForScala(file2, "DrSclaTestFoo");
84+
// assertTrue(_name() + "Foo Class file doesn't exist after compile", ! compiled2.exists());
8485
_model.removeListener(listener);
8586
}
8687

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ public void testInteractionsLiveUpdateClassPath() throws BadLocationException, E
520520
Iterable<File> newCp = _model.getInteractionsClassPath();
521521
System.err.println("New class path is:\n" + IterUtil.multilineToString(newCp));
522522
System.err.println("Classpath after extension = '" + _model.getInteractionsClassPath() + "'");
523-
Utilities.show("Pause to inspect class path including " + cp);
523+
// Utilities.show("Pause to inspect class path including " + cp);
524524

525525
// example format of REPL result: res0: String = DrScalaTestFoo
526526
String pattern = "\\s*res[0-9]+: String = DrScalaTestFoo\\s*";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ public void updateCurrentLocationInDoc() { /* this event is not directly tested
994994
}
995995

996996
public static class InteractionListener extends TestListener {
997-
private static final int WAIT_TIMEOUT = 100000; // time to wait for _interactionDone or _resetDone
997+
private static final int WAIT_TIMEOUT = 300000; // time to wait for _interactionDone or _resetDone
998998
private volatile CompletionMonitor _interactionDone;
999999
private volatile CompletionMonitor _resetDone;
10001000

‎drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,15 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {
301301

302302

303303
// File buildDir = _model.isProjectActive() ? _model.getBuildDirectory() : sourceRoot;
304-
if (buildDir == null || buildDir == FileOps.NULL_FILE) // flat file mode or unset build directory in a project
304+
if (buildDir == null || buildDir == FileOps.NULL_FILE) { // flat file mode or unset build directory in a project
305305
buildDir = _model.getProjectRoot();
306-
306+
_model.setBuildDirectory(buildDir);
307+
307308
// Utilities.show("buildDir is: " + buildDir);
308-
309-
System.err.println("Calling _compileFiles(" + filesToCompile + ", " + buildDir + ")");
310-
_compileFiles(filesToCompile, buildDir);
309+
310+
System.err.println("Calling _compileFiles(" + filesToCompile + ", " + buildDir + ")");
311+
_compileFiles(filesToCompile, buildDir);
312+
}
311313
}
312314
catch (Throwable t) {
313315
DJError err = new DJError(t.toString(), false);

‎drjava/src/edu/rice/cs/drjava/model/compiler/Javac160FilteringCompiler.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@
4646
import java.io.FileFilter;
4747
import java.io.InputStream;
4848
import java.io.FileOutputStream;
49-
import edu.rice.cs.plt.io.IOUtil;
49+
;
5050
import edu.rice.cs.drjava.config.OptionConstants;
5151
import edu.rice.cs.drjava.DrScala;
5252
import edu.rice.cs.drjava.model.DJError;
53-
import edu.rice.cs.util.ArgumentTokenizer;
5453
import edu.rice.cs.plt.reflect.JavaVersion;
54+
import edu.rice.cs.plt.io.IOUtil;
55+
import edu.rice.cs.util.ArgumentTokenizer;
56+
import edu.rice.cs.util.Log;
5557

5658
/** An abstract parent for all javac-based compiler interfaces that may need to filter .exe files from the
5759
* classpath, i.e. javac from JDKs 1.6.0_04 or newer.
@@ -61,31 +63,33 @@ public abstract class Javac160FilteringCompiler extends JavacCompiler {
6163
protected final boolean _filterExe;
6264
protected final File _tempJUnit;
6365
protected static final String PREFIX = "drscala-junit";
64-
protected static final String SUFFIX = ".jar";
66+
protected static final String SUFFIX = ".jar";
67+
68+
protected static final Log _log = new Log("jdk8.txt",true);
6569

6670
protected Javac160FilteringCompiler(JavaVersion.FullVersion version,
6771
String location,
6872
List<? extends File> defaultBootClassPath) {
6973
super(version, location, defaultBootClassPath);
7074

7175
_filterExe = version.compareTo(JavaVersion.parseFullVersion("1.6.0_04")) >= 0;
76+
_log.log("filterExe = " + _filterExe);
7277
File tempJUnit = null;
7378
if (_filterExe) {
7479
// if we need to filter out exe files from the classpath, we also need to
7580
// extract junit.jar and create a temporary file
7681
try {
77-
// edu.rice.cs.util.Log LOG = new edu.rice.cs.util.Log("jdk160.txt",true);
78-
// LOG.log("Filtering exe files from classpath.");
82+
// _log.log("Filtering exe files from classpath.");
7983
InputStream is = Javac160FilteringCompiler.class.getResourceAsStream("/junit.jar");
8084
if (is!=null) {
81-
// LOG.log("\tjunit.jar found");
85+
// _log.log("\tjunit.jar found");
8286
tempJUnit = edu.rice.cs.plt.io.IOUtil.createAndMarkTempFile(PREFIX,SUFFIX);
8387
FileOutputStream fos = new FileOutputStream(tempJUnit);
8488
int size = edu.rice.cs.plt.io.IOUtil.copyInputStream(is,fos);
85-
// LOG.log("\t"+size+" bytes written to "+tempJUnit.getAbsolutePath());
89+
// _log.log("\t"+size+" bytes written to "+tempJUnit.getAbsolutePath());
8690
}
8791
else {
88-
// LOG.log("\tjunit.jar not found");
92+
// _log.log("\tjunit.jar not found");
8993
if (tempJUnit!=null) {
9094
tempJUnit.delete();
9195
tempJUnit = null;

‎platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,15 @@
7373

7474
/** An implementation of JavacCompiler that supports compiling with the Scala 2.11.x compiler based on Java 1.7.0.
7575
* Must be compiled using javac 1.7.0 and with Scala compiler jar on the boot classpath. The class
76-
* Javac160FilteringCompiler filters .exe files out of the class path because the JVM does not recognize such files
76+
* Javac160FilteringCompiler filters .exe filters out of the class path because the JVM does not recognize such files
7777
* on its classpath after early builds of Java 6.
7878
*
7979
* @version $Id$
8080
*/
8181
public class ScalaCompiler extends Javac160FilteringCompiler implements /* Scala */ CompilerInterface {
8282

83-
public static final Log _log = new Log("GlobalModel.txt", false);
83+
// _log is also defined in a superclass
84+
public static final Log _log = new Log("jdk8.txt", true);
8485

8586
private File _outputDir = null;
8687

@@ -170,7 +171,7 @@ public boolean isAvailable() {
170171
* @return true if the specified file is a source file for this compiler. */
171172
public boolean isSourceFileForThisCompiler(File f) {
172173
// by default, use DrJavaFileUtils.isSourceFile
173-
// _log.log("ScalaCompiler.isSourceFile(" + f + ") called");
174+
_log.log("ScalaCompiler.isSourceFile(" + f + ") called");
174175
String fileName = f.getName();
175176
return fileName.endsWith(SCALA_FILE_EXTENSION) || fileName.endsWith(OptionConstants.JAVA_FILE_EXTENSION);
176177
}
@@ -254,8 +255,12 @@ public List<? extends DJError> compile(List<? extends File> files, List<? extend
254255
// this, files, classPath, sourcePath, destination, bootClassPath, sourceVersion, showWarnings);
255256
// java.util.List<File> filteredClassPath = getFilteredClassPath(classPath);
256257

258+
_log.log("In " + this + ", compile(" + files + ", " + classPath + ", " + sourcePath + ", " + destination + ", " +
259+
bootClassPath + ", " + sourceVersion + ", " + showWarnings + ") called");
260+
261+
257262
/* Must create a Reporter object for the Scalac compiler. In Scala Setting appears to be the rough equivalent of
258-
* compilatoin context. We are using the default Setting. Scalac does not take a list of JavaFileObjects. */
263+
* compilation context. We are using the default Setting. Scalac does not take a list of JavaFileObjects. */
259264

260265
/** DrJava error table, which is passed to our compilation reporter and embedded in it. */
261266
LinkedList<DJError> errors = new LinkedList<DJError>();
@@ -270,20 +275,26 @@ public List<? extends DJError> compile(List<? extends File> files, List<? extend
270275
// settings.processArgumentString("-usejavacp");
271276
settings.processArgumentString("-deprecation");
272277
String dest = (destination == null) ? null : destination.getPath();
273-
// Utilities.show("dest = '" + dest + "'");
278+
System.err.println("In ScalaCompiler, dest = '" + dest + "'");
274279
if (dest != null) {
275280
_log.log("Passing argument string '" + "-d " + '"' + dest + '"' + "to the scala compiler (Global)");
281+
// Utilities.show("Passing argument string '" + "-d " + '"' + dest + '"' + "to the scala compiler (Global)");
276282
settings.processArgumentString("-d " + '"' + dest + '"');
277283
}
278-
else settings.processArgumentString("-d " + '"' + '"');
284+
else {
285+
// settings.processArgumentString("-d " + '"' + '"');
286+
// Utilities.show("No destination argument string passed");
287+
_log.log("No destination argument string passed");
288+
}
289+
279290
// additionalBootClassPathForInteractions consists of the jar files required to run scalac
280291
String cp = additionalBootClassPathForInteractions().toString() + dJPathToPath(classPath);
281292
settings.processArgumentString("-cp " + '"' + cp + '"'); // cp quoted because unescaped blanks may appear in Windows file names
282-
// Utilities.show("Location of Scala distribution is: " + _location + "\nScala compiler class path set to '" + cp + "'");
293+
_log.log("Scala compiler class path set to '" + cp + "'");
283294

284295
Global compiler = new Global(settings, reporter);
285296

286-
// Utilities.show("Scala compiler object constructed");
297+
_log.log("Scala compiler object constructed");
287298
/* Create a run of the Scala compiler. */
288299
Global.Run run = compiler.new Run();
289300

@@ -292,12 +303,16 @@ public List<? extends DJError> compile(List<? extends File> files, List<? extend
292303
scala.collection.immutable.List fileObjects =
293304
scala.collection.immutable.Nil$.MODULE$; // the empty list in Scala
294305
for (File f : files) fileObjects = fileObjects.$colon$colon(new PlainFile(Path.jfile2path(f)));
295-
try { run.compileFiles(fileObjects); } // fileObjects has raw type List
306+
try {
307+
_log.log("Compiling " + fileObjects);
308+
run.compileFiles(fileObjects);
309+
} // fileObjects has raw type List
296310
catch(Throwable t) { // compiler threw an exception/error (typically out of memory error)
297311
errors.addFirst(new DJError("Compile exception: " + t, false));
312+
_log.log("Compilation generated exception: " + t);
298313
// error.log(t);
299314
}
300-
315+
_log.log("End compile()");
301316
// debug.logEnd("compile()");
302317
return errors;
303318
}

0 commit comments

Comments
 (0)