From d635b2b3870717e4af475e1349765f75878eadcf Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 30 Sep 2015 18:55:40 +0100 Subject: Allow arguments to be passed to methods --- src/main/java/org/zwobble/couscous/values/BooleanValue.java | 4 +++- src/main/java/org/zwobble/couscous/values/IntegerValue.java | 4 +++- src/main/java/org/zwobble/couscous/values/InterpreterValue.java | 4 +++- src/main/java/org/zwobble/couscous/values/StringValue.java | 9 ++++++++- src/main/java/org/zwobble/couscous/values/UnitValue.java | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/values') diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/values/BooleanValue.java index e6998df..dd8cd39 100644 --- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java +++ b/src/main/java/org/zwobble/couscous/values/BooleanValue.java @@ -1,5 +1,7 @@ package org.zwobble.couscous.values; +import java.util.List; + import lombok.AccessLevel; import lombok.Getter; import lombok.Value; @@ -14,7 +16,7 @@ public class BooleanValue implements InterpreterValue { } @Override - public InterpreterValue callMethod(String methodName) { + public InterpreterValue callMethod(String methodName, List arguments) { throw new UnsupportedOperationException(); } } diff --git a/src/main/java/org/zwobble/couscous/values/IntegerValue.java b/src/main/java/org/zwobble/couscous/values/IntegerValue.java index 2bb28d8..acc0c56 100644 --- a/src/main/java/org/zwobble/couscous/values/IntegerValue.java +++ b/src/main/java/org/zwobble/couscous/values/IntegerValue.java @@ -1,5 +1,7 @@ package org.zwobble.couscous.values; +import java.util.List; + import lombok.Value; @Value @@ -7,7 +9,7 @@ public class IntegerValue implements InterpreterValue { int value; @Override - public InterpreterValue callMethod(String methodName) { + public InterpreterValue callMethod(String methodName, List arguments) { throw new UnsupportedOperationException(); } } diff --git a/src/main/java/org/zwobble/couscous/values/InterpreterValue.java b/src/main/java/org/zwobble/couscous/values/InterpreterValue.java index 7ffebbc..6162aaa 100644 --- a/src/main/java/org/zwobble/couscous/values/InterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/values/InterpreterValue.java @@ -1,5 +1,7 @@ package org.zwobble.couscous.values; +import java.util.List; + public interface InterpreterValue { - InterpreterValue callMethod(String methodName); + InterpreterValue callMethod(String methodName, List arguments); } diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java index 0e3f626..3a1a13d 100644 --- a/src/main/java/org/zwobble/couscous/values/StringValue.java +++ b/src/main/java/org/zwobble/couscous/values/StringValue.java @@ -1,15 +1,22 @@ package org.zwobble.couscous.values; +import java.util.List; + import lombok.Value; +import lombok.val; @Value public class StringValue implements InterpreterValue { String value; @Override - public InterpreterValue callMethod(String methodName) { + public InterpreterValue callMethod(String methodName, List arguments) { if (methodName == "length") { return 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())); } else { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/values/UnitValue.java index 45178dd..030fb03 100644 --- a/src/main/java/org/zwobble/couscous/values/UnitValue.java +++ b/src/main/java/org/zwobble/couscous/values/UnitValue.java @@ -1,5 +1,7 @@ package org.zwobble.couscous.values; +import java.util.List; + import lombok.ToString; @ToString @@ -10,7 +12,7 @@ public class UnitValue implements InterpreterValue { } @Override - public InterpreterValue callMethod(String methodName) { + public InterpreterValue callMethod(String methodName, List arguments) { throw new UnsupportedOperationException(); } } -- cgit v1.2.3