From bf3645905d5384d25b20e572803b6886c476e057 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 8 Jan 2016 21:27:39 +0000 Subject: Add support for String.equals --- .../interpreter/values/BooleanInterpreterValue.java | 3 +++ .../couscous/interpreter/values/InterpreterValues.java | 4 +++- .../interpreter/values/StringInterpreterValue.java | 14 ++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values') diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java index 820c2b1..03a0289 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java @@ -7,6 +7,9 @@ import org.zwobble.couscous.values.PrimitiveValue; import org.zwobble.couscous.values.PrimitiveValues; public final class BooleanInterpreterValue implements InterpreterValue { + public static final BooleanInterpreterValue TRUE = new BooleanInterpreterValue(true); + public static final BooleanInterpreterValue FALSE = new BooleanInterpreterValue(false); + private static final ConcreteType TYPE = ConcreteType.builder(BooleanInterpreterValue.class, "boolean") .method("negate", Collections.emptyList(), (environment, arguments) -> 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 e06732a..14d1085 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java @@ -9,7 +9,9 @@ import org.zwobble.couscous.values.UnitValue; public class InterpreterValues { public static final UnitInterpreterValue UNIT = UnitInterpreterValue.UNIT; - + public static final BooleanInterpreterValue FALSE = BooleanInterpreterValue.FALSE; + public static final BooleanInterpreterValue TRUE = BooleanInterpreterValue.TRUE; + public static InterpreterValue value(int value) { return new IntegerInterpreterValue(value); } 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 4fff53e..3aaa073 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java @@ -1,10 +1,7 @@ package org.zwobble.couscous.interpreter.values; 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 org.zwobble.couscous.values.*; import java.util.Optional; @@ -29,6 +26,15 @@ public final class StringInterpreterValue implements InterpreterValue { .method("toLowerCase", list(), (environment, arguments) -> of(arguments.getReceiver().value.toLowerCase())) + .method("equals", list(ObjectValues.OBJECT), (environment, arguments) -> { + InterpreterValue right = arguments.get(0); + if (right instanceof StringInterpreterValue) { + return new BooleanInterpreterValue(arguments.getReceiver().value.equals(((StringInterpreterValue)right).value)); + } else { + return InterpreterValues.FALSE; + } + }) + .build(); private final String value; -- cgit v1.2.3