diff options
| author | Michael Williamson <mike@zwobble.org> | 2015-10-10 14:16:07 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2015-10-10 14:16:07 +0100 |
| commit | 5116bf791a6360627e6683d818623b49e25900a5 (patch) | |
| tree | 1b74dfcfdba4ee8989ddaf4cb49d86e87ccbdc9f /src | |
| parent | 854993655d4318d565226413645268f0885df0cb (diff) | |
Move project classes into correct package
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/zwobble/couscous/interpreter/Environment.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/interpreter/Interpreter.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/interpreter/JavaProject.java (renamed from src/main/java/org/zwobble/couscous/JavaProject.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/interpreter/MapBackedProject.java (renamed from src/main/java/org/zwobble/couscous/MapBackedProject.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/interpreter/Project.java (renamed from src/main/java/org/zwobble/couscous/Project.java) | 2 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java | 2 |
7 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/org/zwobble/couscous/interpreter/Environment.java b/src/main/java/org/zwobble/couscous/interpreter/Environment.java index 111e18d..9a884f3 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Environment.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Environment.java @@ -3,7 +3,6 @@ package org.zwobble.couscous.interpreter; import java.util.Map; import java.util.Optional; -import org.zwobble.couscous.Project; import org.zwobble.couscous.ast.TypeName; import org.zwobble.couscous.ast.VariableDeclaration; import org.zwobble.couscous.ast.VariableNode; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java index 88e9d0e..0506a59 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.zwobble.couscous.Project; import org.zwobble.couscous.ast.TypeName; import org.zwobble.couscous.ast.ExpressionNode; import org.zwobble.couscous.interpreter.values.InterpreterValue; diff --git a/src/main/java/org/zwobble/couscous/JavaProject.java b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java index dc91584..fd01053 100644 --- a/src/main/java/org/zwobble/couscous/JavaProject.java +++ b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous; +package org.zwobble.couscous.interpreter; import java.util.List; diff --git a/src/main/java/org/zwobble/couscous/MapBackedProject.java b/src/main/java/org/zwobble/couscous/interpreter/MapBackedProject.java index 8547677..7206b1a 100644 --- a/src/main/java/org/zwobble/couscous/MapBackedProject.java +++ b/src/main/java/org/zwobble/couscous/interpreter/MapBackedProject.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous; +package org.zwobble.couscous.interpreter; import java.util.Map; diff --git a/src/main/java/org/zwobble/couscous/Project.java b/src/main/java/org/zwobble/couscous/interpreter/Project.java index 40f5560..287ac9c 100644 --- a/src/main/java/org/zwobble/couscous/Project.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Project.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous; +package org.zwobble.couscous.interpreter; import org.zwobble.couscous.ast.TypeName; import org.zwobble.couscous.interpreter.values.ConcreteType; diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java index e8875ae..005eebb 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java @@ -4,13 +4,13 @@ import java.util.List; import java.util.Optional; import org.junit.Test; -import org.zwobble.couscous.JavaProject; -import org.zwobble.couscous.MapBackedProject; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ExpressionNode; import org.zwobble.couscous.ast.TernaryConditionalNode; import org.zwobble.couscous.interpreter.ConditionMustBeBoolean; import org.zwobble.couscous.interpreter.Environment; +import org.zwobble.couscous.interpreter.JavaProject; +import org.zwobble.couscous.interpreter.MapBackedProject; import org.zwobble.couscous.interpreter.NoSuchField; import org.zwobble.couscous.interpreter.NoSuchMethod; import org.zwobble.couscous.interpreter.StackFrameBuilder; diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java index 449a251..cd00690 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.stream.Collectors; import org.junit.Test; -import org.zwobble.couscous.JavaProject; import org.zwobble.couscous.ast.AssignmentNode; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ExpressionStatementNode; @@ -12,6 +11,7 @@ import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.ast.TypeName; import org.zwobble.couscous.interpreter.Interpreter; +import org.zwobble.couscous.interpreter.JavaProject; import org.zwobble.couscous.interpreter.UnboundVariable; import org.zwobble.couscous.interpreter.UnexpectedValueType; import org.zwobble.couscous.interpreter.VariableNotInScope; |
