From 7c48c6b29d562ac5d3cb82b253e75e92a4b86a93 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 30 Sep 2015 19:13:20 +0100 Subject: Handle missing methods in one place --- .../java/org/zwobble/couscous/values/StringValue.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/values/StringValue.java') diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java index 9cf81ff..3f4b2b0 100644 --- a/src/main/java/org/zwobble/couscous/values/StringValue.java +++ b/src/main/java/org/zwobble/couscous/values/StringValue.java @@ -1,8 +1,6 @@ package org.zwobble.couscous.values; -import java.util.List; - -import org.zwobble.couscous.interpreter.NoSuchMethod; +import java.util.Optional; import lombok.Value; import lombok.val; @@ -12,15 +10,17 @@ public class StringValue implements InterpreterValue { String value; @Override - public InterpreterValue callMethod(String methodName, List arguments) { + public Optional getMethod(String methodName) { if (methodName == "length") { - return new IntegerValue(value.length()); + return Optional.of(arguments -> new IntegerValue(value.length())); } else if (methodName == "substring") { - val startIndex = (IntegerValue)arguments.get(0); - val endIndex = (IntegerValue)arguments.get(1); - return new StringValue(value.substring(startIndex.getValue(), endIndex.getValue())); + return Optional.of(arguments -> { + val startIndex = (IntegerValue)arguments.get(0); + val endIndex = (IntegerValue)arguments.get(1); + return new StringValue(value.substring(startIndex.getValue(), endIndex.getValue())); + }); } else { - throw new NoSuchMethod(methodName); + return Optional.empty(); } } } -- cgit v1.2.3