Skip to content

[Builtins] Allow casing on booleans and integers #7029

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

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

[Builtins] Allow casing on booleans and integers #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
06d1a16
[Builtins] Allow casing on booleans
effectfully Apr 9, 2025
2c5a658
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Apr 17, 2025
89f9909
Restore the original case-of-case
effectfully Apr 19, 2025
9e65c92
Proper error messages, support for old 'IfThenElse'
effectfully Apr 29, 2025
5f0c523
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Apr 29, 2025
50689dc
Make the default branch correspond to 'False'
effectfully May 16, 2025
d0a5a27
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully May 16, 2025
43789e2
Fix conformance tests
effectfully May 19, 2025
8173d7c
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully May 22, 2025
15f15b9
Add 'Case on constants' tests
effectfully May 22, 2025
eaf8284
Docs
effectfully May 22, 2025
7c5387e
Cosmetics
effectfully May 22, 2025
b63ff2f
Fix a test
effectfully May 23, 2025
35c61d8
Apply 'fourmolu' to 'plutus-tx'
effectfully May 23, 2025
dafd361
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully May 23, 2025
9ac9643
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully May 30, 2025
5fad6c1
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully May 30, 2025
7826ad0
Remove redudant golden files
effectfully May 31, 2025
b5aff71
Remove 'term' from 'CaseBuiltin'
effectfully Jun 2, 2025
d404be1
Address comments
effectfully Jun 2, 2025
81948ad
Allow constants in case-of-case too
effectfully Jun 3, 2025
82d703f
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Jun 3, 2025
cabbbe3
A failed experiment to add 'caserBuiltin' to 'MachineParameters'
effectfully Jun 4, 2025
8d72e6c
Add versioning for casing
effectfully Jun 5, 2025
2748dbb
Add 'BuiltinCasing' to fix 'plutus-ledger-api' tests
effectfully Jun 10, 2025
2338a26
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Jun 11, 2025
7901ba5
Fix constitution tests
effectfully Jun 11, 2025
d221ef4
Fix 'cost-model'
effectfully Jun 11, 2025
9fa4ef3
Add a comment to 'CaseOfCase'
effectfully Jun 11, 2025
29c1442
Fix golden tests
effectfully Jun 11, 2025
51dfc51
Polishing
effectfully Jun 20, 2025
02a071c
Fix the remaining issues
effectfully Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.cbor.size.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2140
2090
2 changes: 1 addition & 1 deletion ...stitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.large.budget.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ExBudget {exBudgetCPU = ExCPU 540852171, exBudgetMemory = ExMemory 2592918}
ExBudget {exBudgetCPU = ExCPU 472550709, exBudgetMemory = ExMemory 2373780}
105 changes: 46 additions & 59 deletions cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.pir.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ program
!`$fOrdInteger_$ccompare` : integer -> integer -> Ordering
= \(eta : integer) (eta : integer) ->
Bool_match
(ifThenElse {Bool} (equalsInteger eta eta) True False)
(case Bool (equalsInteger eta eta) [False, True])
{all dead. Ordering}
(/\dead -> EQ)
(/\dead ->
Bool_match
(ifThenElse {Bool} (lessThanEqualsInteger eta eta) True False)
(case Bool (lessThanEqualsInteger eta eta) [False, True])
{all dead. Ordering}
(/\dead -> LT)
(/\dead -> GT)
Expand All @@ -162,19 +162,18 @@ program
ds
{Bool}
(\(n' : integer) (d' : integer) ->
ifThenElse
{Bool}
case
Bool
(lessThanEqualsInteger
(multiplyInteger n d')
(multiplyInteger n' d))
True
False))
[False, True]))
in
letrec
!euclid : integer -> integer -> integer
= \(x : integer) (y : integer) ->
Bool_match
(ifThenElse {Bool} (equalsInteger 0 y) True False)
(case Bool (equalsInteger 0 y) [False, True])
{all dead. integer}
(/\dead -> x)
(/\dead -> euclid y (modInteger x y))
Expand All @@ -184,12 +183,12 @@ program
!unsafeRatio : integer -> integer -> Rational
= \(n : integer) (d : integer) ->
Bool_match
(ifThenElse {Bool} (equalsInteger 0 d) True False)
(case Bool (equalsInteger 0 d) [False, True])
{all dead. Rational}
(/\dead -> error {Rational})
(/\dead ->
Bool_match
(ifThenElse {Bool} (lessThanInteger d 0) True False)
(case Bool (lessThanInteger d 0) [False, True])
{all dead. Rational}
(/\dead ->
unsafeRatio (subtractInteger 0 n) (subtractInteger 0 d))
Expand All @@ -211,6 +210,8 @@ program
(\v -> List (Tuple2 PredKey (List v))) Rational -> ParamValue
in
let
!ifThenElse : all a. bool -> a -> a -> a
= /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x]
data Unit | Unit_match where
Unit : Unit
in
Expand All @@ -228,16 +229,12 @@ program
(CConsOrd
{integer}
(\(x : integer) (y : integer) ->
ifThenElse {Bool} (equalsInteger x y) True False)
case Bool (equalsInteger x y) [False, True])
`$fOrdInteger_$ccompare`
(\(x : integer) (y : integer) ->
ifThenElse {Bool} (lessThanInteger x y) True False)
case Bool (lessThanInteger x y) [False, True])
(\(x : integer) (y : integer) ->
ifThenElse
{Bool}
(lessThanEqualsInteger x y)
True
False)
case Bool (lessThanEqualsInteger x y) [False, True])
(\(x : integer) (y : integer) ->
ifThenElse
{Bool}
Expand All @@ -248,22 +245,14 @@ program
ifThenElse {Bool} (lessThanInteger x y) False True)
(\(x : integer) (y : integer) ->
Bool_match
(ifThenElse
{Bool}
(lessThanEqualsInteger x y)
True
False)
(case Bool (lessThanEqualsInteger x y) [False, True])
{all dead. integer}
(/\dead -> y)
(/\dead -> x)
{all dead. dead})
(\(x : integer) (y : integer) ->
Bool_match
(ifThenElse
{Bool}
(lessThanEqualsInteger x y)
True
False)
(case Bool (lessThanEqualsInteger x y) [False, True])
{all dead. integer}
(/\dead -> x)
(/\dead -> y)
Expand All @@ -288,18 +277,16 @@ program
{Bool}
(\(n' : integer) (d' : integer) ->
Bool_match
(ifThenElse
{Bool}
(case
Bool
(equalsInteger n n')
True
False)
[False, True])
{all dead. Bool}
(/\dead ->
ifThenElse
{Bool}
case
Bool
(equalsInteger d d')
True
False)
[False, True])
(/\dead -> False)
{all dead. dead})))
(\(ds : Rational) (ds : Rational) ->
Expand All @@ -323,13 +310,12 @@ program
ds
{Bool}
(\(n' : integer) (d' : integer) ->
ifThenElse
{Bool}
case
Bool
(lessThanInteger
(multiplyInteger n d')
(multiplyInteger n' d))
True
False)))
[False, True])))
`$fOrdRational0_$c<=`
(\(ds : Rational) (ds : Rational) ->
Rational_match
Expand All @@ -340,11 +326,13 @@ program
ds
{Bool}
(\(n' : integer) (d' : integer) ->
let
!x : integer = multiplyInteger n d'
!y : integer = multiplyInteger n' d
in
ifThenElse
{Bool}
(lessThanEqualsInteger
(multiplyInteger n d')
(multiplyInteger n' d))
(lessThanEqualsInteger x y)
False
True)))
(\(ds : Rational) (ds : Rational) ->
Expand All @@ -356,11 +344,13 @@ program
ds
{Bool}
(\(n' : integer) (d' : integer) ->
let
!x : integer = multiplyInteger n d'
!y : integer = multiplyInteger n' d
in
ifThenElse
{Bool}
(lessThanInteger
(multiplyInteger n d')
(multiplyInteger n' d))
(lessThanInteger x y)
False
True)))
(\(x : Rational) (y : Rational) ->
Expand Down Expand Up @@ -399,7 +389,7 @@ program
ds
{list data -> Bool}
(\(eta : list data) ->
ifThenElse {Bool} (nullList {data} eta) True False)
case Bool (nullList {data} eta) [False, True])
(\(paramValueHd : ParamValue)
(paramValueTl : List ParamValue)
(actualValueData : list data) ->
Expand Down Expand Up @@ -499,12 +489,12 @@ program
!args : list data = sndPair {integer} {list data} tup
in
Bool_match
(ifThenElse {Bool} (equalsInteger 1 index) True False)
(case Bool (equalsInteger 1 index) [False, True])
{all dead. Maybe a}
(/\dead -> Nothing {a})
(/\dead ->
Bool_match
(ifThenElse {Bool} (equalsInteger 0 index) True False)
(case Bool (equalsInteger 0 index) [False, True])
{all dead. Maybe a}
(/\dead ->
Just {a} (`$dUnsafeFromData` (headList {data} args)))
Expand Down Expand Up @@ -5330,13 +5320,12 @@ program
(unConstrData ds)))))
in
Bool_match
(ifThenElse
{Bool}
(case
Bool
(equalsInteger
5
(fstPair {integer} {list data} tup))
True
False)
[False, True])
{all dead. data}
(/\dead ->
headList
Expand All @@ -5357,11 +5346,10 @@ program
!tup : pair integer (list data) = unConstrData scrut
in
Bool_match
(ifThenElse
{Bool}
(case
Bool
(equalsInteger 0 (fstPair {integer} {list data} tup))
True
False)
[False, True])
{all dead. r}
(/\dead ->
let
Expand Down Expand Up @@ -5397,11 +5385,10 @@ program
!tup : pair integer (list data) = unConstrData scrut
in
Bool_match
(ifThenElse
{Bool}
(case
Bool
(equalsInteger 2 (fstPair {integer} {list data} tup))
True
False)
[False, True])
{all dead. r}
(/\dead ->
let
Expand Down
2 changes: 1 addition & 1 deletion ...stitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.small.budget.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ExBudget {exBudgetCPU = ExCPU 82805157, exBudgetMemory = ExMemory 359105}
ExBudget {exBudgetCPU = ExCPU 66876110, exBudgetMemory = ExMemory 308402}
Loading