diff --git a/packages/squiggle-lang/bsconfig.json b/packages/squiggle-lang/bsconfig.json index e04d3fea..ed3a37fc 100644 --- a/packages/squiggle-lang/bsconfig.json +++ b/packages/squiggle-lang/bsconfig.json @@ -1,5 +1,5 @@ { - "name": "squiggle-experimental", + "name": "SquiggleExperimental", "reason": {}, "sources": [ { diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 1a4cfb10..bd21e5d8 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -1,6 +1,6 @@ { "name": "squiggle-experimental", - "version": "0.1.6", + "version": "0.1.8", "homepage": "https://foretold-app.github.io/estiband/", "private": false, "scripts": { diff --git a/packages/squiggle-lang/src/distPlus/ProgramEvaluator.res b/packages/squiggle-lang/src/distPlus/ProgramEvaluator.res index 9f08eb7a..e58e2dba 100644 --- a/packages/squiggle-lang/src/distPlus/ProgramEvaluator.res +++ b/packages/squiggle-lang/src/distPlus/ProgramEvaluator.res @@ -37,11 +37,11 @@ module Inputs = { } type \"export" = [ - | #DistPlus(ProbExample.DistPlus.t) + | #DistPlus(SquiggleExperimental.DistPlus.t) | #Float(float) | #Function( - (array, ProbExample.ExpressionTypes.ExpressionTree.node), - ProbExample.ExpressionTypes.ExpressionTree.environment, + (array, SquiggleExperimental.ExpressionTypes.ExpressionTree.node), + SquiggleExperimental.ExpressionTypes.ExpressionTree.environment, ) ] @@ -124,7 +124,7 @@ let renderIfNeeded = (inputs: Inputs.inputs, node: ExpressionTypes.ExpressionTre // TODO: Consider using ExpressionTypes.ExpressionTree.getFloat or similar in this function let coersionToExportedTypes = ( inputs, - env: ProbExample.ExpressionTypes.ExpressionTree.environment, + env: SquiggleExperimental.ExpressionTypes.ExpressionTree.environment, node: ExpressionTypes.ExpressionTree.node, ): result<\"export", string> => node diff --git a/packages/squiggle-lang/src/distPlus/expressionTree/MathJsParser.re b/packages/squiggle-lang/src/distPlus/expressionTree/MathJsParser.re index dba78f69..8cf55d5d 100644 --- a/packages/squiggle-lang/src/distPlus/expressionTree/MathJsParser.re +++ b/packages/squiggle-lang/src/distPlus/expressionTree/MathJsParser.re @@ -203,7 +203,7 @@ module MathAdtToDistDst = { nodeParser: MathJsonToMathJsAdt.arg => Belt.Result.t( - Squiggle-Website.ExpressionTypes.ExpressionTree.node, + SquiggleExperimental.ExpressionTypes.ExpressionTree.node, string, ), name: string, @@ -344,6 +344,7 @@ let fromString2 = str => { }); let value = E.R.bind(mathJsParse, MathAdtToDistDst.run); + Js.log2(mathJsParse, value); value; };