quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Umur-reducer-dev' into reducer-dev

Browse Source
This commit is contained in:
Umur Ozkul 2022-04-25 10:53:08 +02:00
commit f97751b989
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,13 +140,13 @@ let dispatchMacroCall = (
expressionValue, expressionValue,
) => { ) => {
let value = switch expressionValue { let value = switch expressionValue {
| EValue(aValue) => aValue | ExpressionT.EValue(aValue) => aValue
| _ => EvSymbol("internal") | _ => EvSymbol("internal")
} }
Js.Dict.set(acc, key, value) Js.Dict.set(acc, key, value)
acc acc
}) })
externalBindings->EvRecord->ExpressionT.EValue->Ok externalBindings->ExpressionValue.EvRecord->ExpressionT.EValue->Ok
} }
let doBindExpression = (expression: expression, bindings: ExpressionT.bindings) => let doBindExpression = (expression: expression, bindings: ExpressionT.bindings) =>

2
packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res
View File

@ -75,7 +75,7 @@ let rec reduceExpression = (expression: t, bindings: T.bindings): result<express
let parameterList = parameters->Belt.List.fromArray let parameterList = parameters->Belt.List.fromArray
let zippedParameterList = parameterList->Belt.List.zip(args) let zippedParameterList = parameterList->Belt.List.zip(args)
let bindings = Belt.List.reduce(zippedParameterList, defaultBindings, (a, (p, e)) => let bindings = Belt.List.reduce(zippedParameterList, defaultBindings, (a, (p, e)) =>
a->Belt.Map.String.set(p, e->EValue) a->Belt.Map.String.set(p, e->T.EValue)
) )
let newExpression = Builder.passToFunction( let newExpression = Builder.passToFunction(
"$$bindExpression", "$$bindExpression",