From 7d4fee9187aeb5f8fede67944402921c9f7bb3f7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 10 Jan 2016 20:01:53 +0000 Subject: Simplify primitive value visitor interface --- .../interpreter/values/InterpreterValues.java | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java index db33b9d..4e8f1e6 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java @@ -1,6 +1,8 @@ package org.zwobble.couscous.interpreter.values; -import org.zwobble.couscous.values.*; +import org.zwobble.couscous.ast.TypeName; +import org.zwobble.couscous.values.PrimitiveValue; +import org.zwobble.couscous.values.PrimitiveValueVisitor; public class InterpreterValues { public static final UnitInterpreterValue UNIT = UnitInterpreterValue.UNIT; @@ -18,28 +20,28 @@ public class InterpreterValues { public static InterpreterValue value(PrimitiveValue value) { return value.accept(new PrimitiveValueVisitor() { @Override - public InterpreterValue visit(IntegerValue value) { - return new IntegerInterpreterValue(value.getValue()); + public InterpreterValue visitInteger(int value) { + return new IntegerInterpreterValue(value); } @Override - public InterpreterValue visit(StringValue value) { - return StringInterpreterValue.of(value.getValue()); + public InterpreterValue visitString(String value) { + return StringInterpreterValue.of(value); } @Override - public InterpreterValue visit(BooleanValue value) { - return BooleanInterpreterValue.of(value.getValue()); + public InterpreterValue visitBoolean(boolean value) { + return BooleanInterpreterValue.of(value); } @Override - public InterpreterValue visit(UnitValue unitValue) { + public InterpreterValue visitUnit() { return UNIT; } @Override - public InterpreterValue visit(TypeValue value) { - return TypeInterpreterValue.of(value.getValue()); + public InterpreterValue visitType(TypeName value) { + return TypeInterpreterValue.of(value); } }); } -- cgit v1.2.3