Merge pull request #490 from schaefed/master

Fixes #489

Author: thomasmulvaney

pixie/vm/numbers.py

@@ -320,7 +320,7 @@ def to_float(x):
         return rt.wrap(float(x.int_val()))
     if isinstance(x, BigInteger):
         return rt.wrap(x.bigint_val().tofloat())
-    assert False
+    object.runtime_error(u"Cannot convert %s to float" %x.type().name())
 
 def to_float_conv(c):
     if c == Float:

tests/pixie/tests/test-ffi.pxi

@@ -48,6 +48,10 @@
   (t/assert= 0.5 (asinf (sinf 0.5)))
   (t/assert= 1.0 (+ (powf (sinf 0.5) 2.0) (powf (cosf 0.5) 2.0))))
 
+(t/deftest test-invalid-float-argument
+  (t/assert-throws? (m/sin "nil"))
+  (t/assert-throws? (m/sin nil))
+  )
 
 (t/deftest test-ffi-callbacks
   (let [MAX 255