No 666

packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res

@@ -30,15 +30,29 @@ describe("Arity check", () => {
   )
 })
 
-describe("function trics", () => {
+describe("symbol not defined", () => {
   testEvalToBe("f(x)=x(y); f(f)", "Error(y is not defined)")
   testEvalToBe("f(x)=x; f(f)", "Ok(lambda(x=>internal code))")
   testEvalToBe("f(x)=x(y); f(z)", "Error(z is not defined)")
   testEvalToBe("f(x)=x(y); f(2)", "Error(2 is not a function)")
   testEvalToBe("f(x)=x(1); f(2)", "Error(2 is not a function)")
-  MySkip.testParseToBe("f(x)=f(y)=2; f(2)", "????") 
+})
-  MySkip.testEvalToBe("f(x)=f(y)=2; f(2)", "????") //prevent multiple assignment
+
-  testEvalToBe("f(x)=x+1; g(x)=f(x)+1;g(2)", "????") //TODO: f is not found
+Only.describe("call and bindings", () => {
+  testEvalToBe("f(x)=x+1", "Ok({f: lambda(x=>internal code)})") 
+  testEvalToBe("f(x)=x+1; f(1)", "Ok(2)") 
+  testEvalToBe("f=1;y=2", "Ok({f: 1,y: 2})")
+  testEvalToBe("f(x)=x+1; y=f(1)", "Ok({f: lambda(x=>internal code),y: 2})") 
+  testEvalToBe("f(x)=x+1; y=f(1); f(1)", "Ok(2)") 
+  testEvalToBe("f(x)=x+1; y=f(1); z=f(1)", "Ok({f: lambda(x=>internal code),y: 2,z: 2})")
+  testEvalToBe("f(x)=x+1; g(x)=f(x)+1", "Ok({f: lambda(x=>internal code),g: lambda(x=>internal code)})") //TODO: f is not found
+  MyOnly.testEvalToBe("f(x)=x+1; g(x)=f(x)+1; y=g(2)", "????") //TODO: f is not found
+  MySkip.testEvalToBe("f(x)=x+1; g(x)=f(x)+1; g(2)", "????") //TODO: f is not found
+})
+
+Skip.describe("function trics", () => {
+  MySkip.testParseToBe("f(x)=f(y)=2; f(2)", "????") // TODO: No multiple assignment
+  MySkip.testEvalToBe("f(x)=f(y)=2; f(2)", "????") // TODO: No multiple assignment
   MySkip.testEvalToBe("y=2;g(x)=y+1;g(2)", "????") //TODO : y is not found
   MySkip.testEvalToBe("y=2;g(x)=inspect(y)+1", "????") //TODO : 666
 })

packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res

@@ -41,12 +41,7 @@ let dispatchMacroCall = (
   let doBindExpression = (bindingExpr: expression, statement: expression, environment) =>
     switch statement {
     | ExpressionT.EList(list{ExpressionT.EValue(EvCall("$let")), symbolExpr, statement}) => {
-        let rExternalBindingsValue = reduceExpression(
+        let rExternalBindingsValue = reduceExpression(bindingExpr, bindings, environment)
-          bindingExpr,
-          Belt.Map.String.fromArray([("x", ExpressionValue.EvNumber(666.))]),
-          // bindingsToHandDown,
-          environment,
-        )
 
         rExternalBindingsValue->Result.flatMap(externalBindingsValue => {
           let newBindings = Bindings.fromValue(externalBindingsValue)

packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res

@@ -33,6 +33,8 @@ let rec reduceExpression = (expression: t, bindings: T.bindings, environment: en
   expressionValue,
   'e,
 > =>
+  {
+    Js.log(`reduce: ${T.toString(expression)} bindings: ${bindings->Bindings.toString}`)
     switch expression {
   | T.EValue(value) => value->Ok
   | T.EList(list) =>
@@ -45,7 +47,7 @@ let rec reduceExpression = (expression: t, bindings: T.bindings, environment: en
       }
     | _ => reduceExpressionList(list, bindings, environment)
     }
-  }
+  }}
 
 and reduceExpressionList = (
   expressions: list<t>,

packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Bindings.res

@@ -79,3 +79,6 @@ and checkIfCallable = (evValue: expressionValue) =>
   | EvCall(_) | EvLambda(_) => evValue->Ok
   | _ => ErrorValue.RENotAFunction(ExpressionValue.toString(evValue))->Error
   }
+
+let toString = (bindings: ExpressionT.bindings) => 
+  bindings->toExternalBindings->ExpressionValue.EvRecord->ExpressionValue.toString