Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Builtins] Defer 'readKnown' until full saturation #4430

Closed
wants to merge 9 commits into from
Closed

[Builtins] Defer 'readKnown' until full saturation #4430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1030cc
[Builtins] Defer 'readKnown' until full saturation
effectfully Feb 26, 2022
ae0a821
Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'
effectfully Mar 2, 2022
4388d6c
Revert "Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'"
effectfully Mar 2, 2022
932756a
Correct causes for unlifting errors
effectfully Mar 9, 2022
6c9a09a
Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'
effectfully Mar 9, 2022
f4a237c
Playing with bangs
effectfully Mar 9, 2022
e3073ec
Remove a bang
effectfully Mar 9, 2022
046cf60
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Mar 28, 2022
b6743db
Parallel 'TypeScheme' and 'RuntimeScheme'
effectfully Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct causes for unlifting errors
  • Loading branch information
@effectfully
effectfully committed Mar 21, 2022
commit 932756a8a6d5d96a156e1c5e4fca6b69d374d59c
2 changes: 1 addition & 1 deletion plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Ck.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ applyEvaluate stack (VBuiltin term (BuiltinRuntime sch f _)) arg = do
-- It's only possible to apply a builtin application if the builtin expects a term
-- argument next.
RuntimeSchemeArrow schB -> case f arg of
Left err -> throwReadKnownErrorWithCause $ term' <$ err
Left err -> throwReadKnownErrorWithCause $ argTerm <$ err
Right app -> do
let noCosting = error "The CK machine does not support costing"
runtime' = BuiltinRuntime schB app noCosting
Expand Down
2 changes: 1 addition & 1 deletion plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ enterComputeCek = computeCek (toWordArray 0) where
-- It's only possible to apply a builtin application if the builtin expects a term
-- argument next.
RuntimeSchemeArrow schB -> case f arg of
Left err -> throwReadKnownErrorWithCause $ term' <$ err
Left err -> throwReadKnownErrorWithCause $ argTerm <$ err
Right app -> do
-- TODO: should we bother computing that 'ExMemory' eagerly? We may not need it.
-- We pattern match on @arg@ twice: in 'readKnown' and in 'toExMemory'.
Expand Down
2 changes: 1 addition & 1 deletion plutus-core/untyped-plutus-core/test/Evaluation/Golden/iteAtIntegerWrongCondType.plc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(Left An error has occurred: error:
Could not unlift a builtin:
Type mismatch: expected: bool; actual: string
Caused by: [ (force (builtin ifThenElse)) (con string "11 <= 22") ])
Caused by: (con string "11 <= 22"))
2 changes: 1 addition & 1 deletion plutus-core/untyped-plutus-core/test/Evaluation/Golden/iteAtIntegerWrongCondType.uplc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(Left An error has occurred: error:
Could not unlift a builtin:
Type mismatch: expected: bool; actual: string
Caused by: [ (force (builtin ifThenElse)) (con string "11 <= 22") ])
Caused by: (con string "11 <= 22"))