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

RENeedToRun->Error

Browse Source
This commit is contained in:
Umur Ozkul 2022-08-25 10:43:51 +02:00
parent b2fa0db627
commit 1dfc9fe820
9 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_test.res
View File

@ -11,7 +11,7 @@ open Expect.Operators
let runFetchResult = (project, sourceId) => { let runFetchResult = (project, sourceId) => {
Project.run(project, sourceId) Project.run(project, sourceId)
Project.getResult(project, sourceId)->InternalExpressionValue.toStringOptionResult Project.getResult(project, sourceId)->InternalExpressionValue.toStringResult
} }
let runFetchBindings = (project, sourceId) => { let runFetchBindings = (project, sourceId) => {

6
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_tutorial_0_test.res
View File

@ -50,7 +50,7 @@ Case "Running a single source".
/* Let's display the result and bindings */ /* Let's display the result and bindings */
( (
result->InternalExpressionValue.toStringOptionResult, result->InternalExpressionValue.toStringResult,
bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(3)", "@{}") )->expect == ("Ok(3)", "@{}")
/* You've got 3 with empty bindings. */ /* You've got 3 with empty bindings. */
@ -64,7 +64,7 @@ Case "Running a single source".
let bindings = Project.getBindings(project, "main") let bindings = Project.getBindings(project, "main")
/* Now you have external bindings and external result. */ /* Now you have external bindings and external result. */
( (
result->InternalExpressionValue.toStringOptionResult, result->InternalExpressionValue.toStringResult,
bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(3)", "@{}") )->expect == ("Ok(3)", "@{}")
}) })
@ -80,7 +80,7 @@ Case "Running a single source".
Project.runAll(project) Project.runAll(project)
let result = Project.getResult(project, "main") let result = Project.getResult(project, "main")
let _bindings = Project.getBindings(project, "main") let _bindings = Project.getBindings(project, "main")
result->InternalExpressionValue.toStringOptionResult->expect == "Ok(3)" result->InternalExpressionValue.toStringResult->expect == "Ok(3)"
}) })
test("shortcut", () => { test("shortcut", () => {

6
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_tutorial_1_multisource_test.res
View File

@ -32,7 +32,7 @@ describe("ReducerProject Tutorial", () => {
let bindings3 = Project.getBindings(project, "source3") let bindings3 = Project.getBindings(project, "source3")
( (
result3->InternalExpressionValue.toStringOptionResult, result3->InternalExpressionValue.toStringResult,
bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}") )->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}")
}) })
@ -58,7 +58,7 @@ describe("ReducerProject Tutorial", () => {
let bindings3 = Project.getBindings(project, "source3") let bindings3 = Project.getBindings(project, "source3")
( (
result3->InternalExpressionValue.toStringOptionResult, result3->InternalExpressionValue.toStringResult,
bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}") )->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}")
}) })
@ -94,7 +94,7 @@ describe("ReducerProject Tutorial", () => {
let bindings3 = Project.getBindings(project, "source3") let bindings3 = Project.getBindings(project, "source3")
( (
result3->InternalExpressionValue.toStringOptionResult, result3->InternalExpressionValue.toStringResult,
bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings3->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}") )->expect == ("Ok(())", "@{x: 1,y: 2,z: 3}")
/* /*

2
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_tutorial_2_includes_test.res
View File

@ -146,7 +146,7 @@ Here we will finally proceed to a real life scenario. */
/* And see the result and bindings.. */ /* And see the result and bindings.. */
test("recursive includes", () => { test("recursive includes", () => {
( (
result->InternalExpressionValue.toStringOptionResult, result->InternalExpressionValue.toStringResult,
bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString, bindings->InternalExpressionValue.IEvBindings->InternalExpressionValue.toString,
)->expect == ("Ok(6)", "@{doubleX: 2,x: 1,y: 2,z: 3}") )->expect == ("Ok(6)", "@{doubleX: 2,x: 1,y: 2,z: 3}")
/* Everything as expected */ /* Everything as expected */

2
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_tutorial_3_injecting_user_values.res
View File

@ -30,7 +30,7 @@ describe("ReducerProject Tutorial", () => {
/* We can now run the project */ /* We can now run the project */
Project.runAll(project) Project.runAll(project)
let result = Project.getResult(project, "main") let result = Project.getResult(project, "main")
result->InternalExpressionValue.toStringOptionResult->expect == "Ok(6)" result->InternalExpressionValue.toStringResult->expect == "Ok(6)"
}) })
}) })

2
packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_tutorial_4_calling_functions.res
View File

@ -32,7 +32,7 @@ describe("ReducerProject Tutorial", () => {
test("userResults", () => { test("userResults", () => {
let userResultsAsString = Belt.Array.map(userResults, aResult => let userResultsAsString = Belt.Array.map(userResults, aResult =>
aResult->InternalExpressionValue.toStringOptionResult aResult->InternalExpressionValue.toStringResult
) )
userResultsAsString->expect == ["Ok(2)", "Ok(4)", "Ok(6)", "Ok(8)", "Ok(10)"] userResultsAsString->expect == ["Ok(2)", "Ok(4)", "Ok(6)", "Ok(8)", "Ok(10)"]
}) })

5
packages/squiggle-lang/src/rescript/ForTS/ForTS_ReducerProject.res
View File

@ -194,8 +194,9 @@ let getBindings = (project: reducerProject, sourceId: string): squiggleValue_Mod
Get the result after running this source file or the project Get the result after running this source file or the project
*/ */
@genType @genType
let getResult = (project: reducerProject, sourceId: string): option< let getResult = (project: reducerProject, sourceId: string): result<
result<squiggleValue, reducerErrorValue>, squiggleValue,
reducerErrorValue,
> => project->T.Private.castToInternalProject->Private.getResult(sourceId) > => project->T.Private.castToInternalProject->Private.getResult(sourceId)
/* /*

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

@ -21,6 +21,7 @@ type errorValue =
| RESyntaxError(string, option<syntaxErrorLocation>) | RESyntaxError(string, option<syntaxErrorLocation>)
| RETodo(string) // To do | RETodo(string) // To do
| REUnitNotFound(string) | REUnitNotFound(string)
| RENeedToRun
type t = errorValue type t = errorValue
@ -57,4 +58,5 @@ let errorToString = err =>
| RETodo(msg) => `TODO: ${msg}` | RETodo(msg) => `TODO: ${msg}`
| REExpectedType(typeName, valueString) => `Expected type: ${typeName} but got: ${valueString}` | REExpectedType(typeName, valueString) => `Expected type: ${typeName} but got: ${valueString}`
| REUnitNotFound(unitName) => `Unit not found: ${unitName}` | REUnitNotFound(unitName) => `Unit not found: ${unitName}`
| RENeedToRun => "Need to run"
} }

14
packages/squiggle-lang/src/rescript/ReducerProject/ReducerProject.res
View File

@ -96,9 +96,15 @@ module Private = {
Belt.Map.String.set(project["items"], sourceId, newItem)->T.Private.setFieldItems(project, _) Belt.Map.String.set(project["items"], sourceId, newItem)->T.Private.setFieldItems(project, _)
} }
let getResult = (project: t, sourceId: string): ProjectItem.T.resultType => let getResultOption = (project: t, sourceId: string): ProjectItem.T.resultType =>
project->getItem(sourceId)->ProjectItem.getResult project->getItem(sourceId)->ProjectItem.getResult
let getResult = (project: t, sourceId: string): ProjectItem.T.resultArgumentType =>
switch getResultOption(project, sourceId) {
| None => RENeedToRun->Error
| Some(result) => result
}
let setResult = (project: t, sourceId: string, value: ProjectItem.T.resultArgumentType): unit => { let setResult = (project: t, sourceId: string, value: ProjectItem.T.resultArgumentType): unit => {
let newItem = project->getItem(sourceId)->ProjectItem.setResult(value) let newItem = project->getItem(sourceId)->ProjectItem.setResult(value)
Belt.Map.String.set(project["items"], sourceId, newItem)->T.Private.setFieldItems(project, _) Belt.Map.String.set(project["items"], sourceId, newItem)->T.Private.setFieldItems(project, _)
@ -154,7 +160,7 @@ module Private = {
sourceId: string, sourceId: string,
(rPrevResult: ProjectItem.T.resultArgumentType, continuation: ProjectItem.T.continuation), (rPrevResult: ProjectItem.T.resultArgumentType, continuation: ProjectItem.T.continuation),
): (ProjectItem.T.resultArgumentType, ProjectItem.T.continuation) => { ): (ProjectItem.T.resultArgumentType, ProjectItem.T.continuation) => {
switch getResult(project, sourceId) { switch getResultOption(project, sourceId) {
| Some(result) => (result, getContinuation(project, sourceId)) // already ran | Some(result) => (result, getContinuation(project, sourceId)) // already ran
| None => | None =>
switch rPrevResult { switch rPrevResult {
@ -165,7 +171,7 @@ module Private = {
| Ok(_prevResult) => { | Ok(_prevResult) => {
doRunWithContinuation(project, sourceId, continuation) doRunWithContinuation(project, sourceId, continuation)
( (
getResult(project, sourceId)->Belt.Option.getWithDefault(rPrevResult), getResultOption(project, sourceId)->Belt.Option.getWithDefault(rPrevResult),
getContinuation(project, sourceId), getContinuation(project, sourceId),
) )
} }
@ -197,6 +203,6 @@ module Private = {
let these = project->getStdLib let these = project->getStdLib
let ofUser = Continuation.minus(those, these) let ofUser = Continuation.minus(those, these)
(getResult(project, "main")->Belt.Option.getWithDefault(IEvVoid->Ok), ofUser) (getResultOption(project, "main")->Belt.Option.getWithDefault(IEvVoid->Ok), ofUser)
} }
} }