Skip to content

Commit 2a237d1

Browse files
ponderosaTXponderosaTX
committed
This revision cleans up many references to Java 6 and 7 in build.xml
and to a lesser extent in the source tree. No references to Java 6 or 7 remain in either text. The following files were changed modified: build.xml modified: lib/plt.jar modified: ../javalanglevels/lib/plt.jar modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/Augmentor.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/BodyTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/ClassBodyTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/ElementaryLevelTest.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/ExpressionTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/FullJavaVisitor.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/InterfaceBodyFullJavaVisitor.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/InterfaceBodyIntermediateVisitor.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/InterfaceBodyTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/IntermediateLevelTest.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/IntermediateVisitor.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/LValueTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/LValueWithValueTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/Options.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/SpecialTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/TryCatchBodyTypeChecker.java modified: ../javalanglevels/src/edu/rice/cs/javalanglevels/TypeChecker.java modified: ../plt/build.xml
1 parent 4ee07d0 commit 2a237d1

23 files changed

+78
-561
lines changed

‎drjava/build.xml‎

Lines changed: 11 additions & 331 deletions
Large diffs are not rendered by default.

‎drjava/lib/plt.jar‎

15.3 KB
Binary file not shown.

‎javalanglevels/lib/plt.jar‎

18.1 KB
Binary file not shown.

‎javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void testSuccessful() {
117117
for (int i = 0; i < len3; i++) { testFiles[len1 + len2 + i] = files3[i]; }
118118

119119
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
120-
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_6, IterUtil.<File>empty()));
120+
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_8, IterUtil.<File>empty()));
121121

122122
// System.err.println("testFiles = " + Arrays.toString(testFiles));
123123

@@ -228,7 +228,7 @@ public boolean accept(File pathName) {
228228
LanguageLevelConverter llc = new LanguageLevelConverter();
229229
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
230230
for (int i = 0; i<testFiles.length; i++) {
231-
result = llc.convert(new File[]{testFiles[i]}, new Options(JavaVersion.JAVA_6, IterUtil.<File>empty()));
231+
result = llc.convert(new File[]{testFiles[i]}, new Options(JavaVersion.JAVA_8, IterUtil.<File>empty()));
232232
assertTrue("should be parse exceptions or visitor exceptions", !result.getFirst().isEmpty() || !result.getSecond().isEmpty());
233233
}
234234
}
@@ -247,7 +247,7 @@ public void testPackagedOrderMatters() {
247247

248248
LanguageLevelConverter llc = new LanguageLevelConverter();
249249
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
250-
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_6, IterUtil.<File>empty()));
250+
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_8, IterUtil.<File>empty()));
251251
// System.err.println("ParseExceptions: " + result.getFirst());
252252
// System.err.println("VisitorExceptions: " + result.getSecond());
253253

‎javalanglevels/src/edu/rice/cs/javalanglevels/Augmentor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ public void setUp() {
16581658
_a = new Augmentor(true, null, null, llv);
16591659
LanguageLevelConverter.symbolTable.clear();
16601660
Symboltable _s = LanguageLevelConverter.symbolTable;
1661-
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make());
1661+
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make());
16621662
}
16631663

16641664
public void testFormalParameters2TypeDatas() {

‎javalanglevels/src/edu/rice/cs/javalanglevels/BodyTypeChecker.java‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -703,34 +703,7 @@ protected boolean isException(SymbolData sd) {
703703
* Returns null if this try-catch statement doesn't necessarily return a value. NOTE: null represents an
704704
* ill-formed type or VOID_TYPE, which is ambiguous.
705705
*/
706-
<<<<<<< HEAD
707-
protected InstanceData tryCatchLeastRestrictiveType(InstanceData tryBlockRes, InstanceData[] catchBlocksRes,
708-
InstanceData finallyBlock_result) {
709-
// Return the common superclass or null if there exists a block that doesn't return a value(except the finally block)
710-
if (tryBlockRes == null || tryBlockRes == SymbolData.NOT_FOUND.getInstanceData())
711-
return finallyBlock_result;
712-
SymbolData leastRestrictiveType = tryBlockRes.getSymbolData();
713-
for (int i = 0; i < catchBlocksRes.length; i++) {
714-
InstanceData cbr = catchBlocksRes[i];
715-
if (cbr == null) return finallyBlock_result;
716-
if (cbr == SymbolData.NOT_FOUND.getInstanceData()) return cbr;
717-
if (_isAssignableFrom(catchBlocksRes[i].getSymbolData(), leastRestrictiveType.getSymbolData()))
718-
leastRestrictiveType = catchBlocksRes[i].getSymbolData();
719-
else leastRestrictiveType = getCommonSuperType(leastRestrictiveType.getSymbolData(), leastRestrictiveType);
720-
}
721-
722-
if (leastRestrictiveType == null) return null;
723-
// else if (leastRestrictiveType == null) result = getCommonSuperType(null, finallyBlock_result.getSymbolData());
724-
else {
725-
SymbolData result;
726-
if (finallyBlock_result == null)
727-
result = getCommonSuperType(leastRestrictiveType.getSymbolData(), null);
728-
else
729-
result = getCommonSuperType(leastRestrictiveType.getSymbolData(), finallyBlock_result.getSymbolData());
730-
if (result == null) return null;
731-
else return result.getInstanceData();
732-
}
733-
=======
706+
734707
protected InstanceData tryCatchLeastCommonType(InstanceData tryBlockRes, InstanceData[] catchBlocksRes,
735708
InstanceData finallyBlock_result) {
736709
// If tryBlockRes is ill-typed, then the finallyBlock must return a type that meets context constraints
@@ -761,7 +734,6 @@ protected InstanceData tryCatchLeastCommonType(InstanceData tryBlockRes, Instanc
761734
if (leastCommonType == null || leastCommonType == snfType.getSymbolData()) return fbRes;
762735
if (fbType == null || fbType == snfType.getSymbolData()) return leastCommonType.getInstanceData();
763736
return fbRes;
764-
>>>>>>> 272a56558150b7258a67798f47b646a32f3760b4
765737
}
766738

767739
/** Return true if the Exception is unchecked, and false otherwise.
@@ -1099,7 +1071,7 @@ public void setUp() {
10991071
_bd2.addVars(((MethodData)_bd2).getParams());
11001072
_bbtc = new BodyTypeChecker(_bd1, new File(""), "", new LinkedList<String>(), new LinkedList<String>(),
11011073
new LinkedList<VariableData>(), new LinkedList<Pair<SymbolData,JExpression>>());
1102-
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make());
1074+
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make());
11031075
_bbtc._importedPackages.addFirst("java.lang");
11041076
}
11051077

‎javalanglevels/src/edu/rice/cs/javalanglevels/ClassBodyTypeChecker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public void setUp() {
391391
_cbbtc =
392392
new ClassBodyTypeChecker(_sd1, new File(""), "", new LinkedList<String>(), new LinkedList<String>(),
393393
new LinkedList<VariableData>(), new LinkedList<Pair<SymbolData, JExpression>>());
394-
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make());
394+
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make());
395395
_cbbtc._importedPackages.addFirst("java.lang");
396396
}
397397

‎javalanglevels/src/edu/rice/cs/javalanglevels/ElementaryLevelTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
public class ElementaryLevelTest extends TestCase {
5757
File directory;
5858

59-
public void setUp() {
60-
directory = new File("testFiles" + File.separatorChar + "forElementaryLevelTest");
61-
}
59+
public void setUp() { directory = new File("testFiles" + File.separatorChar + "forElementaryLevelTest"); }
6260

6361
// public void assertEquals(String s, Data answer, Data testValue) {
6462
// if (! answer.equals(testValue))
@@ -75,7 +73,7 @@ public void testSuccessful() {
7573
// System.err.println("testFiles for testSuccessful = " + Arrays.toString(testFiles));
7674
LanguageLevelConverter llc = new LanguageLevelConverter();
7775
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
78-
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_6,
76+
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_8,
7977
IterUtil.make(new File("lib/buildlib/junit.jar"))));
8078
// System.err.println("Visitor exception #1 = " + result.getSecond().getFirst());
8179
// fail("Dumping System.err");
@@ -119,7 +117,7 @@ public boolean accept(File pathName) {
119117
for (int i = 0; i < testFiles.length; i++) {
120118
LanguageLevelConverter llc1 = new LanguageLevelConverter();
121119
// System.err.println("TESTING " + testFiles[i]);
122-
result = llc1.convert(new File[]{ testFiles[i] }, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
120+
result = llc1.convert(new File[]{ testFiles[i] }, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
123121
// System.err.println("Test result = " + result);
124122
assertTrue("should be parse exceptions or visitor exceptions in file " + testFiles[i].getName(),
125123
! result.getFirst().isEmpty() || ! result.getSecond().isEmpty());
@@ -130,7 +128,7 @@ public boolean accept(File pathName) {
130128
/** Tests that when some files have already been compiled, the .java files are not generated for those files,
131129
* and files that reference those files are augmented correctly.
132130
*/
133-
public void xtestSomeFilesCompiled() {
131+
public void testSomeFilesCompiled() {
134132
directory = new File(directory, "someCompiled");
135133
File[] testFiles = directory.listFiles(new FileFilter() {
136134
public boolean accept(File pathName) {
@@ -139,7 +137,7 @@ public boolean accept(File pathName) {
139137

140138
LanguageLevelConverter llc = new LanguageLevelConverter();
141139
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
142-
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
140+
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
143141

144142
assertEquals("should be no parse exceptions", new LinkedList<JExprParseException>(), result.getFirst());
145143
assertEquals("should be no visitor exceptions", new LinkedList<Pair<String, JExpressionIF>>(), result.getSecond());
@@ -181,7 +179,7 @@ public void testOrderMatters() {
181179
LanguageLevelConverter llc = new LanguageLevelConverter();
182180
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
183181
// System.err.println("files for testOrderMatters = " + Arrays.toString(files));
184-
result = llc.convert(files, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
182+
result = llc.convert(files, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
185183

186184
assertEquals("should be no parse exceptions", new LinkedList<JExprParseException>(), result.getFirst());
187185
assertEquals("should be 1 visitor exception", 1, result.getSecond().size());
@@ -197,7 +195,7 @@ public void testEmptyFileNoAction() {
197195
File[] files = new File[]{ new File(directory, "EmptyFile.dj0")};
198196
LanguageLevelConverter llc = new LanguageLevelConverter();
199197
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
200-
result = llc.convert(files, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
198+
result = llc.convert(files, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
201199

202200
assertEquals("should be no parse exceptions", new LinkedList<JExprParseException>(), result.getFirst());
203201
assertEquals("should be no visitor exceptions", 0, result.getSecond().size());
@@ -214,14 +212,14 @@ public boolean accept(File pathName) {
214212

215213
LanguageLevelConverter llc = new LanguageLevelConverter();
216214
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
217-
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
215+
result = llc.convert(testFiles, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
218216

219217
assertEquals("should be no parse exceptions", new LinkedList<JExprParseException>(), result.getFirst());
220218
assertEquals("should be no visitor exceptions", new LinkedList<Pair<String, JExpressionIF>>(), result.getSecond());
221219

222220
// for (int i = 0; i <testFiles.length; i++) {
223221
// LanguageLevelConverter llc5 = new LanguageLevelConverter();
224-
// result = llc5.convert(new File[]{testFiles[i]}, new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make()));
222+
// result = llc5.convert(new File[]{testFiles[i]}, new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make()));
225223
//
226224
// assertEquals("should be no parse exceptions", new LinkedList<JExprParseException>(), result.getFirst());
227225
// assertEquals("should be no visitor exceptions", new LinkedList<Pair<String, JExpressionIF>>(), result.getSecond());

‎javalanglevels/src/edu/rice/cs/javalanglevels/ExpressionTypeChecker.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,25 +1430,17 @@ public TypeData forConditionalExpressionOnly(ConditionalExpression that) {
14301430
TypeData conseqType = conseq.visit(this);
14311431
TypeData altType = alt.visit(this);
14321432
TypeData returnType = getCommonSuperType(conseqType.getSymbolData(), altType.getSymbolData());
1433-
<<<<<<< HEAD
1434-
1435-
if (! conditionType.getSymbolData().isAssignableTo(SymbolData.BOOLEAN_TYPE, JAVA_VERSION)) {
1436-
=======
1437-
1438-
// System.err.println("[ETC.forCondExprOnly] conditionType = " + conditionType + ", conseqType = " + conseqType +
1439-
// ", alttype = " + altType);
1440-
1441-
if (! conditionType.getSymbolData().isAssignableTo(SymbolData.BOOLEAN_TYPE, true)) {
1442-
>>>>>>> 272a56558150b7258a67798f47b646a32f3760b4
1433+
1434+
if (! conditionType.equals(SymbolData.BOOLEAN_TYPE)) {
14431435
_addError("The test in this conditional has type " + conditionType.getName() + " instead of boolean.", that);
14441436
return returnType;
14451437
}
1446-
1447-
if (returnType == null) {
1438+
else if (returnType == null) {
14481439
_addError("The type " + conseqType.getName() + " of the consequent and the type " + altType.getName() +
14491440
"of this conditional are not compatible", that);
14501441
return returnType;
1451-
}
1442+
}
1443+
14521444
return returnType;
14531445
}
14541446

@@ -1758,7 +1750,7 @@ public void setUp() {
17581750
_etc =
17591751
new ExpressionTypeChecker(null, new File(""), "", new LinkedList<String>(), new LinkedList<String>(),
17601752
new LinkedList<VariableData>(), new LinkedList<Pair<SymbolData, JExpression>>());
1761-
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_6, EmptyIterable.<File>make());
1753+
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_8, EmptyIterable.<File>make());
17621754
_etc._importedPackages.addFirst("java.lang");
17631755
_sd1 = new SymbolData("i.like.monkey");
17641756
_sd2 = new SymbolData("i.like.giraffe");

‎javalanglevels/src/edu/rice/cs/javalanglevels/FullJavaVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ public void setUp() {
551551
errors = new LinkedList<Pair<String, JExpressionIF>>();
552552
LanguageLevelConverter.symbolTable.clear();
553553
LanguageLevelConverter._newSDs.clear();
554-
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_6, IterUtil.make(new File("lib/buildlib/junit.jar")));
554+
LanguageLevelConverter.OPT = new Options(JavaVersion.JAVA_8, IterUtil.make(new File("lib/buildlib/junit.jar")));
555555
visitedFiles = new LinkedList<Pair<LanguageLevelVisitor, edu.rice.cs.javalanglevels.tree.SourceFile>>();
556556
// _hierarchy = new Hashtable<String, TypeDefBase>();
557557
_fv = new FullJavaVisitor(new File(""),

0 commit comments

Comments
 (0)