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

parse partial tested

Browse Source
This commit is contained in:
Umur Ozkul 2022-04-21 19:05:03 +02:00
parent 6b800c498e
commit 46f3ee3d2c
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res
View File

@ -1,34 +1,34 @@
open Jest open Jest
open Reducer_TestHelpers open Reducer_TestHelpers
Skip.describe("Parse for Bindings", () => { Only.describe("Parse for Bindings", () => {
testParseOuterToBe( testParseOuterToBe(
"x", "x",
"????", "Ok((:$$bindExpression (:$$bindings) :x))",
) )
testParseOuterToBe( testParseOuterToBe(
"x+1", "x+1",
"????", "Ok((:$$bindExpression (:$$bindings) (:add :x 1)))",
) )
testParseOuterToBe( testParseOuterToBe(
"y = x+1; y", "y = x+1; y",
"????", "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) :y))",
) )
testParsePartialToBe( testParsePartialToBe(
"x", "x",
"????", "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) :x) (:$exportVariablesExpression)))",
) )
testParsePartialToBe( testParsePartialToBe(
"y=x", "y=x",
"????", "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y :x)) (:$exportVariablesExpression)))",
) )
testParsePartialToBe( testParsePartialToBe(
"y=x+1", "y=x+1",
"????", "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) (:$exportVariablesExpression)))",
) )
testParsePartialToBe( testParsePartialToBe(
"y = x+1; z = y", "y = x+1; z = y",
"????", "Ok((:$$bindExpression (:$$bindStatement (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) (:$let :z :y)) (:$exportVariablesExpression)))",
) )
}) })

20
packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res
View File

@ -155,18 +155,17 @@ let fromPartialNode = (mathJsNode: Parse.node): result<expression, errorValue> =
Parse.castNodeType(mathJsNode)->Result.flatMap(typedMathJsNode => { Parse.castNodeType(mathJsNode)->Result.flatMap(typedMathJsNode => {
let casePartialBlockNode = (bNode: Parse.blockNode) => { let casePartialBlockNode = (bNode: Parse.blockNode) => {
let blocksOrTags = bNode["blocks"]->Belt.Array.map(toTagOrNode) let blocksOrTags = bNode["blocks"]->Belt.Array.map(toTagOrNode)
let completed = Js.Array2.concatMany( let completed = Js.Array2.concat(
[BlockTag(ImportVariablesStatement)], blocksOrTags,
[blocksOrTags, [BlockTag(ExportVariablesExpression)]], [BlockTag(ExportVariablesExpression)]
) )
completed->caseTagOrNodes completed->caseTagOrNodes
} }
let casePartialExpression = (node: Parse.node) => { let casePartialExpression = (node: Parse.node) => {
let completed = Js.Array2.concatMany( let completed =
[BlockTag(ImportVariablesStatement)], [BlockNode(node), BlockTag(ExportVariablesExpression)]
[[BlockNode(node)], [BlockTag(ExportVariablesExpression)]],
)
completed->caseTagOrNodes completed->caseTagOrNodes
} }
@ -182,15 +181,12 @@ let fromOuterNode = (mathJsNode: Parse.node): result<expression, errorValue> =>
Parse.castNodeType(mathJsNode)->Result.flatMap(typedMathJsNode => { Parse.castNodeType(mathJsNode)->Result.flatMap(typedMathJsNode => {
let casePartialBlockNode = (bNode: Parse.blockNode) => { let casePartialBlockNode = (bNode: Parse.blockNode) => {
let blocksOrTags = bNode["blocks"]->Belt.Array.map(toTagOrNode) let blocksOrTags = bNode["blocks"]->Belt.Array.map(toTagOrNode)
let completed = Js.Array2.concatMany([BlockTag(ImportVariablesStatement)], [blocksOrTags]) let completed = blocksOrTags
completed->caseTagOrNodes completed->caseTagOrNodes
} }
let casePartialExpression = (node: Parse.node) => { let casePartialExpression = (node: Parse.node) => {
let completed = Js.Array2.concatMany( let completed = [BlockNode(node)]
[BlockTag(ImportVariablesStatement)],
[[BlockNode(node)]],
)
completed->caseTagOrNodes completed->caseTagOrNodes
} }