From b7e0010d6e8e5413fcd66eae158111db509eb27b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 28 Feb 2016 19:18:28 +0000 Subject: Split ConcreteType up into specialised type implementations --- .../java/org/zwobble/couscous/interpreter/JavaProject.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/JavaProject.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java index 8038ce1..f96f0c4 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java +++ b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java @@ -1,17 +1,17 @@ package org.zwobble.couscous.interpreter; -import java.util.List; - -import org.zwobble.couscous.ast.ClassNode; +import com.google.common.collect.Iterables; import org.zwobble.couscous.ast.TypeNode; +import org.zwobble.couscous.interpreter.types.InterpreterType; +import org.zwobble.couscous.interpreter.types.IntrinsicInterpreterType; +import org.zwobble.couscous.interpreter.types.UserDefinedInterpreterType; import org.zwobble.couscous.interpreter.values.BoxedIntegerInterpreterValue; -import org.zwobble.couscous.interpreter.values.ConcreteType; import org.zwobble.couscous.interpreter.values.InternalCouscousInterpreterValue; -import com.google.common.collect.Iterables; +import java.util.List; public class JavaProject { - private static final ConcreteType OBJECT_TYPE = ConcreteType.classBuilder("java.lang.Object") + private static final InterpreterType OBJECT_TYPE = IntrinsicInterpreterType.classBuilder("java.lang.Object") .build(); public static MapBackedProject.Builder builder() { @@ -22,7 +22,7 @@ public class JavaProject { } public static Project of(List classNodes) { - Iterable concreteTypes = Iterables.transform(classNodes, ConcreteType::fromNode); + Iterable concreteTypes = Iterables.transform(classNodes, UserDefinedInterpreterType::new); return builder() .addClasses(concreteTypes) .build(); -- cgit v1.2.3