From 7638649357e9cc2c339e743dc84b5249c6cdc0de Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 8 Jan 2016 21:10:34 +0000 Subject: Add support for adding strings --- .../interpreter/values/StringInterpreterValue.java | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java index bbc9f6c..b19d849 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java @@ -1,20 +1,33 @@ package org.zwobble.couscous.interpreter.values; -import java.util.Optional; import org.zwobble.couscous.interpreter.NoSuchField; import org.zwobble.couscous.values.IntegerValue; import org.zwobble.couscous.values.PrimitiveValue; import org.zwobble.couscous.values.PrimitiveValues; import org.zwobble.couscous.values.StringValue; -import static java.util.Arrays.asList; + +import java.util.Optional; + import static org.zwobble.couscous.util.ExtraLists.list; public final class StringInterpreterValue implements InterpreterValue { - public static final ConcreteType TYPE = ConcreteType.builder(StringInterpreterValue.class, StringValue.REF).method("length", list(), (environment, arguments) -> new IntegerInterpreterValue(arguments.getReceiver().value.length())).method("substring", list(IntegerValue.REF, IntegerValue.REF), (environment, arguments) -> { - IntegerInterpreterValue startIndex = (IntegerInterpreterValue)arguments.get(0); - IntegerInterpreterValue endIndex = (IntegerInterpreterValue)arguments.get(1); - return new StringInterpreterValue(arguments.getReceiver().value.substring(startIndex.getValue(), endIndex.getValue())); - }).build(); + public static final ConcreteType TYPE = ConcreteType.builder(StringInterpreterValue.class, StringValue.REF) + .method("length", list(), (environment, arguments) -> + new IntegerInterpreterValue(arguments.getReceiver().value.length())) + + .method("substring", list(IntegerValue.REF, IntegerValue.REF), (environment, arguments) -> { + IntegerInterpreterValue startIndex = (IntegerInterpreterValue)arguments.get(0); + IntegerInterpreterValue endIndex = (IntegerInterpreterValue)arguments.get(1); + return new StringInterpreterValue(arguments.getReceiver().value.substring(startIndex.getValue(), endIndex.getValue())); + }) + + .method("add", list(StringValue.REF), (environment, arguments) -> { + StringInterpreterValue right = (StringInterpreterValue)arguments.get(0); + return new StringInterpreterValue(arguments.getReceiver().value + right.value); + }) + + .build(); + private final String value; @Override -- cgit v1.2.3