From 20dc1e124d606cf4298d5112b6d3c4f6c74e9b68 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 9 Mar 2016 18:11:17 +0000 Subject: Introduce Type interface --- src/main/java/org/zwobble/couscous/interpreter/Interpreter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/Interpreter.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java index 8ec461a..fcf20d9 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java @@ -2,7 +2,8 @@ package org.zwobble.couscous.interpreter; import com.google.common.collect.ImmutableMap; import org.zwobble.couscous.ast.MethodSignature; -import org.zwobble.couscous.ast.TypeName; +import org.zwobble.couscous.ast.types.ScalarType; +import org.zwobble.couscous.ast.types.Type; import org.zwobble.couscous.interpreter.values.InterpreterValue; import org.zwobble.couscous.interpreter.values.StaticReceiverValue; @@ -18,7 +19,7 @@ public class Interpreter { this.project = project; } - public InterpreterValue run(TypeName className, String methodName, List arguments, TypeName returnType) { + public InterpreterValue run(ScalarType className, String methodName, List arguments, Type returnType) { final Environment environment = new Environment( project, Optional.empty(), @@ -27,7 +28,7 @@ public class Interpreter { StaticReceiverValue clazz = environment.findClass(className); MethodSignature signature = new MethodSignature( methodName, - eagerMap(arguments, argument -> argument.getType().getName()), + eagerMap(arguments, argument -> argument.getType().getType()), returnType); return clazz.callMethod(environment, signature, arguments); } -- cgit v1.2.3