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

fix on comments for pull request

Browse Source
This commit is contained in:
Umur Ozkul 2022-03-25 17:34:27 +01:00 committed by Quinn Dougherty
parent 79d3831f5d
commit f58e46c6b0
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/squiggle-lang/__tests__/Reducer/Reducer_test.res
View File

@ -7,6 +7,7 @@ describe("reducer using mathjs parse", () => {
// Reducer.parse is called by Reducer.eval // Reducer.parse is called by Reducer.eval
// See https://mathjs.org/docs/expressions/syntax.html // See https://mathjs.org/docs/expressions/syntax.html
// See https://mathjs.org/docs/reference/functions.html // See https://mathjs.org/docs/reference/functions.html
// Those tests show that we are converting mathjs parse tree to what we need
describe("expressions", () => { describe("expressions", () => {
test("1", () => expectParseToBe("1", "Ok(1)")) test("1", () => expectParseToBe("1", "Ok(1)"))
@ -49,8 +50,6 @@ describe("eval", () => {
// TODO more built ins // TODO more built ins
}) })
describe("arrays", () => { describe("arrays", () => {
//Note. () is a empty list in Lisp
// The only builtin structure in Lisp is list
test("empty array", () => expectEvalToBe( "[]", "Ok([])")) test("empty array", () => expectEvalToBe( "[]", "Ok([])"))
test("[1, 2, 3]", () => expectEvalToBe( "[1, 2, 3]", "Ok([1, 2, 3])")) test("[1, 2, 3]", () => expectEvalToBe( "[1, 2, 3]", "Ok([1, 2, 3])"))
test("['hello', 'world']", () => expectEvalToBe( "['hello', 'world']", "Ok(['hello', 'world'])")) test("['hello', 'world']", () => expectEvalToBe( "['hello', 'world']", "Ok(['hello', 'world'])"))

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

@ -4,4 +4,4 @@ type codeTreeValue = CTV.codeTreeValue
type rec codeTree = type rec codeTree =
| CtList(list<codeTree>) // A list to map-reduce | CtList(list<codeTree>) // A list to map-reduce
| CtValue(codeTreeValue) // Irreducable built-in value. Reducer should not know the internals. External libraries are responsible | CtValue(codeTreeValue) // Irreducible built-in value. Reducer should not know the internals. External libraries are responsible

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

@ -1,5 +1,5 @@
/* /*
Irreducable values. Reducer does not know about those. Only used for external calls Irreducible values. Reducer does not know about those. Only used for external calls
This is a configuration to to make external calls of those types This is a configuration to to make external calls of those types
*/ */
module AE = Reducer_Extra_Array module AE = Reducer_Extra_Array

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

@ -8,7 +8,7 @@ module Rerr = Reducer_Error
type reducerError = Rerr.reducerError type reducerError = Rerr.reducerError
type rec node = { type node = {
"type": string, "type": string,
"isNode": bool, "isNode": bool,
"comment": string "comment": string

12
packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToCodeTree.res
View File

@ -9,18 +9,6 @@ type codeTree = CTT.codeTree
type codeTreeValue = CTV.codeTreeValue type codeTreeValue = CTV.codeTreeValue
type reducerError = Rerr.reducerError type reducerError = Rerr.reducerError
// TODO:
// AccessorNode
// AssignmentNode
// BlockNode
// ConditionalNode
// FunctionAssignmentNode
// IndexNode
// ObjectNode
// RangeNode
// RelationalNode
// SymbolNode
let rec fromNode = let rec fromNode =
(mjnode: MJ.node): result<codeTree, reducerError> => (mjnode: MJ.node): result<codeTree, reducerError> =>
MJ.castNodeType(mjnode) -> Result.flatMap(typedMjNode => { MJ.castNodeType(mjnode) -> Result.flatMap(typedMjNode => {