src/main/ioke/lang/TypeCheckingArgumentsDefinition.java src/main/ioke/lang/TypeCheckingJavaMethod.java @@ -205,9 +205,10 @@ public class IokeList extends IokeData { })); obj.registerMethod(runtime.newJavaMethod("returns a new list that contains the receivers elements and the elements of the list sent in as the argument.", new JavaMethod("+") { - private final DefaultArgumentsDefinition ARGUMENTS = DefaultArgumentsDefinition + private final TypeCheckingArgumentsDefinition ARGUMENTS = TypeCheckingArgumentsDefinition .builder() - .withRequiredPositional("otherList") + .receiverMustMimic(runtime.list) + .withRequiredPositional("otherList").whichMustMimic(runtime.list) .getArguments(); @Override @@ -218,11 +219,11 @@ public class IokeList extends IokeData { @Override public Object activate(IokeObject method, IokeObject context, IokeObject message, Object on) throws ControlFlow { List<Object> args = new ArrayList<Object>(); - getArguments().getEvaluatedArguments(context, message, on, args, new HashMap<String, Object>()); + Object receiver = ARGUMENTS.getValidatedArgumentsAndReceiver(context, message, on, args, new HashMap<String, Object>()); List<Object> newList = new ArrayList<Object>(); - newList.addAll(((IokeList)IokeObject.data(on)).getList()); + newList.addAll(((IokeList)IokeObject.data(receiver)).getList()); newList.addAll(((IokeList)IokeObject.data(args.get(0))).getList()); - return context.runtime.newList(newList, IokeObject.as(on)); + return context.runtime.newList(newList, IokeObject.as(receiver)); } })); src/main/ioke/lang/IokeList.java @@ -5,6 +5,8 @@ package ioke.lang; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import ioke.lang.exceptions.ControlFlow; @@ -64,12 +66,18 @@ public abstract class JavaMethod extends Method { @Override public Object activate(IokeObject self, IokeObject context, IokeObject message, Object on) throws ControlFlow { + return activate(self, on, null, null, context, message); + } + + public Object activate(IokeObject self, Object on, List<Object> args, + Map<String, Object> keywords, IokeObject context, IokeObject message) throws ControlFlow { IokeObject condition = IokeObject.as(IokeObject.getCellChain(context.runtime.condition, - message, - context, - "Error", - "Invocation", - "NotActivatable")).mimic(message, context); + message, + context, + "Error", + "Invocation", + "NotActivatable")).mimic(message, context); + condition.setCell("message", message); condition.setCell("context", context); condition.setCell("receiver", on); @@ -79,7 +87,7 @@ public abstract class JavaMethod extends Method { return self.runtime.nil; } - + private String getDominantClassName() { String name = getClass().getName(); int dollar = name.indexOf("$"); src/main/ioke/lang/JavaMethod.java @@ -683,6 +683,16 @@ describe(List, x = [1,2,3] ([4,5,6] + x) should == [4,5,6,1,2,3] ) + + it("should validate type of receiver", + x = Origin mimic + x cell("+") = List cell("+") + fn(x + [3]) should signal(Condition Error Type IncorrectType) + ) + + it("should validate type of argument", + fn([1,2,3] + 3) should signal(Condition Error Type IncorrectType) + ) ) describe("-", test/list_spec.ik 1b8ff3428792d39d2add21db07e6868cce8df83c 0e20b492b8e057e9d2c006698deca02ebf8f45f7 Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/b6cb75a77cf8764f5b0f6adb4ae1bb78cf393d77 b6cb75a77cf8764f5b0f6adb4ae1bb78cf393d77 2009-01-18T23:51:17-08:00 2009-01-18T23:51:17-08:00 Merge branch 'new-type-checker' of git://github.com/melwin/ioke into melwin/new-type-checker 3b450f1c231daa5fa24b8b8eb73c785f9934d8e3 Ola Bini ola.bini@gmail.com