Sets the _name in BaseCode for MultiArityFns

thomasmulvaney · thomasmulvaney · commit 4d0d836f6208 · 2015-03-05T09:23:43.000Z
Passing an invalid number of args to a MultiArityFn
should throw and error now which includes the name of the
function.
diff --git a/pixie/vm/code.py b/pixie/vm/code.py
@@ -130,15 +130,16 @@ class MultiArityFn(BaseCode):
     def type(self):
         return MultiArityFn._type
 
-    def __init__(self, arities, required_arity=0, rest_fn=None, meta=nil):
+    def __init__(self, name, arities, required_arity=0, rest_fn=None, meta=nil):
         BaseCode.__init__(self)
+        self._name = name
         self._arities = arities
         self._required_arity = required_arity
         self._rest_fn = rest_fn
         self._meta = meta
 
     def with_meta(self, meta):
-        return MultiArityFn(self._arities, self._required_arity, self._rest_fn, meta)
+        return MultiArityFn(self._name, self._arities, self._required_arity, self._rest_fn, meta)
 
     @elidable_promote()
     def get_fn(self, arity):
@@ -155,7 +156,7 @@ def get_fn(self, arity):
         if self._rest_fn:
             acc.append(u" or more")
 
-        affirm(False, u"Wrong number of args to fn: got " + unicode(str(arity)) + u" expected " + u",".join(acc))
+        runtime_error(u"Wrong number of args to fn " + unicode(self._name) + " got " + unicode(str(arity)) + u" expected " + u",".join(acc))
 
     def invoke(self, args):
         return self.invoke_with(args, self)
@@ -212,7 +213,7 @@ def invoke(self, args):
         if len(args) == self.get_arity():
             return self.invoke_with(args, self)
         else:
-            runtime_error(u"Invalid number of arguments " + unicode(len(args)) 
+            runtime_error(u"Invalid number of arguments " + unicode(str(len(args))) 
                           + u" for function '" + unicode(str(self._name)) + u"'. Expected "
                           + unicode(str(self.get_arity())))
 
diff --git a/pixie/vm/compiler.py b/pixie/vm/compiler.py
@@ -33,7 +33,7 @@ def gensym2(prefix):
     return rt.symbol(rt.str(prefix, i))
 
 gensym = code.intern_var(u"pixie.stdlib", u"gensym")
-gensym.set_root(code.MultiArityFn({0: code.wrap_fn(gensym1), 1: code.wrap_fn(gensym2)}))
+gensym.set_root(code.MultiArityFn(u"gensym", {0: code.wrap_fn(gensym1), 1: code.wrap_fn(gensym2)}))
 
 class with_ns(object):
     def __init__(self, nm, include_stdlib=False):
diff --git a/pixie/vm/interpreter.py b/pixie/vm/interpreter.py
@@ -145,8 +145,7 @@ def make_multi_arity(frame, argc):
         else:
             fn = frame.pop()
             d[a] = fn
-
-    return code.MultiArityFn(d, required_arity, rest_fn)
+    return code.MultiArityFn(fn._name, d, required_arity, rest_fn)
 
 class ShallowContinuation(Object):
     _type = Type(u"pixie.stdlib.ShallowContinuation")
diff --git a/pixie/vm/libs/string.py b/pixie/vm/libs/string.py
@@ -47,7 +47,7 @@ def index_of4(a, sep, start, end):
         runtime_error(u"Third and fourth argument must be non-negative integers")
 
 index_of = intern_var(u"pixie.string.internal", u"index-of")
-index_of.set_root(MultiArityFn({2: wrap_fn(index_of2), 3: wrap_fn(index_of3), 4: wrap_fn(index_of4)},
+index_of.set_root(MultiArityFn(u"index-of", {2: wrap_fn(index_of2), 3: wrap_fn(index_of3), 4: wrap_fn(index_of4)},
                                required_arity = 2))
 
 def substring2(a, start):
@@ -64,7 +64,7 @@ def substring3(a, start, end):
         runtime_error(u"Second and third argument must be non-negative integers")
 
 substring = intern_var(u"pixie.string.internal", u"substring")
-substring.set_root(MultiArityFn({2: wrap_fn(substring2), 3: wrap_fn(substring3)},
+substring.set_root(MultiArityFn(u"substring", {2: wrap_fn(substring2), 3: wrap_fn(substring3)},
                                 required_arity = 2))
 
 @as_var("pixie.string.internal", "upper-case")
diff --git a/tests/pixie/tests/test-fns.pxi b/tests/pixie/tests/test-fns.pxi
@@ -18,7 +18,8 @@
 (t/deftest test-code-arity-errors
   (let [arity-0 (fn arity-0 [])
         arity-1 (fn arity-1 [a])
-        arity-2 (fn arity-2 [a b])]
+        arity-2 (fn arity-2 [a b])
+        multi-arity (fn arity-0-or-1)]
     (try
       (arity-0 :foo)
       (catch e
