Skip to content

Commit d7e29fa

Browse files
author
dlsmith
committed
DynamicJava: Code cleanup prompted by Eclipse errors/warnings. Mostly Javadoc fixes and dead code elimination. (Foundd one bug, where a field was unused because its getter was incorrectly returning the value of a different field.)
git-svn-id: file:///tmp/test-svn/trunk@4798 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 5cb9931 commit d7e29fa

Some content is hidden

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

58 files changed

+147
-301
lines changed

‎dynamicjava/src/edu/rice/cs/dynamicjava/CodeStatus.orig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*
4444
END_COPYRIGHT_BLOCK*/
4545

46-
package koala.dynamicjava;
46+
package edu.rice.cs.dynamicjava;
4747

4848
/**
4949
* Contains the constant that specifies whether any new features should be used

‎dynamicjava/src/edu/rice/cs/dynamicjava/Version.orig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*
4444
END_COPYRIGHT_BLOCK*/
4545

46-
package koala.dynamicjava;
46+
package edu.rice.cs.dynamicjava;
4747

4848
import java.util.Date;
4949
import java.text.SimpleDateFormat;

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ClassMemberChecker.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package edu.rice.cs.dynamicjava.interpreter;
22

3-
import edu.rice.cs.plt.iter.IterUtil;
4-
53
import java.lang.reflect.Modifier;
64

75
import koala.dynamicjava.tree.*;
@@ -12,9 +10,9 @@
1210
import edu.rice.cs.dynamicjava.symbol.*;
1311
import edu.rice.cs.dynamicjava.symbol.type.Type;
1412
import edu.rice.cs.dynamicjava.symbol.type.VariableType;
15-
import edu.rice.cs.dynamicjava.symbol.type.IntersectionType;
1613

1714
import static koala.dynamicjava.interpreter.NodeProperties.*;
15+
1816
import static edu.rice.cs.plt.debug.DebugUtil.debug;
1917

2018
/**

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ClassSignatureContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package edu.rice.cs.dynamicjava.interpreter;
22

33
import edu.rice.cs.dynamicjava.symbol.*;
4-
import edu.rice.cs.dynamicjava.symbol.type.Type;
54
import edu.rice.cs.dynamicjava.symbol.type.ClassType;
65
import edu.rice.cs.dynamicjava.symbol.type.VariableType;
76

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/DelegatingContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public boolean localFunctionExists(String name, TypeSystem ts) {
165165
/**
166166
* List all local functions that match the given name (empty if there are none). Overridden for
167167
* convenience, delegating to a trivial instance of
168-
* {@link getLocalFunctions(String, TypeSystem, Iterable)}.
168+
* {@link #getLocalFunctions(String, TypeSystem, Iterable)}.
169169
*/
170170
public Iterable<LocalFunction> getLocalFunctions(String name, TypeSystem ts) {
171171
return getLocalFunctions(name, ts, IterUtil.<LocalFunction>empty());

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/EvaluatorException.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package edu.rice.cs.dynamicjava.interpreter;
22

33
import java.io.PrintWriter;
4-
import java.util.Iterator;
5-
import edu.rice.cs.plt.iter.IterUtil;
6-
import edu.rice.cs.plt.iter.ReadOnceIterable;
7-
import edu.rice.cs.plt.lambda.Lambda;
84

95
import static edu.rice.cs.plt.debug.DebugUtil.debug;
106

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionEvaluator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import edu.rice.cs.plt.iter.IterUtil;
99

1010
import koala.dynamicjava.tree.*;
11-
import koala.dynamicjava.tree.tiger.*;
1211
import koala.dynamicjava.tree.visitor.*;
1312

1413
import edu.rice.cs.dynamicjava.Options;
@@ -19,7 +18,7 @@
1918
/** Evaluates the given expression. The expression is assumed to have been
2019
* checked without any errors. Note that the result of a visitor method is not necessarily
2120
* the value of the expression -- for example, a primitive casting conversion might be required.
22-
* The {@link value} method contains additional checks and conversions, and should be used exclusively
21+
* The {@link #value} method contains additional checks and conversions, and should be used exclusively
2322
* by clients to evaluate an expression.
2423
*/
2524
public class ExpressionEvaluator extends AbstractVisitor<Object> implements Lambda<Node, Object> {

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/FunctionSignatureContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package edu.rice.cs.dynamicjava.interpreter;
22

33
import edu.rice.cs.dynamicjava.symbol.*;
4-
import edu.rice.cs.dynamicjava.symbol.type.Type;
54
import edu.rice.cs.dynamicjava.symbol.type.VariableType;
65

76
// TODO: support references to methods within the body

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/Interpreter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import edu.rice.cs.plt.lambda.WrappedException;
77

88
import koala.dynamicjava.tree.Node;
9-
import koala.dynamicjava.tree.Expression;
109
import koala.dynamicjava.interpreter.error.ExecutionError;
1110
import koala.dynamicjava.parser.wrapper.JavaCCParser;
1211
import koala.dynamicjava.parser.wrapper.ParseError;

‎dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/LocalContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import edu.rice.cs.plt.iter.IterUtil;
44

55
import edu.rice.cs.dynamicjava.symbol.*;
6-
import edu.rice.cs.dynamicjava.symbol.type.Type;
76

87
import static edu.rice.cs.plt.debug.DebugUtil.debug;
98

0 commit comments

Comments
 (0)