changing dependent contract syntax #8

src/nodes.coffee

@@ -480,9 +480,16 @@ exports.FunctionContract = class FunctionContract extends Base
   compileNode: (o) ->
     params = @dom.compile o
     range = @rng.compile o
-    if @rng instanceof WrapContract # dependent function contract case
-      depargs = ("$#{n}" for n in [1..@dom.objects.length]).join(", ")
-      range = "function(#{depargs}) { return #{range}; }"
+    if @rng instanceof WrapContract and @rng.contract instanceof Code # dependent function contract case
+      if @rng?.contract?.params[1]?
+        paramsName = @rng.contract.params[1].compile o
+        delete @rng.contract.params[1]
+        @rng.contract.params.length = 1
+      else
+        paramsName = ""
+      # recompile since we modified @rng
+      range = @rng.compile o
+      range = "function(#{paramsName}) { return #{range}; }"
     if @tags is 'callOnly'
       @options.properties.push(makeObjectProp "callOnly", "true")
     else if @tags is 'newOnly'

test/contracts.coffee

@@ -96,22 +96,22 @@ test "function, dependent", ->
 
   # inc :: (Num) -> !gt
 
-  inc :: (Num) -> !(result) -> result > $1
+  inc :: (Num) -> !(result, params) -> result > params[0]
   inc = (x) -> x + 1
 
   eq (inc 42), 43, "abides by contract"
 
-  bad_inc :: (Num) -> !(result) -> result > $1
+  bad_inc :: (Num) -> !(result, params) -> result > params[0]
   bad_inc = (x) -> x - 1
 
   throws (-> bad_inc 42), "violates dependent contract"
 
-  bad_inc :: (Str, Num) -> !(result) -> result > $2
+  bad_inc :: (Str, Num) -> !(result, params) -> result > params[1]
   bad_inc = (x, y) -> y - 1
 
   throws (-> bad_inc "foo", 42), "violates multi arg dependent contract"
 
-  neg :: (Bool or Num) -> !(r) -> typeof r is typeof $1
+  neg :: (Bool or Num) -> !(r, p) -> typeof r is typeof p[0]
   neg = (x) ->
     if typeof x is 'number'
       0 - x