diff options
Diffstat (limited to 'src/main/java/org/zwobble')
23 files changed, 44 insertions, 35 deletions
diff --git a/src/main/java/org/zwobble/couscous/JavaProject.java b/src/main/java/org/zwobble/couscous/JavaProject.java index e9d2ba4..a13399c 100644 --- a/src/main/java/org/zwobble/couscous/JavaProject.java +++ b/src/main/java/org/zwobble/couscous/JavaProject.java @@ -1,6 +1,6 @@ package org.zwobble.couscous; -import org.zwobble.couscous.values.IntegerValue; +import org.zwobble.couscous.interpreter.values.IntegerValue; public class JavaProject { public static MapBackedProject.Builder builder() { diff --git a/src/main/java/org/zwobble/couscous/MapBackedProject.java b/src/main/java/org/zwobble/couscous/MapBackedProject.java index f8e457f..5fc0395 100644 --- a/src/main/java/org/zwobble/couscous/MapBackedProject.java +++ b/src/main/java/org/zwobble/couscous/MapBackedProject.java @@ -2,7 +2,7 @@ package org.zwobble.couscous; import java.util.Map; -import org.zwobble.couscous.values.ConcreteType; +import org.zwobble.couscous.interpreter.values.ConcreteType; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/zwobble/couscous/Project.java b/src/main/java/org/zwobble/couscous/Project.java index 56b439f..86299ca 100644 --- a/src/main/java/org/zwobble/couscous/Project.java +++ b/src/main/java/org/zwobble/couscous/Project.java @@ -1,6 +1,6 @@ package org.zwobble.couscous; -import org.zwobble.couscous.values.ConcreteType; +import org.zwobble.couscous.interpreter.values.ConcreteType; public interface Project { ConcreteType<?> findClass(String name); diff --git a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java index 0869653..6bc498a 100644 --- a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java +++ b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java @@ -1,10 +1,10 @@ package org.zwobble.couscous.ast; import org.zwobble.couscous.ast.visitors.ExpressionNodeVisitor; -import org.zwobble.couscous.values.BooleanValue; -import org.zwobble.couscous.values.IntegerValue; -import org.zwobble.couscous.values.InterpreterValue; -import org.zwobble.couscous.values.StringValue; +import org.zwobble.couscous.interpreter.values.BooleanValue; +import org.zwobble.couscous.interpreter.values.IntegerValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.StringValue; import lombok.Value; diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java index 816a80d..4c26a0a 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java @@ -21,8 +21,8 @@ import org.zwobble.couscous.backends.python.ast.PythonExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode; import org.zwobble.couscous.backends.python.ast.PythonModuleNode; import org.zwobble.couscous.backends.python.ast.PythonStatementNode; -import org.zwobble.couscous.values.IntegerValue; -import org.zwobble.couscous.values.StringValue; +import org.zwobble.couscous.interpreter.values.IntegerValue; +import org.zwobble.couscous.interpreter.values.StringValue; import static java.util.Arrays.asList; import static org.zwobble.couscous.backends.python.ast.PythonClassNode.pythonClass; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Arguments.java b/src/main/java/org/zwobble/couscous/interpreter/Arguments.java index af674a1..f34a456 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Arguments.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Arguments.java @@ -2,7 +2,7 @@ package org.zwobble.couscous.interpreter; import java.util.List; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; public class Arguments { private List<InterpreterValue> values; diff --git a/src/main/java/org/zwobble/couscous/interpreter/ConditionMustBeBoolean.java b/src/main/java/org/zwobble/couscous/interpreter/ConditionMustBeBoolean.java index c69c290..7f2e901 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/ConditionMustBeBoolean.java +++ b/src/main/java/org/zwobble/couscous/interpreter/ConditionMustBeBoolean.java @@ -1,6 +1,6 @@ package org.zwobble.couscous.interpreter; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Environment.java b/src/main/java/org/zwobble/couscous/interpreter/Environment.java index 6838ba5..5e6e231 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Environment.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Environment.java @@ -6,8 +6,8 @@ import java.util.Optional; import org.zwobble.couscous.Project; import org.zwobble.couscous.ast.VariableDeclaration; import org.zwobble.couscous.ast.VariableNode; -import org.zwobble.couscous.values.ConcreteType; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.ConcreteType; +import org.zwobble.couscous.interpreter.values.InterpreterValue; import org.zwobble.couscous.values.TypeReference; import static java.util.stream.Collectors.toMap; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java index 6287348..6b61b7f 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java @@ -11,8 +11,8 @@ import org.zwobble.couscous.ast.StaticMethodCallNode; import org.zwobble.couscous.ast.TernaryConditionalNode; import org.zwobble.couscous.ast.VariableReferenceNode; import org.zwobble.couscous.ast.visitors.ExpressionNodeVisitor; -import org.zwobble.couscous.values.BooleanValue; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.BooleanValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; import lombok.val; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Executor.java b/src/main/java/org/zwobble/couscous/interpreter/Executor.java index 95eddad..2f12e0c 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Executor.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Executor.java @@ -11,8 +11,8 @@ import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.ast.StatementNode; import org.zwobble.couscous.ast.VariableNode; import org.zwobble.couscous.ast.visitors.StatementNodeVisitor; -import org.zwobble.couscous.values.InterpreterValue; -import org.zwobble.couscous.values.UnitValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.UnitValue; import static org.zwobble.couscous.interpreter.Evaluator.eval; diff --git a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java index 884a082..39191ce 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import org.zwobble.couscous.Project; import org.zwobble.couscous.ast.ExpressionNode; import org.zwobble.couscous.ast.LiteralNode; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/zwobble/couscous/interpreter/StackFrameBuilder.java b/src/main/java/org/zwobble/couscous/interpreter/StackFrameBuilder.java index 3b163f3..c546807 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/StackFrameBuilder.java +++ b/src/main/java/org/zwobble/couscous/interpreter/StackFrameBuilder.java @@ -4,7 +4,7 @@ import java.util.Map; import org.zwobble.couscous.ast.VariableDeclaration; import org.zwobble.couscous.ast.VariableNode; -import org.zwobble.couscous.values.InterpreterValue; +import org.zwobble.couscous.interpreter.values.InterpreterValue; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanValue.java index aeeb7e3..1837d6f 100644 --- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanValue.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/Callable.java b/src/main/java/org/zwobble/couscous/interpreter/values/Callable.java new file mode 100644 index 0000000..dc372bb --- /dev/null +++ b/src/main/java/org/zwobble/couscous/interpreter/values/Callable.java @@ -0,0 +1,9 @@ +package org.zwobble.couscous.interpreter.values; + +import java.util.List; + +import org.zwobble.couscous.values.TypeReference; + +public interface Callable { + List<TypeReference> getArgumentTypes(); +} diff --git a/src/main/java/org/zwobble/couscous/values/ConcreteType.java b/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java index f3c226c..b2abd2b 100644 --- a/src/main/java/org/zwobble/couscous/values/ConcreteType.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; import java.util.List; import java.util.Map; @@ -12,6 +12,7 @@ import org.zwobble.couscous.interpreter.Executor; import org.zwobble.couscous.interpreter.NoSuchMethod; import org.zwobble.couscous.interpreter.UnexpectedValueType; import org.zwobble.couscous.interpreter.WrongNumberOfArguments; +import org.zwobble.couscous.values.TypeReference; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/zwobble/couscous/values/IntegerValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerValue.java index c87bd27..89fd056 100644 --- a/src/main/java/org/zwobble/couscous/values/IntegerValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerValue.java @@ -1,4 +1,6 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; + +import org.zwobble.couscous.values.TypeReference; import static java.util.Arrays.asList; import static org.zwobble.couscous.values.TypeReference.typeRef; diff --git a/src/main/java/org/zwobble/couscous/values/InterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValue.java index f1afa85..cf2aa5b 100644 --- a/src/main/java/org/zwobble/couscous/values/InterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValue.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; public interface InterpreterValue { ConcreteType<?> getType(); diff --git a/src/main/java/org/zwobble/couscous/values/InterpreterValues.java b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java index 6b220d0..ec2d97f 100644 --- a/src/main/java/org/zwobble/couscous/values/InterpreterValues.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; public class InterpreterValues { public static final UnitValue UNIT = UnitValue.UNIT; diff --git a/src/main/java/org/zwobble/couscous/values/MethodValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/MethodValue.java index 495f608..ea76870 100644 --- a/src/main/java/org/zwobble/couscous/values/MethodValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/MethodValue.java @@ -1,9 +1,10 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; import java.util.List; import java.util.function.BiFunction; import org.zwobble.couscous.interpreter.Arguments; +import org.zwobble.couscous.values.TypeReference; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/org/zwobble/couscous/values/StaticMethodValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java index e291914..21697b1 100644 --- a/src/main/java/org/zwobble/couscous/values/StaticMethodValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java @@ -1,10 +1,11 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; import java.util.List; import java.util.function.BiFunction; import org.zwobble.couscous.interpreter.Arguments; import org.zwobble.couscous.interpreter.Environment; +import org.zwobble.couscous.values.TypeReference; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/StringValue.java index 0e24ac6..43a4bde 100644 --- a/src/main/java/org/zwobble/couscous/values/StringValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/StringValue.java @@ -1,4 +1,6 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; + +import org.zwobble.couscous.values.TypeReference; import static java.util.Arrays.asList; import static org.zwobble.couscous.values.TypeReference.typeRef; diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/UnitValue.java index af00b32..4e2eb2c 100644 --- a/src/main/java/org/zwobble/couscous/values/UnitValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/UnitValue.java @@ -1,4 +1,4 @@ -package org.zwobble.couscous.values; +package org.zwobble.couscous.interpreter.values; import lombok.ToString; diff --git a/src/main/java/org/zwobble/couscous/values/Callable.java b/src/main/java/org/zwobble/couscous/values/Callable.java deleted file mode 100644 index 5065598..0000000 --- a/src/main/java/org/zwobble/couscous/values/Callable.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zwobble.couscous.values; - -import java.util.List; - -public interface Callable { - List<TypeReference> getArgumentTypes(); -} |