Skip to content

Commit 80e4424

Browse files
ponderosaTXponderosaTX
committed
This revision contains some revisions to .gitignore files to eliminate essentially
all untracked files; it also includes some minor code polishing changes that should not affect program behavior. The following files were modified, added, or removed: modified: ../.gitignore new file: ../docs/.gitignore modified: .gitignore new file: extra-src/ExtendedTypeSystem.java new file: extra-src/StandardTypeSystem.java new file: extra-src/TypeSystem.java new file: extra-src/types/ArrayType.java new file: extra-src/types/BooleanType.java new file: extra-src/types/BottomType.java new file: extra-src/types/BoundType.java new file: extra-src/types/ByteType.java new file: extra-src/types/CharType.java new file: extra-src/types/ClassType.java new file: extra-src/types/DoubleType.java new file: extra-src/types/ExtendedTypeSystem.java.alt new file: extra-src/types/ExtendedTypeSystem1.java.alt new file: extra-src/types/FloatType.java new file: extra-src/types/FloatingPointType.java new file: extra-src/types/IntType.java new file: extra-src/types/IntegerType.java new file: extra-src/types/IntegralType.java new file: extra-src/types/IntersectionType.java new file: extra-src/types/LongType.java new file: extra-src/types/NullType.java new file: extra-src/types/NumericType.java new file: extra-src/types/ParameterizedClassType.java new file: extra-src/types/PrimitiveType.java new file: extra-src/types/RawClassType.java new file: extra-src/types/ReferenceType.java new file: extra-src/types/ShortType.java new file: extra-src/types/SimpleArrayType.java new file: extra-src/types/SimpleClassType.java new file: extra-src/types/StandardTypeSystem.java new file: extra-src/types/TabPrintWriter.java new file: extra-src/types/ToStringWalker.java new file: extra-src/types/TopType.java new file: extra-src/types/TreeWalker.java new file: extra-src/types/Type.java new file: extra-src/types/TypeAbstractVisitor.java new file: extra-src/types/TypeAbstractVisitor_void.java new file: extra-src/types/TypeDepthFirstVisitor.java new file: extra-src/types/TypeDepthFirstVisitor_void.java new file: extra-src/types/TypeSystem.java.alt new file: extra-src/types/TypeUpdateVisitor.java new file: extra-src/types/TypeVisitor.java new file: extra-src/types/TypeVisitorLambda.java new file: extra-src/types/TypeVisitorRunnable1.java new file: extra-src/types/TypeVisitor_void.java new file: extra-src/types/UnionType.java new file: extra-src/types/ValidType.java new file: extra-src/types/VarargArrayType.java new file: extra-src/types/VariableType.java new file: extra-src/types/VoidType.java new file: extra-src/types/Wildcard.java new file: lib/.gitignore modified: src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java modified: src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java modified: ../platform/.gitignore new file: ../plt/.gitignore
1 parent deed2c9 commit 80e4424

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+14597
-69
lines changed

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
*.old
88
*.svn
99
*.new
10-
drjava/svn-info.txt
11-
drjava/classes
10+
Bugs
11+
*.txt
12+
13+
VectorArch
14+
hs_err_*
15+
replay_*

‎docs/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
docs.jar
2+
docs

‎drjava/.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
drscala.jar
22
classes/
3-
3+
svn-info.txt
4+
*.old
5+
*.drscala
6+
drscala.jar.*
7+
oldlib
8+
Logs

‎drjava/extra-src/ExtendedTypeSystem.java‎

Lines changed: 1258 additions & 0 deletions
Large diffs are not rendered by default.

‎drjava/extra-src/StandardTypeSystem.java‎

Lines changed: 2775 additions & 0 deletions
Large diffs are not rendered by default.

‎drjava/extra-src/TypeSystem.java‎

Lines changed: 640 additions & 0 deletions
Large diffs are not rendered by default.

‎drjava/extra-src/types/ArrayType.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package edu.rice.cs.drjava.model.repl.types;
2+
3+
import edu.rice.cs.drjava.model.repl.newjvm.*;
4+
5+
/** Class ArrayType, a component of the ASTGen-generated composite hierarchy.
6+
* Note: null is not allowed as a value for any field.
7+
* @version Generated automatically by ASTGen at Thu Oct 16 08:57:12 CDT 2014
8+
*/
9+
//@SuppressWarnings("unused")
10+
public abstract class ArrayType extends ReferenceType {
11+
private final Type _ofType;
12+
13+
/** Constructs an ArrayType.
14+
* @throws java.lang.IllegalArgumentException If any parameter to the constructor is null.
15+
*/
16+
public ArrayType(Type in_ofType) {
17+
super();
18+
if (in_ofType == null) {
19+
throw new java.lang.IllegalArgumentException("Parameter 'ofType' to the ArrayType constructor was null");
20+
}
21+
_ofType = in_ofType;
22+
}
23+
24+
public Type ofType() { return _ofType; }
25+
26+
public abstract int generateHashCode();
27+
}

‎drjava/extra-src/types/BooleanType.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
package edu.rice.cs.drjava.model.repl.types;
2+
3+
import edu.rice.cs.drjava.model.repl.newjvm.*;
4+
5+
/**
6+
* Class BooleanType, a component of the ASTGen-generated composite hierarchy.
7+
* Note: null is not allowed as a value for any field.
8+
* @version Generated automatically by ASTGen at Thu Oct 16 08:57:12 CDT 2014
9+
*/
10+
//@SuppressWarnings("unused")
11+
public class BooleanType extends PrimitiveType {
12+
13+
/**
14+
* Constructs a BooleanType.
15+
* @throws java.lang.IllegalArgumentException If any parameter to the constructor is null.
16+
*/
17+
public BooleanType() {
18+
super();
19+
}
20+
21+
22+
public <RetType> RetType apply(TypeVisitor<RetType> visitor) {
23+
return visitor.forBooleanType(this);
24+
}
25+
26+
public void apply(TypeVisitor_void visitor) {
27+
visitor.forBooleanType(this);
28+
}
29+
30+
/**
31+
* Implementation of toString that uses
32+
* {@link #output} to generate a nicely tabbed tree.
33+
*/
34+
public java.lang.String toString() {
35+
java.io.StringWriter w = new java.io.StringWriter();
36+
walk(new ToStringWalker(w, 2));
37+
return w.toString();
38+
}
39+
40+
/**
41+
* Prints this object out as a nicely tabbed tree.
42+
*/
43+
public void output(java.io.Writer writer) {
44+
walk(new ToStringWalker(writer, 2));
45+
}
46+
47+
/**
48+
* Implementation of equals that is based on the values of the fields of the
49+
* object. Thus, two objects created with identical parameters will be equal.
50+
*/
51+
public boolean equals(java.lang.Object obj) {
52+
if (obj == null) return false;
53+
if ((obj.getClass() != this.getClass()) || (obj.hashCode() != this.hashCode())) {
54+
return false;
55+
}
56+
else {
57+
BooleanType casted = (BooleanType) obj;
58+
return true;
59+
}
60+
}
61+
62+
63+
/**
64+
* Implementation of hashCode that is consistent with equals. The value of
65+
* the hashCode is formed by XORing the hashcode of the class object with
66+
* the hashcodes of all the fields of the object.
67+
*/
68+
public int generateHashCode() {
69+
int code = getClass().hashCode();
70+
return code;
71+
}
72+
73+
public void walk(TreeWalker w) {
74+
if (w.visitNode(this, "BooleanType", 0)) {
75+
w.endNode(this, "BooleanType", 0);
76+
}
77+
}
78+
79+
}

‎drjava/extra-src/types/BottomType.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
package edu.rice.cs.drjava.model.repl.types;
2+
3+
import edu.rice.cs.drjava.model.repl.newjvm.*;
4+
5+
/**
6+
* Class BottomType, a component of the ASTGen-generated composite hierarchy.
7+
* Note: null is not allowed as a value for any field.
8+
* @version Generated automatically by ASTGen at Thu Oct 16 08:57:12 CDT 2014
9+
*/
10+
//@SuppressWarnings("unused")
11+
public class BottomType extends ValidType {
12+
13+
/**
14+
* Constructs a BottomType.
15+
* @throws java.lang.IllegalArgumentException If any parameter to the constructor is null.
16+
*/
17+
public BottomType() {
18+
super();
19+
}
20+
21+
22+
public <RetType> RetType apply(TypeVisitor<RetType> visitor) {
23+
return visitor.forBottomType(this);
24+
}
25+
26+
public void apply(TypeVisitor_void visitor) {
27+
visitor.forBottomType(this);
28+
}
29+
30+
/**
31+
* Implementation of toString that uses
32+
* {@link #output} to generate a nicely tabbed tree.
33+
*/
34+
public java.lang.String toString() {
35+
java.io.StringWriter w = new java.io.StringWriter();
36+
walk(new ToStringWalker(w, 2));
37+
return w.toString();
38+
}
39+
40+
/**
41+
* Prints this object out as a nicely tabbed tree.
42+
*/
43+
public void output(java.io.Writer writer) {
44+
walk(new ToStringWalker(writer, 2));
45+
}
46+
47+
/**
48+
* Implementation of equals that is based on the values of the fields of the
49+
* object. Thus, two objects created with identical parameters will be equal.
50+
*/
51+
public boolean equals(java.lang.Object obj) {
52+
if (obj == null) return false;
53+
if ((obj.getClass() != this.getClass()) || (obj.hashCode() != this.hashCode())) {
54+
return false;
55+
}
56+
else {
57+
BottomType casted = (BottomType) obj;
58+
return true;
59+
}
60+
}
61+
62+
63+
/**
64+
* Implementation of hashCode that is consistent with equals. The value of
65+
* the hashCode is formed by XORing the hashcode of the class object with
66+
* the hashcodes of all the fields of the object.
67+
*/
68+
public int generateHashCode() {
69+
int code = getClass().hashCode();
70+
return code;
71+
}
72+
73+
public void walk(TreeWalker w) {
74+
if (w.visitNode(this, "BottomType", 0)) {
75+
w.endNode(this, "BottomType", 0);
76+
}
77+
}
78+
79+
}

‎drjava/extra-src/types/BoundType.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package edu.rice.cs.drjava.model.repl.types;
2+
3+
import edu.rice.cs.drjava.model.repl.newjvm.*;
4+
5+
/**
6+
* Class BoundType, a component of the ASTGen-generated composite hierarchy.
7+
* Note: null is not allowed as a value for any field.
8+
* @version Generated automatically by ASTGen at Thu Oct 16 08:57:12 CDT 2014
9+
*/
10+
//@SuppressWarnings("unused")
11+
public abstract class BoundType extends ValidType {
12+
private final Iterable<? extends Type> _ofTypes;
13+
14+
/**
15+
* Constructs a BoundType.
16+
* @throws java.lang.IllegalArgumentException If any parameter to the constructor is null.
17+
*/
18+
public BoundType(Iterable<? extends Type> in_ofTypes) {
19+
super();
20+
if (in_ofTypes == null) {
21+
throw new java.lang.IllegalArgumentException("Parameter 'ofTypes' to the BoundType constructor was null");
22+
}
23+
_ofTypes = in_ofTypes;
24+
}
25+
26+
public Iterable<? extends Type> ofTypes() { return _ofTypes; }
27+
28+
public abstract int generateHashCode();
29+
}

0 commit comments

Comments
 (0)