diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.cbor.size b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.cbor.size index 0a5d03c1fdf..4725b8206dc 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.cbor.size +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.cbor.size @@ -1 +1 @@ -2039 \ No newline at end of file +2033 \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.large.budget b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.large.budget index c597e460131..94d03e84889 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.large.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.large.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 401320625, exBudgetMemory = ExMemory 2038256} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 398677958, exBudgetMemory = ExMemory 2022256} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.pir b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.pir index 75c0e81ce19..cde241f441b 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.pir +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.pir @@ -128,8 +128,6 @@ program go expectedPredValues)) in go ds - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] in letrec !euclid : integer -> integer -> integer @@ -211,14 +209,9 @@ program (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) + (\(x : integer) (y : integer) -> lessThanInteger y x) (\(x : integer) (y : integer) -> - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) @@ -318,13 +311,8 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True))) + lessThanInteger (multiplyInteger n' d) x))) (\(ds : Rational) (ds : Rational) -> Rational_match ds @@ -336,13 +324,10 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanInteger x y) - False - True))) + lessThanEqualsInteger + (multiplyInteger n' d) + x))) (\(x : Rational) (y : Rational) -> Rational_match x @@ -380,8 +365,10 @@ program !bl : list data = unListData eta !bl' : list data = tailList {data} bl in - ifThenElse - {Unit -> Rational} + (let + a = Unit -> Rational + in + \(b : bool) (x : a) (y : a) -> case a b [y, x]) (nullList {data} (tailList {data} bl')) (\(ds : Unit) -> unsafeRatio diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.small.budget b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.small.budget index 444c27e691b..95bd8f6d7cc 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.small.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.small.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 58860489, exBudgetMemory = ExMemory 267518} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 58843036, exBudgetMemory = ExMemory 267418} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.uplc b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.uplc index bfe00149f51..3006587c0cb 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.uplc +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.golden.uplc @@ -1,1193 +1,1232 @@ program 1.1.0 - ((\validatePreds -> - (\euclid -> - (\unsafeRatio -> - (\cse -> - (\validateParamValue -> - (\validateParamValues -> - (\runRules -> - (\matchData_go -> - (\fun ds -> - (\cse -> - case - (case - (equalsInteger 0 (case cse [(\l r -> l)])) - [ (case - (equalsInteger - 2 - (case cse [(\l r -> l)])) - [ error - , ((\l -> constr 1 []) - (case cse [(\l r -> r)])) ]) - , (constr 0 - [ (force matchData_go - (unMapData - (force headList - (force tailList - (case - cse - [ (\l r -> - r) ]))))) ]) ]) - [ (\cparams -> - case (fun cparams) [error, ()]) - , () ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ((\tup -> - case - (equalsInteger - 5 - (case - tup - [(\l r -> l)])) - [ error - , (force headList - (force tailList + (case + (constr 0 [(force nullList), (force tailList), (force headList)]) + [ (\forced forced forced -> + (\validatePreds -> + (\euclid -> + (\unsafeRatio -> + (\cse -> + (\validateParamValue -> + (\validateParamValues -> + (\runRules -> + (\matchData_go -> + (\fun ds -> + (\cse -> + case + (case + (equalsInteger + 0 + (case cse [(\l r -> l)])) + [ (case + (equalsInteger + 2 + (case cse [(\l r -> l)])) + [ error + , ((\l -> constr 1 []) + (case + cse + [(\l r -> r)])) ]) + , (constr 0 + [ (force matchData_go + (unMapData + (forced + (forced (case - tup + cse [ (\l r -> - r) ]))) ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ds) - [ (\l r -> - r) ]))))))) - [(\l r -> r)])))))) - (runRules - ((\cse -> - constr 1 - [ (constr 0 - [ 0 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [30, cse]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 []) - , (constr 1 - [ 1000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 1 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [ 100000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - []) - , (constr 1 - [ 10000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 2 - , (constr 1 - [ (constr 1 + r) ]))))) ]) ]) + [ (\cparams -> + case (fun cparams) [error, ()]) + , () ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ((\tup -> + case + (equalsInteger + 5 + (case + tup + [ (\l r -> + l) ])) + [ error + , (forced + (forced + (case + tup + [ (\l + r -> + r) ]))) ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ds) + [ (\l + r -> + r) ]))))))) + [(\l r -> r)])))))) + (runRules + ((\cse -> + constr 1 + [ (constr 0 + [ 0 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [ 30 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + []) + , (constr 1 + [ 1000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 1 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + []) + , (constr 1 + [ 100000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 2 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 24576 + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 122880 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - []) + [ 3 , (constr 1 - [ 24576 - , (constr 0 - [ ]) ]) ]) + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 32768 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 4 , (constr 1 - [ 122880 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 3 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 32768 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 4 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 5000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 5 - , (constr 1 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 5 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1000000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 6 , (constr 1 - [ 1000000 - , cse ]) ]) + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250000000 + , cse ]) ]) + , cse ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 7 , (constr 1 - [ 5000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 6 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250000000 - , cse ]) ]) - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 7 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 8 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 2000 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 9 - , (constr 3 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 10 - , (constr 3 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 8 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 2000 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 9 + , (constr 3 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 10 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 1000) + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 200) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 1000) - , cse ]) ]) + [ 11 + , (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 + [ 16 + , (constr 1 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 [ (constr 0 - [ ]) + [ 17 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 3000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 6500 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) , (constr 1 - [ (cse - 200) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 11 - , (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 16 - , (constr 1 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 17 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 3000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 6500 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 18 - , (constr 0 - [ ]) ]) - , (constr 1 - [ (constr 0 - [ 19 - , (constr 2 - [ (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 25) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 20000) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5000) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 20 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 21 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 120000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 22 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 12288 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 23 - , (constr 1 - [ (constr 1 + [ (constr 0 + [ 18 + , (constr 0 + [ ]) ]) + , (constr 1 + [ (constr 0 + [ 19 + , (constr 2 + [ (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 25) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 20000) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5000) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 20 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 21 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 120000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 22 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 12288 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 23 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 100 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 200 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 24 , (constr 1 - [ 100 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 200 + [ (constr 1 + [ cse , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 24 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 25 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , cse ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 26 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) + [ ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 25 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , cse ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 26 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 13 + 20) + , (constr 0 + [ ]) ]) ]) ]) + , cse ]) ]) + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , cse ]) ]) + , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 27 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 3 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 28 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 18 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 293 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 29 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 30 + , (constr 1 + [ (constr 1 + [ cse , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 31 + , (constr 1 + [ (constr 1 [ cse , (constr 1 - [ (unsafeRatio - 13 - 20) + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 100000000000 + , (constr 0 + [ ]) ]) ]) , (constr 0 - [ ]) ]) ]) ]) - , cse ]) ]) - , (constr 1 - [ cse + [ ]) ]) ]) ]) ]) , (constr 1 - [ cse - , (constr 1 - [ cse + [ (constr 0 + [ 32 , (constr 1 - [ cse - , (constr 1 - [ (constr 3 + [ (constr 1 + [ (constr 0 [ (constr 1 + [ ]) + , (constr 1 + [ 13 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 37 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 33 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , cse ]) + , (constr 1 [ (constr 0 - [ (constr 1 + [ (constr 0 [ ]) , (constr 1 - [ cse - , cse ]) ]) - , cse ]) ]) - , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 27 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 3 - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 28 - , (constr 1 - [ (constr 1 - [ (constr 0 + [ (unsafeRatio + 1000 + 1) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + (constr 0 [ (constr 1 [ ]) , (constr 1 [ 0 , (constr 1 - [ 18 + [ 1000000 , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 293 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 29 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 30 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10000000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 31 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 100000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 32 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 13 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 37 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 33 - , (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , cse ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (unsafeRatio - 1000 - 1) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 1000000 - , (constr 0 - [ ]) ]) ]) ])) ]) ]) ]) ]) ]) - (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 4 - 5) - , (constr 0 - [ ]) ]) ]) ]) + [ ]) ]) ]) ])) ]) ]) ]) ]) ]) + (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) , (constr 0 - [ ]) ]) ]) ])) - (constr 3 - [ (constr 1 - [ cse - , cse ]) ])) - (constr 1 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 1 + [ (cse + 4) + , (constr 0 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 4 + 5) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 3 + [ (constr 1 + [ cse + , cse ]) ])) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 51 + 100) + , (constr 0 + [ ]) ]) ]) ])) + (cse + 2)) + (constr 1 + [ (constr 0 [ (constr 0 - [ (constr 0 - [ ]) + [ ]) + , (constr 1 + [ cse , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 9 - 10) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ])) - (constr 1 - [ (cse - 4) - , (constr 0 - [ ]) ])) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 51 - 100) - , (constr 0 - [ ]) ]) ]) ])) - (cse - 2)) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 1 - , (constr 0 - [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) - (unsafeRatio - 3)) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) - (constr 1 - [ cse - , (constr 0 - [ ]) ])) - (cse - 1)) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ])) - (unsafeRatio - 1)) - (constr 1 - [ (unsafeRatio - 0 - 1) - , (constr 0 - [ ]) ])) ]) - (constr 1 - [ (constr 0 - [ (constr 2 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 500000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ])) ]) ]) ]) - (constr 0 - [ (constr 1 []) - , cse ])) ]) ]) ]) - (constr 1 [0, (constr 0 [])])))) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\xs -> - case - xs - [ (\x xs -> - constr 1 - [ (case - x - [(\l r -> constr 0 [l, r])]) - , (force (s s (delay (\x -> x))) - xs) ]) - , (constr 0 []) ])))) - ((\s -> s s) - (\s ds cparams -> - case - ds - [ (case cparams [True, (\ipv ipv -> False)]) - , (\ds cfgRest -> + [ (unsafeRatio + 9 + 10) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ])) ]) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1 + , (constr 0 + [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) + (unsafeRatio + 3)) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) + (constr 1 + [ cse + , (constr 0 + [ ]) ])) + (cse + 1)) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ])) + (unsafeRatio + 1)) + (constr 1 + [ (unsafeRatio + 0 + 1) + , (constr 0 + [ ]) ])) ]) + (constr 1 + [ (constr 0 + [ (constr 2 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 500000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ])) ]) ]) ]) + (constr 0 + [ (constr 1 []) + , cse ])) ]) ]) ]) + (constr 1 [0, (constr 0 [])])))) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\xs -> + case + xs + [ (\x xs -> + constr 1 + [ (case + x + [ (\l r -> + constr 0 + [l, r]) ]) + , (force + (s + s + (delay (\x -> x))) + xs) ]) + , (constr 0 []) ])))) + ((\s -> s s) + (\s ds cparams -> case ds - [ (\expectedPid paramValue -> + [ (case + cparams + [True, (\ipv ipv -> False)]) + , (\ds cfgRest -> case - cparams - [ True - , (\ds cparamsRest -> + ds + [ (\expectedPid paramValue -> case - ds - [ (\ds actualValueData -> - (\x -> - case - (case + cparams + [ True + , (\ds cparamsRest -> + case + ds + [ (\ds + actualValueData -> + (\x -> + case + (case + (equalsInteger + x + expectedPid) + [ (case + (lessThanEqualsInteger + x + expectedPid) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) + [ (case + (validateParamValue + paramValue + actualValueData) + [ False + , (case + (constr 0 + [ s + , cfgRest + , cparamsRest ]) + [ s ]) ]) + , (case + (constr 0 + [ s + , cfgRest + , cparams ]) + [s]) + , False ]) + (unIData + ds)) ]) ]) ]) ]))) + (cse (\arg_0 arg_1 -> arg_1))) + (cse (\arg_0 arg_1 -> arg_0))) + ((\s -> + force + (s + s + (delay + (\choose + validateParamValue + validateParamValues -> + choose + (\eta eta -> + case + eta + [ True + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\x y -> + equalsInteger + x + y) + , (\eta eta -> + case (equalsInteger - x - expectedPid) + eta + eta) [ (case (lessThanEqualsInteger - x - expectedPid) + eta + eta) [ (constr 1 []) , (constr 2 [ ]) ]) , (constr 0 []) ]) - [ (case - (validateParamValue - paramValue - actualValueData) - [ False - , (case - (constr 0 - [ s - , cfgRest - , cparamsRest ]) - [s]) ]) - , (case - (constr 0 - [ s - , cfgRest - , cparams ]) - [s]) - , False ]) - (unIData - ds)) ]) ]) ]) ]))) - (cse (\arg_0 arg_1 -> arg_1))) - (cse (\arg_0 arg_1 -> arg_0))) - ((\s -> - force - (s - s - (delay - (\choose validateParamValue validateParamValues -> - choose - (\eta eta -> - case - eta - [ True - , (\preds -> - case - (constr 0 - [ (constr 0 - [ (\x y -> equalsInteger x y) - , (\eta eta -> - case - (equalsInteger - eta - eta) - [ (case - (lessThanEqualsInteger - eta - eta) - [ (constr 1 []) - , (constr 2 - []) ]) - , (constr 0 []) ]) - , (\x y -> - lessThanInteger x y) - , (\x y -> - lessThanEqualsInteger - x - y) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [True, False]) - , (\x y -> - case - (lessThanInteger x y) - [True, False]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [x, y]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [y, x]) ]) - , preds - , (unIData eta) ]) - [validatePreds]) - , (\paramValues -> - validateParamValues - paramValues - (unListData eta)) - , (\preds -> - case - (constr 0 - [ (constr 0 - [ (\ds ds -> - case - ds - [ (\l1l l2l -> + , (\x y -> + lessThanInteger + x + y) + , (\x y -> + lessThanEqualsInteger + x + y) + , (\x y -> + lessThanInteger + y + x) + , (\x y -> + lessThanEqualsInteger + y + x) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [x, y]) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [y, x]) ]) + , preds + , (unIData eta) ]) + [validatePreds]) + , (\paramValues -> + validateParamValues + paramValues + (unListData eta)) + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\ds ds -> case ds - [ (\r1r r2r -> + [ (\l1l l2l -> case - (equalsInteger - l1l - r1r) - [ False - , (equalsInteger - l2l - r2r) ]) ]) ]) - , (\eta eta -> - case - eta - [ (\ipv ipv -> + ds + [ (\r1r + r2r -> + case + (equalsInteger + l1l + r1r) + [ False + , (equalsInteger + l2l + r2r) ]) ]) ]) + , (\eta eta -> case eta [ (\ipv ipv -> case - (case - (equalsInteger - ipv - ipv) - [ False - , (equalsInteger - ipv - ipv) ]) - [ (case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ (constr 1 - [ ]) - , (constr 2 - [ ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + eta + [ (\ipv + ipv -> + case + (case + (equalsInteger + ipv + ipv) + [ False + , (equalsInteger + ipv + ipv) ]) + [ (case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanEqualsInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + ds + [ (\n' + d' -> + (\x -> + lessThanInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + ds + [ (\n' + d' -> + (\x -> + lessThanEqualsInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ x - , y ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ x + , y ]) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ y - , x ]) ]) ]) ]) - , preds - , ((\bl -> - (\bl' -> - case - (force nullList - (force tailList - bl')) - [ (\ds -> error) - , (\ds -> - unsafeRatio - (unIData - (force - headList - bl)) - (unIData - (force - headList - bl'))) ] - (constr 0 [])) - (force tailList bl)) - (unListData eta)) ]) - [validatePreds]) ]) - (\ds -> - case - ds - [ (\eta -> force nullList eta) - , (\paramValueHd - paramValueTl - actualValueData -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ y + , x ]) ]) ]) ]) + , preds + , ((\bl -> + (\bl' -> + case + (forced + (forced bl')) + [ (\ds -> error) + , (\ds -> + unsafeRatio + (unIData + (forced + bl)) + (unIData + (forced + bl'))) ] + (constr 0 [])) + (forced bl)) + (unListData eta)) ]) + [validatePreds]) ]) + (\ds -> case - (validateParamValue - paramValueHd - (force headList actualValueData)) - [ False - , (validateParamValues - paramValueTl - (force tailList - actualValueData)) ]) ]))))) - (\s h -> - delay - (\fr -> - (\k -> - fr - (\x -> k (\f_0 f_1 -> f_0 x)) - (\x -> k (\f_0 f_1 -> f_1 x))) - (\fq -> force (s s h) (force h fq)))))) - ((\s -> s s) - (\s n d -> - case - (equalsInteger 0 d) - [ (case - (lessThanInteger d 0) - [ ((\gcd' -> - constr 0 - [ (quotientInteger n gcd') - , (quotientInteger d gcd') ]) - (euclid n d)) - , ((\x -> - case (constr 0 [s, x, (subtractInteger 0 d)]) [s]) - (subtractInteger 0 n)) ]) - , error ]))) - ((\s -> s s) - (\s x y -> - case - (equalsInteger 0 y) - [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) - (\`$dOrd` ds ds -> - (\s -> s s ds) - (\s ds -> - case - ds - [ True - , (\x xs -> + ds + [ (\eta -> forced eta) + , (\paramValueHd + paramValueTl + actualValueData -> + case + (validateParamValue + paramValueHd + (forced actualValueData)) + [ False + , (validateParamValues + paramValueTl + (forced + actualValueData)) ]) ]))))) + (\s h -> + delay + (\fr -> + (\k -> + fr + (\x -> k (\f_0 f_1 -> f_0 x)) + (\x -> k (\f_0 f_1 -> f_1 x))) + (\fq -> force (s s h) (force h fq)))))) + ((\s -> s s) + (\s n d -> + case + (equalsInteger 0 d) + [ (case + (lessThanInteger d 0) + [ ((\gcd' -> + constr 0 + [ (quotientInteger n gcd') + , (quotientInteger d gcd') ]) + (euclid n d)) + , ((\x -> + case + (constr 0 [s, x, (subtractInteger 0 d)]) + [s]) + (subtractInteger 0 n)) ]) + , error ]))) + ((\s -> s s) + (\s x y -> + case + (equalsInteger 0 y) + [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) + (\`$dOrd` ds ds -> + (\s -> s s ds) + (\s ds -> case - x - [ (\predKey expectedPredValues -> - (\meaning -> - (\s -> s s expectedPredValues) - (\s ds -> - case - ds - [ (s s xs) - , (\x xs -> + ds + [ True + , (\x xs -> + case + x + [ (\predKey expectedPredValues -> + (\meaning -> + (\s -> s s expectedPredValues) + (\s ds -> case - (meaning x ds) - [False, (s s xs)]) ])) - (case - predKey - [ (case `$dOrd` [(\v v v v v v v v -> v)]) - , (case `$dOrd` [(\v v v v v v v v -> v)]) - , (\x y -> - case - (case `$dOrd` [(\v v v v v v v v -> v)] - x - y) - [True, False]) ])) ]) ]))) \ No newline at end of file + ds + [ (s s xs) + , (\x xs -> + case + (meaning x ds) + [False, (s s xs)]) ])) + (case + predKey + [ (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (\x y -> + case + (case + `$dOrd` + [(\v v v v v v v v -> v)] + x + y) + [True, False]) ])) ]) ]))) ]) \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.cbor.size b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.cbor.size index c32e6ac9eb8..6f6e5593834 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.cbor.size +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.cbor.size @@ -1 +1 @@ -2019 \ No newline at end of file +2012 \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.large.budget b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.large.budget index af23e9f69ce..5d3ac7fee6d 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.large.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.large.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 565605480, exBudgetMemory = ExMemory 2923191} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 562962813, exBudgetMemory = ExMemory 2907191} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.pir b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.pir index c3fa3050a69..9fe62fd55e8 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.pir +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.pir @@ -128,8 +128,6 @@ program go expectedPredValues)) in go ds - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] in letrec !euclid : integer -> integer -> integer @@ -211,14 +209,9 @@ program (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) + (\(x : integer) (y : integer) -> lessThanInteger y x) (\(x : integer) (y : integer) -> - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) @@ -318,13 +311,8 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True))) + lessThanInteger (multiplyInteger n' d) x))) (\(ds : Rational) (ds : Rational) -> Rational_match ds @@ -336,13 +324,10 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanInteger x y) - False - True))) + lessThanEqualsInteger + (multiplyInteger n' d) + x))) (\(x : Rational) (y : Rational) -> Rational_match x @@ -380,8 +365,10 @@ program !bl : list data = unListData eta !bl' : list data = tailList {data} bl in - ifThenElse - {Unit -> Rational} + (let + a = Unit -> Rational + in + \(b : bool) (x : a) (y : a) -> case a b [y, x]) (nullList {data} (tailList {data} bl')) (\(ds : Unit) -> unsafeRatio diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.small.budget b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.small.budget index f89da80ad3f..ec7280a1fb5 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.small.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.small.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 57466746, exBudgetMemory = ExMemory 259919} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 57449293, exBudgetMemory = ExMemory 259819} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.uplc b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.uplc index fab5acf9c95..f9d07e61d0b 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.uplc +++ b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.golden.uplc @@ -1,1167 +1,1204 @@ program 1.1.0 - ((\validatePreds -> - (\euclid -> - (\unsafeRatio -> - (\cse -> - (\validateParamValue -> - (\validateParamValues -> - (\matchData_go -> - (\cfg -> - (\go ds -> - (\cse -> - case - (case - (equalsInteger 0 (case cse [(\l r -> l)])) - [ (case - (equalsInteger - 2 - (case cse [(\l r -> l)])) - [ error - , ((\l -> constr 1 []) - (case cse [(\l r -> r)])) ]) - , (constr 0 - [ (force matchData_go - (unMapData - (force headList - (force tailList - (case - cse - [ (\l r -> - r) ]))))) ]) ]) - [ (\cparams -> case (go cparams) [error, ()]) - , () ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ((\tup -> - case - (equalsInteger - 5 - (case - tup - [(\l r -> l)])) - [ error - , (force headList - (force tailList + (case + (constr 0 [(force nullList), (force tailList), (force headList)]) + [ (\forced forced forced -> + (\validatePreds -> + (\euclid -> + (\unsafeRatio -> + (\cse -> + (\validateParamValue -> + (\validateParamValues -> + (\matchData_go -> + (\cfg -> + (\go ds -> + (\cse -> + case + (case + (equalsInteger + 0 + (case cse [(\l r -> l)])) + [ (case + (equalsInteger + 2 + (case cse [(\l r -> l)])) + [ error + , ((\l -> constr 1 []) + (case + cse + [(\l r -> r)])) ]) + , (constr 0 + [ (force matchData_go + (unMapData + (forced + (forced (case - tup + cse [ (\l r -> - r) ]))) ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ds) - [ (\l r -> - r) ]))))))) - [(\l r -> r)])))))) - ((\s -> s s) - (\s ds -> - case - ds - [ True - , (\x xs -> + r) ]))))) ]) ]) + [ (\cparams -> + case (go cparams) [error, ()]) + , () ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ((\tup -> + case + (equalsInteger + 5 + (case + tup + [ (\l r -> + l) ])) + [ error + , (forced + (forced + (case + tup + [ (\l + r -> + r) ]))) ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ds) + [ (\l + r -> + r) ]))))))) + [(\l r -> r)])))))) + ((\s -> s s) + (\s ds -> case - (case - x - [ (\ds actualValueData -> - validateParamValue - ((\k -> - (\s -> s s cfg) - (\s ds -> - case - ds - [ error - , (\ds xs' -> + ds + [ True + , (\x xs -> + case + (case + x + [ (\ds actualValueData -> + validateParamValue + ((\k -> + (\s -> s s cfg) + (\s ds -> case ds - [ (\k' - i -> + [ error + , (\ds + xs' -> case - (equalsInteger - k - k') - [ (s - s - xs') - , i ]) ]) ])) - (unIData ds)) - actualValueData) ]) - [False, (s s xs)]) ]))) - ((\cse -> - constr 1 - [ (constr 0 - [ 0 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 [30, cse]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 []) - , (constr 1 - [ 1000 - , (constr 0 - []) ]) ]) - , (constr 0 []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 1 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [100000, cse]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 []) - , (constr 1 - [ 10000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 2 - , (constr 1 - [ (constr 1 + ds + [ (\k' + i -> + case + (equalsInteger + k + k') + [ (s + s + xs') + , i ]) ]) ])) + (unIData ds)) + actualValueData) ]) + [False, (s s xs)]) ]))) + ((\cse -> + constr 1 + [ (constr 0 + [ 0 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [30, cse]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 []) + , (constr 1 + [ 1000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + []) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 1 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [ 100000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + []) + , (constr 1 + [ 10000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 2 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + []) + , (constr 1 + [ 24576 + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 122880 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 []) + [ 3 , (constr 1 - [ 24576 - , (constr 0 - [ ]) ]) ]) + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 32768 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - []) + [ 4 , (constr 1 - [ 122880 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 3 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 32768 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 4 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 5000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 5 - , (constr 1 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 5 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1000000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 6 , (constr 1 - [ 1000000 - , cse ]) ]) + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250000000 + , cse ]) ]) + , cse ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 7 , (constr 1 - [ 5000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 6 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250000000 - , cse ]) ]) - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 7 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 8 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 2000 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 9 - , (constr 3 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 10 - , (constr 3 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 8 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 2000 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 9 + , (constr 3 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 10 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 1000) + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 200) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 1000) - , cse ]) ]) + [ 11 + , (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 + [ 16 + , (constr 1 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 [ (constr 0 - [ ]) + [ 17 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 3000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 6500 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) , (constr 1 - [ (cse - 200) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 11 - , (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 16 - , (constr 1 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 17 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 3000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 6500 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 18 - , (constr 0 - [ ]) ]) - , (constr 1 - [ (constr 0 - [ 19 - , (constr 2 - [ (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 25) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 20000) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5000) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 20 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 21 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 120000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 22 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 12288 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 23 - , (constr 1 - [ (constr 1 + [ (constr 0 + [ 18 + , (constr 0 + [ ]) ]) + , (constr 1 + [ (constr 0 + [ 19 + , (constr 2 + [ (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 25) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 20000) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5000) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 20 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 21 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 120000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 22 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 12288 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 23 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 100 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 200 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 24 , (constr 1 - [ 100 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 200 + [ (constr 1 + [ cse , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 24 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 25 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , cse ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 26 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) + [ ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 25 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , cse ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 26 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 13 + 20) + , (constr 0 + [ ]) ]) ]) ]) + , cse ]) ]) + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , cse ]) ]) + , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 27 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 3 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 28 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 18 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 293 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 29 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 30 + , (constr 1 + [ (constr 1 + [ cse , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 31 + , (constr 1 + [ (constr 1 [ cse , (constr 1 - [ (unsafeRatio - 13 - 20) + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 100000000000 + , (constr 0 + [ ]) ]) ]) , (constr 0 - [ ]) ]) ]) ]) - , cse ]) ]) - , (constr 1 - [ cse + [ ]) ]) ]) ]) ]) , (constr 1 - [ cse - , (constr 1 - [ cse + [ (constr 0 + [ 32 , (constr 1 - [ cse - , (constr 1 - [ (constr 3 + [ (constr 1 + [ (constr 0 [ (constr 1 + [ ]) + , (constr 1 + [ 13 + , cse ]) ]) + , (constr 1 + [ (constr 0 [ (constr 0 - [ (constr 1 + [ ]) + , (constr 1 + [ 37 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 33 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , cse ]) + , (constr 1 + [ (constr 0 + [ (constr 0 [ ]) , (constr 1 - [ cse - , cse ]) ]) - , cse ]) ]) - , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 27 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 3 - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 28 - , (constr 1 - [ (constr 1 - [ (constr 0 + [ (unsafeRatio + 1000 + 1) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + (constr 0 [ (constr 1 [ ]) , (constr 1 [ 0 , (constr 1 - [ 18 + [ 1000000 , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 293 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 29 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 30 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10000000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 31 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 100000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 32 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 13 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 37 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 33 - , (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , cse ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (unsafeRatio - 1000 - 1) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 1000000 - , (constr 0 - [ ]) ]) ]) ])) ]) ]) ]) ]) ]) - (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse + [ ]) ]) ]) ])) ]) ]) ]) ]) ]) + (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) , cse ]) ]) , (constr 0 - [ ]) ]) ]) ])) - (constr 1 - [ (cse - 4) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 4 + 5) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 1 + [ (cse + 4) + , (constr 0 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , cse ]) ])) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 51 + 100) + , (constr 0 + [ ]) ]) ]) ])) + (cse + 2)) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 [ cse , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 4 - 5) - , (constr 0 - [ ]) ]) ]) ]) + [ (unsafeRatio + 9 + 10) , (constr 0 - [ ]) ]) ]) ])) - (constr 3 - [ (constr 1 - [ cse - , cse ]) ])) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 51 - 100) - , (constr 0 - [ ]) ]) ]) ])) - (cse - 2)) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 9 - 10) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ])) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 1 - , (constr 0 - [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) - (unsafeRatio - 3)) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) - (constr 1 - [ cse - , (constr 0 - [ ]) ])) - (cse - 1)) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ])) - (unsafeRatio - 1)) - (constr 1 - [ (unsafeRatio - 0 - 1) - , (constr 0 - [ ]) ])) ]) - (constr 1 - [ (constr 0 - [ (constr 2 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 500000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ])) ]) ]) ]) - (constr 0 - [ (constr 1 []) - , cse ])) ]) ]) ]) - (constr 1 [0, (constr 0 [])]))) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\xs -> - case - xs - [ (\x xs -> - constr 1 - [ (case - x - [(\l r -> constr 0 [l, r])]) - , (force (s s (delay (\x -> x))) - xs) ]) - , (constr 0 []) ])))) - (cse (\arg_0 arg_1 -> arg_1))) - (cse (\arg_0 arg_1 -> arg_0))) - ((\s -> - force - (s - s - (delay - (\choose validateParamValue validateParamValues -> - choose - (\eta eta -> - case - eta - [ True - , (\preds -> + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ])) ]) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1 + , (constr 0 + [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) + (unsafeRatio + 3)) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) + (constr 1 + [ cse + , (constr 0 + [ ]) ])) + (cse + 1)) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ])) + (unsafeRatio + 1)) + (constr 1 + [ (unsafeRatio + 0 + 1) + , (constr 0 + [ ]) ])) ]) + (constr 1 + [ (constr 0 + [ (constr 2 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 500000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ])) ]) ]) ]) + (constr 0 + [ (constr 1 []) + , cse ])) ]) ]) ]) + (constr 1 [0, (constr 0 [])]))) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\xs -> case - (constr 0 - [ (constr 0 - [ (\x y -> equalsInteger x y) - , (\eta eta -> - case - (equalsInteger - eta - eta) - [ (case - (lessThanEqualsInteger - eta - eta) - [ (constr 1 []) - , (constr 2 - []) ]) - , (constr 0 []) ]) - , (\x y -> - lessThanInteger x y) - , (\x y -> - lessThanEqualsInteger - x - y) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [True, False]) - , (\x y -> - case - (lessThanInteger x y) - [True, False]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [x, y]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [y, x]) ]) - , preds - , (unIData eta) ]) - [validatePreds]) - , (\paramValues -> - validateParamValues - paramValues - (unListData eta)) - , (\preds -> + xs + [ (\x xs -> + constr 1 + [ (case + x + [ (\l r -> + constr 0 [l, r]) ]) + , (force + (s s (delay (\x -> x))) + xs) ]) + , (constr 0 []) ])))) + (cse (\arg_0 arg_1 -> arg_1))) + (cse (\arg_0 arg_1 -> arg_0))) + ((\s -> + force + (s + s + (delay + (\choose + validateParamValue + validateParamValues -> + choose + (\eta eta -> case - (constr 0 - [ (constr 0 - [ (\ds ds -> - case - ds - [ (\l1l l2l -> + eta + [ True + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\x y -> + equalsInteger + x + y) + , (\eta eta -> + case + (equalsInteger + eta + eta) + [ (case + (lessThanEqualsInteger + eta + eta) + [ (constr 1 + []) + , (constr 2 + [ ]) ]) + , (constr 0 + []) ]) + , (\x y -> + lessThanInteger + x + y) + , (\x y -> + lessThanEqualsInteger + x + y) + , (\x y -> + lessThanInteger + y + x) + , (\x y -> + lessThanEqualsInteger + y + x) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [x, y]) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [y, x]) ]) + , preds + , (unIData eta) ]) + [validatePreds]) + , (\paramValues -> + validateParamValues + paramValues + (unListData eta)) + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\ds ds -> case ds - [ (\r1r r2r -> + [ (\l1l l2l -> case - (equalsInteger - l1l - r1r) - [ False - , (equalsInteger - l2l - r2r) ]) ]) ]) - , (\eta eta -> - case - eta - [ (\ipv ipv -> + ds + [ (\r1r + r2r -> + case + (equalsInteger + l1l + r1r) + [ False + , (equalsInteger + l2l + r2r) ]) ]) ]) + , (\eta eta -> case eta [ (\ipv ipv -> case - (case - (equalsInteger - ipv - ipv) - [ False - , (equalsInteger - ipv - ipv) ]) - [ (case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ (constr 1 - [ ]) - , (constr 2 - [ ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + eta + [ (\ipv + ipv -> + case + (case + (equalsInteger + ipv + ipv) + [ False + , (equalsInteger + ipv + ipv) ]) + [ (case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanEqualsInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + ds + [ (\n' + d' -> + (\x -> + lessThanInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + ds + [ (\n' + d' -> + (\x -> + lessThanEqualsInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ x - , y ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ x + , y ]) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ y - , x ]) ]) ]) ]) - , preds - , ((\bl -> - (\bl' -> - case - (force nullList - (force tailList - bl')) - [ (\ds -> error) - , (\ds -> - unsafeRatio - (unIData - (force - headList - bl)) - (unIData - (force - headList - bl'))) ] - (constr 0 [])) - (force tailList bl)) - (unListData eta)) ]) - [validatePreds]) ]) - (\ds -> - case - ds - [ (\eta -> force nullList eta) - , (\paramValueHd - paramValueTl - actualValueData -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ y + , x ]) ]) ]) ]) + , preds + , ((\bl -> + (\bl' -> + case + (forced + (forced bl')) + [ (\ds -> error) + , (\ds -> + unsafeRatio + (unIData + (forced + bl)) + (unIData + (forced + bl'))) ] + (constr 0 [])) + (forced bl)) + (unListData eta)) ]) + [validatePreds]) ]) + (\ds -> case - (validateParamValue - paramValueHd - (force headList actualValueData)) - [ False - , (validateParamValues - paramValueTl - (force tailList - actualValueData)) ]) ]))))) - (\s h -> - delay - (\fr -> - (\k -> - fr - (\x -> k (\f_0 f_1 -> f_0 x)) - (\x -> k (\f_0 f_1 -> f_1 x))) - (\fq -> force (s s h) (force h fq)))))) - ((\s -> s s) - (\s n d -> - case - (equalsInteger 0 d) - [ (case - (lessThanInteger d 0) - [ ((\gcd' -> - constr 0 - [ (quotientInteger n gcd') - , (quotientInteger d gcd') ]) - (euclid n d)) - , ((\x -> - case (constr 0 [s, x, (subtractInteger 0 d)]) [s]) - (subtractInteger 0 n)) ]) - , error ]))) - ((\s -> s s) - (\s x y -> - case - (equalsInteger 0 y) - [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) - (\`$dOrd` ds ds -> - (\s -> s s ds) - (\s ds -> - case - ds - [ True - , (\x xs -> + ds + [ (\eta -> forced eta) + , (\paramValueHd + paramValueTl + actualValueData -> + case + (validateParamValue + paramValueHd + (forced actualValueData)) + [ False + , (validateParamValues + paramValueTl + (forced + actualValueData)) ]) ]))))) + (\s h -> + delay + (\fr -> + (\k -> + fr + (\x -> k (\f_0 f_1 -> f_0 x)) + (\x -> k (\f_0 f_1 -> f_1 x))) + (\fq -> force (s s h) (force h fq)))))) + ((\s -> s s) + (\s n d -> + case + (equalsInteger 0 d) + [ (case + (lessThanInteger d 0) + [ ((\gcd' -> + constr 0 + [ (quotientInteger n gcd') + , (quotientInteger d gcd') ]) + (euclid n d)) + , ((\x -> + case + (constr 0 [s, x, (subtractInteger 0 d)]) + [s]) + (subtractInteger 0 n)) ]) + , error ]))) + ((\s -> s s) + (\s x y -> + case + (equalsInteger 0 y) + [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) + (\`$dOrd` ds ds -> + (\s -> s s ds) + (\s ds -> case - x - [ (\predKey expectedPredValues -> - (\meaning -> - (\s -> s s expectedPredValues) - (\s ds -> - case - ds - [ (s s xs) - , (\x xs -> + ds + [ True + , (\x xs -> + case + x + [ (\predKey expectedPredValues -> + (\meaning -> + (\s -> s s expectedPredValues) + (\s ds -> case - (meaning x ds) - [False, (s s xs)]) ])) - (case - predKey - [ (case `$dOrd` [(\v v v v v v v v -> v)]) - , (case `$dOrd` [(\v v v v v v v v -> v)]) - , (\x y -> - case - (case `$dOrd` [(\v v v v v v v v -> v)] - x - y) - [True, False]) ])) ]) ]))) \ No newline at end of file + ds + [ (s s xs) + , (\x xs -> + case + (meaning x ds) + [False, (s s xs)]) ])) + (case + predKey + [ (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (\x y -> + case + (case + `$dOrd` + [(\v v v v v v v v -> v)] + x + y) + [True, False]) ])) ]) ]))) ]) \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.cbor.size b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.cbor.size index 3f3e22d7e91..64ad7c3004a 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.cbor.size +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.cbor.size @@ -1 +1 @@ -2035 \ No newline at end of file +2029 \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.large.budget b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.large.budget index 716d3d2caf7..3dc595c1eba 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.large.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.large.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 401416625, exBudgetMemory = ExMemory 2038856} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 398773958, exBudgetMemory = ExMemory 2022856} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.pir b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.pir index 982e815914d..43694e27bd7 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.pir +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.pir @@ -128,8 +128,6 @@ program go expectedPredValues)) in go ds - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] in letrec !euclid : integer -> integer -> integer @@ -211,14 +209,9 @@ program (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) + (\(x : integer) (y : integer) -> lessThanInteger y x) (\(x : integer) (y : integer) -> - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) @@ -318,13 +311,8 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True))) + lessThanInteger (multiplyInteger n' d) x))) (\(ds : Rational) (ds : Rational) -> Rational_match ds @@ -336,13 +324,10 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanInteger x y) - False - True))) + lessThanEqualsInteger + (multiplyInteger n' d) + x))) (\(x : Rational) (y : Rational) -> Rational_match x @@ -380,8 +365,10 @@ program !bl : list data = unListData eta !bl' : list data = tailList {data} bl in - ifThenElse - {Unit -> Rational} + (let + a = Unit -> Rational + in + \(b : bool) (x : a) (y : a) -> case a b [y, x]) (nullList {data} (tailList {data} bl')) (\(ds : Unit) -> unsafeRatio diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.small.budget b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.small.budget index b1ced94cadb..0b10de24c97 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.small.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.small.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 58956489, exBudgetMemory = ExMemory 268118} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 58939036, exBudgetMemory = ExMemory 268018} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.uplc b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.uplc index 6cd4007428e..f1618379ff6 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.uplc +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.golden.uplc @@ -1,1192 +1,1229 @@ program 1.1.0 - ((\validatePreds -> - (\euclid -> - (\unsafeRatio -> - (\cse -> - (\validateParamValue -> - (\validateParamValues -> - (\runRules -> - (\matchData_go -> - (\fun ds -> - (\ds -> - (\x -> - case - (case - (equalsInteger 0 x) - [ (case - (equalsInteger 2 x) - [error, (constr 1 [])]) - , (constr 0 - [ ((\d -> - force matchData_go - (unMapData d)) - (force headList - (force tailList - (case - ds - [ (\l r -> - r) ])))) ]) ]) - [ (\cparams -> - case (fun cparams) [error, ()]) - , () ]) - (case ds [(\l r -> l)])) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ((\si -> - case - (equalsInteger - 5 - (case - si - [(\l r -> l)])) - [ error - , (force headList - (force tailList + (case + (constr 0 [(force nullList), (force tailList), (force headList)]) + [ (\forced forced forced -> + (\validatePreds -> + (\euclid -> + (\unsafeRatio -> + (\cse -> + (\validateParamValue -> + (\validateParamValues -> + (\runRules -> + (\matchData_go -> + (\fun ds -> + (\ds -> + (\x -> + case + (case + (equalsInteger 0 x) + [ (case + (equalsInteger 2 x) + [error, (constr 1 [])]) + , (constr 0 + [ ((\d -> + force matchData_go + (unMapData d)) + (forced + (forced (case - si + ds [ (\l r -> - r) ]))) ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ds) - [ (\l r -> - r) ]))))))) - [(\l r -> r)])))))) - (runRules - ((\cse -> - constr 1 - [ (constr 0 - [ 0 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [30, cse]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 []) - , (constr 1 - [ 1000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 1 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [ 100000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - []) - , (constr 1 - [ 10000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 2 - , (constr 1 - [ (constr 1 + r) ])))) ]) ]) + [ (\cparams -> + case + (fun cparams) + [error, ()]) + , () ]) + (case ds [(\l r -> l)])) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ((\si -> + case + (equalsInteger + 5 + (case + si + [ (\l r -> + l) ])) + [ error + , (forced + (forced + (case + si + [ (\l + r -> + r) ]))) ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ds) + [ (\l + r -> + r) ]))))))) + [(\l r -> r)])))))) + (runRules + ((\cse -> + constr 1 + [ (constr 0 + [ 0 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [ 30 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + []) + , (constr 1 + [ 1000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 1 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + []) + , (constr 1 + [ 100000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 2 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 24576 + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 122880 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - []) + [ 3 , (constr 1 - [ 24576 - , (constr 0 - [ ]) ]) ]) + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 32768 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 4 , (constr 1 - [ 122880 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 3 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 32768 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 4 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 5000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 5 - , (constr 1 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 5 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1000000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 6 , (constr 1 - [ 1000000 - , cse ]) ]) + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250000000 + , cse ]) ]) + , cse ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 7 , (constr 1 - [ 5000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 6 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250000000 - , cse ]) ]) - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 7 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 8 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 2000 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 9 - , (constr 3 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 10 - , (constr 3 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 8 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 2000 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 9 + , (constr 3 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 10 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 1000) + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 200) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 1000) - , cse ]) ]) + [ 11 + , (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 + [ 16 + , (constr 1 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 [ (constr 0 - [ ]) + [ 17 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 3000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 6500 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) , (constr 1 - [ (cse - 200) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 11 - , (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 16 - , (constr 1 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 17 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 3000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 6500 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 18 - , (constr 0 - [ ]) ]) - , (constr 1 - [ (constr 0 - [ 19 - , (constr 2 - [ (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 25) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 20000) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5000) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 20 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 21 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 120000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 22 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 12288 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 23 - , (constr 1 - [ (constr 1 + [ (constr 0 + [ 18 + , (constr 0 + [ ]) ]) + , (constr 1 + [ (constr 0 + [ 19 + , (constr 2 + [ (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 25) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 20000) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5000) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 20 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 21 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 120000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 22 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 12288 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 23 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 100 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 200 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 24 , (constr 1 - [ 100 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 200 + [ (constr 1 + [ cse , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 24 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 25 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , cse ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 26 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) + [ ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 25 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , cse ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 26 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 13 + 20) + , (constr 0 + [ ]) ]) ]) ]) + , cse ]) ]) + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , cse ]) ]) + , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 27 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 3 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 28 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 18 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 293 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 29 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 30 + , (constr 1 + [ (constr 1 + [ cse , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 31 + , (constr 1 + [ (constr 1 [ cse , (constr 1 - [ (unsafeRatio - 13 - 20) + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 100000000000 + , (constr 0 + [ ]) ]) ]) , (constr 0 - [ ]) ]) ]) ]) - , cse ]) ]) - , (constr 1 - [ cse + [ ]) ]) ]) ]) ]) , (constr 1 - [ cse - , (constr 1 - [ cse + [ (constr 0 + [ 32 , (constr 1 - [ cse - , (constr 1 - [ (constr 3 + [ (constr 1 + [ (constr 0 [ (constr 1 + [ ]) + , (constr 1 + [ 13 + , cse ]) ]) + , (constr 1 + [ (constr 0 [ (constr 0 - [ (constr 1 + [ ]) + , (constr 1 + [ 37 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 33 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , cse ]) + , (constr 1 + [ (constr 0 + [ (constr 0 [ ]) , (constr 1 - [ cse - , cse ]) ]) - , cse ]) ]) - , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 27 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 3 - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 28 - , (constr 1 - [ (constr 1 - [ (constr 0 + [ (unsafeRatio + 1000 + 1) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + (constr 0 [ (constr 1 [ ]) , (constr 1 [ 0 , (constr 1 - [ 18 + [ 1000000 , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 293 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 29 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 30 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10000000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 31 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 100000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 32 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 13 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 37 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 33 - , (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , cse ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (unsafeRatio - 1000 - 1) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 1000000 - , (constr 0 - [ ]) ]) ]) ])) ]) ]) ]) ]) ]) - (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 4 - 5) - , (constr 0 - [ ]) ]) ]) ]) + [ ]) ]) ]) ])) ]) ]) ]) ]) ]) + (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) , (constr 0 - [ ]) ]) ]) ])) - (constr 3 - [ (constr 1 - [ cse - , cse ]) ])) - (constr 1 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 4 + 5) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 1 + [ (cse + 4) + , (constr 0 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , cse ]) ])) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 51 + 100) + , (constr 0 + [ ]) ]) ]) ])) + (cse + 2)) + (constr 1 + [ (constr 0 [ (constr 0 - [ (constr 0 - [ ]) + [ ]) + , (constr 1 + [ cse , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 9 - 10) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ])) - (constr 1 - [ (cse - 4) - , (constr 0 - [ ]) ])) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 51 - 100) - , (constr 0 - [ ]) ]) ]) ])) - (cse - 2)) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 1 - , (constr 0 - [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) - (unsafeRatio - 3)) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) - (constr 1 - [ cse - , (constr 0 - [ ]) ])) - (cse - 1)) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ])) - (unsafeRatio - 1)) - (constr 1 - [ (unsafeRatio - 0 - 1) - , (constr 0 - [ ]) ])) ]) - (constr 1 - [ (constr 0 - [ (constr 2 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 500000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ])) ]) ]) ]) - (constr 0 - [ (constr 1 []) - , cse ])) ]) ]) ]) - (constr 1 [0, (constr 0 [])])))) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\xs -> - case - xs - [ (\x xs -> - constr 1 - [ (case - x - [(\l r -> constr 0 [l, r])]) - , (force (s s (delay (\x -> x))) - xs) ]) - , (constr 0 []) ])))) - ((\s -> s s) - (\s ds cparams -> - case - ds - [ (case cparams [True, (\ipv ipv -> False)]) - , (\ds cfgRest -> + [ (unsafeRatio + 9 + 10) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ])) ]) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1 + , (constr 0 + [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) + (unsafeRatio + 3)) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) + (constr 1 + [ cse + , (constr 0 + [ ]) ])) + (cse + 1)) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ])) + (unsafeRatio + 1)) + (constr 1 + [ (unsafeRatio + 0 + 1) + , (constr 0 + [ ]) ])) ]) + (constr 1 + [ (constr 0 + [ (constr 2 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 500000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ])) ]) ]) ]) + (constr 0 + [ (constr 1 []) + , cse ])) ]) ]) ]) + (constr 1 [0, (constr 0 [])])))) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\xs -> + case + xs + [ (\x xs -> + constr 1 + [ (case + x + [ (\l r -> + constr 0 + [l, r]) ]) + , (force + (s + s + (delay (\x -> x))) + xs) ]) + , (constr 0 []) ])))) + ((\s -> s s) + (\s ds cparams -> case ds - [ (\expectedPid paramValue -> + [ (case + cparams + [True, (\ipv ipv -> False)]) + , (\ds cfgRest -> case - cparams - [ True - , (\ds cparamsRest -> + ds + [ (\expectedPid paramValue -> case - ds - [ (\ds actualValueData -> - (\x -> - case - (case + cparams + [ True + , (\ds cparamsRest -> + case + ds + [ (\ds + actualValueData -> + (\x -> + case + (case + (equalsInteger + x + expectedPid) + [ (case + (lessThanEqualsInteger + x + expectedPid) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) + [ (case + (validateParamValue + paramValue + actualValueData) + [ False + , (case + (constr 0 + [ s + , cfgRest + , cparamsRest ]) + [ s ]) ]) + , (case + (constr 0 + [ s + , cfgRest + , cparams ]) + [s]) + , False ]) + (unIData + ds)) ]) ]) ]) ]))) + (cse (\arg_0 arg_1 -> arg_1))) + (cse (\arg_0 arg_1 -> arg_0))) + ((\s -> + force + (s + s + (delay + (\choose + validateParamValue + validateParamValues -> + choose + (\eta eta -> + case + eta + [ True + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\x y -> + equalsInteger + x + y) + , (\eta eta -> + case (equalsInteger - x - expectedPid) + eta + eta) [ (case (lessThanEqualsInteger - x - expectedPid) + eta + eta) [ (constr 1 []) , (constr 2 [ ]) ]) , (constr 0 []) ]) - [ (case - (validateParamValue - paramValue - actualValueData) - [ False - , (case - (constr 0 - [ s - , cfgRest - , cparamsRest ]) - [s]) ]) - , (case - (constr 0 - [ s - , cfgRest - , cparams ]) - [s]) - , False ]) - (unIData - ds)) ]) ]) ]) ]))) - (cse (\arg_0 arg_1 -> arg_1))) - (cse (\arg_0 arg_1 -> arg_0))) - ((\s -> - force - (s - s - (delay - (\choose validateParamValue validateParamValues -> - choose - (\eta eta -> - case - eta - [ True - , (\preds -> - case - (constr 0 - [ (constr 0 - [ (\x y -> equalsInteger x y) - , (\eta eta -> - case - (equalsInteger - eta - eta) - [ (case - (lessThanEqualsInteger - eta - eta) - [ (constr 1 []) - , (constr 2 - []) ]) - , (constr 0 []) ]) - , (\x y -> - lessThanInteger x y) - , (\x y -> - lessThanEqualsInteger - x - y) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [True, False]) - , (\x y -> - case - (lessThanInteger x y) - [True, False]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [x, y]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [y, x]) ]) - , preds - , (unIData eta) ]) - [validatePreds]) - , (\paramValues -> - validateParamValues - paramValues - (unListData eta)) - , (\preds -> - case - (constr 0 - [ (constr 0 - [ (\ds ds -> - case - ds - [ (\l1l l2l -> + , (\x y -> + lessThanInteger + x + y) + , (\x y -> + lessThanEqualsInteger + x + y) + , (\x y -> + lessThanInteger + y + x) + , (\x y -> + lessThanEqualsInteger + y + x) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [x, y]) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [y, x]) ]) + , preds + , (unIData eta) ]) + [validatePreds]) + , (\paramValues -> + validateParamValues + paramValues + (unListData eta)) + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\ds ds -> case ds - [ (\r1r r2r -> + [ (\l1l l2l -> case - (equalsInteger - l1l - r1r) - [ False - , (equalsInteger - l2l - r2r) ]) ]) ]) - , (\eta eta -> - case - eta - [ (\ipv ipv -> + ds + [ (\r1r + r2r -> + case + (equalsInteger + l1l + r1r) + [ False + , (equalsInteger + l2l + r2r) ]) ]) ]) + , (\eta eta -> case eta [ (\ipv ipv -> case - (case - (equalsInteger - ipv - ipv) - [ False - , (equalsInteger - ipv - ipv) ]) - [ (case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ (constr 1 - [ ]) - , (constr 2 - [ ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + eta + [ (\ipv + ipv -> + case + (case + (equalsInteger + ipv + ipv) + [ False + , (equalsInteger + ipv + ipv) ]) + [ (case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanEqualsInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + ds + [ (\n' + d' -> + (\x -> + lessThanInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + ds + [ (\n' + d' -> + (\x -> + lessThanEqualsInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ x - , y ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ x + , y ]) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ y - , x ]) ]) ]) ]) - , preds - , ((\bl -> - (\bl' -> - case - (force nullList - (force tailList - bl')) - [ (\ds -> error) - , (\ds -> - unsafeRatio - (unIData - (force - headList - bl)) - (unIData - (force - headList - bl'))) ] - (constr 0 [])) - (force tailList bl)) - (unListData eta)) ]) - [validatePreds]) ]) - (\ds -> - case - ds - [ (\eta -> force nullList eta) - , (\paramValueHd - paramValueTl - actualValueData -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ y + , x ]) ]) ]) ]) + , preds + , ((\bl -> + (\bl' -> + case + (forced + (forced bl')) + [ (\ds -> error) + , (\ds -> + unsafeRatio + (unIData + (forced + bl)) + (unIData + (forced + bl'))) ] + (constr 0 [])) + (forced bl)) + (unListData eta)) ]) + [validatePreds]) ]) + (\ds -> case - (validateParamValue - paramValueHd - (force headList actualValueData)) - [ False - , (validateParamValues - paramValueTl - (force tailList - actualValueData)) ]) ]))))) - (\s h -> - delay - (\fr -> - (\k -> - fr - (\x -> k (\f_0 f_1 -> f_0 x)) - (\x -> k (\f_0 f_1 -> f_1 x))) - (\fq -> force (s s h) (force h fq)))))) - ((\s -> s s) - (\s n d -> - case - (equalsInteger 0 d) - [ (case - (lessThanInteger d 0) - [ ((\gcd' -> - constr 0 - [ (quotientInteger n gcd') - , (quotientInteger d gcd') ]) - (euclid n d)) - , ((\x -> - case (constr 0 [s, x, (subtractInteger 0 d)]) [s]) - (subtractInteger 0 n)) ]) - , error ]))) - ((\s -> s s) - (\s x y -> - case - (equalsInteger 0 y) - [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) - (\`$dOrd` ds ds -> - (\s -> s s ds) - (\s ds -> - case - ds - [ True - , (\x xs -> + ds + [ (\eta -> forced eta) + , (\paramValueHd + paramValueTl + actualValueData -> + case + (validateParamValue + paramValueHd + (forced actualValueData)) + [ False + , (validateParamValues + paramValueTl + (forced + actualValueData)) ]) ]))))) + (\s h -> + delay + (\fr -> + (\k -> + fr + (\x -> k (\f_0 f_1 -> f_0 x)) + (\x -> k (\f_0 f_1 -> f_1 x))) + (\fq -> force (s s h) (force h fq)))))) + ((\s -> s s) + (\s n d -> + case + (equalsInteger 0 d) + [ (case + (lessThanInteger d 0) + [ ((\gcd' -> + constr 0 + [ (quotientInteger n gcd') + , (quotientInteger d gcd') ]) + (euclid n d)) + , ((\x -> + case + (constr 0 [s, x, (subtractInteger 0 d)]) + [s]) + (subtractInteger 0 n)) ]) + , error ]))) + ((\s -> s s) + (\s x y -> + case + (equalsInteger 0 y) + [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) + (\`$dOrd` ds ds -> + (\s -> s s ds) + (\s ds -> case - x - [ (\predKey expectedPredValues -> - (\meaning -> - (\s -> s s expectedPredValues) - (\s ds -> - case - ds - [ (s s xs) - , (\x xs -> + ds + [ True + , (\x xs -> + case + x + [ (\predKey expectedPredValues -> + (\meaning -> + (\s -> s s expectedPredValues) + (\s ds -> case - (meaning x ds) - [False, (s s xs)]) ])) - (case - predKey - [ (case `$dOrd` [(\v v v v v v v v -> v)]) - , (case `$dOrd` [(\v v v v v v v v -> v)]) - , (\x y -> - case - (case `$dOrd` [(\v v v v v v v v -> v)] - x - y) - [True, False]) ])) ]) ]))) \ No newline at end of file + ds + [ (s s xs) + , (\x xs -> + case + (meaning x ds) + [False, (s s xs)]) ])) + (case + predKey + [ (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (\x y -> + case + (case + `$dOrd` + [(\v v v v v v v v -> v)] + x + y) + [True, False]) ])) ]) ]))) ]) \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.cbor.size b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.cbor.size index 9cc5e5b6a4f..006b3ab0167 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.cbor.size +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.cbor.size @@ -1 +1 @@ -2015 \ No newline at end of file +2008 \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.large.budget b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.large.budget index aa7ef760c7e..ced14fbb9e3 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.large.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.large.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 565701480, exBudgetMemory = ExMemory 2923791} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 563058813, exBudgetMemory = ExMemory 2907791} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.pir b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.pir index 38d953c8d50..c39deb4ef47 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.pir +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.pir @@ -128,8 +128,6 @@ program go expectedPredValues)) in go ds - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] in letrec !euclid : integer -> integer -> integer @@ -211,14 +209,9 @@ program (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) + (\(x : integer) (y : integer) -> lessThanInteger y x) (\(x : integer) (y : integer) -> - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) @@ -318,13 +311,8 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanEqualsInteger x y) - False - True))) + lessThanInteger (multiplyInteger n' d) x))) (\(ds : Rational) (ds : Rational) -> Rational_match ds @@ -336,13 +324,10 @@ program (\(n' : integer) (d' : integer) -> let !x : integer = multiplyInteger n d' - !y : integer = multiplyInteger n' d in - ifThenElse - {bool} - (lessThanInteger x y) - False - True))) + lessThanEqualsInteger + (multiplyInteger n' d) + x))) (\(x : Rational) (y : Rational) -> Rational_match x @@ -380,8 +365,10 @@ program !bl : list data = unListData eta !bl' : list data = tailList {data} bl in - ifThenElse - {Unit -> Rational} + (let + a = Unit -> Rational + in + \(b : bool) (x : a) (y : a) -> case a b [y, x]) (nullList {data} (tailList {data} bl')) (\(ds : Unit) -> unsafeRatio diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.small.budget b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.small.budget index b8e3b263d93..d4d922b81e8 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.small.budget +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.small.budget @@ -1 +1 @@ -ExBudget {exBudgetCPU = ExCPU 57562746, exBudgetMemory = ExMemory 260519} \ No newline at end of file +ExBudget {exBudgetCPU = ExCPU 57545293, exBudgetMemory = ExMemory 260419} \ No newline at end of file diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.uplc b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.uplc index bf5106a853d..cc90061cca1 100644 --- a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.uplc +++ b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.golden.uplc @@ -1,1167 +1,1199 @@ program 1.1.0 - ((\validatePreds -> - (\euclid -> - (\unsafeRatio -> - (\cse -> - (\validateParamValue -> - (\validateParamValues -> - (\matchData_go -> - (\cfg -> - (\go ds -> - (\ds -> - (\x -> - case - (case - (equalsInteger 0 x) - [ (case - (equalsInteger 2 x) - [error, (constr 1 [])]) - , (constr 0 - [ ((\d -> - force matchData_go - (unMapData d)) - (force headList - (force tailList - (case - ds - [ (\l r -> - r) ])))) ]) ]) - [ (\cparams -> - case (go cparams) [error, ()]) - , () ]) - (case ds [(\l r -> l)])) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ((\si -> - case - (equalsInteger - 5 - (case - si - [(\l r -> l)])) - [ error - , (force headList - (force tailList + (case + (constr 0 [(force nullList), (force tailList), (force headList)]) + [ (\forced forced forced -> + (\validatePreds -> + (\euclid -> + (\unsafeRatio -> + (\cse -> + (\validateParamValue -> + (\validateParamValues -> + (\matchData_go -> + (\cfg -> + (\go ds -> + (\ds -> + (\x -> + case + (case + (equalsInteger 0 x) + [ (case + (equalsInteger 2 x) + [error, (constr 1 [])]) + , (constr 0 + [ ((\d -> + force matchData_go + (unMapData d)) + (forced + (forced (case - si + ds [ (\l r -> - r) ]))) ]) - (unConstrData - (force headList - (force tailList - (force tailList - (case - (unConstrData - ds) - [ (\l r -> - r) ]))))))) - [(\l r -> r)])))))) - ((\s -> s s) - (\s ds -> - case - ds - [ True - , (\x xs -> + r) ])))) ]) ]) + [ (\cparams -> + case (go cparams) [error, ()]) + , () ]) + (case ds [(\l r -> l)])) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ((\si -> + case + (equalsInteger + 5 + (case + si + [ (\l r -> + l) ])) + [ error + , (forced + (forced + (case + si + [ (\l + r -> + r) ]))) ]) + (unConstrData + (forced + (forced + (forced + (case + (unConstrData + ds) + [ (\l + r -> + r) ]))))))) + [(\l r -> r)])))))) + ((\s -> s s) + (\s ds -> case - (case - x - [ (\ds actualValueData -> - validateParamValue - ((\k -> - (\s -> s s cfg) - (\s ds -> - case - ds - [ error - , (\ds xs' -> + ds + [ True + , (\x xs -> + case + (case + x + [ (\ds actualValueData -> + validateParamValue + ((\k -> + (\s -> s s cfg) + (\s ds -> case ds - [ (\k' - i -> + [ error + , (\ds + xs' -> case - (equalsInteger - k - k') - [ (s - s - xs') - , i ]) ]) ])) - (unIData ds)) - actualValueData) ]) - [False, (s s xs)]) ]))) - ((\cse -> - constr 1 - [ (constr 0 - [ 0 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 [30, cse]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 []) - , (constr 1 - [ 1000 - , (constr 0 - []) ]) ]) - , (constr 0 []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 1 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [100000, cse]) ]) - , (constr 1 + ds + [ (\k' + i -> + case + (equalsInteger + k + k') + [ (s + s + xs') + , i ]) ]) ])) + (unIData ds)) + actualValueData) ]) + [False, (s s xs)]) ]))) + ((\cse -> + constr 1 + [ (constr 0 + [ 0 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [30, cse]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 []) + , (constr 1 + [ 1000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + []) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 1 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 []) + , (constr 1 + [ 100000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + []) + , (constr 1 + [ 10000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 2 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + []) + , (constr 1 + [ 24576 + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 122880 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 0 []) + [ 3 , (constr 1 - [ 10000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - []) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 2 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 []) - , (constr 1 - [ 24576 - , (constr 0 - [ ]) ]) ]) + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 32768 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - []) + [ 4 , (constr 1 - [ 122880 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 3 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 32768 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 4 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 5000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 5 - , (constr 1 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 5 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1000000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 5000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 6 , (constr 1 - [ 1000000 - , cse ]) ]) + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250000000 + , cse ]) ]) + , cse ]) ]) ]) , (constr 1 [ (constr 0 - [ (constr 0 - [ ]) + [ 7 , (constr 1 - [ 5000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 6 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250000000 - , cse ]) ]) - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 7 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 8 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 250 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 2000 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 9 - , (constr 3 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 10 - , (constr 3 - [ (constr 1 + [ (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 8 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 250 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 2000 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 9 + , (constr 3 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 10 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 1000) + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 200) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 1000) - , cse ]) ]) + [ 11 + , (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) , (constr 1 [ (constr 0 + [ 16 + , (constr 1 + [ (constr 1 + [ cse + , cse ]) ]) ]) + , (constr 1 [ (constr 0 - [ ]) + [ 17 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 3000 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 6500 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) , (constr 1 - [ (cse - 200) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 11 - , (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 16 - , (constr 1 - [ (constr 1 - [ cse - , cse ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 17 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 3000 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 6500 - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 18 - , (constr 0 - [ ]) ]) - , (constr 1 - [ (constr 0 - [ 19 - , (constr 2 - [ (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 25) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 20000) - , (constr 0 - [ ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (cse - 5000) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 20 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 21 - , (constr 2 - [ (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 120000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 40000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 22 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 12288 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 23 - , (constr 1 - [ (constr 1 + [ (constr 0 + [ 18 + , (constr 0 + [ ]) ]) + , (constr 1 + [ (constr 0 + [ 19 + , (constr 2 + [ (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 25) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 20000) + , (constr 0 + [ ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ (cse + 5000) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 20 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 21 + , (constr 2 + [ (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 120000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 40000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 22 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 12288 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 23 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 100 + , cse ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 200 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , ((\cse -> + constr 1 [ (constr 0 - [ (constr 1 - [ ]) + [ 24 , (constr 1 - [ 100 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 200 + [ (constr 1 + [ cse , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 24 - , (constr 1 - [ (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) ]) - , ((\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - constr 1 - [ (constr 0 - [ 25 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , cse ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 26 - , (constr 2 - [ (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ cse - , (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) + [ ]) ]) ]) ]) + , ((\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + constr 1 + [ (constr 0 + [ 25 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , cse ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 26 + , (constr 2 + [ (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 13 + 20) + , (constr 0 + [ ]) ]) ]) ]) + , cse ]) ]) + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ cse + , (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , cse ]) ]) + , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 27 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 3 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 28 + , (constr 1 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 0 + , (constr 1 + [ 18 + , (constr 0 + [ ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 293 + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 29 + , (constr 1 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 15 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , ((\cse -> + constr 1 + [ (constr 0 + [ 30 + , (constr 1 + [ (constr 1 + [ cse , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 10000000000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 31 + , (constr 1 + [ (constr 1 [ cse , (constr 1 - [ (unsafeRatio - 13 - 20) + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 100000000000 + , (constr 0 + [ ]) ]) ]) , (constr 0 - [ ]) ]) ]) ]) - , cse ]) ]) - , (constr 1 - [ cse + [ ]) ]) ]) ]) ]) , (constr 1 - [ cse - , (constr 1 - [ cse + [ (constr 0 + [ 32 , (constr 1 - [ cse - , (constr 1 - [ (constr 3 + [ (constr 1 + [ (constr 0 [ (constr 1 + [ ]) + , (constr 1 + [ 13 + , cse ]) ]) + , (constr 1 + [ (constr 0 [ (constr 0 - [ (constr 1 + [ ]) + , (constr 1 + [ 37 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 1 + [ (constr 0 + [ 33 + , (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , cse ]) + , (constr 1 + [ (constr 0 + [ (constr 0 [ ]) , (constr 1 - [ cse - , cse ]) ]) - , cse ]) ]) - , cse ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 27 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 3 - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 28 - , (constr 1 - [ (constr 1 - [ (constr 0 + [ (unsafeRatio + 1000 + 1) + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ]) ]) + (constr 0 [ (constr 1 [ ]) , (constr 1 [ 0 , (constr 1 - [ 18 - , (constr 0 - [ ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 293 + [ 1000000 , (constr 0 - [ ]) ]) ]) - , cse ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 29 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 15 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , ((\cse -> - constr 1 - [ (constr 0 - [ 30 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 10000000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 31 - , (constr 1 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 100000000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 32 - , (constr 1 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 13 - , cse ]) ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 37 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 1 - [ (constr 0 - [ 33 - , (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , cse ]) - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ (unsafeRatio - 1000 - 1) - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - , (constr 0 - [ ]) ]) ]) ]) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 0 - , (constr 1 - [ 1000000 - , (constr 0 - [ ]) ]) ]) ])) ]) ]) ]) ]) ]) - (constr 1 - [ (constr 3 - [ (constr 1 - [ (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 0 - [ ]) ]) ]) - , cse ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 4 - 5) - , (constr 0 - [ ]) ]) ]) ]) + [ ]) ]) ]) ])) ]) ]) ]) ]) ]) + (constr 1 + [ (constr 3 + [ (constr 1 + [ (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 0 + [ ]) ]) ]) + , cse ]) ]) , (constr 0 - [ ]) ]) ]) ])) - (constr 3 - [ (constr 1 - [ cse - , cse ]) ])) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 9 - 10) - , (constr 0 - [ ]) ]) ]) ]) - , (constr 0 - [ ]) ])) - (constr 3 - [ (constr 1 - [ cse - , (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , cse ]) ])) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 9 + 10) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse , (constr 1 - [ cse - , cse ]) ]) - , (constr 0 - [ ]) ]) ]) ])) - (constr 1 - [ (cse - 4) - , (constr 0 - [ ]) ])) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ cse - , (constr 1 - [ (unsafeRatio - 51 - 100) - , (constr 0 - [ ]) ]) ]) ])) - (cse - 2)) ]) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ 1 - , (constr 0 - [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) - (unsafeRatio - 3)) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) - (constr 1 - [ cse - , (constr 0 - [ ]) ])) - (cse - 1)) - (constr 0 - [ (constr 1 - [ ]) - , (constr 1 - [ (cse - 10) - , cse ]) ])) - (unsafeRatio - 1)) - (constr 1 - [ (unsafeRatio - 0 - 1) - , (constr 0 - [ ]) ])) ]) - (constr 1 - [ (constr 0 - [ (constr 2 - [ ]) - , cse ]) - , (constr 0 - [ ]) ])) ]) ]) - (constr 1 - [ (constr 0 - [ (constr 0 - [ ]) - , (constr 1 - [ 500000000 - , (constr 0 - [ ]) ]) ]) - , (constr 0 - [ ]) ])) ]) ]) ]) - (constr 0 - [ (constr 1 []) - , cse ])) ]) ]) ]) - (constr 1 [0, (constr 0 [])]))) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\xs -> - case - xs - [ (\x xs -> - constr 1 - [ (case - x - [(\l r -> constr 0 [l, r])]) - , (force (s s (delay (\x -> x))) - xs) ]) - , (constr 0 []) ])))) - (cse (\arg_0 arg_1 -> arg_1))) - (cse (\arg_0 arg_1 -> arg_0))) - ((\s -> - force - (s - s - (delay - (\choose validateParamValue validateParamValues -> - choose - (\eta eta -> - case - eta - [ True - , (\preds -> + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , cse ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 1 + [ (cse + 4) + , (constr 0 + [ ]) ])) + (constr 3 + [ (constr 1 + [ cse + , (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 4 + 5) + , (constr 0 + [ ]) ]) ]) ]) + , (constr 0 + [ ]) ]) ]) ])) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ cse + , (constr 1 + [ (unsafeRatio + 51 + 100) + , (constr 0 + [ ]) ]) ]) ])) + (cse + 2)) ]) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ 1 + , (constr 0 + [ ]) ]) ])) ]) ]) ]) ]) ]) ]) ]) ]) ]) + (unsafeRatio + 3)) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) + (constr 1 + [ cse + , (constr 0 + [ ]) ])) + (cse + 1)) + (constr 0 + [ (constr 1 + [ ]) + , (constr 1 + [ (cse + 10) + , cse ]) ])) + (unsafeRatio + 1)) + (constr 1 + [ (unsafeRatio + 0 + 1) + , (constr 0 + [ ]) ])) ]) + (constr 1 + [ (constr 0 + [ (constr 2 + [ ]) + , cse ]) + , (constr 0 + [ ]) ])) ]) ]) + (constr 1 + [ (constr 0 + [ (constr 0 + [ ]) + , (constr 1 + [ 500000000 + , (constr 0 + [ ]) ]) ]) + , (constr 0 + [ ]) ])) ]) ]) ]) + (constr 0 + [ (constr 1 []) + , cse ])) ]) ]) ]) + (constr 1 [0, (constr 0 [])]))) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\xs -> case - (constr 0 - [ (constr 0 - [ (\x y -> equalsInteger x y) - , (\eta eta -> - case - (equalsInteger - eta - eta) - [ (case - (lessThanEqualsInteger - eta - eta) - [ (constr 1 []) - , (constr 2 - []) ]) - , (constr 0 []) ]) - , (\x y -> - lessThanInteger x y) - , (\x y -> - lessThanEqualsInteger - x - y) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [True, False]) - , (\x y -> - case - (lessThanInteger x y) - [True, False]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [x, y]) - , (\x y -> - case - (lessThanEqualsInteger - x - y) - [y, x]) ]) - , preds - , (unIData eta) ]) - [validatePreds]) - , (\paramValues -> - validateParamValues - paramValues - (unListData eta)) - , (\preds -> + xs + [ (\x xs -> + constr 1 + [ (case + x + [ (\l r -> + constr 0 [l, r]) ]) + , (force + (s s (delay (\x -> x))) + xs) ]) + , (constr 0 []) ])))) + (cse (\arg_0 arg_1 -> arg_1))) + (cse (\arg_0 arg_1 -> arg_0))) + ((\s -> + force + (s + s + (delay + (\choose + validateParamValue + validateParamValues -> + choose + (\eta eta -> case - (constr 0 - [ (constr 0 - [ (\ds ds -> - case - ds - [ (\l1l l2l -> + eta + [ True + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\x y -> + equalsInteger + x + y) + , (\eta eta -> + case + (equalsInteger + eta + eta) + [ (case + (lessThanEqualsInteger + eta + eta) + [ (constr 1 + []) + , (constr 2 + [ ]) ]) + , (constr 0 + []) ]) + , (\x y -> + lessThanInteger + x + y) + , (\x y -> + lessThanEqualsInteger + x + y) + , (\x y -> + lessThanInteger + y + x) + , (\x y -> + lessThanEqualsInteger + y + x) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [x, y]) + , (\x y -> + case + (lessThanEqualsInteger + x + y) + [y, x]) ]) + , preds + , (unIData eta) ]) + [validatePreds]) + , (\paramValues -> + validateParamValues + paramValues + (unListData eta)) + , (\preds -> + case + (constr 0 + [ (constr 0 + [ (\ds ds -> case ds - [ (\r1r r2r -> + [ (\l1l l2l -> case - (equalsInteger - l1l - r1r) - [ False - , (equalsInteger - l2l - r2r) ]) ]) ]) - , (\eta eta -> - case - eta - [ (\ipv ipv -> + ds + [ (\r1r + r2r -> + case + (equalsInteger + l1l + r1r) + [ False + , (equalsInteger + l2l + r2r) ]) ]) ]) + , (\eta eta -> case eta [ (\ipv ipv -> case - (case - (equalsInteger - ipv - ipv) - [ False - , (equalsInteger - ipv - ipv) ]) - [ (case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ (constr 1 - [ ]) - , (constr 2 - [ ]) ]) - , (constr 0 - [ ]) ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + eta + [ (\ipv + ipv -> + case + (case + (equalsInteger + ipv + ipv) + [ False + , (equalsInteger + ipv + ipv) ]) + [ (case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ (constr 1 + [ ]) + , (constr 2 + [ ]) ]) + , (constr 0 + [ ]) ]) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> - lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + [ (\n d -> + case + ds + [ (\n' + d' -> + lessThanEqualsInteger + (multiplyInteger + n + d') + (multiplyInteger + n' + d)) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanEqualsInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\ds ds -> - case - ds - [ (\n d -> + ds + [ (\n' + d' -> + (\x -> + lessThanInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\ds ds -> case ds - [ (\n' d' -> + [ (\n d -> case - (lessThanInteger - (multiplyInteger - n - d') - (multiplyInteger - n' - d)) - [ True - , False ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + ds + [ (\n' + d' -> + (\x -> + lessThanEqualsInteger + (multiplyInteger + n' + d) + x) + (multiplyInteger + n + d')) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ x - , y ]) ]) ]) - , (\x y -> - case - x - [ (\ipv ipv -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ x + , y ]) ]) ]) + , (\x y -> case - y + x [ (\ipv ipv -> case - (lessThanEqualsInteger - (multiplyInteger - ipv - ipv) - (multiplyInteger - ipv - ipv)) - [ y - , x ]) ]) ]) ]) - , preds - , ((\bl -> - (\bl' -> - case - (force nullList - (force tailList - bl')) - [ (\ds -> error) - , (\ds -> - unsafeRatio - (unIData - (force - headList - bl)) - (unIData - (force - headList - bl'))) ] - (constr 0 [])) - (force tailList bl)) - (unListData eta)) ]) - [validatePreds]) ]) - (\ds -> - case - ds - [ (\eta -> force nullList eta) - , (\paramValueHd - paramValueTl - actualValueData -> + y + [ (\ipv + ipv -> + case + (lessThanEqualsInteger + (multiplyInteger + ipv + ipv) + (multiplyInteger + ipv + ipv)) + [ y + , x ]) ]) ]) ]) + , preds + , ((\bl -> + (\bl' -> + case + (forced + (forced bl')) + [ (\ds -> error) + , (\ds -> + unsafeRatio + (unIData + (forced + bl)) + (unIData + (forced + bl'))) ] + (constr 0 [])) + (forced bl)) + (unListData eta)) ]) + [validatePreds]) ]) + (\ds -> case - (validateParamValue - paramValueHd - (force headList actualValueData)) - [ False - , (validateParamValues - paramValueTl - (force tailList - actualValueData)) ]) ]))))) - (\s h -> - delay - (\fr -> - (\k -> - fr - (\x -> k (\f_0 f_1 -> f_0 x)) - (\x -> k (\f_0 f_1 -> f_1 x))) - (\fq -> force (s s h) (force h fq)))))) - ((\s -> s s) - (\s n d -> - case - (equalsInteger 0 d) - [ (case - (lessThanInteger d 0) - [ ((\gcd' -> - constr 0 - [ (quotientInteger n gcd') - , (quotientInteger d gcd') ]) - (euclid n d)) - , ((\x -> - case (constr 0 [s, x, (subtractInteger 0 d)]) [s]) - (subtractInteger 0 n)) ]) - , error ]))) - ((\s -> s s) - (\s x y -> - case - (equalsInteger 0 y) - [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) - (\`$dOrd` ds ds -> - (\s -> s s ds) - (\s ds -> - case - ds - [ True - , (\x xs -> + ds + [ (\eta -> forced eta) + , (\paramValueHd + paramValueTl + actualValueData -> + case + (validateParamValue + paramValueHd + (forced actualValueData)) + [ False + , (validateParamValues + paramValueTl + (forced + actualValueData)) ]) ]))))) + (\s h -> + delay + (\fr -> + (\k -> + fr + (\x -> k (\f_0 f_1 -> f_0 x)) + (\x -> k (\f_0 f_1 -> f_1 x))) + (\fq -> force (s s h) (force h fq)))))) + ((\s -> s s) + (\s n d -> + case + (equalsInteger 0 d) + [ (case + (lessThanInteger d 0) + [ ((\gcd' -> + constr 0 + [ (quotientInteger n gcd') + , (quotientInteger d gcd') ]) + (euclid n d)) + , ((\x -> + case + (constr 0 [s, x, (subtractInteger 0 d)]) + [s]) + (subtractInteger 0 n)) ]) + , error ]))) + ((\s -> s s) + (\s x y -> + case + (equalsInteger 0 y) + [(case (constr 0 [s, y, (modInteger x y)]) [s]), x]))) + (\`$dOrd` ds ds -> + (\s -> s s ds) + (\s ds -> case - x - [ (\predKey expectedPredValues -> - (\meaning -> - (\s -> s s expectedPredValues) - (\s ds -> - case - ds - [ (s s xs) - , (\x xs -> + ds + [ True + , (\x xs -> + case + x + [ (\predKey expectedPredValues -> + (\meaning -> + (\s -> s s expectedPredValues) + (\s ds -> case - (meaning x ds) - [False, (s s xs)]) ])) - (case - predKey - [ (case `$dOrd` [(\v v v v v v v v -> v)]) - , (case `$dOrd` [(\v v v v v v v v -> v)]) - , (\x y -> - case - (case `$dOrd` [(\v v v v v v v v -> v)] - x - y) - [True, False]) ])) ]) ]))) \ No newline at end of file + ds + [ (s s xs) + , (\x xs -> + case + (meaning x ds) + [False, (s s xs)]) ])) + (case + predKey + [ (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (case + `$dOrd` + [(\v v v v v v v v -> v)]) + , (\x y -> + case + (case + `$dOrd` + [(\v v v v v v v v -> v)] + x + y) + [True, False]) ])) ]) ]))) ]) \ No newline at end of file diff --git a/doc/docusaurus/docs/delve-deeper/plinth-compiler-options.md b/doc/docusaurus/docs/delve-deeper/plinth-compiler-options.md index b3c216acdbf..1beb38015fc 100644 --- a/doc/docusaurus/docs/delve-deeper/plinth-compiler-options.md +++ b/doc/docusaurus/docs/delve-deeper/plinth-compiler-options.md @@ -22,7 +22,7 @@ For each boolean option, you can add a `no-` prefix to switch it off, such as `n |-|-|-|-| |`apply-to-case`|Bool|True|Run the apply-to-case pass, turning multi-argument applications into case-constr form.| |`certified-opts-only`|Bool|False|Run only those optimisation passes which are certified to preserve the functional behavior of the original program.| -|`certify`|Maybe [Char]||Produce a certificate for the compiled program, with the given name. This certificate provides evidence that the compiler optimizations have preserved the functional behavior of the original program. Currently, this is only supported for the UPLC compilation pipeline.| +|`certify`|Maybe [Char]||Produce Agda certificate projects for compiled programs. This certificate provides evidence that the compiler optimizations have preserved the functional behavior of the original program. Currently, this is only supported for the UPLC compilation pipeline. When used without a value, certificates are placed next to source files. When given a directory path (certify=DIR), all certificates are placed there.| |`conservative-optimisation`|Bool|False|When conservative optimisation is used, only the optimisations that never make the program worse (in terms of cost or size) are employed. Implies `no-relaxed-float-in`, `no-inline-constants`, `no-inline-fix`, `no-simplifier-evaluate-builtins`, and `preserve-logging`.| |`context-level`|Int|1|Set context level for error messages.| |`coverage-all`|Bool|False|Add all available coverage annotations in the trace output| @@ -35,6 +35,7 @@ For each boolean option, you can add a `no-` prefix to switch it off, such as `n |`dump-pir`|Bool|False|Dump Plutus IR| |`dump-tplc`|Bool|False|Dump Typed Plutus Core| |`dump-uplc`|Bool|False|Dump Untyped Plutus Core| +|`hoist-polymorphic-builtins`|Bool|True|Run the hoist-polymorphic-builtins pass, reducing the number of forces.| |`inline-callsite-growth`|Int|5|Sets the inlining threshold for callsite inlining. 0 disables inlining a binding at a callsite if it increases the AST size; `n` allows inlining if the AST size grows by no more than `n`. Keep in mind that doing so does not mean the final program will be bigger, since inlining can often unlock further optimizations.| |`inline-constants`|Bool|True|Always inline constants. Inlining constants always reduces script costs slightly, but may increase script sizes if a large constant is used more than once. Implied by `no-conservative-optimisation`.| |`inline-fix`|Bool|True|Always inline fixed point combinators. This is generally preferable as it often enables further optimization, though it may increase script size.| diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.golden.eval b/plutus-benchmark/bitwise/test/9.6/8 queens.golden.eval index 0a5eda600d1..de711260c3d 100644 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.golden.eval +++ b/plutus-benchmark/bitwise/test/9.6/8 queens.golden.eval @@ -1,7 +1,7 @@ -CPU: 673_257_890_876 -Memory: 2_318_925_523 -AST Size: 347 -Flat Size: 397 +CPU: 670_459_986_876 +Memory: 2_301_438_623 +AST Size: 348 +Flat Size: 399 (constr 1 diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.golden.uplc b/plutus-benchmark/bitwise/test/9.6/8 queens.golden.uplc index e9c5c36bcc7..2e43de98ab9 100644 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.golden.uplc +++ b/plutus-benchmark/bitwise/test/9.6/8 queens.golden.uplc @@ -1,165 +1,168 @@ (program 1.1.0 - ((\goList -> + ((\forced -> (\goList -> (\goList -> - (\selectByteString - dim -> - (\dim -> - (\lastRow -> - (\go -> - (\bytesNeeded -> - case - (lessThanInteger dim 8) - [ (case - (equalsInteger 0 (remainderInteger dim 8)) - [ (constr 0 []) - , ((\cse -> + (\goList -> + (\selectByteString + dim -> + (\dim -> + (\lastRow -> + (\go -> + (\bytesNeeded -> + case + (lessThanInteger dim 8) + [ (case + (equalsInteger 0 (remainderInteger dim 8)) + [ (constr 0 []) + , ((\cse -> + case + (constr 0 + [ 0 + , 0 + , cse + , cse + , cse + , (replicateByte + bytesNeeded + 255) ]) + [go]) + (replicateByte bytesNeeded 0)) ]) + , (constr 0 []) ]) + (quotientInteger dim 8)) + ((\s -> + s s) + (\s + selectIx + row + down + left + right + control -> + case + (equalsInteger selectIx dim) + [ ((\available -> case - (constr 0 - [ 0 - , 0 - , cse - , cse - , cse - , (replicateByte - bytesNeeded - 255) ]) - [go]) - (replicateByte bytesNeeded 0)) ]) - , (constr 0 []) ]) - (quotientInteger dim 8)) - ((\s -> - s s) - (\s - selectIx - row - down - left - right - control -> - case - (equalsInteger selectIx dim) - [ ((\available -> - case - (equalsInteger -1 available) - [ (case - (equalsInteger row lastRow) - [ ((\newRow -> - (\cse -> - (\newRight -> - (\newLeft -> - (\newDown -> - (\newControl -> - case - (case - (constr 0 - [ s - , 0 - , newRow - , newDown - , newLeft - , newRight - , newControl ]) - [s]) - [ (case - (constr 0 - [ s - , (addInteger - 1 - selectIx) - , row - , down - , left - , right - , control ]) - [s]) - , (\ipv - ipv -> - constr 1 - [ (constr 0 - [ row - , available ]) - , (case - (constr 0 - [ s - , 0 - , newRow - , newDown - , newLeft - , newRight - , newControl ]) - [ s ]) ]) ]) - (complementByteString - (case - (constr 0 - [ False - , newDown - , (case - (constr 0 - [ False - , newLeft - , newRight ]) - [ orByteString ]) ]) - [ orByteString ]))) - (case - (constr 0 - [ down - , (goList - cse) - , True ]) - [writeBits])) + (equalsInteger -1 available) + [ (case + (equalsInteger row lastRow) + [ ((\newRow -> + (\cse -> + (\newRight -> + (\newLeft -> + (\newDown -> + (\newControl -> + case + (case + (constr 0 + [ s + , 0 + , newRow + , newDown + , newLeft + , newRight + , newControl ]) + [s]) + [ (case + (constr 0 + [ s + , (addInteger + 1 + selectIx) + , row + , down + , left + , right + , control ]) + [s]) + , (\ipv + ipv -> + constr 1 + [ (constr 0 + [ row + , available ]) + , (case + (constr 0 + [ s + , 0 + , newRow + , newDown + , newLeft + , newRight + , newControl ]) + [ s ]) ]) ]) + (complementByteString + (case + (constr 0 + [ False + , newDown + , (case + (constr 0 + [ False + , newLeft + , newRight ]) + [ orByteString ]) ]) + [ orByteString ]))) + (case + (constr 0 + [ down + , (goList + cse) + , True ]) + [ writeBits ])) + (shiftByteString + (case + (constr 0 + [ left + , (goList + cse) + , True ]) + [writeBits]) + 1)) (shiftByteString (case (constr 0 - [ left + [ right , (goList cse) , True ]) [writeBits]) - 1)) - (shiftByteString - (case - (constr 0 - [ right - , (goList cse) - , True ]) - [writeBits]) - -1)) - (constr 1 - [ available - , (constr 0 []) ])) - (addInteger 1 row)) - , (constr 1 - [ (constr 0 [row, available]) - , (constr 0 []) ]) ]) - , (constr 0 []) ]) - (selectByteString selectIx control)) - , (constr 0 []) ]))) - (subtractInteger dim 1)) - (unIData dim)) + -1)) + (constr 1 + [ available + , (constr 0 []) ])) + (addInteger 1 row)) + , (constr 1 + [ (constr 0 + [row, available]) + , (constr 0 []) ]) ]) + , (constr 0 []) ]) + (selectByteString selectIx control)) + , (constr 0 []) ]))) + (subtractInteger dim 1)) + (unIData dim)) + ((\s -> s s) + (\s which bs -> + case + (lessThanEqualsInteger which 0) + [ ((\i -> + case + (equalsInteger -1 i) + [ ((\cse -> + addInteger + cse + (findFirstSetBit + (shiftByteString + bs + (subtractInteger 0 cse)))) + (addInteger 1 i)) + , -1 ]) + ((\x -> case (constr 0 [s, x, bs]) [s]) + (subtractInteger which 1))) + , (findFirstSetBit bs) ]))) ((\s -> s s) - (\s which bs -> - case - (lessThanEqualsInteger which 0) - [ ((\i -> - case - (equalsInteger -1 i) - [ ((\cse -> - addInteger - cse - (findFirstSetBit - (shiftByteString - bs - (subtractInteger 0 cse)))) - (addInteger 1 i)) - , -1 ]) - ((\x -> case (constr 0 [s, x, bs]) [s]) - (subtractInteger which 1))) - , (findFirstSetBit bs) ]))) - ((\s -> s s) - (\s ds -> case ds [[], (\d ds -> force mkCons d (s s ds))]))) - ((\s -> s s) - (\s ds -> case ds [[], (\d ds -> force mkCons d (s s ds))]))) - ((\s -> s s) (\s ds -> case ds [[], (\d ds -> force mkCons d (s s ds))])) + (\s ds -> case ds [[], (\d ds -> forced d (s s ds))]))) + ((\s -> s s) (\s ds -> case ds [[], (\d ds -> forced d (s s ds))]))) + ((\s -> s s) (\s ds -> case ds [[], (\d ds -> forced d (s s ds))]))) + (force mkCons) (I 8))) \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval index 5897c669a01..2e65a1ce53c 100644 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval +++ b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.eval @@ -1,6 +1,6 @@ -CPU: 34_779_245_253 -Memory: 18_410_360 -AST Size: 3_084 -Flat Size: 5_170 +CPU: 34_779_261_253 +Memory: 18_410_460 +AST Size: 3_086 +Flat Size: 5_172 (con bool False) \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc index 6051656bb96..78281e16f75 100644 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc +++ b/plutus-benchmark/bitwise/test/9.6/Ed25519.golden.uplc @@ -1,186 +1,186 @@ (program 1.1.0 - ((\goList -> + ((\forced -> (\goList -> - (\next -> - (\lsig512_ -> + (\goList -> + (\next -> (\lsig512_ -> - (\xRecover -> - (\checkValid_f -> - (\decodePoint -> - (\runSha -> - (\edwards -> - (\scalarMult - signature - msg - pk -> - (\sig -> - (\message -> - (\pubKey -> - (\bx -> - (\s -> - (\nt -> + (\lsig512_ -> + (\xRecover -> + (\checkValid_f -> + (\decodePoint -> + (\runSha -> + (\edwards -> + (\scalarMult + signature + msg + pk -> + (\sig -> + (\message -> + (\pubKey -> + (\bx -> + (\s -> (\nt -> - (\h -> - case - (scalarMult - (constr 0 - [ (modInteger - bx - 57896044618658097711785492504343953926634992332820282019728792003956564819949) - , 46316835694926478169428394003475163141307993866256225615783033603165251855960 ]) - s) - [ (\x - y -> - case - (edwards - nt - (scalarMult + (\nt -> + (\h -> + case + (scalarMult + (constr 0 + [ (modInteger + bx + 57896044618658097711785492504343953926634992332820282019728792003956564819949) + , 46316835694926478169428394003475163141307993866256225615783033603165251855960 ]) + s) + [ (\x + y -> + case + (edwards nt - h)) - [ (\x - y -> - case - (equalsInteger - x - x) - [ False - , (equalsInteger - y - y) ]) ]) ]) - ((\eta -> - byteStringToInteger - False - (case + (scalarMult + nt + h)) + [ (\x + y -> + case + (equalsInteger + x + x) + [ False + , (equalsInteger + y + y) ]) ]) ]) + ((\eta -> + byteStringToInteger + False (case - (constr 0 - [ (constr 0 - [ #6a09e667f3bcc908 - , #bb67ae8584caa73b - , #3c6ef372fe94f82b - , #a54ff53a5f1d36f1 - , #510e527fade682d1 - , #9b05688c2b3e6c1f - , #1f83d9abfb41bd6b - , #5be0cd19137e2179 ]) - , (\bs - s -> - case - s - [ (\a - b - c - d - e - f - g - h -> - (\`#+` -> - (\ds -> - case - (case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\ds -> - case - ds - [ (\ipv - ipv -> - (\cse -> + (case + (constr 0 + [ (constr 0 + [ #6a09e667f3bcc908 + , #bb67ae8584caa73b + , #3c6ef372fe94f82b + , #a54ff53a5f1d36f1 + , #510e527fade682d1 + , #9b05688c2b3e6c1f + , #1f83d9abfb41bd6b + , #5be0cd19137e2179 ]) + , (\bs + s -> + case + s + [ (\a + b + c + d + e + f + g + h -> + (\`#+` -> + (\ds -> + case + (case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> + (\ds -> + case + ds + [ (\ipv + ipv -> (\cse -> (\cse -> (\cse -> - (\nt -> - (\cse -> + (\cse -> + (\nt -> (\cse -> (\cse -> - (\nt -> - (\cse -> + (\cse -> + (\nt -> (\cse -> (\cse -> - (\nt -> - (\cse -> + (\cse -> + (\nt -> (\cse -> - (\nt -> - (\cse -> - (\nt -> - (\cse -> - (\nt -> - (\cse -> - (\nt -> - (\cse -> - (\nt -> + (\cse -> + (\nt -> + (\cse -> + (\nt -> + (\cse -> + (\nt -> + (\cse -> + (\nt -> + (\cse -> (\nt -> (\nt -> (\nt -> @@ -235,105 +235,115 @@ (\nt -> (\nt -> (\nt -> - constr 0 - [ (constr 0 - [ cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , cse - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , nt - , (`#+` - (`#+` + (\nt -> + constr 0 + [ (constr 0 + [ cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , cse + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , nt + , (`#+` (`#+` - (lsig512_ + (`#+` + (lsig512_ + nt) nt) - nt) - (lsig512_ - nt)) - nt) - , (`#+` - (`#+` - (`#+` (lsig512_ + nt)) + nt) + , (`#+` + (`#+` + (`#+` + (lsig512_ + nt) nt) - nt) - (lsig512_ - nt)) - nt) ]) - , ipv ]) + (lsig512_ + nt)) + nt) ]) + , ipv ]) + (`#+` + (`#+` + (`#+` + (lsig512_ + nt) + nt) + (lsig512_ + nt)) + nt)) (`#+` (`#+` (`#+` @@ -747,7 +757,7 @@ nt) (lsig512_ nt)) - nt)) + cse)) (`#+` (`#+` (`#+` @@ -755,7 +765,7 @@ nt) nt) (lsig512_ - nt)) + cse)) cse)) (`#+` (`#+` @@ -820,90 +830,86 @@ (lsig512_ cse)) cse)) + (case + ds + [ (\w + rest -> + w) ])) + (`#+` (`#+` (`#+` - (`#+` - (lsig512_ - nt) - nt) (lsig512_ - cse)) - cse)) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` - (`#+` - (`#+` + nt) + cse) (lsig512_ - nt) - cse) - (lsig512_ - cse)) - cse)) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (`#+` (`#+` + (`#+` + (lsig512_ + nt) + cse) (lsig512_ - nt) - cse) - (lsig512_ - cse)) - cse)) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (`#+` (`#+` + (`#+` + (lsig512_ + nt) + cse) (lsig512_ - nt) - cse) - (lsig512_ - cse)) - cse)) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (`#+` (`#+` - (lsig512_ + (`#+` + (lsig512_ + cse) cse) - cse) - (lsig512_ - cse)) - cse)) + (lsig512_ + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (case ds [ (\w rest -> w) ])) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` (`#+` (`#+` + (`#+` + (lsig512_ + nt) + cse) (lsig512_ - nt) - cse) - (lsig512_ - cse)) - cse)) + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (case ds [ (\w @@ -914,20 +920,20 @@ [ (\w rest -> w) ])) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` (`#+` (`#+` + (`#+` + (lsig512_ + nt) + cse) (lsig512_ - nt) - cse) - (lsig512_ - cse)) - cse)) + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (case ds [ (\w @@ -938,20 +944,20 @@ [ (\w rest -> w) ])) - (case - ds - [ (\w - rest -> - w) ])) - (`#+` (`#+` (`#+` - (lsig512_ + (`#+` + (lsig512_ + cse) cse) - cse) - (lsig512_ - cse)) - cse)) + (lsig512_ + cse)) + cse)) + (case + ds + [ (\w + rest -> + w) ])) (case ds [ (\w @@ -965,767 +971,760 @@ (case ds [ (\w - rest -> - w) ])) - (case - ds - [ (\w - cont -> - w) ])) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - (next - ipv)) ]) - [ (\ds - cont -> - case - ds - [ (\w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w - w -> - (\step -> - case - (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ (case - (constr 0 - [ s - , 4794697086780616226 - , w ]) - [ step ]) - , 8158064640168781261 - , w ]) - [ step ]) - , 13096744586834688815 - , w ]) - [ step ]) - , 16840607885511220156 - , w ]) - [ step ]) - , 4131703408338449720 - , w ]) - [ step ]) - , 6480981068601479193 - , w ]) - [ step ]) - , 10538285296894168987 - , w ]) - [ step ]) - , 12329834152419229976 - , w ]) - [ step ]) - , 15566598209576043074 - , w ]) - [ step ]) - , 1334009975649890238 - , w ]) - [ step ]) - , 2608012711638119052 - , w ]) - [ step ]) - , 6128411473006802146 - , w ]) - [ step ]) - , 8268148722764581231 - , w ]) - [ step ]) - , 9286055187155687089 - , w ]) - [ step ]) - , 11230858885718282805 - , w ]) - [ step ]) - , 13951009754708518548 - , w ]) - [ step ]) - , 16472876342353939154 - , w ]) - [ step ]) - , 17275323862435702243 - , w ]) - [ step ]) - , 1135362057144423861 - , w ]) - [ step ]) - , 2597628984639134821 - , w ]) - [ step ]) - , 3308224258029322869 - , w ]) - [ step ]) - , 5365058923640841347 - , w ]) - [ step ]) - , 6679025012923562964 - , w ]) - [ step ]) - , 8573033837759648693 - , w ]) - [ step ]) - , 10970295158949994411 - , w ]) - [ step ]) - , 12119686244451234320 - , w ]) - [ step ]) - , 12683024718118986047 - , w ]) - [ step ]) - , 13788192230050041572 - , w ]) - [ step ]) - , 14330467153632333762 - , w ]) - [ step ]) - , 15395433587784984357 - , w ]) - [ step ]) - , 489312712824947311 - , w ]) - [ step ]) - , 1452737877330783856 - , w ]) - [ step ]) - , 2861767655752347644 - , w ]) - [ step ]) - , 3322285676063803686 - , w ]) - [ step ]) - , 5560940570517711597 - , w ]) - [ step ]) - , 5996557281743188959 - , w ]) - [ step ]) - , 7280758554555802590 - , w ]) - [ step ]) - , 8532644243296465576 - , w ]) - [ step ]) - , 9350256976987008742 - , w ]) - [ step ]) - , 10552545826968843579 - , w ]) - [ step ]) - , 11727347734174303076 - , w ]) - [ step ]) - , 12113106623233404929 - , w ]) - [ step ]) - , 14000437183269869457 - , w ]) - [ step ]) - , 14369950271660146224 - , w ]) - [ step ]) - , 15101387698204529176 - , w ]) - [ step ]) - , 15463397548674623760 - , w ]) - [ step ]) - , 17586052441742319658 - , w ]) - [ step ]) - , 1182934255886127544 - , w ]) - [ step ]) - , 1847814050463011016 - , w ]) - [ step ]) - , 2177327727835720531 - , w ]) - [ step ]) - , 2830643537854262169 - , w ]) - [ step ]) - , 3796741975233480872 - , w ]) - [ step ]) - , 4115178125766777443 - , w ]) - [ step ]) - , 5681478168544905931 - , w ]) - [ step ]) - , 6601373596472566643 - , w ]) - [ step ]) - , 7507060721942968483 - , w ]) - [ step ]) - , 8399075790359081724 - , w ]) - [ step ]) - , 8693463985226723168 - , w ]) - [ step ]) - , 9568029438360202098 - , w ]) - [ step ]) - , 10144078919501101548 - , w ]) - [ step ]) - , 10430055236837252648 - , w ]) - [ step ]) - , 11840083180663258601 - , w ]) - [ step ]) - , 13761210420658862357 - , w ]) - [ step ]) - , 14299343276471374635 - , w ]) - [ step ]) - , 14566680578165727644 - , w ]) - [ step ]) - , 15097957966210449927 - , w ]) - [ step ]) - , 16922976911328602910 - , w ]) - [ step ]) - , 17689382322260857208 - , w ]) - [ step ]) - , 500013540394364858 - , w ]) - [ step ]) - , 748580250866718886 - , w ]) - [ step ]) - , 1242879168328830382 - , w ]) - [ step ]) - , 1977374033974150939 - , w ]) - [ step ]) - , 2944078676154940804 - , w ]) - [ step ]) - , 3659926193048069267 - , w ]) - [ step ]) - , 4368137639120453308 - , w ]) - [ step ]) - , 4836135668995329356 - , w ]) - [ step ]) - , 5532061633213252278 - , w ]) - [ step ]) - , 6448918945643986474 - , w ]) - [ step ]) - , 6902733635092675308 - , w ]) - [ step ]) - , 7801388544844847127 - , w ]) - [ step ]) - [ (\ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv -> - constr 0 - [ (constr 0 - [ (`#+` - a - ipv) - , (`#+` - b - ipv) - , (`#+` - c - ipv) - , (`#+` - d - ipv) - , (`#+` - e - ipv) - , (`#+` - f - ipv) - , (`#+` - g - ipv) - , (`#+` - h - ipv) ]) - , cont ]) ]) - (\ds - k - w -> - case - ds - [ (\x - x - x - x - x - x - x - x -> - (\nt -> + cont -> + w) ])) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + (next + ipv)) ]) + [ (\ds + cont -> + case + ds + [ (\w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w + w -> + (\step -> + case + (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ (case + (constr 0 + [ s + , 4794697086780616226 + , w ]) + [ step ]) + , 8158064640168781261 + , w ]) + [ step ]) + , 13096744586834688815 + , w ]) + [ step ]) + , 16840607885511220156 + , w ]) + [ step ]) + , 4131703408338449720 + , w ]) + [ step ]) + , 6480981068601479193 + , w ]) + [ step ]) + , 10538285296894168987 + , w ]) + [ step ]) + , 12329834152419229976 + , w ]) + [ step ]) + , 15566598209576043074 + , w ]) + [ step ]) + , 1334009975649890238 + , w ]) + [ step ]) + , 2608012711638119052 + , w ]) + [ step ]) + , 6128411473006802146 + , w ]) + [ step ]) + , 8268148722764581231 + , w ]) + [ step ]) + , 9286055187155687089 + , w ]) + [ step ]) + , 11230858885718282805 + , w ]) + [ step ]) + , 13951009754708518548 + , w ]) + [ step ]) + , 16472876342353939154 + , w ]) + [ step ]) + , 17275323862435702243 + , w ]) + [ step ]) + , 1135362057144423861 + , w ]) + [ step ]) + , 2597628984639134821 + , w ]) + [ step ]) + , 3308224258029322869 + , w ]) + [ step ]) + , 5365058923640841347 + , w ]) + [ step ]) + , 6679025012923562964 + , w ]) + [ step ]) + , 8573033837759648693 + , w ]) + [ step ]) + , 10970295158949994411 + , w ]) + [ step ]) + , 12119686244451234320 + , w ]) + [ step ]) + , 12683024718118986047 + , w ]) + [ step ]) + , 13788192230050041572 + , w ]) + [ step ]) + , 14330467153632333762 + , w ]) + [ step ]) + , 15395433587784984357 + , w ]) + [ step ]) + , 489312712824947311 + , w ]) + [ step ]) + , 1452737877330783856 + , w ]) + [ step ]) + , 2861767655752347644 + , w ]) + [ step ]) + , 3322285676063803686 + , w ]) + [ step ]) + , 5560940570517711597 + , w ]) + [ step ]) + , 5996557281743188959 + , w ]) + [ step ]) + , 7280758554555802590 + , w ]) + [ step ]) + , 8532644243296465576 + , w ]) + [ step ]) + , 9350256976987008742 + , w ]) + [ step ]) + , 10552545826968843579 + , w ]) + [ step ]) + , 11727347734174303076 + , w ]) + [ step ]) + , 12113106623233404929 + , w ]) + [ step ]) + , 14000437183269869457 + , w ]) + [ step ]) + , 14369950271660146224 + , w ]) + [ step ]) + , 15101387698204529176 + , w ]) + [ step ]) + , 15463397548674623760 + , w ]) + [ step ]) + , 17586052441742319658 + , w ]) + [ step ]) + , 1182934255886127544 + , w ]) + [ step ]) + , 1847814050463011016 + , w ]) + [ step ]) + , 2177327727835720531 + , w ]) + [ step ]) + , 2830643537854262169 + , w ]) + [ step ]) + , 3796741975233480872 + , w ]) + [ step ]) + , 4115178125766777443 + , w ]) + [ step ]) + , 5681478168544905931 + , w ]) + [ step ]) + , 6601373596472566643 + , w ]) + [ step ]) + , 7507060721942968483 + , w ]) + [ step ]) + , 8399075790359081724 + , w ]) + [ step ]) + , 8693463985226723168 + , w ]) + [ step ]) + , 9568029438360202098 + , w ]) + [ step ]) + , 10144078919501101548 + , w ]) + [ step ]) + , 10430055236837252648 + , w ]) + [ step ]) + , 11840083180663258601 + , w ]) + [ step ]) + , 13761210420658862357 + , w ]) + [ step ]) + , 14299343276471374635 + , w ]) + [ step ]) + , 14566680578165727644 + , w ]) + [ step ]) + , 15097957966210449927 + , w ]) + [ step ]) + , 16922976911328602910 + , w ]) + [ step ]) + , 17689382322260857208 + , w ]) + [ step ]) + , 500013540394364858 + , w ]) + [ step ]) + , 748580250866718886 + , w ]) + [ step ]) + , 1242879168328830382 + , w ]) + [ step ]) + , 1977374033974150939 + , w ]) + [ step ]) + , 2944078676154940804 + , w ]) + [ step ]) + , 3659926193048069267 + , w ]) + [ step ]) + , 4368137639120453308 + , w ]) + [ step ]) + , 4836135668995329356 + , w ]) + [ step ]) + , 5532061633213252278 + , w ]) + [ step ]) + , 6448918945643986474 + , w ]) + [ step ]) + , 6902733635092675308 + , w ]) + [ step ]) + , 7801388544844847127 + , w ]) + [ step ]) + [ (\ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv -> + constr 0 + [ (constr 0 + [ (`#+` + a + ipv) + , (`#+` + b + ipv) + , (`#+` + c + ipv) + , (`#+` + d + ipv) + , (`#+` + e + ipv) + , (`#+` + f + ipv) + , (`#+` + g + ipv) + , (`#+` + h + ipv) ]) + , cont ]) ]) + (\ds + k + w -> + case + ds + [ (\x + x + x + x + x + x + x + x -> (\nt -> (\nt -> - constr 0 - [ (`#+` - nt - nt) - , x - , x - , x - , (`#+` - x - nt) - , x - , x - , x ]) - (`#+` + (\nt -> + constr 0 + [ (`#+` + nt + nt) + , x + , x + , x + , (`#+` + x + nt) + , x + , x + , x ]) (`#+` (`#+` (`#+` - x + (`#+` + x + (case + (constr 0 + [ True + , (case + (constr 0 + [ True + , (rotateByteString + x + -14) + , (rotateByteString + x + -18) ]) + [ xorByteString ]) + , (rotateByteString + x + -41) ]) + [ xorByteString ])) (case (constr 0 [ True , (case (constr 0 [ True - , (rotateByteString - x - -14) - , (rotateByteString - x - -18) ]) - [ xorByteString ]) - , (rotateByteString - x - -41) ]) + , x + , x ]) + [ andByteString ]) + , (case + (constr 0 + [ True + , (complementByteString + x) + , x ]) + [ andByteString ]) ]) [ xorByteString ])) - (case - (constr 0 - [ True - , (case - (constr 0 - [ True - , x - , x ]) - [ andByteString ]) - , (case - (constr 0 - [ True - , (complementByteString - x) - , x ]) - [ andByteString ]) ]) - [ xorByteString ])) - nt) - w)) - (case - (constr 0 - [ True - , 8 - , k ]) - [ integerToByteString ])) - (`#+` - (case - (constr 0 - [ True - , (case - (constr 0 - [ True - , (rotateByteString - x - -28) - , (rotateByteString - x - -34) ]) - [ xorByteString ]) - , (rotateByteString - x - -39) ]) - [ xorByteString ]) - (case - (constr 0 - [ True - , (case - (constr 0 - [ True - , x - , (case - (constr 0 - [ True - , x - , x ]) - [ orByteString ]) ]) - [ andByteString ]) - , (case - (constr 0 - [ True - , x - , x ]) - [ andByteString ]) ]) - [ orByteString ]))) ])) ]) ]) - (next - bs)) - (\x - y -> - (\yI -> - (\added -> - (\g -> - case - (lessThanInteger - 18446744073709551615 - added) - [ (g - added) - , (g - (subtractInteger + nt) + w)) + (case + (constr 0 + [ True + , 8 + , k ]) + [ integerToByteString ])) + (`#+` + (case + (constr 0 + [ True + , (case + (constr 0 + [ True + , (rotateByteString + x + -28) + , (rotateByteString + x + -34) ]) + [ xorByteString ]) + , (rotateByteString + x + -39) ]) + [ xorByteString ]) + (case + (constr 0 + [ True + , (case + (constr 0 + [ True + , x + , (case + (constr 0 + [ True + , x + , x ]) + [ orByteString ]) ]) + [ andByteString ]) + , (case + (constr 0 + [ True + , x + , x ]) + [ andByteString ]) ]) + [ orByteString ]))) ])) ]) ]) + (next + bs)) + (\x + y -> + (\yI -> + (\added -> + (\g -> + case + (lessThanInteger + 18446744073709551615 + added) + [ (g + added) + , (g (subtractInteger - added - 18446744073709551615) - 1)) ]) - (integerToByteString - True - 8)) + (subtractInteger + added + 18446744073709551615) + 1)) ]) + (integerToByteString + True + 8)) + (addInteger + (byteStringToInteger + True + x) + yI)) + (byteStringToInteger + True + y))) ]) + , ((\lenBits -> + (\r -> + (\`$j` -> + case + (lessThanEqualsInteger + r + -1) + [ (`$j` + r) + , (`$j` (addInteger - (byteStringToInteger - True - x) - yI)) - (byteStringToInteger - True - y))) ]) - , ((\lenBits -> - (\r -> - (\`$j` -> - case - (lessThanEqualsInteger - r - -1) - [ (`$j` - r) - , (`$j` - (addInteger - 1024 - r)) ]) - (\k -> - appendByteString - eta - (appendByteString - (consByteString - 128 - (replicateByte - (subtractInteger - (divideInteger - (addInteger - 1 - k) - 8) - 1) - 0)) - (case - (constr 0 - [ True - , 16 - , lenBits ]) - [ integerToByteString ])))) - (subtractInteger + 1024 + r)) ]) + (\k -> + appendByteString + eta + (appendByteString + (consByteString + 128 + (replicateByte + (subtractInteger + (divideInteger + (addInteger + 1 + k) + 8) + 1) + 0)) + (case + (constr 0 + [ True + , 16 + , lenBits ]) + [ integerToByteString ])))) (subtractInteger - 896 - (modInteger - lenBits - 1024)) - 1)) - (multiplyInteger - 8 - (lengthOfByteString - eta))) ]) - [ runSha ]) - [ (\x - x - x - x - x - x - x - x -> - appendByteString + (subtractInteger + 896 + (modInteger + lenBits + 1024)) + 1)) + (multiplyInteger + 8 + (lengthOfByteString + eta))) ]) + [ runSha ]) + [ (\x + x + x + x + x x - (appendByteString + x + x -> + appendByteString x (appendByteString x @@ -1737,259 +1736,279 @@ x (appendByteString x - x))))))) ])) - (appendByteString - (case - nt - [ (\x - y -> - (\xLSBVal -> - case - (constr 0 - [ (case - (constr 0 - [ False - , 32 - , y ]) - [ integerToByteString ]) - , (goList - (constr 1 - [ 7 - , (constr 0 - [ ]) ])) - , xLSBVal ]) - [ writeBits ]) - (readBit - (case - (constr 0 - [ False - , 32 - , x ]) - [ integerToByteString ]) - 248)) ]) + (appendByteString + x + x))))))) ])) (appendByteString - pubKey - message)))) - (decodePoint - (case - (constr 0 - [0, 32, sig]) - [ sliceByteString ]))) - (decodePoint pubKey)) - (checkValid_f - (case - (constr 0 - [32, 32, sig]) - [sliceByteString]))) - (xRecover - 46316835694926478169428394003475163141307993866256225615783033603165251855960)) - (unBData pk)) - (unBData msg)) - (unBData signature)) - ((\s -> s s) - (\s p e -> - case - (equalsInteger 0 e) - [ ((\nt -> - (\nt -> - case - (equalsInteger - 0 - (modInteger e 2)) - [(edwards nt p), nt]) - (edwards nt nt)) - (case - (constr 0 - [ s - , p - , (divideInteger e 2) ]) - [s])) - , (constr 0 [0, 1]) ]))) - (\ds - ds -> - case - ds - [ (\x - y -> - case - ds - [ (\x - y -> - (\cse -> - (\y -> - constr 0 - [ (modInteger - (multiplyInteger - (addInteger - (multiplyInteger - x - y) - (multiplyInteger - x - y)) - (case - (constr 0 - [ (addInteger - 1 - cse) - , 57896044618658097711785492504343953926634992332820282019728792003956564819947 - , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) - [ expModInteger ])) - 57896044618658097711785492504343953926634992332820282019728792003956564819949) - , (modInteger - y - 57896044618658097711785492504343953926634992332820282019728792003956564819949) ]) - (multiplyInteger - (addInteger - (multiplyInteger - y - y) - (multiplyInteger - x - x)) - (case - (constr 0 - [ (subtractInteger - 1 - cse) - , 57896044618658097711785492504343953926634992332820282019728792003956564819947 - , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) - [expModInteger]))) - (multiplyInteger + (case + nt + [ (\x + y -> + (\xLSBVal -> + case + (constr 0 + [ (case + (constr 0 + [ False + , 32 + , y ]) + [ integerToByteString ]) + , (goList + (constr 1 + [ 7 + , (constr 0 + [ ]) ])) + , xLSBVal ]) + [ writeBits ]) + (readBit + (case + (constr 0 + [ False + , 32 + , x ]) + [ integerToByteString ]) + 248)) ]) + (appendByteString + pubKey + message)))) + (decodePoint + (case + (constr 0 + [ 0 + , 32 + , sig ]) + [ sliceByteString ]))) + (decodePoint pubKey)) + (checkValid_f + (case + (constr 0 + [32, 32, sig]) + [sliceByteString]))) + (xRecover + 46316835694926478169428394003475163141307993866256225615783033603165251855960)) + (unBData pk)) + (unBData msg)) + (unBData signature)) + ((\s -> s s) + (\s p e -> + case + (equalsInteger 0 e) + [ ((\nt -> + (\nt -> + case + (equalsInteger + 0 + (modInteger e 2)) + [(edwards nt p), nt]) + (edwards nt nt)) + (case + (constr 0 + [ s + , p + , (divideInteger + e + 2) ]) + [s])) + , (constr 0 [0, 1]) ]))) + (\ds + ds -> + case + ds + [ (\x + y -> + case + ds + [ (\x + y -> + (\cse -> + (\y -> + constr 0 + [ (modInteger + (multiplyInteger + (addInteger + (multiplyInteger + x + y) + (multiplyInteger + x + y)) + (case + (constr 0 + [ (addInteger + 1 + cse) + , 57896044618658097711785492504343953926634992332820282019728792003956564819947 + , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) + [ expModInteger ])) + 57896044618658097711785492504343953926634992332820282019728792003956564819949) + , (modInteger + y + 57896044618658097711785492504343953926634992332820282019728792003956564819949) ]) + (multiplyInteger + (addInteger + (multiplyInteger + y + y) + (multiplyInteger + x + x)) + (case + (constr 0 + [ (subtractInteger + 1 + cse) + , 57896044618658097711785492504343953926634992332820282019728792003956564819947 + , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) + [ expModInteger ]))) (multiplyInteger (multiplyInteger (multiplyInteger - -4513249062541557337682894930092624173785641285191125241628941591882900924598840740 + (multiplyInteger + -4513249062541557337682894930092624173785641285191125241628941591882900924598840740 + x) x) - x) - y) - y)) ]) ])) - ((\s -> s s) - (\s state next input -> - case - (equalsInteger - 0 - (lengthOfByteString input)) - [ (case - (next input state) - [ (\ipv ipv -> - case - (constr 0 [s, ipv, next, ipv]) - [s]) ]) - , state ]))) - (\bs -> - (\yInt -> - (\x -> - (\x_ -> + y) + y)) ]) ])) + ((\s -> s s) + (\s state next input -> case - (equalsInteger 0 (modInteger x 2)) + (equalsInteger + 0 + (lengthOfByteString input)) [ (case - x_ - [ (constr 0 - [ (subtractInteger - 57896044618658097711785492504343953926634992332820282019728792003956564819949 - x) - , yInt ]) - , (constr 0 [x, yInt]) ]) - , (case - x_ - [ (constr 0 [x, yInt]) - , (constr 0 - [ (subtractInteger - 57896044618658097711785492504343953926634992332820282019728792003956564819949 - x) - , yInt ]) ]) ]) - (readBit bs 7)) - (xRecover yInt)) - (checkValid_f - (case - (constr 0 - [ bs - , (goList - (constr 1 [7, (constr 0 [])])) - , False ]) - [writeBits])))) - (byteStringToInteger False)) - (\y -> - (\xx -> - (\x -> - (\xA -> - (\xAB -> - (\xB -> - (\`$j` -> + (next input state) + [ (\ipv ipv -> + case + (constr 0 + [s, ipv, next, ipv]) + [s]) ]) + , state ]))) + (\bs -> + (\yInt -> + (\x -> + (\x_ -> case - (equalsInteger - 0 - (modInteger - (subtractInteger - (multiplyInteger x x) - xx) - 57896044618658097711785492504343953926634992332820282019728792003956564819949)) - [(`$j` True), (`$j` False)]) - (\cond -> - (\`$j` -> - case - cond - [ (case - (equalsInteger - 0 - (modInteger x 2)) - [ (`$j` True) - , (`$j` False) ]) - , (case - (equalsInteger - 0 - (modInteger xA 2)) - [ (`$j` True) - , (`$j` False) ]) ]) - (\cond -> - case - (case - cond - [ False - , (case - cond - [True, False]) ]) - [ (case - (case - cond - [False, cond]) - [ (case - (case - cond - [cond, False]) - [x, xB]) - , xAB ]) - , xA ]))) + (equalsInteger 0 (modInteger x 2)) + [ (case + x_ + [ (constr 0 + [ (subtractInteger + 57896044618658097711785492504343953926634992332820282019728792003956564819949 + x) + , yInt ]) + , (constr 0 [x, yInt]) ]) + , (case + x_ + [ (constr 0 [x, yInt]) + , (constr 0 + [ (subtractInteger + 57896044618658097711785492504343953926634992332820282019728792003956564819949 + x) + , yInt ]) ]) ]) + (readBit bs 7)) + (xRecover yInt)) + (checkValid_f + (case + (constr 0 + [ bs + , (goList + (constr 1 [7, (constr 0 [])])) + , False ]) + [writeBits])))) + (byteStringToInteger False)) + (\y -> + (\xx -> + (\x -> + (\xA -> + (\xAB -> + (\xB -> + (\`$j` -> + case + (equalsInteger + 0 + (modInteger + (subtractInteger + (multiplyInteger x x) + xx) + 57896044618658097711785492504343953926634992332820282019728792003956564819949)) + [(`$j` True), (`$j` False)]) + (\cond -> + (\`$j` -> + case + cond + [ (case + (equalsInteger + 0 + (modInteger x 2)) + [ (`$j` True) + , (`$j` False) ]) + , (case + (equalsInteger + 0 + (modInteger xA 2)) + [ (`$j` True) + , (`$j` False) ]) ]) + (\cond -> + case + (case + cond + [ False + , (case + cond + [True, False]) ]) + [ (case + (case + cond + [False, cond]) + [ (case + (case + cond + [ cond + , False ]) + [x, xB]) + , xAB ]) + , xA ]))) + (subtractInteger + 57896044618658097711785492504343953926634992332820282019728792003956564819949 + x)) (subtractInteger 57896044618658097711785492504343953926634992332820282019728792003956564819949 - x)) - (subtractInteger - 57896044618658097711785492504343953926634992332820282019728792003956564819949 - xA)) - (multiplyInteger - 19681161376707505956807079304988542015446066515923890162744021073123829784752 - x)) - (case - (constr 0 - [ xx - , 7237005577332262213973186563042994240829374041602535252466099000494570602494 - , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) - [expModInteger])) - (multiplyInteger - (subtractInteger (multiplyInteger y y) 1) - (case - (constr 0 - [ (addInteger - 1 - (multiplyInteger + xA)) + (multiplyInteger + 19681161376707505956807079304988542015446066515923890162744021073123829784752 + x)) + (case + (constr 0 + [ xx + , 7237005577332262213973186563042994240829374041602535252466099000494570602494 + , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) + [expModInteger])) + (multiplyInteger + (subtractInteger (multiplyInteger y y) 1) + (case + (constr 0 + [ (addInteger + 1 (multiplyInteger - -4513249062541557337682894930092624173785641285191125241628941591882900924598840740 - y) - y)) - , 57896044618658097711785492504343953926634992332820282019728792003956564819947 - , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) - [expModInteger])))) + (multiplyInteger + -4513249062541557337682894930092624173785641285191125241628941591882900924598840740 + y) + y)) + , 57896044618658097711785492504343953926634992332820282019728792003956564819947 + , 57896044618658097711785492504343953926634992332820282019728792003956564819949 ]) + [expModInteger])))) + (\x -> + case + (constr 0 + [ True + , (case + (constr 0 + [ True + , (rotateByteString x -1) + , (rotateByteString x -8) ]) + [xorByteString]) + , (shiftByteString x -7) ]) + [xorByteString])) (\x -> case (constr 0 @@ -1997,32 +2016,20 @@ , (case (constr 0 [ True - , (rotateByteString x -1) - , (rotateByteString x -8) ]) + , (rotateByteString x -19) + , (rotateByteString x -61) ]) [xorByteString]) - , (shiftByteString x -7) ]) + , (shiftByteString x -6) ]) [xorByteString])) - (\x -> - case - (constr 0 - [ True - , (case - (constr 0 - [ True - , (rotateByteString x -19) - , (rotateByteString x -61) ]) - [xorByteString]) - , (shiftByteString x -6) ]) - [xorByteString])) - (\bs -> - (\len -> - constr 0 - [ (case (constr 0 [0, 8, bs]) [sliceByteString]) - , (case (constr 0 [8, len, bs]) [sliceByteString]) ]) - (lengthOfByteString bs))) - ((\s -> s s) - (\s ds -> case ds [[], (\d ds -> force mkCons d (s s ds))]))) - ((\s -> s s) (\s ds -> case ds [[], (\d ds -> force mkCons d (s s ds))])) + (\bs -> + (\len -> + constr 0 + [ (case (constr 0 [0, 8, bs]) [sliceByteString]) + , (case (constr 0 [8, len, bs]) [sliceByteString]) ]) + (lengthOfByteString bs))) + ((\s -> s s) (\s ds -> case ds [[], (\d ds -> forced d (s s ds))]))) + ((\s -> s s) (\s ds -> case ds [[], (\d ds -> forced d (s s ds))]))) + (force mkCons) (B #c080c2932178c2adc2a7c3917a6009c3b37cc383245824c3a9c2a6c3aac080c286c2986c14c3b334c39915c298c2b47b244dc3a352c396c39a25c3b1c29d050e0509c298c28cc2abc3b0c38866c2b8c285c38bc3a37ac2a3c080c2b9c29b59c28bc2b2c3b902) (B #68656c6c6f20776f726c64) (B #283ac3bfc3bbc281372d5e77c3bdc2910b681bc2ab72c2bdc39f2fc395517a62c3b9c2af247ac39371c38311c386))) \ No newline at end of file diff --git a/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden b/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden index 075d3141dde..44b6e7d28dc 100644 --- a/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden +++ b/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden @@ -121,13 +121,13 @@ Aggregate Single Key n Script size CPU usage Memory usage ---------------------------------------------------------------------- - - 802 (4.9%) 2716698310 (27.2%) 44301 (0.3%) + - 805 (4.9%) 2716762310 (27.2%) 44701 (0.3%) Aggregate Multi Key n Script size CPU usage Memory usage ---------------------------------------------------------------------- - - 1794 (10.9%) 3422534991 (34.2%) 275781 (2.0%) + - 1797 (11.0%) 3422598991 (34.2%) 276181 (2.0%) Schnorr Signature G1 diff --git a/plutus-benchmark/cardano-loans/test/9.6/main.golden.eval b/plutus-benchmark/cardano-loans/test/9.6/main.golden.eval index 4851c5705dc..cb6c6839dd3 100644 --- a/plutus-benchmark/cardano-loans/test/9.6/main.golden.eval +++ b/plutus-benchmark/cardano-loans/test/9.6/main.golden.eval @@ -1,6 +1,6 @@ -CPU: 102_310_646 -Memory: 567_450 -AST Size: 7_222 -Flat Size: 8_543 +CPU: 101_126_646 +Memory: 560_050 +AST Size: 7_199 +Flat Size: 8_535 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/cardano-loans/test/9.6/main.golden.pir b/plutus-benchmark/cardano-loans/test/9.6/main.golden.pir index 0ee32671892..2eacb5fcf14 100644 --- a/plutus-benchmark/cardano-loans/test/9.6/main.golden.pir +++ b/plutus-benchmark/cardano-loans/test/9.6/main.golden.pir @@ -243,7 +243,7 @@ \(c : integer -> a -> a) (n : a) -> case (all dead. a) - (case bool (lessThanEqualsInteger x 0) [True, False]) + (lessThanInteger 0 x) [(/\dead -> n), (/\dead -> c x n)] {all dead. dead}) (\(ds : integer) (ds : List integer) -> Cons {integer} ds ds) diff --git a/plutus-benchmark/cardano-loans/test/9.6/main.golden.uplc b/plutus-benchmark/cardano-loans/test/9.6/main.golden.uplc index 93b1d3efd9a..c1f9a493115 100644 --- a/plutus-benchmark/cardano-loans/test/9.6/main.golden.uplc +++ b/plutus-benchmark/cardano-loans/test/9.6/main.golden.uplc @@ -1,943 +1,755 @@ (program 1.1.0 - ((\`$fEqAddress0_$c==` -> - (\fail -> - (\foo -> + ((\forced + forced -> + (\`$fEqAddress0_$c==` -> + (\fail -> (\foo -> - (\concatMap -> - (\mapQuantity -> - (\go -> + (\foo -> + (\concatMap -> + (\mapQuantity -> (\go -> (\go -> - (\union -> - (\equalsByteString -> - (\go -> - (\addInteger -> - (\`$fFunctorMap_$cfmap` -> - (\`$fAdditiveGroupValue` -> - (\go -> - (\`$fFromDataInteger_$cfromBuiltinData` -> - (\`$fFromDataTuple2_$cfromBuiltinData` -> - (\`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` -> - (\defaultBody -> - (\euclid -> - (\traceError -> - (\unsafeRatio -> - (\`$fFromDataMap_$cfromBuiltinData` -> - (\`$fFromDataMaybe_$cfromBuiltinData` -> - (\matchData' -> - (\`$fFromDataCredential_$cfromBuiltinData` -> - (\`$fFromDataTxOut_$cfromBuiltinData` -> - (\`$fFromDataTxOutRef_$cfromBuiltinData` -> - (\`$fFromDataScriptContext_$cfromBuiltinData` -> + (\go -> + (\union -> + (\equalsByteString -> + (\go -> + (\addInteger -> + (\`$fFunctorMap_$cfmap` -> + (\`$fAdditiveGroupValue` -> + (\go -> + (\`$fFromDataInteger_$cfromBuiltinData` -> + (\`$fFromDataTuple2_$cfromBuiltinData` -> + (\`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` -> + (\defaultBody -> + (\euclid -> + (\traceError -> + (\unsafeRatio -> + (\`$fFromDataMap_$cfromBuiltinData` -> + (\`$fFromDataMaybe_$cfromBuiltinData` -> + (\matchData' -> + (\`$fFromDataCredential_$cfromBuiltinData` -> + (\`$fFromDataTxOut_$cfromBuiltinData` -> + (\`$fFromDataTxOutRef_$cfromBuiltinData` -> (\`$fFromDataScriptContext_$cfromBuiltinData` -> - (\`$fFromDataList_$cfromBuiltinData` -> - (\`$fFromDataGovernanceAction_$cfromBuiltinData` -> - (\`$fFromDataRational_$cfromBuiltinData` -> - (\`$fFromDataProposalProcedure_$cfromBuiltinData` -> - (\`$fFromDataExtended_$cfromBuiltinData` -> - (\`$fFromDataBool_$cfromBuiltinData` -> - (\`$fFromDataBuiltinData_$cfromBuiltinData` -> - (\`$dFromData` -> - (\`$fAdditiveGroupValue_go` -> - (\getScriptInput -> - (\signed - scriptContextData -> - case - (force - trace - "Parsing ScriptContext..." - (case - (constr 0 - [ scriptContextData - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - (\d -> - case - (constr 0 - [ d - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataTxOutRef_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataTxOut_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> + (\`$fFromDataScriptContext_$cfromBuiltinData` -> + (\`$fFromDataList_$cfromBuiltinData` -> + (\`$fFromDataGovernanceAction_$cfromBuiltinData` -> + (\`$fFromDataRational_$cfromBuiltinData` -> + (\`$fFromDataProposalProcedure_$cfromBuiltinData` -> + (\`$fFromDataExtended_$cfromBuiltinData` -> + (\`$fFromDataBool_$cfromBuiltinData` -> + (\`$fFromDataBuiltinData_$cfromBuiltinData` -> + (\`$dFromData` -> + (\`$fAdditiveGroupValue_go` -> + (\getScriptInput -> + (\signed + scriptContextData -> + case + (forced + "Parsing ScriptContext..." + (case + (constr 0 + [ scriptContextData + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + (\d -> + case + (constr 0 + [ d + , (\index + args -> case - (`$fFromDataList_$cfromBuiltinData` - (\d -> - case - (constr 0 - [ d - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataTxOutRef_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataTxOut_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) , (constr 1 [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataTxOutRef_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + (\d -> + case + (constr 0 + [ d + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataTxOutRef_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataTxOut_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) , (constr 1 [ ]) ]) - [ (\ds -> - case - (`$fFromDataTxOut_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 [ ]) ]) - [ matchData' ]) - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - `$fFromDataTxOut_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , (`$fFromDataMap_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData`) - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - `$fFromDataScriptContext_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataCredential_$cfromBuiltinData` - , `$fFromDataInteger_$cfromBuiltinData` - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataExtended_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBool_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataExtended_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBool_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + `$fFromDataTxOut_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , (`$fFromDataMap_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData`) + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + `$fFromDataScriptContext_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataCredential_$cfromBuiltinData` + , `$fFromDataInteger_$cfromBuiltinData` + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + ds + [ (\ds + ds -> case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ (\d -> - case - (constr 0 - [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataExtended_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBool_$cfromBuiltinData` + ds) + [ (\arg -> constr 0 - [ h ]) + [ (constr 0 + [ arg + , arg ]) ]) , (constr 1 [ ]) ]) - [ (\ds -> - case - (`$fFromDataTxOutRef_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 4 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 2 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 3 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 3 - index) - [ (fail - ()) - , (case + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataExtended_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case (case - args + ds [ (\h - t -> + ds -> constr 0 - [ (constr 0 - [ h - , t ]) ]) + [ h ]) , (constr 1 [ ]) ]) [ (\ds -> case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataScriptContext_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 4 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataScriptContext_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 5 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 5 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataProposalProcedure_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) + (`$fFromDataBool_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) , (constr 1 - [ ]) ]) ])))))) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - , `$fFromDataBuiltinData_$cfromBuiltinData` - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinData_$cfromBuiltinData` - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - case + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ (\d -> + case + (constr 0 + [ d + , (\index + args -> + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataTxOutRef_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 4 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 2 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 3 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 3 + index) + [ (fail + ()) + , (case (case - ds + args [ (\h t -> constr 0 @@ -952,676 +764,821 @@ [ (\ds ds -> case - (case - (constr 0 - [ `$fFromDataScriptContext_$cfromBuiltinData` - , (`$fFromDataMap_$cfromBuiltinData` - `$fFromDataGovernanceAction_$cfromBuiltinData` - (\d -> - case - (constr 0 - [ d - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (case - (equalsInteger - 1 - index) - [ (case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 0 - [ ]) ]) ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) + (`$fFromDataInteger_$cfromBuiltinData` + ds) [ (\arg -> case (case ds [ (\h - t -> + ds -> constr 0 - [ (constr 0 - [ h - , t ]) ]) + [ h ]) , (constr 1 [ ]) ]) [ (\ds -> case - ds - [ (\ds - ds -> + (`$fFromDataScriptContext_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 4 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataScriptContext_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 5 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 5 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (`$fFromDataList_$cfromBuiltinData` - `$fFromDataProposalProcedure_$cfromBuiltinData` + (`$fFromDataProposalProcedure_$cfromBuiltinData` ds) [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) + constr 0 + [ (constr 2 + [ arg + , arg ]) ]) , (constr 1 - [ ]) ]) ]) + [ ]) ]) + , (constr 1 + [ ]) ]) , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ])))))) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + , `$fFromDataBuiltinData_$cfromBuiltinData` + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinData_$cfromBuiltinData` + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataScriptContext_$cfromBuiltinData` + , (`$fFromDataMap_$cfromBuiltinData` + `$fFromDataGovernanceAction_$cfromBuiltinData` + (\d -> + case + (constr 0 + [ d + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (case + (equalsInteger + 1 + index) + [ (case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 0 + [ ]) ]) ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])) + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + `$fFromDataProposalProcedure_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataTxOutRef_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataBuiltinData_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 4 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 2 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 3 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 3 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataScriptContext_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 4 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataScriptContext_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 5 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 5 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataProposalProcedure_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg + , arg ]) ]) , (constr 1 [ ]) ]) , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) + [ ]) ]) + , (constr 1 + [ ]) ]) ]) , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 + [ ]) ]) ])))))) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) + [ matchData' ]) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , ds + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) , (constr 1 [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])) + [ (\ctx -> + (\context -> + (\loanRedeemer -> + case + (forced + "Validation completed" + ((\loanDatum -> + case + context + [ (\ipv + ipv + ipv -> + (\ds -> + (\inputCredentials -> + (\stakingCredApproves' -> + (\nt -> + (\nt -> + (\allAddrInputs -> + (\nt -> + (\outputs -> case (case - ds - [ (\h + (case + (constr 0 + [ inputCredentials + , (constr 0 + [ ]) + , outputs ]) + [ foo ]) + [ (fail + ()) + , (\x ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataTxOutRef_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataBuiltinData_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 4 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 2 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 3 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 3 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataScriptContext_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 4 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataScriptContext_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 5 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 5 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataProposalProcedure_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ])))))) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , ds - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - [ (\ctx -> - (\context -> - (\loanRedeemer -> - case - (force - trace - "Validation completed" - ((\loanDatum -> - case - context - [ (\ipv - ipv - ipv -> - (\ds -> - (\inputCredentials -> - (\stakingCredApproves' -> - (\nt -> - (\nt -> - (\allAddrInputs -> - (\nt -> - (\outputs -> - case - (case - (case - (constr 0 - [ inputCredentials - , (constr 0 - [ ]) - , outputs ]) - [ foo ]) - [ (fail - ()) - , (\x - ds -> - case - ds - [ x - , (\ipv - ipv -> - fail - ()) ]) ]) - [ (\ipv - ipv - ipv - ipv -> - (\cse -> - (\nt -> - (\valueOf -> - (\a -> - case - loanRedeemer - [ True - , True - , (case - (case - (equalsInteger - 0 - (case - loanDatum - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - 2) - , (\ds - ds - ds - ds - ds - ds -> - 0) - , (\ds - ds - ds - ds - ds - ds - ds - ds -> - 1) ])) - [ (force - trace - "Datum is not an AskDatum" - False) - , True ]) - [ False - , (case - (case - stakingCredApproves' - [ (force - trace - "Staking credential did not approve" - False) - , True ]) - [ False - , (case - (equalsInteger - (case - (case - loanDatum - [ (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 - default_arg6 - default_arg7 - default_arg8 - default_arg9 - default_arg10 -> - error) - , (\ds - ds - ds - ds - ds - ds -> - ds) - , (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 - default_arg6 - default_arg7 -> - error) ]) - [ (\a - b -> - case - (constr 0 - [ nt - , a - , b ]) - [ valueOf ]) ]) - (subtractInteger - 0 + case + ds + [ x + , (\ipv + ipv -> + fail + ()) ]) ]) + [ (\ipv + ipv + ipv + ipv -> + (\cse -> + (\nt -> + (\valueOf -> + (\a -> + case + loanRedeemer + [ True + , True + , (case + (case + (equalsInteger + 0 + (case + loanDatum + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + 2) + , (\ds + ds + ds + ds + ds + ds -> + 0) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + 1) ])) + [ (forced + "Datum is not an AskDatum" + False) + , True ]) + [ False + , (case + (case + stakingCredApproves' + [ (forced + "Staking credential did not approve" + False) + , True ]) + [ False + , (case + (equalsInteger (case (case loanDatum @@ -1660,126 +1617,144 @@ [ nt , a , b ]) - [ valueOf ]) ]))) - [ (force - trace - "Ask beacons not burned." - False) - , True ]) ]) ]) - , (case - (case - (equalsInteger - 1 - (case - loanDatum - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - 2) - , (\ds - ds - ds - ds - ds - ds -> - 0) - , (\ds - ds - ds - ds - ds - ds - ds - ds -> - 1) ])) - [ (force - trace - "Datum is not an OfferDatum" - False) - , True ]) - [ False - , (case - (equalsInteger - 1 - (case - (case - loanDatum - [ (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 - default_arg6 - default_arg7 - default_arg8 - default_arg9 - default_arg10 -> - error) - , (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 -> - error) - , (\ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - [ (\a - b -> - case - (constr 0 - [ cse - , a - , b ]) - [ valueOf ]) ])) - [ (case - stakingCredApproves' - [ (force - trace - "Staking credential did not approve" - False) - , True ]) - , (case - (case - (signed - (case - ipv - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - (case + [ valueOf ]) ]) + (subtractInteger + 0 (case - loanDatum + (case + loanDatum + [ (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 + default_arg6 + default_arg7 + default_arg8 + default_arg9 + default_arg10 -> + error) + , (\ds + ds + ds + ds + ds + ds -> + ds) + , (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 + default_arg6 + default_arg7 -> + error) ]) + [ (\a + b -> + case + (constr 0 + [ nt + , a + , b ]) + [ valueOf ]) ]))) + [ (forced + "Ask beacons not burned." + False) + , True ]) ]) ]) + , (case + (case + (equalsInteger + 1 + (case + loanDatum + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + 2) + , (\ds + ds + ds + ds + ds + ds -> + 0) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + 1) ])) + [ (forced + "Datum is not an OfferDatum" + False) + , True ]) + [ False + , (case + (equalsInteger + 1 + (case + (case + loanDatum + [ (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 + default_arg6 + default_arg7 + default_arg8 + default_arg9 + default_arg10 -> + error) + , (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 -> + error) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\a + b -> + case + (constr 0 + [ cse + , a + , b ]) + [ valueOf ]) ])) + [ (case + stakingCredApproves' + [ (forced + "Staking credential did not approve" + False) + , True ]) + , (case + (case + (signed + (case + ipv [ (\ds ds ds @@ -1790,17 +1765,6 @@ ds ds ds - ds -> - ds) - , (\ipv - ipv - ipv - ipv - ipv - ipv -> - error) - , (\ds - ds ds ds ds @@ -1808,59 +1772,48 @@ ds ds -> ds) ]) - [ (\ds - b -> - b) ])) - [ (force - trace - "Lender did not sign" - False) - , True ]) - [ False - , (case - (case - (equalsInteger - (case - (case - loanDatum - [ (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 - default_arg6 - default_arg7 - default_arg8 - default_arg9 - default_arg10 -> - error) - , (\default_arg0 - default_arg1 - default_arg2 - default_arg3 - default_arg4 - default_arg5 -> - error) - , (\ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - [ (\a - b -> - case - (constr 0 - [ nt - , a - , b ]) - [ valueOf ]) ]) - (subtractInteger - 0 + (case + (case + loanDatum + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) + , (\ipv + ipv + ipv + ipv + ipv + ipv -> + error) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\ds + b -> + b) ])) + [ (forced + "Lender did not sign" + False) + , True ]) + [ False + , (case + (case + (equalsInteger (case (case loanDatum @@ -1899,56 +1852,55 @@ [ nt , a , b ]) - [ valueOf ]) ]))) - [ (force - trace - "Offer beacons not burned" - False) - , True ]) - [ False - , (case - (equalsInteger - (case - (case - loanDatum - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) - , (\ipv - ipv - ipv - ipv - ipv - ipv -> - error) - , (\ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - [ (\a - b -> - case - (constr 0 - [ nt - , a - , b ]) - [ valueOf ]) ]) - (subtractInteger - 0 + [ valueOf ]) ]) + (subtractInteger + 0 + (case + (case + loanDatum + [ (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 + default_arg6 + default_arg7 + default_arg8 + default_arg9 + default_arg10 -> + error) + , (\default_arg0 + default_arg1 + default_arg2 + default_arg3 + default_arg4 + default_arg5 -> + error) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\a + b -> + case + (constr 0 + [ nt + , a + , b ]) + [ valueOf ]) ]))) + [ (forced + "Offer beacons not burned" + False) + , True ]) + [ False + , (case + (equalsInteger (case (case loanDatum @@ -1987,117 +1939,226 @@ [ nt , a , b ]) - [ valueOf ]) ]))) - [ (force - trace - "Lender IDs not burned" - False) - , True ]) ]) ]) ]) ]) - , True ]) - (case + [ valueOf ]) ]) + (subtractInteger + 0 + (case + (case + loanDatum + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) + , (\ipv + ipv + ipv + ipv + ipv + ipv -> + error) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\a + b -> + case + (constr 0 + [ nt + , a + , b ]) + [ valueOf ]) ]))) + [ (forced + "Lender IDs not burned" + False) + , True ]) ]) ]) ]) ]) + , True ]) (case - loanDatum - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) - , (\ds - ds - ds - ds - ds + (case + loanDatum + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) + , (\ds + ds + ds + ds + ds + ds -> + ds) + , (\ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\a + b -> + case + (constr 0 + [ nt + , a + , b ]) + [ valueOf ]) ])) + (\value + cur + tn -> + (\go -> + (\s -> + s + s + value) + (\s ds -> - ds) - , (\ds - ds - ds - ds - ds - ds - ds + case + ds + [ 0 + , (\ds + xs' -> + case + ds + [ (\c' + i -> + case + (equalsByteString + c' + cur) + [ (s + s + xs') + , (go + i) ]) ]) ])) + ((\s -> + s + s) + (\s ds -> - ds) ]) - [ (\a - b -> - case - (constr 0 - [ nt - , a - , b ]) - [ valueOf ]) ])) - (\value - cur - tn -> - (\go -> - (\s -> - s - s - value) - (\s - ds -> - case - ds - [ 0 - , (\ds - xs' -> - case - ds - [ (\c' - i -> - case - (equalsByteString - c' - cur) - [ (s - s - xs') - , (go - i) ]) ]) ])) - ((\s -> - s - s) - (\s - ds -> - case - ds - [ 0 - , (\ds - xs' -> - case - ds - [ (\c' - i -> - case - (equalsByteString - c' - tn) - [ (s - s - xs') - , i ]) ]) ])))) - ((\cse -> - cse - ipv - (cse - (constr 0 - [ ]) - (`$fAdditiveGroupValue_go` - cse))) - (`$fAdditiveGroupValue` - addInteger))) - (case - ds - [ (\inputCredentials - inputValue -> - inputValue) ])) ]) + case + ds + [ 0 + , (\ds + xs' -> + case + ds + [ (\c' + i -> + case + (equalsByteString + c' + tn) + [ (s + s + xs') + , i ]) ]) ])))) + ((\cse -> + cse + ipv + (cse + (constr 0 + [ ]) + (`$fAdditiveGroupValue_go` + cse))) + (`$fAdditiveGroupValue` + addInteger))) + (case + ds + [ (\inputCredentials + inputValue -> + inputValue) ])) ]) + (case + ipv + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ])) + (case + (case + (case + (case + ipv + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + [ (\ds + ds -> + ds) ]) + [ (\t + ds -> + t) ]) + [ (\t -> + t) + , ((\x -> + error) + (forced + "Shouldn't be NegInf." + (constr 0 + [ ]))) + , ((\x -> + error) + (forced + "invalid-hereafter not specified" + (constr 0 + [ ]))) ])) + ((\inputs -> + case + (constr 0 + [ inputCredentials + , (constr 0 + [ ]) + , inputs ]) + [ foo ]) (case ipv [ (\ds @@ -2116,59 +2177,8 @@ ds ds ds -> - ds) ])) - (case - (case - (case - (case - ipv - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - [ (\ds - ds -> - ds) ]) - [ (\t - ds -> - t) ]) - [ (\t -> - t) - , ((\x -> - error) - (force - trace - "Shouldn't be NegInf." - (constr 0 - [ ]))) - , ((\x -> - error) - (force - trace - "invalid-hereafter not specified" - (constr 0 - [ ]))) ])) - ((\inputs -> - case - (constr 0 - [ inputCredentials - , (constr 0 - [ ]) - , inputs ]) - [ foo ]) + ds) ]))) + (go (case ipv [ (\ds @@ -2188,1040 +2198,1036 @@ ds ds -> ds) ]))) - (go - (case - ipv - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]))) + (case + ipv + [ (\ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv -> + go + ipv) ])) (case - ipv + inputCredentials [ (\ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv ipv -> - go - ipv) ])) + case + ipv + [ (\ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv + ipv -> + case + ipv + [ (\ds -> + case + ds + [ (\cred -> + case + cred + [ (\pkh -> + signed + ipv + pkh) + , (\ds -> + (\s -> + case + (s + s + ipv) + [ (\ds -> + True) + , False ]) + (\s + ds -> + case + ds + [ (constr 1 + [ ]) + , (\ds + xs' -> + case + ds + [ (\c' + i -> + case + (case + c' + [ (\l1l -> + False) + , (\l1l -> + equalsByteString + l1l + ds) ]) + [ (s + s + xs') + , (constr 0 + [ i ]) ]) ]) ])) ]) + , (\ipv + ipv + ipv -> + (\x -> + error) + (forced + "Wrong kind of staking credential." + (constr 0 + [ ]))) ]) + , True ]) ]) ])) + (case + ds + [ (\inputCredentials + inputValue -> + inputCredentials) ])) + (case (case - inputCredentials - [ (\ipv - ipv -> + context + [ (\info + ds + ds -> case - ipv - [ (\ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv - ipv -> - case - ipv - [ (\ds -> - case + ds + [ (\default_arg0 + default_arg1 -> + force + defaultBody) + , (\default_arg0 -> + force + defaultBody) + , (\default_arg0 + default_arg1 -> + force + defaultBody) + , (\default_arg0 -> + force + defaultBody) + , (\ref + ds -> + getScriptInput + (case + info + [ (\ds ds - [ (\cred -> - case - cred - [ (\pkh -> - signed - ipv - pkh) - , (\ds -> - (\s -> - case - (s - s - ipv) - [ (\ds -> - True) - , False ]) - (\s - ds -> - case - ds - [ (constr 1 - [ ]) - , (\ds - xs' -> - case - ds - [ (\c' - i -> - case - (case - c' - [ (\l1l -> - False) - , (\l1l -> - equalsByteString - l1l - ds) ]) - [ (s - s - xs') - , (constr 0 - [ i ]) ]) ]) ])) ]) - , (\ipv - ipv - ipv -> - (\x -> - error) - (force - trace - "Wrong kind of staking credential." - (constr 0 - [ ]))) ]) - , True ]) ]) ])) - (case - ds - [ (\inputCredentials - inputValue -> - inputCredentials) ])) - (case - (case - context - [ (\info - ds - ds -> - case - ds - [ (\default_arg0 - default_arg1 -> - force - defaultBody) - , (\default_arg0 -> - force - defaultBody) - , (\default_arg0 - default_arg1 -> - force - defaultBody) - , (\default_arg0 -> - force - defaultBody) - , (\ref - ds -> - getScriptInput - (case - info - [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds -> - ds) ]) - ref) - , (\default_arg0 -> - force - defaultBody) ]) ]) - [ (\ipv - ipv - ipv - ipv -> - constr 0 - [ ipv - , ipv ]) ])) ]) - (case + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + ds) ]) + ref) + , (\default_arg0 -> + force + defaultBody) ]) ]) + [ (\ipv + ipv + ipv + ipv -> + constr 0 + [ ipv + , ipv ]) ])) ]) (case (case - context - [ (\ds - ds + (case + context + [ (\ds + ds + ds -> + ds) ]) + [ (\default_arg0 + default_arg1 -> + (\cse -> + case + cse + [ cse ]) + error) + , (\default_arg0 -> + (\cse -> + case + cse + [ cse ]) + error) + , (\default_arg0 + default_arg1 -> + (\cse -> + case + cse + [ cse ]) + error) + , (\default_arg0 -> + (\cse -> + case + cse + [ cse ]) + error) + , (\ds ds -> - ds) ]) - [ (\default_arg0 - default_arg1 -> - (\cse -> - case - cse - [ cse ]) - error) - , (\default_arg0 -> - (\cse -> - case - cse - [ cse ]) - error) - , (\default_arg0 - default_arg1 -> - (\cse -> - case - cse - [ cse ]) - error) - , (\default_arg0 -> - (\cse -> case - cse - [ cse ]) - error) - , (\ds - ds -> + ds + [ (\ds -> + constr 0 + [ ds ]) + , ((\cse -> + case + cse + [ cse ]) + error) ]) + , (\default_arg0 -> + (\cse -> + case + cse + [ cse ]) + error) ]) + [ (\ipv -> case - ds - [ (\ds -> - constr 0 - [ ds ]) - , ((\cse -> - case - cse - [ cse ]) - error) ]) - , (\default_arg0 -> - (\cse -> - case - cse - [ cse ]) - error) ]) - [ (\ipv -> - case - (case - (constr 0 - [ ipv - , (\ds -> - case - (unConstrData - ipv) - [ (\l - r -> - (\fail -> - case - (equalsInteger - 0 - l) - [ (fail - ()) - , (case - (case - r - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataList_$cfromBuiltinData` - (`$fFromDataTuple2_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`) - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg - , arg - , arg - , arg - , arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - l) - [ (fail - ()) - , (case - (case - r - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataRational_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataList_$cfromBuiltinData` - (force - `$dFromData`) - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 2 - l) - [ (constr 1 - [ ]) - , (case - (case - r - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case + (case + (constr 0 + [ ipv + , (\ds -> + case + (unConstrData + ipv) + [ (\l + r -> + (\fail -> + case + (equalsInteger + 0 + l) + [ (fail + ()) + , (case + (case + r + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - , ds ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\arg -> - case - (case + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataList_$cfromBuiltinData` + (`$fFromDataTuple2_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`) + ds) + [ (\arg -> constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataRational_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - (force - `$dFromData`) - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) + [ (constr 1 + [ arg + , arg + , arg + , arg + , arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + l) + [ (fail + ()) + , (case + (case + r + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataRational_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataList_$cfromBuiltinData` + (force + `$dFromData`) + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 2 + l) + [ (constr 1 + [ ]) + , (case + (case + r + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + , ds ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataRational_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + (force + `$dFromData`) + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataRational_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg + , arg ]) ]) + , (constr 1 + [ ]) ]) , (constr 1 [ ]) ]) - [ (\ds -> - case - (`$fFromDataRational_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]))) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ]) - [ (\r -> - force - trace - "Parsed Datum" - r) - , (traceError - "Failed to parse Datum") ]) ]))) - [ (traceError - "PT5") - , () ]) - ((\d -> - case + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]))) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (constr 0 + [ ]) ]) + [ forced ]) + [ (\r -> + forced + "Parsed Datum" + r) + , (traceError + "Failed to parse Datum") ]) ]))) + [ (traceError + "PT5") + , () ]) + ((\d -> + case + (case + (constr 0 + [ d + , (\ds -> + case + (unConstrData + d) + [ (\l + r -> + case + (equalsInteger + 0 + l) + [ (case + (equalsInteger + 1 + l) + [ (case + (equalsInteger + 2 + l) + [ (case + (equalsInteger + 3 + l) + [ (case + (equalsInteger + 4 + l) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) + , (constr 0 + [ (constr 4 + [ ]) ]) ]) + , (constr 0 + [ (constr 0 + [ ]) ]) ]) + , (constr 0 + [ (constr 3 + [ ]) ]) ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (constr 0 + [ ]) ]) + [ forced ]) + [ (\r -> + forced + "Parsed Redeemer" + r) + , (traceError + "Failed to parse Redeemer") ]) (case - (constr 0 - [ d - , (\ds -> - case - (unConstrData - d) - [ (\l - r -> - case - (equalsInteger - 0 - l) - [ (case - (equalsInteger - 1 - l) - [ (case - (equalsInteger - 2 - l) - [ (case - (equalsInteger - 3 - l) - [ (case - (equalsInteger - 4 - l) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) - , (constr 0 - [ (constr 4 - [ ]) ]) ]) - , (constr 0 - [ (constr 0 - [ ]) ]) ]) - , (constr 0 - [ (constr 3 - [ ]) ]) ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ]) - [ (\r -> - force - trace - "Parsed Redeemer" - r) - , (traceError - "Failed to parse Redeemer") ]) - (case - context - [ (\ds - ds - ds -> - ds) ]))) - (force - trace - "Parsed ScriptContext" - ctx)) - , (traceError - "Failed to parse ScriptContext") ]) + context + [ (\ds + ds + ds -> + ds) ]))) + (forced + "Parsed ScriptContext" + ctx)) + , (traceError + "Failed to parse ScriptContext") ]) + ((\s -> + s + s) + (\s + ds + ds -> + case + ds + [ False + , (\k + ks -> + case + (equalsByteString + k + ds) + [ (case + (constr 0 + [ s + , ks + , ds ]) + [ s ]) + , True ]) ]))) ((\s -> s s) @@ -3230,125 +3236,179 @@ ds -> case ds - [ False - , (\k - ks -> + [ ((\x -> + error) + (forced + "script input error getScriptInput" + (constr 0 + [ ]))) + , (\ds + tl -> case - (equalsByteString - k - ds) - [ (case - (constr 0 - [ s - , ks - , ds ]) - [ s ]) - , True ]) ]))) + ds + [ (\iRef + ot -> + case + ds + [ (\ipv + ipv -> + case + (case + iRef + [ (\l1l + l2l -> + case + (equalsByteString + l1l + ipv) + [ False + , (equalsInteger + l2l + ipv) ]) ]) + [ (case + (constr 0 + [ s + , tl + , ds ]) + [ s ]) + , ot ]) ]) ]) ]))) ((\s -> s s) (\s - ds ds -> case ds - [ ((\x -> - error) - (force - trace - "script input error getScriptInput" - (constr 0 - [ ]))) - , (\ds - tl -> - case - ds - [ (\iRef - ot -> - case - ds - [ (\ipv - ipv -> - case - (case - iRef - [ (\l1l - l2l -> - case - (equalsByteString - l1l - ipv) - [ False - , (equalsInteger - l2l - ipv) ]) ]) - [ (case - (constr 0 - [ s - , tl - , ds ]) - [ s ]) - , ot ]) ]) ]) ]))) - ((\s -> - s - s) - (\s - ds -> - case - ds - [ (constr 0 - [ ]) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (`$fFunctorMap_$cfmap` - (\i' -> - multiplyInteger - -1 - i') - a) ]) ]) - , (s - s - xs) ]) ]))) - (delay - (`$fFromDataTuple2_$cfromBuiltinData` + [ (constr 0 + [ ]) + , (\x + xs -> + constr 1 + [ (case + x + [ (\c + a -> + constr 0 + [ c + , (`$fFunctorMap_$cfmap` + (\i' -> + multiplyInteger + -1 + i') + a) ]) ]) + , (s + s + xs) ]) ]))) + (delay (`$fFromDataTuple2_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`) - `$fFromDataRational_$cfromBuiltinData`))) + (`$fFromDataTuple2_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`) + `$fFromDataRational_$cfromBuiltinData`))) + (\d -> + constr 0 + [ d ])) (\d -> - constr 0 - [ d ])) - (\d -> + case + (constr 0 + [ d + , (\ds -> + case + (unConstrData + d) + [ (\l + r -> + case + (equalsInteger + 0 + l) + [ (case + (equalsInteger + 1 + l) + [ (constr 1 + [ ]) + , (constr 0 + [ True ]) ]) + , (constr 0 + [ False ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (constr 0 + [ ]) ]) + [ forced ])) + (\`$dFromData` + d -> case (constr 0 [ d - , (\ds -> + , (\index + args -> case - (unConstrData - d) - [ (\l - r -> - case - (equalsInteger - 0 - l) - [ (case - (equalsInteger - 1 - l) - [ (constr 1 - [ ]) - , (constr 0 - [ True ]) ]) - , (constr 0 - [ False ]) ]) ]) + (equalsInteger + 0 + index) + [ (case + (equalsInteger + 1 + index) + [ (case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$dFromData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) ]) + , (case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) ]) ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) , (\ds -> constr 1 [ ]) @@ -3360,13 +3420,9 @@ [ ]) , (\ds -> constr 1 - [ ]) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ])) - (\`$dFromData` - d -> + [ ]) ]) + [ matchData' ])) + (\d -> case (constr 0 [ d @@ -3376,747 +3432,817 @@ (equalsInteger 0 index) - [ (case - (equalsInteger - 1 - index) - [ (case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$dFromData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) ]) - , (case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) ]) ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - (\d -> - case - (constr 0 - [ d - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataGovernanceAction_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 4 - [ arg - , ds - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataGovernanceAction_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 2 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> case - ds - [ (\ds - ds -> + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataGovernanceAction_$cfromBuiltinData` + ds) + [ (\arg -> case (case - (constr 0 - [ `$fFromDataCredential_$cfromBuiltinData` - , `$fFromDataInteger_$cfromBuiltinData` - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + ds + [ (\ds + ds -> case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 5 - [ arg - , arg ]) ]) + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 4 + [ arg + , ds + , arg ]) ]) + , (fail + ()) ]) , (fail - ()) ]) - , (fail - ()) ]) + ()) ]) ]) , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 3 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> case (`$fFromDataMaybe_$cfromBuiltinData` `$fFromDataGovernanceAction_$cfromBuiltinData` ds) [ (\arg -> - constr 0 - [ (constr 3 - [ arg ]) ]) + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 4 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 2 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> case - ds - [ (\ds - ds -> + (case + (constr 0 + [ `$fFromDataCredential_$cfromBuiltinData` + , `$fFromDataInteger_$cfromBuiltinData` + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataGovernanceAction_$cfromBuiltinData` - ds) - [ (\arg -> + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataList_$cfromBuiltinData` - `$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ `$fFromDataCredential_$cfromBuiltinData` - , `$fFromDataInteger_$cfromBuiltinData` - , ds ]) - [ `$fFromDataMap_$cfromBuiltinData` ]) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataRational_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 6 - [ arg - , arg - , arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 5 + [ arg + , arg ]) ]) , (fail ()) ]) , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 5 - index) - [ (case - (equalsInteger - 6 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) - , (case - (case - args - [ (\h - t -> + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 3 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataGovernanceAction_$cfromBuiltinData` + ds) + [ (\arg -> constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataGovernanceAction_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ arg ]) - , (constr 1 - [ ]) ]) + [ (constr 3 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 4 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataGovernanceAction_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataList_$cfromBuiltinData` + `$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ `$fFromDataCredential_$cfromBuiltinData` + , `$fFromDataInteger_$cfromBuiltinData` + , ds ]) + [ `$fFromDataMap_$cfromBuiltinData` ]) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataRational_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 6 + [ arg + , arg + , arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 5 + index) + [ (case + (equalsInteger + 6 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataGovernanceAction_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ arg ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg + , arg ]) ]) + , (case + (equalsInteger + 6 + index) + [ (constr 1 [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg - , arg ]) ]) - , (case - (equalsInteger - 6 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) ]) - , (case - (equalsInteger - 6 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) ]) - , (case - (equalsInteger - 6 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) ]) ]) - , (case - (equalsInteger - 6 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) ]) ])))))) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) ]) + , (case + (equalsInteger + 6 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) ]) + , (case + (equalsInteger + 6 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) ]) ]) + , (case + (equalsInteger + 6 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) ]) ])))))) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])) + (\eta -> + case + (case + (constr 0 + [ `$fFromDataInteger_$cfromBuiltinData` + , `$fFromDataInteger_$cfromBuiltinData` + , eta ]) + [ `$fFromDataTuple2_$cfromBuiltinData` ]) + [ (\x -> + case + x + [ (\n + d -> + case + (equalsInteger + 0 + d) + [ (constr 0 + [ (unsafeRatio + n + d) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ])) + (\d -> + case + (constr 0 + [ d + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) , (constr 1 [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])) + (\`$dFromData` -> + (\go + d -> + case + (constr 0 + [ d + , (\ds -> + case + (unConstrData + d) + [ (\l + r -> + constr 1 + [ ]) ]) + , (\ds -> + (\ds -> constr 1 [ ]) - , (\ds -> + (unMapData + d)) + , (\ds -> + go + (unListData + d)) + , (\ds -> + (\ds -> constr 1 [ ]) - , (\ds -> + (unIData + d)) + , (\ds -> + (\ds -> constr 1 [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - (\eta -> - case - (case - (constr 0 - [ `$fFromDataInteger_$cfromBuiltinData` - , `$fFromDataInteger_$cfromBuiltinData` - , eta ]) - [ `$fFromDataTuple2_$cfromBuiltinData` ]) - [ (\x -> - case - x - [ (\n - d -> - case - (equalsInteger - 0 - d) - [ (constr 0 - [ (unsafeRatio - n - d) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ])) - (\d -> - case - (constr 0 - [ d - , (\index - args -> + (unBData + d)) + , (constr 0 + [ ]) ]) + [ forced ]) + ((\s -> + s + s) + (\s + xs -> + case + xs + [ (\x + xs -> + case + (`$dFromData` + x) + [ (\a -> + case + (s + s + xs) + [ (\ipv -> + constr 0 + [ (constr 1 + [ a + , ipv ]) ]) + , (constr 1 + [ ]) ]) + , ((\ds -> + constr 1 + [ ]) + (s + s + xs)) ]) + , (constr 0 + [ (constr 0 + [ ]) ]) ])))) + (\d -> + case + (constr 0 + [ d + , (\index + args -> + (\fail -> case (equalsInteger 0 index) - [ (constr 1 - [ ]) + [ (fail + ()) , (case (case args @@ -4134,7 +4260,7 @@ [ (\ds ds -> case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + (`$fFromDataCredential_$cfromBuiltinData` ds) [ (\arg -> case @@ -4148,415 +4274,548 @@ [ ]) ]) [ (\ds -> case - (`$fFromDataInteger_$cfromBuiltinData` + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` ds) [ (\arg -> constr 0 - [ (constr 0 + [ (constr 6 [ arg , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - (\`$dFromData` -> - (\go - d -> - case - (constr 0 - [ d - , (\ds -> - case - (unConstrData - d) - [ (\l - r -> - constr 1 - [ ]) ]) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unMapData - d)) - , (\ds -> - go - (unListData - d)) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unIData - d)) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unBData - d)) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ]) - ((\s -> - s - s) - (\s - xs -> - case - xs - [ (\x - xs -> - case - (`$dFromData` - x) - [ (\a -> - case - (s - s - xs) - [ (\ipv -> - constr 0 - [ (constr 1 - [ a - , ipv ]) ]) - , (constr 1 - [ ]) ]) - , ((\ds -> - constr 1 - [ ]) - (s - s - xs)) ]) - , (constr 0 - [ (constr 0 - [ ]) ]) ])))) - (\d -> - case - (constr 0 - [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 9 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\`$fFromDataDelegatee_$cfromBuiltinData` -> + (\fail -> + case + (equalsInteger + 2 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataDelegatee_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 3 + index) + [ (fail + ()) + , (case (case - ds + args [ (\h - ds -> + t -> constr 0 - [ h ]) + [ (constr 0 + [ h + , t ]) ]) , (constr 1 [ ]) ]) [ (\ds -> case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 6 - [ arg - , arg ]) ]) - , (fail - ()) ]) + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataDelegatee_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 5 + [ arg + , arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 4 + index) + [ (fail + ()) + , (case (case - ds + args [ (\h - ds -> + t -> constr 0 - [ h ]) + [ (constr 0 + [ h + , t ]) ]) , (constr 1 [ ]) ]) [ (\ds -> case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 9 - [ arg - , arg ]) ]) - , (fail - ()) ]) + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 4 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\`$fFromDataDelegatee_$cfromBuiltinData` -> - (\fail -> - case - (equalsInteger - 2 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataDelegatee_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg - , arg ]) ]) + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 5 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 10 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 6 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 8 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 7 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 3 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 8 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (`$fFromDataDelegatee_$cfromBuiltinData` - ds) - [ (\arg -> + ds + [ (\ds + ds -> case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 5 - [ arg - , arg - , arg ]) ]) + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 3 + [ arg + , arg ]) ]) + , (fail + ()) ]) , (fail ()) ]) , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 4 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 4 - [ arg - , arg ]) ]) + ()) ]) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 9 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> + ()) ]) ]) + (\ds -> + case + (equalsInteger + 10 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 7 + [ arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]))))))))) + (\d -> + case + (constr 0 + [ d + , (\index + args -> (\fail -> case (equalsInteger - 5 + 0 index) [ (fail ()) @@ -4571,78 +4830,53 @@ [ ]) ]) [ (\ds -> case - (`$fFromDataCredential_$cfromBuiltinData` + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` ds) [ (\arg -> constr 0 - [ (constr 10 + [ (constr 0 [ arg ]) ]) , (fail ()) ]) , (fail ()) ]) ]) (\ds -> - (\fail -> - case - (equalsInteger - 6 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 8 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> + (\`$fFromDataDRep_$cfromBuiltinData` -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataDRep_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> case (equalsInteger - 7 + 2 index) - [ (fail - ()) + [ (constr 1 + [ ]) , (case (case args @@ -4668,86 +4902,37 @@ ds [ (\h ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 8 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 3 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - , (fail - ()) ]) ]) - (\ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataDRep_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ])) + (\d -> + case + (constr 0 + [ d + , (\index + args -> (\fail -> case (equalsInteger - 9 + 0 index) [ (fail ()) @@ -4755,270 +4940,170 @@ (case args [ (\h - t -> + ds -> constr 0 - [ (constr 0 - [ h - , t ]) ]) + [ h ]) , (constr 1 [ ]) ]) [ (\ds -> case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (fail + ()) ]) , (fail ()) ]) ]) (\ds -> case (equalsInteger - 10 + 1 index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 7 - [ arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]))))))))) - (\d -> + [ (case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (constr 0 + [ (constr 2 + [ ]) ]) ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ])) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]))) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])))) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ])) + (\d -> + case + (constr 0 + [ d + , (\index + args -> + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> case - (constr 0 - [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\`$fFromDataDRep_$cfromBuiltinData` -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataDRep_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataDRep_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ])) - (\d -> - case - (constr 0 - [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 1 - index) - [ (case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (constr 0 - [ (constr 2 - [ ]) ]) ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ])) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]))) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])))) + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + (\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]))) , (\ds -> constr 1 [ ]) @@ -5038,91 +5123,58 @@ [ d , (\index args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - (\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]))) + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) , (\ds -> constr 1 [ ]) @@ -5165,29 +5217,351 @@ [ (\ds ds -> case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + (\d -> + case + (constr 0 + [ d + , (\index + args -> + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataCredential_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 1 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataInteger_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg + , arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ])) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) [ (\arg -> case (case ds [ (\h - ds -> + t -> constr 0 - [ h ]) + [ (constr 0 + [ h + , t ]) ]) , (constr 1 [ ]) ]) [ (\ds -> case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) + ds + [ (\ds + ds -> + (\cse -> + case + (cse + (cse + `$fFromDataInteger_$cfromBuiltinData`) + ds) + [ (\arg -> + case + (case + ds + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (case + (constr 0 + [ ds + , (\index + args -> + case + (equalsInteger + 0 + index) + [ ((\fail -> + case + (equalsInteger + 1 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 2 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 2 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + constr 0 + [ (constr 1 + [ ds ]) ]) + , (constr 1 + [ ]) ]) ])) + , (constr 0 + [ (constr 0 + [ ]) ]) ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) ]) + [ matchData' ]) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataMaybe_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg + , arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + (`$fFromDataMap_$cfromBuiltinData` + `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`)) ]) , (constr 1 [ ]) ]) , (constr 1 @@ -5213,380 +5587,62 @@ [ d , (\index args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - (\d -> - case - (constr 0 - [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataCredential_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 1 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataInteger_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg - , arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ])) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - (\cse -> - case - (cse - (cse - `$fFromDataInteger_$cfromBuiltinData`) - ds) - [ (\arg -> - case - (case - ds - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (case - (constr 0 - [ ds - , (\index - args -> - case - (equalsInteger - 0 - index) - [ ((\fail -> - case - (equalsInteger - 1 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 2 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 2 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - constr 0 - [ (constr 1 - [ ds ]) ]) - , (constr 1 - [ ]) ]) ])) - , (constr 0 - [ (constr 0 - [ ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ]) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataMaybe_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg - , arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - (`$fFromDataMap_$cfromBuiltinData` - `$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData`)) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) + (\fail -> + case + (equalsInteger + 0 + index) + [ (fail + ()) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (fail + ()) ]) + , (fail + ()) ]) ]) + (\ds -> + case + (equalsInteger + 1 + index) + [ (constr 1 + [ ]) + , (case + (case + args + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` + ds) + [ (\arg -> + constr 0 + [ (constr 1 + [ arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ])) , (\ds -> constr 1 [ ]) @@ -5600,87 +5656,45 @@ constr 1 [ ]) ]) [ matchData' ])) - (\d -> + (\d + constrCase + mapCase + listCase + iCase + bCase -> case (constr 0 [ d - , (\index - args -> - (\fail -> - case - (equalsInteger - 0 - index) - [ (fail - ()) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg ]) ]) - , (fail - ()) ]) - , (fail - ()) ]) ]) - (\ds -> - case - (equalsInteger - 1 - index) - [ (constr 1 - [ ]) - , (case - (case - args - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$fFromDataBuiltinBLS12_381_G1_Element_$cfromBuiltinData` - ds) - [ (\arg -> - constr 0 - [ (constr 1 - [ arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ])) , (\ds -> - constr 1 - [ ]) + case + (unConstrData + d) + [ (\l + r -> + constrCase + l + r) ]) , (\ds -> - constr 1 - [ ]) + mapCase + (unMapData + d)) , (\ds -> - constr 1 - [ ]) + listCase + (unListData + d)) , (\ds -> - constr 1 - [ ]) ]) - [ matchData' ])) - (\d - constrCase - mapCase - listCase - iCase - bCase -> + iCase + (unIData + d)) + , (\ds -> + bCase + (unBData + d)) + , (constr 0 + [ ]) ]) + [ forced ])) + (\`$dFromData` + d -> case (constr 0 [ d @@ -5690,270 +5704,272 @@ d) [ (\l r -> - constrCase - l - r) ]) + case + (equalsInteger + 1 + l) + [ (case + (equalsInteger + 0 + l) + [ (constr 1 + [ ]) + , (case + (case + r + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$dFromData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 0 + [ (constr 1 + [ ]) ]) ]) ]) , (\ds -> - mapCase - (unMapData - d)) + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 1 + [ ]) + , (constr 0 + [ ]) ]) + [ forced ])) + (\`$dFromData` + `$dFromData` -> + (\go + d -> + case + (constr 0 + [ d + , (\ds -> + case + (unConstrData + d) + [ (\l + r -> + constr 1 + [ ]) ]) + , (\ds -> + case + (go + (unMapData + d)) + [ (\a -> + constr 0 + [ a ]) + , (constr 1 + [ ]) ]) , (\ds -> - listCase + (\ds -> + constr 1 + [ ]) (unListData d)) , (\ds -> - iCase + (\ds -> + constr 1 + [ ]) (unIData d)) , (\ds -> - bCase + (\ds -> + constr 1 + [ ]) (unBData d)) , (constr 0 [ ]) ]) - [ (force - chooseData) ])) - (\`$dFromData` - d -> - case - (constr 0 - [ d - , (\ds -> - case - (unConstrData - d) - [ (\l - r -> - case - (equalsInteger - 1 - l) - [ (case - (equalsInteger - 0 - l) - [ (constr 1 - [ ]) - , (case - (case - r - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$dFromData` - ds) - [ (\arg -> - constr 0 + [ forced ]) + ((\s -> + s + s) + (\s + xs -> + case + xs + [ (\tup + tups -> + case + (`$dFromData` + (case + tup + [ (\l + r -> + l) ])) + [ (\a -> + case + (`$dFromData` + (case + tup + [ (\l + r -> + r) ])) + [ (\ipv -> + case + (s + s + tups) + [ (\ipv -> + constr 0 + [ (constr 1 [ (constr 0 - [ arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 0 - [ (constr 1 - [ ]) ]) ]) ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 1 - [ ]) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ])) - (\`$dFromData` - `$dFromData` -> - (\go + [ a + , ipv ]) + , ipv ]) ]) + , (constr 1 + [ ]) ]) + , ((\ds -> + constr 1 + [ ]) + (s + s + tups)) ]) + , ((\ds -> + (\ds -> + constr 1 + [ ]) + (s + s + tups)) + (`$dFromData` + (case + tup + [ (\l + r -> + r) ]))) ]) + , (constr 0 + [ (constr 0 + [ ]) ]) ])))) + ((\s -> + s + s) + (\s + n d -> case - (constr 0 - [ d - , (\ds -> - case - (unConstrData - d) - [ (\l - r -> - constr 1 - [ ]) ]) - , (\ds -> - case - (go - (unMapData - d)) - [ (\a -> - constr 0 - [ a ]) - , (constr 1 - [ ]) ]) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unListData - d)) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unIData - d)) - , (\ds -> - (\ds -> - constr 1 - [ ]) - (unBData + (equalsInteger + 0 + d) + [ (case + (lessThanInteger + d + 0) + [ ((\gcd' -> + constr 0 + [ (quotientInteger + n + gcd') + , (quotientInteger + d + gcd') ]) + (euclid + n d)) - , (constr 0 - [ ]) ]) - [ (force - chooseData) ]) - ((\s -> - s - s) - (\s - xs -> - case - xs - [ (\tup - tups -> - case - (`$dFromData` - (case - tup - [ (\l - r -> - l) ])) - [ (\a -> - case - (`$dFromData` - (case - tup - [ (\l - r -> - r) ])) - [ (\ipv -> - case - (s - s - tups) - [ (\ipv -> - constr 0 - [ (constr 1 - [ (constr 0 - [ a - , ipv ]) - , ipv ]) ]) - , (constr 1 - [ ]) ]) - , ((\ds -> - constr 1 - [ ]) - (s - s - tups)) ]) - , ((\ds -> - (\ds -> - constr 1 - [ ]) - (s - s - tups)) - (`$dFromData` - (case - tup - [ (\l - r -> - r) ]))) ]) - , (constr 0 - [ (constr 0 - [ ]) ]) ])))) - ((\s -> - s s) - (\s - n - d -> - case - (equalsInteger - 0 - d) - [ (case - (lessThanInteger - d - 0) - [ ((\gcd' -> - constr 0 - [ (quotientInteger - n - gcd') - , (quotientInteger - d - gcd') ]) - (euclid - n - d)) - , ((\x -> - case - (constr 0 - [ s - , x - , (subtractInteger - 0 - d) ]) - [ s ]) - (subtractInteger - 0 - n)) ]) - , (traceError - "PT3") ]))) - (\str -> - (\x -> - error) - (force - trace - str - (constr 0 - [ ])))) - ((\s -> - s s) - (\s - x - y -> - case - (equalsInteger - 0 - y) - [ (case - (constr 0 - [ s - , y - , (modInteger - x - y) ]) - [ s ]) - , x ]))) - (delay - ((\x -> - error) - (force - trace - "script input error ownInput" - (constr 0 - [ ]))))) - (\d -> + , ((\x -> + case + (constr 0 + [ s + , x + , (subtractInteger + 0 + d) ]) + [ s ]) + (subtractInteger + 0 + n)) ]) + , (traceError + "PT3") ]))) + (\str -> + (\x -> + error) + (forced + str + (constr 0 + [ ])))) + ((\s -> + s s) + (\s + x + y -> + case + (equalsInteger + 0 + y) + [ (case + (constr 0 + [ s + , y + , (modInteger + x + y) ]) + [ s ]) + , x ]))) + (delay + ((\x -> + error) + (forced + "script input error ownInput" + (constr 0 + [ ]))))) + (\d -> + case + (constr 0 + [ d + , (\ds -> + case + (unConstrData + d) + [ (\l + r -> + constr 1 + [ ]) ]) + , (\ds -> + (\ds -> + constr 1 + [ ]) + (unMapData + d)) + , (\ds -> + (\ds -> + constr 1 + [ ]) + (unListData + d)) + , (\ds -> + (\ds -> + constr 1 + [ ]) + (unIData + d)) + , (\ds -> + constr 0 + [ (unBData + d) ]) + , (constr 0 + [ ]) ]) + [forced])) + (\`$dFromData` + `$dFromData` + d -> case (constr 0 [ d @@ -5963,37 +5979,74 @@ d) [ (\l r -> - constr 1 - [ ]) ]) + case + (equalsInteger + 0 + l) + [ (constr 1 + [ ]) + , (case + (case + r + [ (\h + t -> + constr 0 + [ (constr 0 + [ h + , t ]) ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + ds + [ (\ds + ds -> + case + (`$dFromData` + ds) + [ (\arg -> + case + (case + ds + [ (\h + ds -> + constr 0 + [ h ]) + , (constr 1 + [ ]) ]) + [ (\ds -> + case + (`$dFromData` + ds) + [ (\arg -> + constr 0 + [ (constr 0 + [ arg + , arg ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) + , (constr 1 + [ ]) ]) ]) + , (constr 1 + [ ]) ]) ]) ]) , (\ds -> - (\ds -> - constr 1 - [ ]) - (unMapData - d)) + constr 1 + []) , (\ds -> - (\ds -> - constr 1 - [ ]) - (unListData - d)) + constr 1 + []) , (\ds -> - (\ds -> - constr 1 - [ ]) - (unIData - d)) + constr 1 + []) , (\ds -> - constr 0 - [ (unBData - d) ]) + constr 1 + []) , (constr 0 []) ]) - [ (force - chooseData) ])) - (\`$dFromData` - `$dFromData` - d -> + [forced])) + (\d -> case (constr 0 [ d @@ -6003,150 +6056,113 @@ d) [ (\l r -> - case - (equalsInteger - 0 - l) - [ (constr 1 - [ ]) - , (case - (case - r - [ (\h - t -> - constr 0 - [ (constr 0 - [ h - , t ]) ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - ds - [ (\ds - ds -> - case - (`$dFromData` - ds) - [ (\arg -> - case - (case - ds - [ (\h - ds -> - constr 0 - [ h ]) - , (constr 1 - [ ]) ]) - [ (\ds -> - case - (`$dFromData` - ds) - [ (\arg -> - constr 0 - [ (constr 0 - [ arg - , arg ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) - , (constr 1 - [ ]) ]) ]) - , (constr 1 - [ ]) ]) ]) ]) + constr 1 + [ ]) ]) , (\ds -> - constr 1 - []) + (\ds -> + constr 1 + []) + (unMapData + d)) , (\ds -> - constr 1 - []) + (\ds -> + constr 1 + []) + (unListData + d)) , (\ds -> - constr 1 - []) + constr 0 + [ (unIData + d) ]) , (\ds -> - constr 1 - []) + (\ds -> + constr 1 + []) + (unBData + d)) , (constr 0 []) ]) - [ (force - chooseData) ])) - (\d -> - case - (constr 0 - [ d - , (\ds -> + [forced])) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> case - (unConstrData - d) - [ (\l - r -> - constr 1 - [ ]) ]) - , (\ds -> - (\ds -> - constr 1 - []) - (unMapData - d)) - , (\ds -> - (\ds -> - constr 1 - []) - (unListData - d)) - , (\ds -> - constr 0 - [ (unIData - d) ]) - , (\ds -> - (\ds -> - constr 1 - []) - (unBData - d)) - , (constr 0 []) ]) - [ (force - chooseData) ])) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - case - x - [ (\ipv - ipv -> - case - (constr 0 - [ addInteger - , (case - ipv - [ (\ds - ds - ds - ds -> - ds) ]) - , (s - s - xs) ]) - [ `$fAdditiveGroupValue` ]) ]) ]))) + x + [ (\ipv + ipv -> + case + (constr 0 + [ addInteger + , (case + ipv + [ (\ds + ds + ds + ds -> + ds) ]) + , (s + s + xs) ]) + [ `$fAdditiveGroupValue` ]) ]) ]))) + (\f -> + (\go + ls + rs -> + go + (go + (case + (constr 0 + [ equalsByteString + , ls + , rs ]) + [ (force + union) ]))) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> + constr 1 + [ (case + x + [ (\c + a -> + constr 0 + [ c + , (`$fFunctorMap_$cfmap` + (\k' -> + case + k' + [ (\b -> + f + 0 + b) + , (\a + b -> + f + a + b) + , (\a -> + f + a + 0) ]) + a) ]) ]) + , (s + s + xs) ]) ])))) (\f -> - (\go - ls - rs -> - go - (go - (case - (constr 0 - [ equalsByteString - , ls - , rs ]) - [(force union)]))) + (\go ds -> + go ds) ((\s -> s s) (\s @@ -6163,148 +6179,154 @@ a -> constr 0 [ c - , (`$fFunctorMap_$cfmap` - (\k' -> - case - k' - [ (\b -> - f - 0 - b) - , (\a - b -> - f - a - b) - , (\a -> - f - a - 0) ]) + , (f a) ]) ]) , (s s xs) ]) ])))) - (\f -> - (\go ds -> - go ds) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (f - a) ]) ]) - , (s - s - xs) ]) ])))) - (\x y -> addInteger x y)) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (case - a - [ (\b -> - go - b) - , (\a - b -> - case - (constr 0 - [ equalsByteString - , a - , b ]) - [ (force - union) ]) - , (\a -> - go - a) ]) ]) ]) - , (s s xs) ]) ]))) - (\x y -> equalsByteString x y)) - (delay - ((\go - `$dEq` - ds - ds -> - (\go -> - (\rs'' -> - (\s -> s s (go ds)) - (\s ds -> + (\x y -> addInteger x y)) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> + constr 1 + [ (case + x + [ (\c + a -> + constr 0 + [ c + , (case + a + [ (\b -> + go + b) + , (\a + b -> + case + (constr 0 + [ equalsByteString + , a + , b ]) + [ (force + union) ]) + , (\a -> + go + a) ]) ]) ]) + , (s s xs) ]) ]))) + (\x y -> equalsByteString x y)) + (delay + ((\go + `$dEq` + ds + ds -> + (\go -> + (\rs'' -> + (\s -> s s (go ds)) + (\s ds -> + case + ds + [ rs'' + , (\x xs -> + constr 1 + [ x + , (s s xs) ]) ])) + (go + ((\s -> + s s ds) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> + (\xs -> + case + (case + x + [ (\c -> + (\go + ds -> + go + ds) + ((\s -> + s + s) + (\s + ds -> + case + ds + [ True + , (\x + xs -> + case + x + [ (\c' + ds -> + case + (`$dEq` + c' + c) + [ (s + s + xs) + , False ]) ]) ]))) ]) + [ xs + , (constr 1 + [ x + , xs ]) ]) + (s + s + xs)) ])))) + ((\s -> + s s) + (\s + ds -> case ds - [ rs'' - , (\x xs -> + [ (constr 0 []) + , (\x + xs -> constr 1 - [x, (s s xs)]) ])) - (go - ((\s -> - s s ds) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - (\xs -> - case - (case - x - [ (\c -> - (\go - ds -> - go - ds) - ((\s -> + [ (case + x + [ (\c + i -> + constr 0 + [ c + , ((\s -> + s s - s) - (\s - ds -> - case - ds - [ True - , (\x - xs -> - case - x - [ (\c' - ds -> - case - (`$dEq` - c' - c) - [ (s - s - xs) - , False ]) ]) ]))) ]) - [ xs - , (constr 1 - [ x - , xs ]) ]) - (s s xs)) ])))) + ds) + (\s + ds -> + case + ds + [ (constr 2 + [ i ]) + , (\ds + xs' -> + case + ds + [ (\c' + i -> + case + (`$dEq` + c' + c) + [ (s + s + xs') + , (constr 1 + [ i + , i ]) ]) ]) ])) ]) ]) + , (s s xs) ]) ]))) ((\s -> s s) (\s @@ -6318,55 +6340,27 @@ [ (case x [ (\c - i -> + a -> constr 0 [ c - , ((\s -> - s - s - ds) - (\s - ds -> - case - ds - [ (constr 2 - [ i ]) - , (\ds - xs' -> - case - ds - [ (\c' - i -> - case - (`$dEq` - c' - c) - [ (s - s - xs') - , (constr 1 - [ i - , i ]) ]) ]) ])) ]) ]) - , (s s xs) ]) ]))) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (constr 0 - [ a ]) ]) ]) - , (s s xs) ]) ]))))) + , (constr 0 + [ a ]) ]) ]) + , (s s xs) ]) ]))))) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + constr 1 + [ (case + x + [ (\c a -> + constr 0 + [ c + , (constr 0 + [a]) ]) ]) + , (s s xs) ]) ]))) ((\s -> s s) (\s ds -> case @@ -6378,249 +6372,241 @@ x [ (\c a -> constr 0 - [c, (constr 0 [a])]) ]) + [c, (constr 2 [a])]) ]) , (s s xs) ]) ]))) - ((\s -> s s) - (\s ds -> + ((\s -> + s s) + (\s + ds -> case ds [ (constr 0 []) - , (\x xs -> - constr 1 - [ (case - x - [ (\c a -> - constr 0 - [c, (constr 2 [a])]) ]) - , (s s xs) ]) ]))) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - case - x - [ (\currency - tokenQuantities -> - case - (concatMap - (\eta -> - case - eta - [ (\c -> - (\go a -> - go - (mapQuantity a)) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (constr 0 - []) - , (\x - xs -> - constr 1 - [ (constr 0 - [ c - , x ]) - , (s - s - xs) ]) ]))) ]) - tokenQuantities) - [ (s s xs) - , (\ipv - ipv -> - constr 1 - [ (constr 0 - [ currency - , (concatMap - (\eta -> - case - eta - [ (\c -> - (\go - a -> - go - (mapQuantity - a)) - ((\s -> - s - s) - (\s - ds -> - case - ds - [ (constr 0 - [ ]) - , (\x - xs -> - constr 1 - [ (constr 0 - [ c - , x ]) - , (s - s - xs) ]) ]))) ]) - tokenQuantities) ]) - , (s s xs) ]) ]) ]) ]))) - (\x -> + , (\x + xs -> + case + x + [ (\currency + tokenQuantities -> + case + (concatMap + (\eta -> + case + eta + [ (\c -> + (\go a -> + go + (mapQuantity + a)) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (constr 0 + []) + , (\x + xs -> + constr 1 + [ (constr 0 + [ c + , x ]) + , (s + s + xs) ]) ]))) ]) + tokenQuantities) + [ (s s xs) + , (\ipv + ipv -> + constr 1 + [ (constr 0 + [ currency + , (concatMap + (\eta -> + case + eta + [ (\c -> + (\go + a -> + go + (mapQuantity + a)) + ((\s -> + s + s) + (\s + ds -> + case + ds + [ (constr 0 + [ ]) + , (\x + xs -> + constr 1 + [ (constr 0 + [ c + , x ]) + , (s + s + xs) ]) ]))) ]) + tokenQuantities) ]) + , (s s xs) ]) ]) ]) ]))) + (\x -> + case + (lessThanInteger 0 x) + [(constr 0 []), (constr 1 [x, (constr 0 [])])])) + (\f -> + (\go eta -> go eta) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + (\ys -> + (\s -> s s (f x)) + (\s ds -> + case + ds + [ ys + , (\x xs -> + constr 1 + [x, (s s xs)]) ])) + (s s xs)) ])))) + ((\s -> s s) + (\s ds acc ds -> case - (lessThanEqualsInteger x 0) - [(constr 1 [x, (constr 0 [])]), (constr 0 [])])) - (\f -> - (\go eta -> go eta) - ((\s -> s s) - (\s ds -> - case - ds - [ (constr 0 []) - , (\x xs -> - (\ys -> - (\s -> s s (f x)) - (\s ds -> - case - ds - [ ys - , (\x xs -> - constr 1 [x, (s s xs)]) ])) - (s s xs)) ])))) - ((\s -> s s) - (\s ds acc ds -> + ds + [ acc + , (\ds xs -> + case + ds + [ (\ds ds -> + case + ds + [ (\ds ds ds ds -> + case + (`$fEqAddress0_$c==` ds ds) + [ (case + (constr 0 [s, ds, acc, xs]) + [s]) + , (case + (constr 0 + [ s + , ds + , (constr 1 [ds, acc]) + , xs ]) + [s]) ]) ]) ]) ]))) + ((\s -> + s s) + (\s + ds + acc + ds -> case ds [ acc - , (\ds xs -> + , (\x' + xs' -> case - ds - [ (\ds ds -> + x' + [ (\ds + ds + ds + ds -> case - ds - [ (\ds ds ds ds -> - case - (`$fEqAddress0_$c==` ds ds) - [ (case - (constr 0 [s, ds, acc, xs]) - [s]) - , (case - (constr 0 - [ s - , ds - , (constr 1 [ds, acc]) - , xs ]) - [s]) ]) ]) ]) ]))) - ((\s -> - s s) - (\s - ds - acc - ds -> - case - ds - [ acc - , (\x' - xs' -> - case - x' - [ (\ds - ds - ds - ds -> - case - (`$fEqAddress0_$c==` ds ds) - [ (case (constr 0 [s, ds, acc, xs']) [s]) - , (case - (case acc [True, (\ipv ipv -> False)]) - [ ((\x -> - error) - (force - trace - "There can only be one output to address" - (constr 0 []))) - , (case - (constr 0 - [ s - , ds - , (constr 1 [x', acc]) - , xs' ]) - [s]) ]) ]) ]) ]))) - (\ds -> - (\x -> error) - (force trace "Missing output to address" (constr 0 [])))) - (\eta - eta -> - case - eta - [ (\l1l - l2l -> - case - eta - [ (\r1r - r2r -> - (\`$fEqCredential0_$c==` -> - case - (`$fEqCredential0_$c==` l1l r1r) - [ False - , (case - l2l + (`$fEqAddress0_$c==` ds ds) + [ (case (constr 0 [s, ds, acc, xs']) [s]) + , (case + (case acc [True, (\ipv ipv -> False)]) + [ ((\x -> + error) + (forced + "There can only be one output to address" + (constr 0 []))) + , (case + (constr 0 + [ s + , ds + , (constr 1 [x', acc]) + , xs' ]) + [s]) ]) ]) ]) ]))) + (\ds -> + (\x -> error) + (forced "Missing output to address" (constr 0 [])))) + (\eta + eta -> + case + eta + [ (\l1l + l2l -> + case + eta + [ (\r1r + r2r -> + (\`$fEqCredential0_$c==` -> + case + (`$fEqCredential0_$c==` l1l r1r) + [ False + , (case + l2l + [ (\l1l -> + case + r2r + [ (\r1r -> + case + l1l + [ (\l1l -> + case + r1r + [ (\r1r -> + `$fEqCredential0_$c==` + l1l + r1r) + , (\ipv ipv ipv -> + False) ]) + , (\l1l + l2l + l3l -> + case + r1r + [ (\ipv -> False) + , (\r1r + r2r + r3r -> + case + (equalsInteger + l1l + r1r) + [ False + , (case + (equalsInteger + l2l + r2r) + [ False + , (equalsInteger + l3l + r3r) ]) ]) ]) ]) + , False ]) + , (case r2r [(\ipv -> False), True]) ]) ]) + (\ds ds -> + case + ds [ (\l1l -> case - r2r - [ (\r1r -> - case + ds + [ (\r1r -> equalsByteString l1l r1r) + , (\ipv -> False) ]) + , (\l1l -> + case + ds + [ (\ipv -> False) + , (\r1r -> + equalsByteString l1l - [ (\l1l -> - case - r1r - [ (\r1r -> - `$fEqCredential0_$c==` - l1l - r1r) - , (\ipv ipv ipv -> - False) ]) - , (\l1l - l2l - l3l -> - case - r1r - [ (\ipv -> False) - , (\r1r - r2r - r3r -> - case - (equalsInteger - l1l - r1r) - [ False - , (case - (equalsInteger - l2l - r2r) - [ False - , (equalsInteger - l3l - r3r) ]) ]) ]) ]) - , False ]) - , (case r2r [(\ipv -> False), True]) ]) ]) - (\ds ds -> - case - ds - [ (\l1l -> - case - ds - [ (\r1r -> equalsByteString l1l r1r) - , (\ipv -> False) ]) - , (\l1l -> - case - ds - [ (\ipv -> False) - , (\r1r -> - equalsByteString l1l r1r) ]) ])) ]) ]) + r1r) ]) ])) ]) ])) + (force chooseData) + (force trace) (Constr 0 [ Constr 0 [ List diff --git a/plutus-benchmark/coop/test/9.6/authMpBurning.golden.eval b/plutus-benchmark/coop/test/9.6/authMpBurning.golden.eval index 23e6ecc4c9b..331054e0138 100644 --- a/plutus-benchmark/coop/test/9.6/authMpBurning.golden.eval +++ b/plutus-benchmark/coop/test/9.6/authMpBurning.golden.eval @@ -1,6 +1,6 @@ -CPU: 159_973_352 -Memory: 795_166 -AST Size: 1_428 -Flat Size: 5_365 +CPU: 154_933_352 +Memory: 763_666 +AST Size: 1_354 +Flat Size: 5_344 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/authMpMinting.golden.eval b/plutus-benchmark/coop/test/9.6/authMpMinting.golden.eval index 23ffbce6085..bdc4d8015ae 100644 --- a/plutus-benchmark/coop/test/9.6/authMpMinting.golden.eval +++ b/plutus-benchmark/coop/test/9.6/authMpMinting.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_547_014 -Memory: 1_841_856 -AST Size: 1_428 -Flat Size: 6_762 +CPU: 357_859_014 +Memory: 1_775_056 +AST Size: 1_354 +Flat Size: 6_741 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/certMpBurning.golden.eval b/plutus-benchmark/coop/test/9.6/certMpBurning.golden.eval index 4fc17638116..1da645c78e5 100644 --- a/plutus-benchmark/coop/test/9.6/certMpBurning.golden.eval +++ b/plutus-benchmark/coop/test/9.6/certMpBurning.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_833_257_359 -Memory: 10_701_518 -AST Size: 3_069 -Flat Size: 8_023 +CPU: 1_825_154_094 +Memory: 10_650_918 +AST Size: 2_977 +Flat Size: 7_990 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/certMpMinting.golden.eval b/plutus-benchmark/coop/test/9.6/certMpMinting.golden.eval index 4aa61c6d707..5a6074a167a 100644 --- a/plutus-benchmark/coop/test/9.6/certMpMinting.golden.eval +++ b/plutus-benchmark/coop/test/9.6/certMpMinting.golden.eval @@ -1,6 +1,6 @@ -CPU: 398_262_706 -Memory: 2_013_656 -AST Size: 3_069 -Flat Size: 8_546 +CPU: 387_254_706 +Memory: 1_944_856 +AST Size: 2_977 +Flat Size: 8_513 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/fsMpBurning.golden.eval b/plutus-benchmark/coop/test/9.6/fsMpBurning.golden.eval index 9060be919b6..8105d65bfe6 100644 --- a/plutus-benchmark/coop/test/9.6/fsMpBurning.golden.eval +++ b/plutus-benchmark/coop/test/9.6/fsMpBurning.golden.eval @@ -1,6 +1,6 @@ -CPU: 218_127_256 -Memory: 1_137_975 -AST Size: 3_469 -Flat Size: 7_390 +CPU: 213_215_256 +Memory: 1_107_275 +AST Size: 3_357 +Flat Size: 7_350 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/fsMpMinting.golden.eval b/plutus-benchmark/coop/test/9.6/fsMpMinting.golden.eval index 033759945f7..7f36a129d01 100644 --- a/plutus-benchmark/coop/test/9.6/fsMpMinting.golden.eval +++ b/plutus-benchmark/coop/test/9.6/fsMpMinting.golden.eval @@ -1,6 +1,6 @@ -CPU: 558_289_462 -Memory: 2_985_467 -AST Size: 3_469 -Flat Size: 9_208 +CPU: 547_921_462 +Memory: 2_920_667 +AST Size: 3_357 +Flat Size: 9_168 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/coop/test/9.6/mustBurnOwnSingleton.golden.eval b/plutus-benchmark/coop/test/9.6/mustBurnOwnSingleton.golden.eval index a943ab6666e..6c3c5e75ae0 100644 --- a/plutus-benchmark/coop/test/9.6/mustBurnOwnSingleton.golden.eval +++ b/plutus-benchmark/coop/test/9.6/mustBurnOwnSingleton.golden.eval @@ -1,6 +1,6 @@ -CPU: 113_258_490 -Memory: 574_505 -AST Size: 1_224 -Flat Size: 3_805 +CPU: 110_170_490 +Memory: 555_205 +AST Size: 1_152 +Flat Size: 3_785 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden b/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden index 64d2611ae49..13c60f34e30 100644 --- a/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden +++ b/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden @@ -1,20 +1,20 @@ n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 374 (2.3%) 1747704 (0.0%) 9329 (0.1%) - 10 2101 (12.8%) 580916364 (5.8%) 228689 (1.6%) - 20 3828 (23.4%) 1160085024 (11.6%) 448049 (3.2%) - 30 5555 (33.9%) 1739253684 (17.4%) 667409 (4.8%) - 40 7282 (44.4%) 2318422344 (23.2%) 886769 (6.3%) - 50 9008 (55.0%) 2897591004 (29.0%) 1106129 (7.9%) - 60 10735 (65.5%) 3476759664 (34.8%) 1325489 (9.5%) - 70 12462 (76.1%) 4055928324 (40.6%) 1544849 (11.0%) - 80 14188 (86.6%) 4635096984 (46.4%) 1764209 (12.6%) - 90 15915 (97.1%) 5214265644 (52.1%) 1983569 (14.2%) - 100 17642 (107.7%) 5793434304 (57.9%) 2202929 (15.7%) - 110 19369 (118.2%) 6372602964 (63.7%) 2422289 (17.3%) - 120 21095 (128.8%) 6951771624 (69.5%) 2641649 (18.9%) - 130 22822 (139.3%) 7530940284 (75.3%) 2861009 (20.4%) - 140 24549 (149.8%) 8110108944 (81.1%) 3080369 (22.0%) - 150 26276 (160.4%) 8689277604 (86.9%) 3299729 (23.6%) + 0 376 (2.3%) 1779704 (0.0%) 9529 (0.1%) + 10 2103 (12.8%) 580148364 (5.8%) 223889 (1.6%) + 20 3830 (23.4%) 1158517024 (11.6%) 438249 (3.1%) + 30 5557 (33.9%) 1736885684 (17.4%) 652609 (4.7%) + 40 7284 (44.5%) 2315254344 (23.2%) 866969 (6.2%) + 50 9010 (55.0%) 2893623004 (28.9%) 1081329 (7.7%) + 60 10737 (65.5%) 3471991664 (34.7%) 1295689 (9.3%) + 70 12464 (76.1%) 4050360324 (40.5%) 1510049 (10.8%) + 80 14190 (86.6%) 4628728984 (46.3%) 1724409 (12.3%) + 90 15917 (97.1%) 5207097644 (52.1%) 1938769 (13.8%) + 100 17644 (107.7%) 5785466304 (57.9%) 2153129 (15.4%) + 110 19371 (118.2%) 6363834964 (63.6%) 2367489 (16.9%) + 120 21097 (128.8%) 6942203624 (69.4%) 2581849 (18.4%) + 130 22824 (139.3%) 7520572284 (75.2%) 2796209 (20.0%) + 140 24551 (149.8%) 8098940944 (81.0%) 3010569 (21.5%) + 150 26278 (160.4%) 8677309604 (86.8%) 3224929 (23.0%) Off-chain version succeeded on 100 inputs diff --git a/plutus-benchmark/linear-vesting/test/9.6/main.golden.eval b/plutus-benchmark/linear-vesting/test/9.6/main.golden.eval index 5777db76b0e..5abc59ad2b5 100644 --- a/plutus-benchmark/linear-vesting/test/9.6/main.golden.eval +++ b/plutus-benchmark/linear-vesting/test/9.6/main.golden.eval @@ -1,6 +1,6 @@ -CPU: 11_039_941 -Memory: 45_828 -AST Size: 1_405 -Flat Size: 2_193 +CPU: 10_623_941 +Memory: 43_228 +AST Size: 1_305 +Flat Size: 2_161 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/linear-vesting/test/9.6/main.golden.uplc b/plutus-benchmark/linear-vesting/test/9.6/main.golden.uplc index 7b2e00090b9..6cffba51697 100644 --- a/plutus-benchmark/linear-vesting/test/9.6/main.golden.uplc +++ b/plutus-benchmark/linear-vesting/test/9.6/main.golden.uplc @@ -1,877 +1,804 @@ (program 1.1.0 - ((\fix1 -> - (\countInputsAtScript -> - (\caseList' -> - (\findInputByOutRef -> - (\findOutputByAddress -> - (\txSignedBy' - scriptContextData -> - (\ctxFields -> - (\txInfoFields -> - (\txInfoFields -> - (\txInfoFields -> - (\txSignatories -> - (\txValidRange -> - (\txOutputs -> - (\txInputs -> - (\redeemerTag -> - (\spendingInfo -> - (\ownRef -> - (\datumData -> - case - (force - trace - "Parsed ScriptContext" - (force - trace - "Parsed Redeemer" - (case - redeemerTag - [ (force - trace - "Partial unlock requested" - ((\currentTimeApproximation -> - (\vdFields -> - (\vdFields -> - (\vdFields -> - (\vdFields -> - (\vdFields -> - (\vdFields -> - (\totalInstallments -> - (\firstUnlockPossibleAfter -> - (\vestingPeriodEnd -> - (\vestingTimeRemaining -> - (\timeBetweenTwoInstallments -> - (\expectedRemainingQty -> - (\assetFields -> - (\assetCs -> - (\assetTn -> - (\findToken -> - (\findCurrency -> - (\findToken -> - (\findCurrency -> - (\beneficiaryHash -> - (\signed -> - (\resolvedFields -> - (\inputAddress -> - (\scriptHash -> - (\ownOutputFields -> - (\outputDatum -> - (\newRemainingQty -> - (\resolvedDatum -> - (\oldRemainingQty -> - case - signed - [ ((\x -> - error) - (force - trace - "Missing beneficiary signature" - (constr 0 - [ ]))) - , (case - (lessThanEqualsInteger - currentTimeApproximation - firstUnlockPossibleAfter) - [ (case - (lessThanEqualsInteger - newRemainingQty - 0) - [ (case - (lessThanEqualsInteger - oldRemainingQty - newRemainingQty) - [ (case - (equalsInteger - expectedRemainingQty - newRemainingQty) - [ ((\x -> - error) - (force - trace - "Mismatched remaining asset" - (constr 0 - [ ]))) - , (case - (equalsData - resolvedDatum - outputDatum) - [ ((\x -> - error) - (force - trace - "Datum Modification Prohibited" - (constr 0 - [ ]))) - , (case - (equalsInteger - 1 - (countInputsAtScript - scriptHash - txInputs)) - [ ((\x -> - error) - (force - trace - "Double satisfaction" - (constr 0 - [ ]))) - , True ]) ]) ]) - , ((\x -> - error) - (force - trace - "Remaining asset is not decreasing" - (constr 0 - [ ]))) ]) - , ((\x -> - error) - (force - trace - "Zero remaining assets not allowed" - (constr 0 - [ ]))) ]) - , ((\x -> - error) - (force - trace - "Unlock not permitted until firstUnlockPossibleAfter time" - (constr 0 - [ ]))) ]) ]) - (findCurrency - (unMapData - (force - headList - (force - tailList - resolvedFields))))) - (force - headList - (force - tailList - (force - tailList - resolvedFields)))) - (findCurrency - (unMapData - (force - headList - (force - tailList - ownOutputFields))))) - (force - headList - (force - tailList - (force - tailList - ownOutputFields)))) - (case - (unConstrData - (findOutputByAddress - inputAddress - txOutputs)) - [ (\l - r -> - r) ])) - (unBData - (force - headList - (case - (unConstrData - (force - headList - (case - (unConstrData - inputAddress) - [ (\l - r -> - r) ]))) - [ (\l - r -> - r) ])))) - (force - headList - resolvedFields)) - (case - (unConstrData - (force - headList - (force - tailList - (case - (unConstrData - (findInputByOutRef - ownRef - txInputs)) - [ (\l - r -> - r) ])))) - [ (\l - r -> - r) ])) - (txSignedBy' - txSignatories - beneficiaryHash)) - (unBData - (force - headList - (case - (unConstrData - (force - headList - (case - (unConstrData - (force - headList - vdFields)) - [ (\l - r -> - r) ]))) - [ (\l - r -> - r) ])))) - (fix1 - (\findCurrency - pairs -> - case - (force - nullList - pairs) - [ ((\pair -> - case - (equalsByteString - (unBData - (case - pair - [ (\l - r -> - l) ])) - assetCs) - [ (findCurrency - (force - tailList - pairs)) - , (findToken - (unMapData - (case - pair - [ (\l - r -> - r) ]))) ]) - (force - headList - pairs)) - , 0 ]))) - (fix1 - (\findToken - pairs -> - case - (force - nullList - pairs) - [ ((\pair -> - case - (equalsByteString - (unBData - (case - pair - [ (\l - r -> - l) ])) - assetTn) - [ (findToken - (force - tailList - pairs)) - , (unIData - (case - pair - [ (\l - r -> - r) ])) ]) - (force - headList - pairs)) - , 0 ]))) - (fix1 - (\findCurrency - pairs -> - case - (force - nullList - pairs) - [ ((\pair -> - case - (equalsByteString - (unBData + (case + (constr 0 + [(force nullList), (force tailList), (force headList), (force trace)]) + [ (\forced + forced + forced + forced -> + (\fix1 -> + (\countInputsAtScript -> + (\caseList' -> + (\findInputByOutRef -> + (\findOutputByAddress -> + (\txSignedBy' + scriptContextData -> + (\ctxFields -> + (\txInfoFields -> + (\txInfoFields -> + (\txInfoFields -> + (\txSignatories -> + (\txValidRange -> + (\txOutputs -> + (\txInputs -> + (\redeemerTag -> + (\spendingInfo -> + (\ownRef -> + (\datumData -> + case + (forced + "Parsed ScriptContext" + (forced + "Parsed Redeemer" + (case + redeemerTag + [ (forced + "Partial unlock requested" + ((\currentTimeApproximation -> + (\vdFields -> + (\vdFields -> + (\vdFields -> + (\vdFields -> + (\vdFields -> + (\vdFields -> + (\totalInstallments -> + (\firstUnlockPossibleAfter -> + (\vestingPeriodEnd -> + (\vestingTimeRemaining -> + (\timeBetweenTwoInstallments -> + (\expectedRemainingQty -> + (\assetFields -> + (\assetCs -> + (\assetTn -> + (\findToken -> + (\findCurrency -> + (\findToken -> + (\findCurrency -> + (\beneficiaryHash -> + (\signed -> + (\resolvedFields -> + (\inputAddress -> + (\scriptHash -> + (\ownOutputFields -> + (\outputDatum -> + (\newRemainingQty -> + (\resolvedDatum -> + (\oldRemainingQty -> + case + signed + [ ((\x -> + error) + (forced + "Missing beneficiary signature" + (constr 0 + [ ]))) + , (case + (lessThanEqualsInteger + currentTimeApproximation + firstUnlockPossibleAfter) + [ (case + (lessThanEqualsInteger + newRemainingQty + 0) + [ (case + (lessThanEqualsInteger + oldRemainingQty + newRemainingQty) + [ (case + (equalsInteger + expectedRemainingQty + newRemainingQty) + [ ((\x -> + error) + (forced + "Mismatched remaining asset" + (constr 0 + [ ]))) + , (case + (equalsData + resolvedDatum + outputDatum) + [ ((\x -> + error) + (forced + "Datum Modification Prohibited" + (constr 0 + [ ]))) + , (case + (equalsInteger + 1 + (countInputsAtScript + scriptHash + txInputs)) + [ ((\x -> + error) + (forced + "Double satisfaction" + (constr 0 + [ ]))) + , True ]) ]) ]) + , ((\x -> + error) + (forced + "Remaining asset is not decreasing" + (constr 0 + [ ]))) ]) + , ((\x -> + error) + (forced + "Zero remaining assets not allowed" + (constr 0 + [ ]))) ]) + , ((\x -> + error) + (forced + "Unlock not permitted until firstUnlockPossibleAfter time" + (constr 0 + [ ]))) ]) ]) + (findCurrency + (unMapData + (forced + (forced + resolvedFields))))) + (forced + (forced + (forced + resolvedFields)))) + (findCurrency + (unMapData + (forced + (forced + ownOutputFields))))) + (forced + (forced + (forced + ownOutputFields)))) + (case + (unConstrData + (findOutputByAddress + inputAddress + txOutputs)) + [ (\l + r -> + r) ])) + (unBData + (forced + (case + (unConstrData + (forced + (case + (unConstrData + inputAddress) + [ (\l + r -> + r) ]))) + [ (\l + r -> + r) ])))) + (forced + resolvedFields)) (case - pair + (unConstrData + (forced + (forced + (case + (unConstrData + (findInputByOutRef + ownRef + txInputs)) + [ (\l + r -> + r) ])))) [ (\l r -> - l) ])) - assetCs) - [ (findCurrency - (force - tailList - pairs)) - , (findToken - (unMapData - (case - pair - [ (\l - r -> - r) ]))) ]) - (force - headList - pairs)) - , 0 ]))) - (fix1 - (\findToken - pairs -> - case - (force - nullList - pairs) - [ ((\pair -> - case - (equalsByteString + r) ])) + (txSignedBy' + txSignatories + beneficiaryHash)) (unBData - (case - pair - [ (\l - r -> - l) ])) - assetTn) - [ (findToken - (force - tailList - pairs)) - , (unIData - (case - pair - [ (\l - r -> - r) ])) ]) - (force - headList - pairs)) - , 0 ]))) - (unBData - (force - headList - (force - tailList - assetFields)))) - (unBData - (force - headList - assetFields))) - (case - (unConstrData - (force - headList - vdFields)) - [ (\l - r -> - r) ])) - (addInteger - 1 - (divideInteger - (subtractInteger - (multiplyInteger - (addInteger - 1 - (divideInteger - (subtractInteger - vestingTimeRemaining - 1) - timeBetweenTwoInstallments)) - (unIData - (force - headList - vdFields))) - 1) - totalInstallments))) - (addInteger - 1 - (divideInteger - (subtractInteger - (subtractInteger - vestingPeriodEnd - (unIData - (force - headList - vdFields))) - 1) - totalInstallments))) - (subtractInteger - vestingPeriodEnd - currentTimeApproximation)) - (unIData - (force - headList - vdFields))) - (unIData - (force - headList - vdFields))) - (unIData - (force - headList - (force - tailList - vdFields)))) - (force - tailList - vdFields)) - (force - tailList - vdFields)) - (force - tailList - vdFields)) - (force - tailList - vdFields)) - (force - tailList - vdFields)) - (case - (unConstrData - datumData) - [ (\l - r -> - r) ])) - ((\lowerFields -> - (\extCon -> - (\extTag -> - (\extFields -> - (\offset -> - case - (equalsInteger - 1 - extTag) - [ ((\x -> - error) - (force - trace - "Time range not Finite" - (constr 0 - [ ]))) - , (addInteger - (unIData - (force - headList - extFields)) - offset) ]) - (case - (equalsInteger - 1 - (case - (unConstrData - (force - headList - (force - tailList - lowerFields))) - [ (\l - r -> - l) ])) - [ 1 - , 0 ])) - (case - extCon - [ (\l - r -> - r) ])) - (case - extCon - [ (\l - r -> - l) ])) - (unConstrData - (force - headList - lowerFields))) - (case - (unConstrData - (force - headList - (case - (unConstrData - txValidRange) - [ (\l - r -> - r) ]))) - [ (\l - r -> - r) ])))) - , (force - trace - "Full unlock requested" - ((\currentTimeApproximation -> - (\vdFields -> - (\vestingPeriodEnd -> - (\beneficiaryHash -> - case - (txSignedBy' - txSignatories - beneficiaryHash) - [ ((\x -> - error) - (force - trace - "Missing beneficiary signature" - (constr 0 - [ ]))) - , (case - (lessThanEqualsInteger - currentTimeApproximation - vestingPeriodEnd) - [ True - , ((\x -> - error) - (force - trace - "Unlock not permitted until vestingPeriodEnd time" - (constr 0 - [ ]))) ]) ]) - (unBData - (force - headList - (case - (unConstrData - (force - headList - (case - (unConstrData - (force - headList - vdFields)) - [ (\l - r -> - r) ]))) - [ (\l - r -> - r) ])))) - (unIData - (force - headList - (force - tailList - (force - tailList - (force - tailList - (force - tailList - vdFields))))))) - (case - (unConstrData - datumData) - [ (\l - r -> - r) ])) - ((\lowerFields -> - (\extCon -> - (\extTag -> - (\extFields -> - (\offset -> - case - (equalsInteger - 1 - extTag) - [ ((\x -> - error) - (force - trace - "Time range not Finite" - (constr 0 - [ ]))) - , (addInteger - (unIData - (force - headList - extFields)) - offset) ]) - (case - (equalsInteger - 1 - (case - (unConstrData - (force - headList - (force - tailList - lowerFields))) - [ (\l - r -> - l) ])) - [ 1 - , 0 ])) - (case - extCon - [ (\l - r -> - r) ])) - (case - extCon - [ (\l - r -> - l) ])) - (unConstrData - (force - headList - lowerFields))) - (case - (unConstrData - (force - headList - (case - (unConstrData - txValidRange) - [ (\l - r -> - r) ]))) - [ (\l - r -> - r) ])))) ]))) - [ ((\x -> - error) - (force - trace - "Validation failed" - (constr 0 - []))) - , (force - trace - "Validation completed" - ()) ]) - (case - spendingInfo - [(\l r -> r)])) - (case - spendingInfo - [(\l r -> l)])) - ((\con -> - (\tag -> - (\fields -> - case - (equalsInteger - 1 - tag) - [ ((\x -> - error) - (force - trace - "Not spending script" - (constr 0 - []))) - , ((\mdCon -> - (\mdTag -> - (\mdFields -> - (\ownRef -> - case - (equalsInteger - 0 - mdTag) - [ ((\x -> - error) - (force - trace - "Missing datum" - (constr 0 - [ ]))) - , (mkPairData - ownRef - (force - headList - mdFields)) ]) - (force - headList - fields)) - (case - mdCon - [ (\l - r -> - r) ])) - (case - mdCon - [ (\l - r -> - l) ])) - (unConstrData - (force - headList - (force - tailList - fields)))) ]) - (case - con - [(\l r -> r)])) - (case - con - [(\l r -> l)])) - (unConstrData - (force - headList - (force - tailList - (force - tailList - ctxFields)))))) - (case - (unConstrData - (force headList - (force tailList - ctxFields))) - [(\l r -> l)])) - (unListData - (force headList txInfoFields))) - (unListData - (force headList txInfoFields))) - (force headList txInfoFields)) - (unListData - (force headList - (force tailList txInfoFields)))) - (force tailList - (force tailList - (force tailList - (force tailList - (force tailList txInfoFields)))))) - (force tailList (force tailList txInfoFields))) - (case - (unConstrData (force headList ctxFields)) - [(\l r -> r)])) - (case - (unConstrData - (force trace - "Parsing ScriptContext..." - scriptContextData)) - [(\l r -> r)])) - (fix1 - (\txSignedBy' signatories pkh -> - case - signatories - [ (\s ss -> - case - (equalsByteString (unBData s) pkh) - [(txSignedBy' ss pkh), True]) - , False ]))) - (fix1 - (\findOutputByAddress addr outputs -> - case - (constr 0 - [ ((\x -> error) - (force trace - "Own output not found" - (constr 0 []))) - , (\out outs -> + (forced + (case + (unConstrData + (forced + (case + (unConstrData + (forced + vdFields)) + [ (\l + r -> + r) ]))) + [ (\l + r -> + r) ])))) + (fix1 + (\findCurrency + pairs -> + case + (forced + pairs) + [ ((\pair -> + case + (equalsByteString + (unBData + (case + pair + [ (\l + r -> + l) ])) + assetCs) + [ (findCurrency + (forced + pairs)) + , (findToken + (unMapData + (case + pair + [ (\l + r -> + r) ]))) ]) + (forced + pairs)) + , 0 ]))) + (fix1 + (\findToken + pairs -> + case + (forced + pairs) + [ ((\pair -> + case + (equalsByteString + (unBData + (case + pair + [ (\l + r -> + l) ])) + assetTn) + [ (findToken + (forced + pairs)) + , (unIData + (case + pair + [ (\l + r -> + r) ])) ]) + (forced + pairs)) + , 0 ]))) + (fix1 + (\findCurrency + pairs -> + case + (forced + pairs) + [ ((\pair -> + case + (equalsByteString + (unBData + (case + pair + [ (\l + r -> + l) ])) + assetCs) + [ (findCurrency + (forced + pairs)) + , (findToken + (unMapData + (case + pair + [ (\l + r -> + r) ]))) ]) + (forced + pairs)) + , 0 ]))) + (fix1 + (\findToken + pairs -> + case + (forced + pairs) + [ ((\pair -> + case + (equalsByteString + (unBData + (case + pair + [ (\l + r -> + l) ])) + assetTn) + [ (findToken + (forced + pairs)) + , (unIData + (case + pair + [ (\l + r -> + r) ])) ]) + (forced + pairs)) + , 0 ]))) + (unBData + (forced + (forced + assetFields)))) + (unBData + (forced + assetFields))) + (case + (unConstrData + (forced + vdFields)) + [ (\l + r -> + r) ])) + (addInteger + 1 + (divideInteger + (subtractInteger + (multiplyInteger + (addInteger + 1 + (divideInteger + (subtractInteger + vestingTimeRemaining + 1) + timeBetweenTwoInstallments)) + (unIData + (forced + vdFields))) + 1) + totalInstallments))) + (addInteger + 1 + (divideInteger + (subtractInteger + (subtractInteger + vestingPeriodEnd + (unIData + (forced + vdFields))) + 1) + totalInstallments))) + (subtractInteger + vestingPeriodEnd + currentTimeApproximation)) + (unIData + (forced + vdFields))) + (unIData + (forced + vdFields))) + (unIData + (forced + (forced + vdFields)))) + (forced + vdFields)) + (forced + vdFields)) + (forced + vdFields)) + (forced + vdFields)) + (forced + vdFields)) + (case + (unConstrData + datumData) + [ (\l + r -> + r) ])) + ((\lowerFields -> + (\extCon -> + (\extTag -> + (\extFields -> + (\offset -> + case + (equalsInteger + 1 + extTag) + [ ((\x -> + error) + (forced + "Time range not Finite" + (constr 0 + [ ]))) + , (addInteger + (unIData + (forced + extFields)) + offset) ]) + (case + (equalsInteger + 1 + (case + (unConstrData + (forced + (forced + lowerFields))) + [ (\l + r -> + l) ])) + [ 1 + , 0 ])) + (case + extCon + [ (\l + r -> + r) ])) + (case + extCon + [ (\l + r -> + l) ])) + (unConstrData + (forced + lowerFields))) + (case + (unConstrData + (forced + (case + (unConstrData + txValidRange) + [ (\l + r -> + r) ]))) + [ (\l + r -> + r) ])))) + , (forced + "Full unlock requested" + ((\currentTimeApproximation -> + (\vdFields -> + (\vestingPeriodEnd -> + (\beneficiaryHash -> + case + (txSignedBy' + txSignatories + beneficiaryHash) + [ ((\x -> + error) + (forced + "Missing beneficiary signature" + (constr 0 + [ ]))) + , (case + (lessThanEqualsInteger + currentTimeApproximation + vestingPeriodEnd) + [ True + , ((\x -> + error) + (forced + "Unlock not permitted until vestingPeriodEnd time" + (constr 0 + [ ]))) ]) ]) + (unBData + (forced + (case + (unConstrData + (forced + (case + (unConstrData + (forced + vdFields)) + [ (\l + r -> + r) ]))) + [ (\l + r -> + r) ])))) + (unIData + (forced + (forced + (forced + (forced + (forced + vdFields))))))) + (case + (unConstrData + datumData) + [ (\l + r -> + r) ])) + ((\lowerFields -> + (\extCon -> + (\extTag -> + (\extFields -> + (\offset -> + case + (equalsInteger + 1 + extTag) + [ ((\x -> + error) + (forced + "Time range not Finite" + (constr 0 + [ ]))) + , (addInteger + (unIData + (forced + extFields)) + offset) ]) + (case + (equalsInteger + 1 + (case + (unConstrData + (forced + (forced + lowerFields))) + [ (\l + r -> + l) ])) + [ 1 + , 0 ])) + (case + extCon + [ (\l + r -> + r) ])) + (case + extCon + [ (\l + r -> + l) ])) + (unConstrData + (forced + lowerFields))) + (case + (unConstrData + (forced + (case + (unConstrData + txValidRange) + [ (\l + r -> + r) ]))) + [ (\l + r -> + r) ])))) ]))) + [ ((\x -> + error) + (forced + "Validation failed" + (constr 0 + [ ]))) + , (forced + "Validation completed" + ()) ]) + (case + spendingInfo + [ (\l r -> + r) ])) + (case + spendingInfo + [(\l r -> l)])) + ((\con -> + (\tag -> + (\fields -> + case + (equalsInteger + 1 + tag) + [ ((\x -> + error) + (forced + "Not spending script" + (constr 0 + [ ]))) + , ((\mdCon -> + (\mdTag -> + (\mdFields -> + (\ownRef -> + case + (equalsInteger + 0 + mdTag) + [ ((\x -> + error) + (forced + "Missing datum" + (constr 0 + [ ]))) + , (mkPairData + ownRef + (forced + mdFields)) ]) + (forced + fields)) + (case + mdCon + [ (\l + r -> + r) ])) + (case + mdCon + [ (\l + r -> + l) ])) + (unConstrData + (forced + (forced + fields)))) ]) + (case + con + [ (\l + r -> + r) ])) + (case + con + [ (\l r -> + l) ])) + (unConstrData + (forced + (forced + (forced + ctxFields)))))) + (case + (unConstrData + (forced + (forced + ctxFields))) + [(\l r -> l)])) + (unListData + (forced txInfoFields))) + (unListData + (forced txInfoFields))) + (forced txInfoFields)) + (unListData + (forced (forced txInfoFields)))) + (forced + (forced + (forced + (forced + (forced txInfoFields)))))) + (forced (forced txInfoFields))) + (case + (unConstrData (forced ctxFields)) + [(\l r -> r)])) + (case + (unConstrData + (forced + "Parsing ScriptContext..." + scriptContextData)) + [(\l r -> r)])) + (fix1 + (\txSignedBy' signatories pkh -> case - (equalsData - (force headList - (case - (unConstrData out) - [(\l r -> r)])) - addr) - [(findOutputByAddress addr outs), out]) - , outputs ]) - [caseList']))) - (fix1 - (\findInputByOutRef ref inputs -> - case - (constr 0 - [ ((\x -> error) - (force trace - "Own input not found" - (constr 0 []))) - , (\txIn txIns -> + signatories + [ (\s ss -> + case + (equalsByteString (unBData s) pkh) + [(txSignedBy' ss pkh), True]) + , False ]))) + (fix1 + (\findOutputByAddress addr outputs -> case - (equalsData - (force headList - (case (unConstrData txIn) [(\l r -> r)])) - ref) - [(findInputByOutRef ref txIns), txIn]) - , inputs ]) - [caseList']))) - (\z f xs -> case xs [f, z])) - (fix1 - (\countInputsAtScript scriptHash inputs -> - case - inputs - [ (\txIn txIns -> - (\rest -> - (\credCon -> - (\credTag -> - (\credFields -> - case - (equalsInteger 1 credTag) - [ rest - , (case - (equalsByteString - (unBData - (force headList credFields)) - scriptHash) - [rest, (addInteger 1 rest)]) ]) - (case credCon [(\l r -> r)])) - (case credCon [(\l r -> l)])) - (unConstrData - (force headList - (case - (unConstrData - (force headList - (case - (unConstrData - (force headList - (force tailList - (case - (unConstrData txIn) - [(\l r -> r)])))) - [(\l r -> r)]))) - [(\l r -> r)])))) - (countInputsAtScript scriptHash txIns)) - , 0 ]))) - (\f -> - (\s -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - f - (\x -> - s s x) - x) - x) - x) - x) - x) - x) - x) - x) - x) - x) - x)) - (\s -> f (\x -> s s x))) + (constr 0 + [ ((\x -> error) + (forced + "Own output not found" + (constr 0 []))) + , (\out outs -> + case + (equalsData + (forced + (case + (unConstrData out) + [(\l r -> r)])) + addr) + [ (findOutputByAddress addr outs) + , out ]) + , outputs ]) + [caseList']))) + (fix1 + (\findInputByOutRef ref inputs -> + case + (constr 0 + [ ((\x -> error) + (forced + "Own input not found" + (constr 0 []))) + , (\txIn txIns -> + case + (equalsData + (forced + (case + (unConstrData txIn) + [(\l r -> r)])) + ref) + [(findInputByOutRef ref txIns), txIn]) + , inputs ]) + [caseList']))) + (\z f xs -> case xs [f, z])) + (fix1 + (\countInputsAtScript scriptHash inputs -> + case + inputs + [ (\txIn txIns -> + (\rest -> + (\credCon -> + (\credTag -> + (\credFields -> + case + (equalsInteger 1 credTag) + [ rest + , (case + (equalsByteString + (unBData (forced credFields)) + scriptHash) + [rest, (addInteger 1 rest)]) ]) + (case credCon [(\l r -> r)])) + (case credCon [(\l r -> l)])) + (unConstrData + (forced + (case + (unConstrData + (forced + (case + (unConstrData + (forced + (forced + (case + (unConstrData + txIn) + [ (\l r -> + r) ])))) + [(\l r -> r)]))) + [(\l r -> r)])))) + (countInputsAtScript scriptHash txIns)) + , 0 ]))) + (\f -> + (\s -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + f + (\x -> + s + s + x) + x) + x) + x) + x) + x) + x) + x) + x) + x) + x) + x)) + (\s -> f (\x -> s s x)))) ] (Constr 0 [ Constr 0 [ List diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.golden.eval index 0f19c169f99..f2985a166cd 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.golden.eval @@ -1,6 +1,6 @@ -CPU: 65_033_610 -Memory: 301_330 -AST Size: 103 -Flat Size: 174 +CPU: 65_097_610 +Memory: 301_730 +AST Size: 106 +Flat Size: 176 (con integer 155) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.golden.eval index fd85878cce6..c11113c0abf 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_628_028_200 -Memory: 25_513_300 -AST Size: 103 -Flat Size: 757 +CPU: 5_628_092_200 +Memory: 25_513_700 +AST Size: 106 +Flat Size: 759 (con integer 15050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.golden.eval index 6707d197c81..6fbaa5190c9 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.golden.eval @@ -1,6 +1,6 @@ -CPU: 18_910_330 -Memory: 89_590 -AST Size: 103 -Flat Size: 151 +CPU: 18_974_330 +Memory: 89_990 +AST Size: 106 +Flat Size: 154 (con integer 40) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.golden.eval index bc37b8e98e2..af733701478 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_430_393_650 -Memory: 6_500_650 -AST Size: 103 -Flat Size: 373 +CPU: 1_430_457_650 +Memory: 6_501_050 +AST Size: 106 +Flat Size: 375 (con integer 3775) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.golden.eval index 5dc17db179e..d35cbe8ad3c 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.golden.eval @@ -1,6 +1,6 @@ -CPU: 71_059_410 -Memory: 333_350 -AST Size: 206 -Flat Size: 312 +CPU: 71_123_410 +Memory: 333_750 +AST Size: 209 +Flat Size: 314 (con integer 155) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.golden.eval index 2e1d5984e30..a17d3b92605 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_688_286_200 -Memory: 25_833_500 -AST Size: 926 -Flat Size: 1_974 +CPU: 5_688_350_200 +Memory: 25_833_900 +AST Size: 929 +Flat Size: 1_976 (con integer 15050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.golden.eval index 6f04388f37f..36ecace3d7d 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.golden.eval @@ -1,6 +1,6 @@ -CPU: 21_923_230 -Memory: 105_600 -AST Size: 166 -Flat Size: 228 +CPU: 21_987_230 +Memory: 106_000 +AST Size: 169 +Flat Size: 231 (con integer 40) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.golden.eval b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.golden.eval index d2b5ec0746d..c1fefe07bd9 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.golden.eval +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_460_522_650 -Memory: 6_660_750 -AST Size: 526 -Flat Size: 990 +CPU: 1_460_586_650 +Memory: 6_661_150 +AST Size: 529 +Flat Size: 992 (con integer 3775) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.golden.eval b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.golden.eval index 790b7c878f6..30dd04764c3 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.golden.eval +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.golden.eval @@ -1,6 +1,6 @@ -CPU: 155_828_496 -Memory: 718_265 -AST Size: 122 -Flat Size: 704 +CPU: 152_740_496 +Memory: 698_965 +AST Size: 128 +Flat Size: 709 (con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.golden.eval b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.golden.eval index 7cfef59c274..64950ce592e 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.golden.eval +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.golden.eval @@ -1,6 +1,6 @@ -CPU: 160_628_496 -Memory: 748_265 -AST Size: 125 -Flat Size: 706 +CPU: 157_540_496 +Memory: 728_965 +AST Size: 131 +Flat Size: 711 (con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/scripts/rolepayout/validator/data.flat b/plutus-benchmark/marlowe/scripts/rolepayout/validator/data.flat index 88603981614..cb6152386a0 100644 Binary files a/plutus-benchmark/marlowe/scripts/rolepayout/validator/data.flat and b/plutus-benchmark/marlowe/scripts/rolepayout/validator/data.flat differ diff --git a/plutus-benchmark/marlowe/scripts/rolepayout/validator/sop.flat b/plutus-benchmark/marlowe/scripts/rolepayout/validator/sop.flat index 751fb23f459..3ab0951a82d 100644 Binary files a/plutus-benchmark/marlowe/scripts/rolepayout/validator/sop.flat and b/plutus-benchmark/marlowe/scripts/rolepayout/validator/sop.flat differ diff --git a/plutus-benchmark/marlowe/scripts/semantics/validator/data.flat b/plutus-benchmark/marlowe/scripts/semantics/validator/data.flat index 7ff1cb1ee51..1af2884c8f2 100644 Binary files a/plutus-benchmark/marlowe/scripts/semantics/validator/data.flat and b/plutus-benchmark/marlowe/scripts/semantics/validator/data.flat differ diff --git a/plutus-benchmark/marlowe/scripts/semantics/validator/sop.flat b/plutus-benchmark/marlowe/scripts/semantics/validator/sop.flat index d0be398c481..babcc9a6eb4 100644 Binary files a/plutus-benchmark/marlowe/scripts/semantics/validator/sop.flat and b/plutus-benchmark/marlowe/scripts/semantics/validator/sop.flat differ diff --git a/plutus-benchmark/marlowe/test/budgets.golden.tsv b/plutus-benchmark/marlowe/test/budgets.golden.tsv index 5057e9165d3..cee7ce0fb65 100644 --- a/plutus-benchmark/marlowe/test/budgets.golden.tsv +++ b/plutus-benchmark/marlowe/test/budgets.golden.tsv @@ -1,200 +1,200 @@ -244341380 1150786 11608 -340950489 1336004 11608 -763493725 3718631 11608 -600261963 2598862 11608 -730158097 1778962 11608 -227747786 1079943 11608 -595872986 2709128 11608 -595334728 2811378 11608 -558789075 2488543 11608 -883415079 3863045 11608 -862821743 3516334 11608 -789030674 3689617 11608 -884488026 4108854 11608 -1066632058 4838596 11608 -364648799 1739987 11608 -562394930 2594581 11608 -382386200 1819379 11608 -572967024 2683058 11608 -229969726 1084845 11608 -699154874 3121293 11608 -593479732 2510589 11608 -230024284 1084845 11608 -904613052 955489 11608 -3800644165 1286822 11608 -263826496 1211122 11608 -227747786 1079943 11608 -403777064 1933081 11608 -1690865716 1292843 11608 -747533578 2592968 11608 -595373099 2813026 11608 -591649742 2560026 11608 -847654293 4024618 11608 -229969726 1084845 11608 -354831535 1696069 11608 -464463495 2207310 11608 -564120386 2573459 11608 -227747786 1079943 11608 -629332318 2816260 11608 -227747786 1079943 11608 -797579171 3774356 11608 -532773189 2526817 11608 -302051040 1239164 11608 -283574525 1309510 11608 -290650140 1340976 11608 -227747786 1079943 11608 -568167254 2696941 11608 -227747786 1079943 11608 -375352348 1788471 11608 -824166154 3717398 11608 -802034986 3719203 11608 -401572037 1877610 11608 -229969726 1084845 11608 -551399812 2572838 11608 -377173629 1796663 11608 -495773741 2344943 11608 -2075419357 1438732 11608 -1060918193 4159058 11608 -807925467 3793388 11608 -3800644165 1286822 11608 -377519955 1793373 11608 -578664950 2611686 11608 -366925297 1744889 11608 -606775723 2835900 11608 -594333755 2842089 11608 -530470075 2516335 11608 -389195237 1765004 11608 -364324202 1640159 11608 -1024831072 3886330 11608 -845585327 3909419 11608 -263826496 1211122 11608 -229969726 1084845 11608 -891110196 3885485 11608 -290650140 1340976 11608 -389195237 1765004 11608 -479264835 2216493 11608 -252965819 1130548 11608 -429734321 2019757 11608 -1065797008 4828239 11608 -577293083 2722741 11608 -730557509 3482345 11608 -565246818 2710778 11608 -607921327 2845809 11608 -898646819 925145 11608 -668324316 3115845 11608 -636517165 2947456 11608 -381803780 1814808 11608 -17769739902 808273 11608 -792434471 3767527 11608 -227747786 1079943 11608 -357053475 1700971 11608 -572736475 2721635 11608 -274768052 1169158 11608 -292859306 1359144 11608 -229969726 1084845 11608 -768388592 1937891 11608 -227747786 1079943 11608 -492625756 2193188 11608 -605440479 2305353 11608 -3703327540 878279 11608 -711725032 3244386 11608 -177091770 818700 2605 -253694556 1234120 2605 -191210049 892173 2605 -156147908 710140 2605 -173275074 793544 2605 -162116781 736381 2605 -161179677 731179 2605 -200051219 931591 2605 -186017933 864056 2605 -173315066 794224 2605 -190168278 883004 2605 -191514089 895886 2605 -225125078 1074812 2605 -159341625 725857 2605 -170740651 783523 2605 -154230855 689275 2605 -190766837 898361 2605 -169360424 776400 2605 -170093317 792734 2605 -196298750 923234 2605 -163440805 748787 2605 -180436457 835135 2605 -177091770 818700 2605 -187373073 874451 2605 -161025756 728584 2605 -158923214 720664 2605 -161780399 735079 2605 -158404371 720655 2605 -177259816 812348 2605 -169114757 772231 2605 -179264996 830926 2605 -161025756 728584 2605 -155965447 711433 2605 -170836150 784322 2605 -159341475 725857 2605 -159341475 725857 2605 -192739523 903623 2605 -166440430 760770 2605 -192782040 908586 2605 -177091770 818700 2605 -196704602 912962 2605 -160843295 729877 2605 -160843295 729877 2605 -168397226 775100 2605 -219327711 1046307 2605 -203142278 952786 2605 -172213922 800256 2605 -160843295 729877 2605 -229304207 1106830 2605 -190766837 898361 2605 -168397226 775100 2605 -197063172 928012 2605 -179101611 832097 2605 -158404371 720655 2605 -154230855 689275 2605 -160843295 729877 2605 -161780399 735079 2605 -160843295 729877 2605 -161780399 735079 2605 -185869639 875271 2605 -194063547 916029 2605 -195084388 923924 2605 -176662687 822875 2605 -166675833 763009 2605 -172489171 791495 2605 -181169181 836109 2605 -155211029 704938 2605 -160843295 729877 2605 -200753541 958227 2605 -161780399 735079 2605 -160843295 729877 2605 -161780399 735079 2605 -192403141 902321 2605 -161780399 735079 2605 -220959066 1043894 2605 -244549775 1179219 2605 -161780399 735079 2605 -187525293 883877 2605 -187373073 874451 2605 -162116781 736381 2605 -174223763 813653 2605 -173898203 802983 2605 -201500943 955752 2605 -154230855 689275 2605 -162116781 736381 2605 -184134452 845802 2605 -179823529 828647 2605 -187525293 883877 2605 -168316221 774301 2605 -168318653 767231 2605 -168655035 768533 2605 -161780399 735079 2605 -185657681 856939 2605 -187373073 874451 2605 -160843295 729877 2605 -159341475 725857 2605 -176337127 812205 2605 -161780399 735079 2605 -169114757 772231 2605 -194890117 910310 2605 +233861380 1085286 11094 +329734489 1265904 11094 +737589725 3556731 11094 +575701963 2445362 11094 +712462097 1668362 11094 +217923786 1018543 11094 +574144986 2573328 11094 +570278728 2654778 11094 +535589075 2343543 11094 +840343079 3593845 11094 +818053743 3236534 11094 +759494674 3505017 11094 +848152026 3881754 11094 +1029384058 4605796 11094 +349896799 1647787 11094 +537690930 2440181 11094 +366242200 1718479 11094 +550087024 2540058 11094 +220129726 1023345 11094 +676258874 2978193 11094 +569879732 2363089 11094 +220184284 1023345 11094 +895461052 898289 11094 +3787796165 1206522 11094 +254178496 1150822 11094 +217923786 1018543 11094 +389057064 1841081 11094 +1677729716 1210743 11094 +718365578 2410668 11094 +570093099 2655026 11094 +571665742 2435126 11094 +818982293 3845418 11094 +220129726 1023345 11094 +340095535 1603969 11094 +446895495 2097510 11094 +542504386 2438359 11094 +217923786 1018543 11094 +600964318 2638960 11094 +217923786 1018543 11094 +768107171 3590156 11094 +510485189 2387517 11094 +291923040 1175864 11094 +270054525 1225010 11094 +276506140 1252576 11094 +217923786 1018543 11094 +548007254 2570941 11094 +217923786 1018543 11094 +360296348 1694371 11094 +786294154 3480698 11094 +772306986 3533403 11094 +385924037 1779810 11094 +220129726 1023345 11094 +529943812 2438738 11094 +361989629 1701763 11094 +476205741 2222643 11094 +2060379357 1344732 11094 +1010102193 3841458 11094 +777717467 3604588 11094 +3787796165 1206522 11094 +362447955 1699173 11094 +553896950 2456886 11094 +352157297 1652589 11094 +583799723 2692300 11094 +571613755 2700089 11094 +508038075 2376135 11094 +370731237 1649604 11094 +352964202 1569159 11094 +977711072 3591830 11094 +816625327 3728419 11094 +254178496 1150822 11094 +220129726 1023345 11094 +847942196 3615685 11094 +276506140 1252576 11094 +370731237 1649604 11094 +461824835 2107493 11094 +239461819 1046148 11094 +412310321 1910857 11094 +1028373008 4594339 11094 +557085083 2596441 11094 +704765509 3321145 11094 +541918818 2564978 11094 +585025327 2702709 11094 +889990819 871045 11094 +645668316 2974245 11094 +614261165 2808356 11094 +365899780 1715408 11094 +17762667902 764073 11094 +763234471 3585027 11094 +217923786 1018543 11094 +342301475 1608771 11094 +552480475 2595035 11094 +265664052 1112258 11094 +281179306 1286144 11094 +220129726 1023345 11094 +748260592 1812091 11094 +217923786 1018543 11094 +473361756 2072788 11094 +577616479 2131453 11094 +3695231540 827679 11094 +686797032 3088586 11094 +168499770 765000 2496 +243102556 1167920 2496 +182106049 835273 2496 +148291908 661040 2496 +164699074 739944 2496 +153908781 685081 2496 +152987677 679979 2496 +190515219 871991 2496 +177121933 808456 2496 +164691066 740324 2496 +181032278 825904 2496 +182554089 839886 2496 +215077078 1012012 2496 +151341625 675857 2496 +162340651 731023 2496 +146054855 638175 2496 +182030837 843761 2496 +160928424 723700 2496 +162061317 742534 2496 +187130750 865934 2496 +155360805 698287 2496 +171716457 780635 2496 +168499770 765000 2496 +178525073 819151 2496 +152785756 677084 2496 +150859214 670264 2496 +153588399 683879 2496 +150420371 670755 2496 +168427816 757148 2496 +160666757 719431 2496 +170640996 777026 2496 +152785756 677084 2496 +148173447 662733 2496 +162452150 731922 2496 +151341475 675857 2496 +151341475 675857 2496 +183731523 847323 2496 +158104430 708670 2496 +183870040 852886 2496 +168499770 765000 2496 +187216602 853662 2496 +152667295 678777 2496 +152667295 678777 2496 +160205226 723900 2496 +209503711 984907 2496 +193718278 893886 2496 +164005922 748956 2496 +152667295 678777 2496 +219512207 1045630 2496 +182030837 843761 2496 +160205226 723900 2496 +187927172 870912 2496 +170525611 778497 2496 +150420371 670755 2496 +146054855 638175 2496 +152667295 678777 2496 +153588399 683879 2496 +152667295 678777 2496 +153588399 683879 2496 +177277639 821571 2496 +185183547 860529 2496 +186252388 868724 2496 +168278687 770475 2496 +158419833 711409 2496 +163913171 737895 2496 +172257181 780409 2496 +147371029 655938 2496 +152667295 678777 2496 +191889541 902827 2496 +153588399 683879 2496 +152667295 678777 2496 +153588399 683879 2496 +183411141 846121 2496 +153588399 683879 2496 +210783066 980294 2496 +234133775 1114119 2496 +153588399 683879 2496 +178917293 830077 2496 +178525073 819151 2496 +153908781 685081 2496 +166031763 762453 2496 +165450203 750183 2496 +192412943 898952 2496 +146054855 638175 2496 +153908781 685081 2496 +175014452 788802 2496 +170991529 773447 2496 +178917293 830077 2496 +160108221 723001 2496 +159854653 714331 2496 +160175035 715533 2496 +153588399 683879 2496 +176665681 800739 2496 +178525073 819151 2496 +152667295 678777 2496 +151341475 675857 2496 +167697127 758205 2496 +153588399 683879 2496 +160666757 719431 2496 +185722117 853010 2496 diff --git a/plutus-benchmark/marlowe/test/data.budgets.golden.tsv b/plutus-benchmark/marlowe/test/data.budgets.golden.tsv index f7e797f0a91..2b5161e7790 100644 --- a/plutus-benchmark/marlowe/test/data.budgets.golden.tsv +++ b/plutus-benchmark/marlowe/test/data.budgets.golden.tsv @@ -1,200 +1,200 @@ -254475257 1134603 12156 -359666774 1342658 12156 -914863377 4015784 12156 -661301652 2695902 12156 -760238219 1784823 12156 -237313864 1062832 12156 -650786234 2792130 12156 -698882591 3009851 12156 -618340171 2588489 12156 -910147628 3894373 12156 -889736281 3554092 12156 -915304754 3941885 12156 -1049290843 4469546 12156 -1181501677 5054815 12156 -390381549 1767687 12156 -617164178 2676683 12156 -412432648 1868812 12156 -661276875 2833210 12156 -240007603 1068062 12156 -784733688 3254851 12156 -644640853 2581960 12156 -240062161 1068062 12156 -923137337 960943 12156 -3828045425 1326004 12156 -282070982 1217448 12156 -237313864 1062832 12156 -442454734 1998885 12156 -1717532053 1326429 12156 -774583915 2628954 12156 -693257392 2981971 12156 -643050863 2632897 12156 -1003991060 4329343 12156 -240007603 1068062 12156 -380527481 1732392 12156 -517639741 2287875 12156 -619505433 2656789 12156 -237313864 1062832 12156 -680117640 2887903 12156 -237313864 1062832 12156 -961568643 4117166 12156 -602383987 2655072 12156 -320767325 1245818 12156 -293612402 1292727 12156 -300216218 1323865 12156 -237313864 1062832 12156 -652975563 2829974 12156 -237313864 1062832 12156 -401460897 1815899 12156 -922301786 3882123 12156 -888120126 3936671 12156 -428200385 1905666 12156 -240007603 1068062 12156 -612583501 2670778 12156 -403282178 1824091 12156 -546511063 2416286 12156 -2101613895 1471990 12156 -1088496530 4198344 12156 -974603945 4158656 12156 -3828045425 1326004 12156 -404100303 1821129 12156 -633753588 2689373 12156 -393129846 1772917 12156 -692878992 2979713 12156 -687917015 2995057 12156 -589316744 2608876 12156 -407663166 1778153 12156 -383232487 1648013 12156 -1042547356 3833658 12156 -968178455 4121110 12156 -282070982 1217448 12156 -240007603 1068062 12156 -918314544 3917141 12156 -300216218 1323865 12156 -407663166 1778153 12156 -539183321 2312324 12156 -255475623 1102012 12156 -480279643 2089900 12156 -1177157789 5046000 12156 -661805454 2862605 12156 -790146201 3602908 12156 -667363058 2929427 12156 -703289014 3010691 12156 -917171104 930599 12156 -761073368 3262735 12156 -726820929 3091006 12156 -407536530 1842508 12156 -17788264187 813727 12156 -967445645 4151933 12156 -237313864 1062832 12156 -383221220 1737622 12156 -662069796 2872091 12156 -293484337 1175812 12156 -311575591 1365798 12156 -240007603 1068062 12156 -794637197 1938036 12156 -237313864 1062832 12156 -552128852 2292834 12156 -631827017 2339811 12156 -3721851825 883733 12156 -806056612 3393052 12156 -134071662 575243 1615 -290355376 1196427 1615 -169773351 703347 1615 -108246780 462728 1615 -134890588 566761 1615 -105602297 468190 1615 -106539401 473392 1615 -169273588 716211 1615 -162972309 682213 1615 -128037243 554974 1615 -151634630 651239 1615 -177617193 743585 1615 -231210448 930002 1615 -105602447 468190 1615 -131990682 548501 1615 -100256277 423837 1615 -174973085 749047 1615 -132522502 558296 1615 -148327425 620841 1615 -187197463 767904 1615 -114383781 506188 1615 -142929136 602217 1615 -134071662 575243 1615 -160328051 687675 1615 -108246780 462728 1615 -108246780 462728 1615 -105602297 468190 1615 -106539401 473392 1615 -130453374 560004 1615 -121184285 534764 1615 -145988536 628960 1615 -108246780 462728 1615 -106539401 473392 1615 -134890588 566761 1615 -105602297 468190 1615 -105602297 468190 1615 -165109520 687858 1615 -119255759 516976 1615 -176346851 731614 1615 -134071662 575243 1615 -175271193 719250 1615 -106539401 473392 1615 -106539401 473392 1615 -134890588 566761 1615 -225100039 920757 1615 -195844916 828870 1615 -134071662 575243 1615 -106539401 473392 1615 -245845020 1018711 1615 -174973085 749047 1615 -134890588 566761 1615 -178762982 736644 1615 -145683167 626303 1615 -106539401 473392 1615 -100256277 423837 1615 -106539401 473392 1615 -105602297 468190 1615 -106539401 473392 1615 -105602297 468190 1615 -169268846 703633 1615 -173891004 725856 1615 -181779067 771639 1615 -145683167 626303 1615 -121184285 534764 1615 -133478315 560954 1615 -149794252 622321 1615 -109183659 467930 1615 -106539401 473392 1615 -202040310 846148 1615 -105602297 468190 1615 -106539401 473392 1615 -105602297 468190 1615 -165109520 687858 1615 -105602297 468190 1615 -207523565 855668 1615 -275264730 1153008 1615 -105602297 468190 1615 -165109520 687858 1615 -160328051 687675 1615 -105602297 468190 1615 -145683167 626303 1615 -134147652 564219 1615 -198762840 824892 1615 -100256277 423837 1615 -105602297 468190 1615 -139234858 598002 1615 -154044927 638120 1615 -165109520 687858 1615 -131994418 548501 1615 -114383781 506188 1615 -114383781 506188 1615 -105602297 468190 1615 -150474053 657508 1615 -160328051 687675 1615 -106539401 473392 1615 -105602297 468190 1615 -134147652 564219 1615 -105602297 468190 1615 -121184285 534764 1615 -171695465 727791 1615 +242187257 1057803 11540 +345970774 1257058 11540 +873375377 3756484 11540 +629909652 2499702 11540 +738510219 1649023 11540 +225777864 990732 11540 +622706234 2616630 11540 +662194591 2780551 11540 +588404171 2401389 11540 +863779628 3604573 11540 +841896281 3255092 11540 +872056754 3671585 11540 +996442843 4139246 11540 +1131773677 4744015 11540 +372429549 1655487 11540 +586108178 2482583 11540 +392944648 1747012 11540 +628604875 2629010 11540 +228359603 995262 11540 +752237688 3051751 11540 +614768853 2395260 11540 +228414161 995262 11540 +911505337 888243 11540 +3812077425 1226204 11540 +270038982 1142248 11540 +225777864 990732 11540 +423782734 1882185 11540 +1701228053 1224529 11540 +742247915 2426854 11540 +657081392 2755871 11540 +616794863 2468797 11540 +959255060 4049743 11540 +228359603 995262 11540 +362895481 1622192 11540 +493703741 2138275 11540 +591441433 2481389 11540 +225777864 990732 11540 +645573640 2672003 11540 +225777864 990732 11540 +914848643 3825166 11540 +571967987 2464972 11540 +308159325 1167018 11540 +278284402 1196927 11540 +284360218 1224765 11540 +225777864 990732 11540 +623759563 2647374 11540 +225777864 990732 11540 +383108897 1701199 11540 +873309786 3575923 11540 +849768126 3696971 11540 +409160385 1786666 11540 +228359603 995262 11540 +584295501 2493978 11540 +384802178 1708591 11540 +520767063 2255386 11540 +2083501895 1358790 11540 +1034512530 3860944 11540 +927339945 3863256 11540 +3812077425 1226204 11540 +385636303 1705729 11540 +602425588 2493573 11540 +375065846 1660017 11540 +659982992 2774113 11540 +654653015 2787157 11540 +559748744 2424076 11540 +386703166 1647153 11540 +369392487 1561513 11540 +992259356 3519358 11540 +926242455 3859010 11540 +270038982 1142248 11540 +228359603 995262 11540 +871754544 3626141 11540 +284360218 1224765 11540 +386703166 1647153 11540 +514799321 2159924 11540 +240979623 1011412 11540 +456679643 1942400 11540 +1127733789 4737100 11540 +632125454 2677105 11540 +758226201 3403408 11540 +633299058 2716527 11540 +669881014 2801891 11540 +906035104 860999 11540 +728369368 3058335 11540 +694724929 2890406 11540 +388432530 1723108 11540 +17778712187 754027 11540 +920405645 3857933 11540 +225777864 990732 11540 +365477220 1626722 11540 +632101796 2684791 11540 +281900337 1103412 11540 +297415591 1277298 11540 +228359603 995262 11540 +770765197 1788836 11540 +225777864 990732 11540 +526128852 2130334 11540 +600931017 2146711 11540 +3711275825 817633 11540 +770552612 3171152 11540 +127463662 533943 1570 +274307376 1096127 1570 +161133351 649347 1570 +103046780 430228 1570 +128282588 525461 1570 +100482297 436190 1570 +101403401 441292 1570 +160537588 661611 1570 +154636309 630113 1570 +121637243 514974 1570 +143938630 603139 1570 +168321193 685485 1570 +219482448 856702 1570 +100482447 436190 1570 +125526682 508101 1570 +95440277 393737 1570 +165757085 691447 1570 +125914502 516996 1570 +140951425 574741 1570 +177709463 708604 1570 +108719781 470788 1570 +135825136 557817 1570 +127463662 533943 1570 +152072051 636075 1570 +103046780 430228 1570 +103046780 430228 1570 +100482297 436190 1570 +101403401 441292 1570 +123941374 519304 1570 +115088285 496664 1570 +138340536 581160 1570 +103046780 430228 1570 +101403401 441292 1570 +128282588 525461 1570 +100482297 436190 1570 +100482297 436190 1570 +156885520 636458 1570 +113399759 480376 1570 +167498851 676314 1570 +127463662 533943 1570 +166375193 663650 1570 +101403401 441292 1570 +101403401 441292 1570 +128282588 525461 1570 +213532039 848457 1570 +185060916 761470 1570 +127463662 533943 1570 +101403401 441292 1570 +232613020 936011 1570 +165757085 691447 1570 +128282588 525461 1570 +169802982 680644 1570 +138387167 580703 1570 +101403401 441292 1570 +95440277 393737 1570 +101403401 441292 1570 +100482297 436190 1570 +101403401 441292 1570 +100482297 436190 1570 +160516846 648933 1570 +165123004 671056 1570 +172099067 711139 1570 +138387167 580703 1570 +115088285 496664 1570 +126758315 518954 1570 +142354252 575821 1570 +103967659 435330 1570 +101403401 441292 1570 +191496310 780248 1570 +100482297 436190 1570 +101403401 441292 1570 +100482297 436190 1570 +156885520 636458 1570 +100482297 436190 1570 +196819565 788768 1570 +259920730 1057108 1570 +100482297 436190 1570 +156885520 636458 1570 +152072051 636075 1570 +100482297 436190 1570 +138387167 580703 1570 +127587652 523219 1570 +188394840 760092 1570 +95440277 393737 1570 +100482297 436190 1570 +132178858 553902 1570 +146108927 588520 1570 +156885520 636458 1570 +125530418 508101 1570 +108719781 470788 1570 +108719781 470788 1570 +100482297 436190 1570 +142458053 607408 1570 +152072051 636075 1570 +101403401 441292 1570 +100482297 436190 1570 +127587652 523219 1570 +100482297 436190 1570 +115088285 496664 1570 +162655465 671291 1570 diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.eval b/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.eval index c34b30b11ae..5816ba8487d 100644 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.eval +++ b/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.eval @@ -1,6 +1,6 @@ -CPU: 42_414_202_450 -Memory: 257_565_190 -AST Size: 1_402 -Flat Size: 1_510 +CPU: 42_032_975_890 +Memory: 255_069_190 +AST Size: 1_396 +Flat Size: 1_503 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.pir b/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.pir index 67ac4363c00..5103a2d44e7 100644 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.pir +++ b/plutus-benchmark/nofib/test/9.6/clausify-F5.golden.pir @@ -22,8 +22,6 @@ defaultBody ~defaultBody : Tuple2 (List integer) (List integer) = fail () ~defaultBody : Tuple2 (List integer) (List integer) = fail () - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] data Ordering | Ordering_match where EQ : Ordering GT : Ordering @@ -59,10 +57,8 @@ {all dead. dead}) (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanEqualsInteger x y) False True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + (\(x : integer) (y : integer) -> lessThanInteger y x) + (\(x : integer) (y : integer) -> lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.eval b/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.eval index bd2b7187e33..6443e095243 100644 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.eval +++ b/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_001_765_330 +CPU: 1_000_973_445 Memory: 5_259_358 -AST Size: 1_645 -Flat Size: 1_701 +AST Size: 1_639 +Flat Size: 1_693 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.pir b/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.pir index e4d39a873c5..135300ebf34 100644 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.pir +++ b/plutus-benchmark/nofib/test/9.6/knights10-4x4.golden.pir @@ -46,8 +46,6 @@ `$fEqChessSet_$c==` (\(x : ChessSet) (y : ChessSet) -> y) (\(x : ChessSet) (y : ChessSet) -> x) - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] !v : Ord integer = CConsOrd {integer} @@ -66,10 +64,8 @@ {all dead. dead}) (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanEqualsInteger x y) False True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + (\(x : integer) (y : integer) -> lessThanInteger y x) + (\(x : integer) (y : integer) -> lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) @@ -437,7 +433,7 @@ = \(a : integer) -> case (all dead. List integer) - (ifThenElse {bool} (lessThanEqualsInteger a b) False True) + (lessThanInteger b a) [ (/\dead -> Cons {integer} a (go (addInteger 1 a))) , (/\dead -> Nil {integer}) ] {all dead. dead} @@ -605,7 +601,7 @@ (ipv : List (Tuple2 integer integer)) -> case (all dead. bool) - (ifThenElse {bool} (lessThanInteger x 1) False True) + (lessThanEqualsInteger 1 x) [ (/\dead -> False) , (/\dead -> case @@ -615,11 +611,7 @@ , (/\dead -> case (all dead. bool) - (ifThenElse - {bool} - (lessThanInteger y 1) - False - True) + (lessThanEqualsInteger 1 y) [ (/\dead -> False) , (/\dead -> case diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.eval b/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.eval index 04bd9af4728..2441cfb9e14 100644 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.eval +++ b/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.eval @@ -1,7 +1,7 @@ -CPU: 3_349_357_578 -Memory: 18_617_969 -AST Size: 1_766 -Flat Size: 1_782 +CPU: 3_349_428_843 +Memory: 18_618_369 +AST Size: 1_769 +Flat Size: 1_784 (constr 1 diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.pir b/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.pir index 3c071fb8980..c7eda86f6bd 100644 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.pir +++ b/plutus-benchmark/nofib/test/9.6/queens4-bt.golden.pir @@ -525,7 +525,7 @@ = \(a : integer) (b : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger a b) [True, False]) + (lessThanInteger b a) [ (/\dead -> Cons {integer} a (interval (addInteger 1 a) b)) , (/\dead -> Nil {integer}) ] {all dead. dead} diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.eval b/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.eval index 72f3e006f07..1e7b0ab25a7 100644 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.eval +++ b/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.eval @@ -1,7 +1,7 @@ -CPU: 117_187_285_782 -Memory: 682_363_455 -AST Size: 1_766 -Flat Size: 1_782 +CPU: 117_202_950_643 +Memory: 682_363_855 +AST Size: 1_769 +Flat Size: 1_784 (constr 1 diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.pir b/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.pir index cc8e4bae931..4118c2b4805 100644 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.pir +++ b/plutus-benchmark/nofib/test/9.6/queens5-fc.golden.pir @@ -525,7 +525,7 @@ = \(a : integer) (b : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger a b) [True, False]) + (lessThanInteger b a) [ (/\dead -> Cons {integer} a (interval (addInteger 1 a) b)) , (/\dead -> Nil {integer}) ] {all dead. dead} diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.golden.eval index b78ca41e594..afa9f209119 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 111_475_082 -Memory: 550_394 -AST Size: 954 -Flat Size: 1_467 +CPU: 108_179_082 +Memory: 529_794 +AST Size: 890 +Flat Size: 1_449 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.golden.eval index f52e8f698e6..3f898f37de2 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 32_459_834 -Memory: 156_122 -AST Size: 954 -Flat Size: 1_081 +CPU: 31_467_834 +Memory: 149_922 +AST Size: 890 +Flat Size: 1_063 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.golden.astsize index 71ed48c5f39..fb5f8f013c9 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -954 \ No newline at end of file +890 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.golden.eval b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.golden.eval index 205fc10eb49..ea50ccd4686 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 104_194_248 -Memory: 518_652 -AST Size: 897 -Flat Size: 1_393 +CPU: 100_850_248 +Memory: 497_752 +AST Size: 831 +Flat Size: 1_371 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.golden.eval b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.golden.eval index 520487e856a..a9d81bbce17 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 30_382_328 -Memory: 146_812 -AST Size: 897 -Flat Size: 1_007 +CPU: 29_342_328 +Memory: 140_312 +AST Size: 831 +Flat Size: 985 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.golden.astsize b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.golden.astsize index 2ddfe0b71fc..8f5f232320a 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.golden.astsize @@ -1 +1 @@ -897 \ No newline at end of file +831 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.golden.eval index dacb13e122c..6165a183e1d 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 34_586_709 -Memory: 30_101 -AST Size: 309 -Flat Size: 1_160 +CPU: 34_650_709 +Memory: 30_501 +AST Size: 312 +Flat Size: 1_163 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.golden.eval index 304a04449a4..edd4c08afee 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_828_006 -Memory: 33_434 -AST Size: 71 -Flat Size: 642 +CPU: 7_956_006 +Memory: 34_234 +AST Size: 78 +Flat Size: 650 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.golden.eval index 5d35d817d5e..0937d9454e8 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_624_678 -Memory: 11_002 -AST Size: 71 -Flat Size: 255 +CPU: 2_752_678 +Memory: 11_802 +AST Size: 78 +Flat Size: 264 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.golden.astsize index 2fb681e3f93..efee1f88bb8 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -71 \ No newline at end of file +78 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.golden.eval index eb3afd4f78e..3961ca41bc8 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 29_994_709 -Memory: 1_401 -AST Size: 22 -Flat Size: 1_153 +CPU: 30_058_709 +Memory: 1_801 +AST Size: 25 +Flat Size: 1_156 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.golden.eval index bb2161a2e75..eecc2c30a89 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 123_672_664 -Memory: 602_706 -AST Size: 973 -Flat Size: 1_545 +CPU: 119_672_664 +Memory: 577_706 +AST Size: 904 +Flat Size: 1_526 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.golden.eval index 3bff0ff2052..440e112dce4 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 36_251_000 -Memory: 173_298 -AST Size: 973 -Flat Size: 1_111 +CPU: 35_067_000 +Memory: 165_898 +AST Size: 904 +Flat Size: 1_092 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.golden.astsize index 3d3f9551e6f..0735b8030ca 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -973 \ No newline at end of file +904 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.golden.eval index 08628c4b007..070256bb6cf 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 116_359_830 -Memory: 570_764 -AST Size: 914 -Flat Size: 1_470 +CPU: 112_311_830 +Memory: 545_464 +AST Size: 843 +Flat Size: 1_446 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.golden.eval index 714614171fe..a6703826ba4 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 34_141_494 -Memory: 163_788 -AST Size: 914 -Flat Size: 1_036 +CPU: 32_909_494 +Memory: 156_088 +AST Size: 843 +Flat Size: 1_012 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.golden.astsize b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.golden.astsize index 06c2b90374e..6a34de5d27e 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.golden.astsize @@ -1 +1 @@ -914 \ No newline at end of file +843 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.golden.eval index 41a8240bcc9..f83cbc28136 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 37_339_261 -Memory: 32_301 -AST Size: 331 -Flat Size: 1_265 +CPU: 37_403_261 +Memory: 32_701 +AST Size: 334 +Flat Size: 1_268 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.eval index 80390d79cda..8170e8a0f98 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.eval @@ -1,6 +1,6 @@ CPU: 4_914_248 Memory: 9_150 -AST Size: 128 -Flat Size: 1_182 +AST Size: 127 +Flat Size: 1_187 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.uplc b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.uplc index 291ffe3ba54..0a7ea39e65f 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.uplc +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.golden.uplc @@ -1,47 +1,49 @@ (program 1.1.0 - (\obsScriptCred ctx -> - (\ds -> - (\wdrlAtZero -> - (\rest -> - (\wdrlAtOne -> - case - (equalsData obsScriptCred wdrlAtZero) - [ (case - (equalsData obsScriptCred wdrlAtOne) - [ ((\s -> - case - (s s rest) - [ ((\x -> error) - (force trace "not found" (constr 0 []))) - , (constr 0 []) ]) - (\s xs -> - case - xs - [ (\x xs -> - case - (equalsData - obsScriptCred - (case x [(\l r -> l)])) - [(s s xs), True]) - , False ])) + (case + (constr 0 [(force tailList), (force headList), (force trace)]) + [ (\forced forced forced obsScriptCred ctx -> + (\ds -> + (\wdrlAtZero -> + (\rest -> + (\wdrlAtOne -> + case + (equalsData obsScriptCred wdrlAtZero) + [ (case + (equalsData obsScriptCred wdrlAtOne) + [ ((\s -> + case + (s s rest) + [ ((\x -> error) + (forced "not found" (constr 0 []))) + , (constr 0 []) ]) + (\s xs -> + case + xs + [ (\x xs -> + case + (equalsData + obsScriptCred + (case x [(\l r -> l)])) + [(s s xs), True]) + , False ])) + , (constr 0 []) ]) , (constr 0 []) ]) - , (constr 0 []) ]) - (case (force headList rest) [(\l r -> l)])) - (force tailList ds)) - (case (force headList ds) [(\l r -> l)])) - (unMapData - (force headList - (force tailList - (force tailList - (force tailList - (force tailList - (force tailList - (force tailList - (case - (unConstrData - (force headList - (case - (unConstrData ctx) - [(\l r -> r)]))) - [(\l r -> r)]))))))))))) \ No newline at end of file + (case (forced rest) [(\l r -> l)])) + (forced ds)) + (case (forced ds) [(\l r -> l)])) + (unMapData + (forced + (forced + (forced + (forced + (forced + (forced + (forced + (case + (unConstrData + (forced + (case + (unConstrData ctx) + [(\l r -> r)]))) + [(\l r -> r)])))))))))) ])) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.eval index dbdbc8d286b..bdecb2d6e50 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.eval @@ -1,6 +1,6 @@ CPU: 5_058_248 Memory: 10_050 -AST Size: 132 -Flat Size: 1_184 +AST Size: 131 +Flat Size: 1_189 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.uplc b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.uplc index 53845d85b1a..9639a47b8b0 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.uplc +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.golden.uplc @@ -1,43 +1,45 @@ (program 1.1.0 - (\r_stake_cred -> - (\lookForCred r_ctx -> - (\wdrl -> - (\wdrlAtZero -> - (\rest -> - (\wdrlAtOne -> - case - (equalsData r_stake_cred wdrlAtZero) - [ (case - (equalsData r_stake_cred wdrlAtOne) - [(lookForCred rest), (constr 0 [])]) - , (constr 0 []) ]) - (case (force headList rest) [(\l r -> l)])) - (force tailList wdrl)) - (case (force headList wdrl) [(\l r -> l)])) - (unMapData - (force headList - (force tailList - (force tailList - (force tailList - (force tailList - (force tailList - (force tailList - (case - (unConstrData - (force headList - (case - (unConstrData r_ctx) - [(\l r -> r)]))) - [(\l r -> r)])))))))))) - ((\s -> s s) - (\s l -> - case - l - [ (\x xs ds -> - case - (equalsData r_stake_cred (case x [(\l r -> l)])) - [(s s xs), (constr 0 [])]) - , (\ds -> - (\x -> error) (force trace "not found" (constr 0 []))) ] - (constr 0 []))))) \ No newline at end of file + (case + (constr 0 [(force tailList), (force headList), (force trace)]) + [ (\forced forced forced r_stake_cred -> + (\lookForCred r_ctx -> + (\wdrl -> + (\wdrlAtZero -> + (\rest -> + (\wdrlAtOne -> + case + (equalsData r_stake_cred wdrlAtZero) + [ (case + (equalsData r_stake_cred wdrlAtOne) + [(lookForCred rest), (constr 0 [])]) + , (constr 0 []) ]) + (case (forced rest) [(\l r -> l)])) + (forced wdrl)) + (case (forced wdrl) [(\l r -> l)])) + (unMapData + (forced + (forced + (forced + (forced + (forced + (forced + (forced + (case + (unConstrData + (forced + (case + (unConstrData r_ctx) + [(\l r -> r)]))) + [(\l r -> r)])))))))))) + ((\s -> s s) + (\s l -> + case + l + [ (\x xs ds -> + case + (equalsData r_stake_cred (case x [(\l r -> l)])) + [(s s xs), (constr 0 [])]) + , (\ds -> + (\x -> error) (forced "not found" (constr 0 []))) ] + (constr 0 [])))) ])) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.eval b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.eval index 5db610ca248..8eee0481c40 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.eval @@ -1,6 +1,6 @@ -CPU: 145_236_860 -Memory: 719_958 -AST Size: 1_186 -Flat Size: 2_189 +CPU: 140_532_860 +Memory: 690_558 +AST Size: 1_116 +Flat Size: 2_168 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.uplc b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.uplc index d3dbe114d24..652160b20b9 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.uplc +++ b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.golden.uplc @@ -1,859 +1,818 @@ (program 1.1.0 - ((\go -> - (\`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` -> - (\go -> - (\`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` -> - (\go -> - (\`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` -> - (\go -> - (\go - obsScriptCred - ctx -> - case - (case - (unConstrData ctx) - [ (\index - args -> - case - index - [ (\ds -> - (\`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` -> - constr 0 - [ (case - (unConstrData - (force - headList - ds)) - [ (\index - args -> - case - index - [ (\ds -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\l -> - (\cse -> - (\cse -> - constr 0 - [ (go - (unListData - (force - headList - ds))) - , (go - (unListData - (force - headList - l))) - , (go - (unListData - (force - headList - l))) - , (cse - (force - headList - l)) - , (cse - (force - headList - l)) - , (go - (unListData - (force - headList - l))) - , (case - (constr 0 - [ `$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - , unIData - , (force - headList - l) ]) - [ `$fUnsafeFromDataMap_$cunsafeFromBuiltinData` ]) - , (case - (unConstrData - (force - headList - l)) - [ (\index - args -> - case - index - [ (\ds -> - (\`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` -> - (\`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` -> - constr 0 - [ (case - (unConstrData - (force - headList - ds)) - [ (\index - args -> - case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` - unIData - (force - headList - ds)) - , (`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` - (force - headList - (force - tailList - ds))) ]) ] - args) ]) - , (case - (unConstrData - (force - headList - (force - tailList - ds))) - [ (\index - args -> - case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` - unIData - (force - headList - ds)) - , (`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` - (force - headList - (force - tailList - ds))) ]) ] - args) ]) ]) - (\d -> - case - (unConstrData - d) - [ (\index - args -> + (case + (constr 0 [(force tailList), (force headList), (force trace)]) + [ (\forced + forced + forced -> + (\go -> + (\`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` -> + (\go -> + (\`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` -> + (\go -> + (\`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` -> + (\go -> + (\go + obsScriptCred + ctx -> + case + (case + (unConstrData ctx) + [ (\index + args -> + case + index + [ (\ds -> + (\`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` -> + constr 0 + [ (case + (unConstrData + (forced + ds)) + [ (\index + args -> + case + index + [ (\ds -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\l -> + (\cse -> + (\cse -> + constr 0 + [ (go + (unListData + (forced + ds))) + , (go + (unListData + (forced + l))) + , (go + (unListData + (forced + l))) + , (cse + (forced + l)) + , (cse + (forced + l)) + , (go + (unListData + (forced + l))) + , (case + (constr 0 + [ `$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + , unIData + , (forced + l) ]) + [ `$fUnsafeFromDataMap_$cunsafeFromBuiltinData` ]) + , (case + (unConstrData + (forced + l)) + [ (\index + args -> + case + index + [ (\ds -> + (\`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` -> + (\`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` -> + constr 0 + [ (case + (unConstrData + (forced + ds)) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` + unIData + (forced + ds)) + , (`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` + (forced + (forced + ds))) ]) ] + args) ]) + , (case + (unConstrData + (forced + (forced + ds))) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataExtended_$cunsafeFromBuiltinData` + unIData + (forced + ds)) + , (`$fUnsafeFromDataBool_$cunsafeFromBuiltinData` + (forced + (forced + ds))) ]) ] + args) ]) ]) + (\d -> case - index - [ (\ds -> - False) - , (\ds -> - True) ] - args) ])) - (\`$dUnsafeFromData` - d -> - case - (unConstrData - d) - [ (\index - args -> + (unConstrData + d) + [ (\index + args -> + case + index + [ (\ds -> + False) + , (\ds -> + True) ] + args) ])) + (\`$dUnsafeFromData` + d -> case - index - [ (\ds -> - constr 1 - [ ]) - , (\ds -> - constr 0 - [ (`$dUnsafeFromData` - (force - headList - ds)) ]) - , (\ds -> - constr 2 - [ ]) ] - args) ])) ] - args) ]) - , (go - (unListData - (force - headList - l))) - , (case - (constr 0 - [ `$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` - , (\d -> - d) - , (force - headList - l) ]) - [ `$fUnsafeFromDataMap_$cunsafeFromBuiltinData` ]) - , (cse - (\d -> - d) - (force - headList - l)) - , (`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` - (force - headList - (force - tailList - l))) ]) - (cse - (cse - unIData))) - (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` - unBData)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - l)) - (force - tailList - ds)) ] - args) ]) - , (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` - (force - headList - (force - tailList - ds))) ]) - (\d -> - case - (unConstrData - d) - [ (\index - args -> + (unConstrData + d) + [ (\index + args -> + case + index + [ (\ds -> + constr 1 + [ ]) + , (\ds -> + constr 0 + [ (`$dUnsafeFromData` + (forced + ds)) ]) + , (\ds -> + constr 2 + [ ]) ] + args) ])) ] + args) ]) + , (go + (unListData + (forced + l))) + , (case + (constr 0 + [ `$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` + , (\d -> + d) + , (forced + l) ]) + [ `$fUnsafeFromDataMap_$cunsafeFromBuiltinData` ]) + , (cse + (\d -> + d) + (forced + l)) + , (`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` + (forced + (forced + l))) ]) + (cse + (cse + unIData))) + (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` + unBData)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + l)) + (forced + ds)) ] + args) ]) + , (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` + (forced + (forced + ds))) ]) + (\d -> case - index - [ (\ds -> - constr 1 - [ (unBData - (force - headList - ds)) ]) - , (\ds -> - constr 3 - [ (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` - (force - headList - ds)) ]) - , (\ds -> - constr 2 - [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - (force - headList - ds)) ]) - , (\ds -> - constr 0 - [ (`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` - (force - headList - ds)) ]) ] - args) ])) ] - args) ]) - [ (\ds - ds -> - case - ds + (unConstrData + d) + [ (\index + args -> + case + index + [ (\ds -> + constr 1 + [ (unBData + (forced + ds)) ]) + , (\ds -> + constr 3 + [ (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` + (forced + ds)) ]) + , (\ds -> + constr 2 + [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + (forced + ds)) ]) + , (\ds -> + constr 0 + [ (`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` + (forced + ds)) ]) ] + args) ])) ] + args) ]) [ (\ds - ds - ds - ds - ds - ds - ds - ds - ds - ds - ds ds -> - (\`$j` -> - case - ds - [ ((\x -> - case - error - [ (\a - ds -> - `$j` - a - ds) ]) - (force trace - "PT8" - (constr 0 - []))) - , (\x - ds -> + case + ds + [ (\ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds + ds -> + (\`$j` -> case - x - [ (\a + ds + [ ((\x -> + case + error + [ (\a + ds -> + `$j` + a + ds) ]) + (forced + "PT8" + (constr 0 + [ ]))) + , (\x ds -> - `$j` - a - ds) ]) ]) - (\a - ds -> - (\`$j` -> - case - ds - [ (`$j` - ((\x -> - error) - (force - trace - "PT9" - (constr 0 - [ ])))) - , (\ds as -> - `$j` - as) ]) - (\rest -> - (\`$j` -> - case - rest - [ ((\x -> - case - error - [ (\a - ds -> - `$j` - a - ds) ]) - (force - trace - "PT8" - (constr 0 - [ ]))) - , (\x - ds -> + case + x + [ (\a + ds -> + `$j` + a + ds) ]) ]) + (\a + ds -> + (\`$j` -> + case + ds + [ (`$j` + ((\x -> + error) + (forced + "PT9" + (constr 0 + [ ])))) + , (\ds + as -> + `$j` + as) ]) + (\rest -> + (\`$j` -> case - x - [ (\a + rest + [ ((\x -> + case + error + [ (\a + ds -> + `$j` + a + ds) ]) + (forced + "PT8" + (constr 0 + [ ]))) + , (\x ds -> - `$j` - a - ds) ]) ]) - (\a - ds -> - (\obsScriptCred' -> - (\go -> - (\`$j` -> - case - obsScriptCred' - [ (\l1l -> + case + x + [ (\a + ds -> + `$j` + a + ds) ]) ]) + (\a + ds -> + (\obsScriptCred' -> + (\go -> + (\`$j` -> case - a - [ (\r1r -> + obsScriptCred' + [ (\l1l -> case - l1l - [ (\l1l -> + a + [ (\r1r -> case - r1r - [ (\r1r -> + l1l + [ (\l1l -> case - (equalsByteString - l1l - r1r) - [ (force - `$j`) - , (constr 0 - [ ]) ]) - , (\ipv -> - force - `$j`) ]) - , (\l1l -> - case - r1r - [ (\ipv -> - force - `$j`) - , (\r1r -> + r1r + [ (\r1r -> + case + (equalsByteString + l1l + r1r) + [ (force + `$j`) + , (constr 0 + [ ]) ]) + , (\ipv -> + force + `$j`) ]) + , (\l1l -> case - (equalsByteString - l1l - r1r) - [ (force - `$j`) - , (constr 0 - [ ]) ]) ]) ]) - , (\ipv - ipv - ipv -> - force - `$j`) ]) - , (\l1l - l2l - l3l -> - case - a - [ (\ipv -> - force - `$j`) - , (\r1r - r2r - r3r -> + r1r + [ (\ipv -> + force + `$j`) + , (\r1r -> + case + (equalsByteString + l1l + r1r) + [ (force + `$j`) + , (constr 0 + [ ]) ]) ]) ]) + , (\ipv + ipv + ipv -> + force + `$j`) ]) + , (\l1l + l2l + l3l -> case - (case - (equalsInteger - l1l - r1r) - [ False - , (case - (equalsInteger - l2l - r2r) - [ False - , (equalsInteger - l3l - r3r) ]) ]) - [ (force - `$j`) - , (constr 0 - [ ]) ]) ]) ]) - (delay - (case - obsScriptCred' - [ (\l1l -> - case - a - [ (\r1r -> + a + [ (\ipv -> + force + `$j`) + , (\r1r + r2r + r3r -> + case + (case + (equalsInteger + l1l + r1r) + [ False + , (case + (equalsInteger + l2l + r2r) + [ False + , (equalsInteger + l3l + r3r) ]) ]) + [ (force + `$j`) + , (constr 0 + [ ]) ]) ]) ]) + (delay + (case + obsScriptCred' + [ (\l1l -> case - l1l - [ (\l1l -> + a + [ (\r1r -> case - r1r - [ (\r1r -> + l1l + [ (\l1l -> case - (equalsByteString - l1l - r1r) - [ (go - ds) - , (constr 0 - [ ]) ]) - , (\ipv -> - go - ds) ]) - , (\l1l -> - case - r1r - [ (\ipv -> - go - ds) - , (\r1r -> + r1r + [ (\r1r -> + case + (equalsByteString + l1l + r1r) + [ (go + ds) + , (constr 0 + [ ]) ]) + , (\ipv -> + go + ds) ]) + , (\l1l -> case - (equalsByteString - l1l - r1r) - [ (go - ds) - , (constr 0 - [ ]) ]) ]) ]) - , (\ipv - ipv - ipv -> - go - ds) ]) - , (\l1l - l2l - l3l -> - case - a - [ (\ipv -> - go - ds) - , (\r1r - r2r - r3r -> + r1r + [ (\ipv -> + go + ds) + , (\r1r -> + case + (equalsByteString + l1l + r1r) + [ (go + ds) + , (constr 0 + [ ]) ]) ]) ]) + , (\ipv + ipv + ipv -> + go + ds) ]) + , (\l1l + l2l + l3l -> case - (case - (equalsInteger - l1l - r1r) - [ False - , (case - (equalsInteger - l2l - r2r) - [ False - , (equalsInteger - l3l - r3r) ]) ]) - [ (go - ds) - , (constr 0 - [ ]) ]) ]) ]))) - ((\s -> - s - s) - (\s - ds -> - case - ds - [ ((\x -> - error) - (force - trace - "not found" - (constr 0 - [ ]))) - , (\ds - xs' -> + a + [ (\ipv -> + go + ds) + , (\r1r + r2r + r3r -> + case + (case + (equalsInteger + l1l + r1r) + [ False + , (case + (equalsInteger + l2l + r2r) + [ False + , (equalsInteger + l3l + r3r) ]) ]) + [ (go + ds) + , (constr 0 + [ ]) ]) ]) ]))) + ((\s -> + s + s) + (\s + ds -> case ds - [ (\c' - i -> + [ ((\x -> + error) + (forced + "not found" + (constr 0 + [ ]))) + , (\ds + xs' -> case - (case - c' - [ (\l1l -> - case - obsScriptCred' - [ (\r1r -> + ds + [ (\c' + i -> + case + (case + c' + [ (\l1l -> case - l1l - [ (\l1l -> - case - r1r - [ (\r1r -> - equalsByteString - l1l - r1r) - , (\ipv -> - False) ]) - , (\l1l -> + obsScriptCred' + [ (\r1r -> case - r1r - [ (\ipv -> - False) - , (\r1r -> - equalsByteString - l1l - r1r) ]) ]) - , (\ipv - ipv - ipv -> - False) ]) - , (\l1l - l2l - l3l -> - case - obsScriptCred' - [ (\ipv -> - False) - , (\r1r - r2r - r3r -> + l1l + [ (\l1l -> + case + r1r + [ (\r1r -> + equalsByteString + l1l + r1r) + , (\ipv -> + False) ]) + , (\l1l -> + case + r1r + [ (\ipv -> + False) + , (\r1r -> + equalsByteString + l1l + r1r) ]) ]) + , (\ipv + ipv + ipv -> + False) ]) + , (\l1l + l2l + l3l -> case - (equalsInteger - l1l - r1r) - [ False - , (case - (equalsInteger - l2l - r2r) - [ False - , (equalsInteger - l3l - r3r) ]) ]) ]) ]) - [ (s - s - xs') - , (constr 0 - [ ]) ]) ]) ]))) - (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - obsScriptCred))))) ]) ]) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\x + obsScriptCred' + [ (\ipv -> + False) + , (\r1r + r2r + r3r -> + case + (equalsInteger + l1l + r1r) + [ False + , (case + (equalsInteger + l2l + r2r) + [ False + , (equalsInteger + l3l + r3r) ]) ]) ]) ]) + [ (s + s + xs') + , (constr 0 + [ ]) ]) ]) ]))) + (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + obsScriptCred))))) ]) ]) + ((\s -> + s s) + (\s xs -> - constr 1 - [ (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` - x) - , (s s xs) ]) - , (constr 0 []) ]))) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\x + case + xs + [ (\x + xs -> + constr 1 + [ (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` + x) + , (s s xs) ]) + , (constr 0 []) ]))) + ((\s -> + s s) + (\s xs -> - constr 1 - [ (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` - x) - , (s s xs) ]) - , (constr 0 []) ]))) - (\d -> - case - (unConstrData d) - [ (\index - args -> + case + xs + [ (\x + xs -> + constr 1 + [ (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` + x) + , (s s xs) ]) + , (constr 0 []) ]))) + (\d -> case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` - (force headList ds)) - , (`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` - (force headList - (force tailList - ds))) ]) ] - args) ])) - (\d -> - case - (unConstrData d) - [ (\index - args -> + (unConstrData d) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData` + (forced ds)) + , (`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` + (forced + (forced + ds))) ]) ] + args) ])) + (\d -> case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` - (force headList ds)) - , (unIData - (force headList - (force tailList - ds))) ]) ] - args) ])) - (\d -> - case - (unConstrData d) - [ (\index args -> + (unConstrData d) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataTxId_$cunsafeFromBuiltinData` + (forced ds)) + , (unIData + (forced + (forced + ds))) ]) ] + args) ])) + (\d -> case - index - [(\ds -> unBData (force headList ds))] - args) ])) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\x + (unConstrData d) + [ (\index args -> + case + index + [(\ds -> unBData (forced ds))] + args) ])) + ((\s -> + s s) + (\s xs -> - constr 1 - [ (`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` - x) - , (s s xs) ]) - , (constr 0 []) ]))) - (\eta -> - case - (unConstrData eta) - [ (\index - args -> + case + xs + [ (\x + xs -> + constr 1 + [ (`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` + x) + , (s s xs) ]) + , (constr 0 []) ]))) + (\eta -> case - index - [ (\ds -> - (\l -> - (\l -> - (\`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` -> - constr 0 - [ (case - (unConstrData - (force headList ds)) - [ (\index - args -> - case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` - (force - headList - ds)) - , (`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` - `$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - (force - headList - (force - tailList - ds))) ]) ] - args) ]) - , ((\cse -> - cse - (cse unIData) - (force headList l)) - (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` - unBData)) - , (case - (unConstrData - (force headList l)) - [ (\index - args -> - case - index - [ (\ds -> - constr 0 - []) - , (\ds -> - constr 2 - [ (unBData - (force - headList - ds)) ]) - , (\ds -> - constr 1 - [ (force - headList - ds) ]) ] - args) ]) - , (`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` - unBData - (force headList - (force tailList - l))) ]) - (\`$dUnsafeFromData` - d -> - case - (unConstrData d) - [ (\index - args -> + (unConstrData eta) + [ (\index + args -> + case + index + [ (\ds -> + (\l -> + (\l -> + (\`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` -> + constr 0 + [ (case + (unConstrData + (forced ds)) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` + (forced + ds)) + , (`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` + `$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + (forced + (forced + ds))) ]) ] + args) ]) + , ((\cse -> + cse + (cse unIData) + (forced l)) + (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` + unBData)) + , (case + (unConstrData + (forced l)) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ ]) + , (\ds -> + constr 2 + [ (unBData + (forced + ds)) ]) + , (\ds -> + constr 1 + [ (forced + ds) ]) ] + args) ]) + , (`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` + unBData + (forced + (forced + l))) ]) + (\`$dUnsafeFromData` + d -> case - index - [ (\ds -> - constr 0 - [ (`$dUnsafeFromData` - (force - headList - ds)) ]) - , (\ds -> - constr 1 []) ] - args) ])) - (force tailList l)) - (force tailList ds)) ] - args) ])) - (\`$dUnsafeFromData` `$dUnsafeFromData` -> - (\go d -> go (unMapData d)) - ((\s -> s s) - (\s xs -> - case - xs - [ (\tup tups -> - constr 1 - [ (constr 0 - [ (`$dUnsafeFromData` - (case tup [(\l r -> l)])) - , (`$dUnsafeFromData` - (case tup [(\l r -> r)])) ]) - , (s s tups) ]) - , (constr 0 []) ])))) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\x + (unConstrData d) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$dUnsafeFromData` + (forced + ds)) ]) + , (\ds -> + constr 1 + []) ] + args) ])) + (forced l)) + (forced ds)) ] + args) ])) + (\`$dUnsafeFromData` `$dUnsafeFromData` -> + (\go d -> go (unMapData d)) + ((\s -> s s) + (\s xs -> + case + xs + [ (\tup tups -> + constr 1 + [ (constr 0 + [ (`$dUnsafeFromData` + (case + tup + [(\l r -> l)])) + , (`$dUnsafeFromData` + (case + tup + [(\l r -> r)])) ]) + , (s s tups) ]) + , (constr 0 []) ])))) + ((\s -> + s s) + (\s xs -> - constr 1 - [ (`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` - x) - , (s s xs) ]) - , (constr 0 []) ]))) - (\d -> - case - (unConstrData d) - [ (\index - args -> + case + xs + [ (\x + xs -> + constr 1 + [ (`$fUnsafeFromDataDCert_$cunsafeFromBuiltinData` + x) + , (s s xs) ]) + , (constr 0 []) ]))) + (\d -> case - index - [ (\ds -> - constr 2 - [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - (force headList ds)) ]) - , (\ds -> - constr 0 - [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - (force headList ds)) ]) - , (\ds -> - constr 1 - [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` - (force headList ds)) - , (unBData - (force headList (force tailList ds))) ]) - , (\ds -> - constr 5 - [ (unBData (force headList ds)) - , (unBData - (force headList (force tailList ds))) ]) - , (\ds -> - constr 6 - [ (unBData (force headList ds)) - , (unIData - (force headList (force tailList ds))) ]) - , (\ds -> constr 3 []) - , (\ds -> constr 4 []) ] - args) ])) - (\d -> - case - (unConstrData d) - [ (\index - args -> + (unConstrData d) + [ (\index + args -> + case + index + [ (\ds -> + constr 2 + [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + (forced ds)) ]) + , (\ds -> + constr 0 + [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + (forced ds)) ]) + , (\ds -> + constr 1 + [ (`$fUnsafeFromDataStakingCredential_$cunsafeFromBuiltinData` + (forced ds)) + , (unBData (forced (forced ds))) ]) + , (\ds -> + constr 5 + [ (unBData (forced ds)) + , (unBData (forced (forced ds))) ]) + , (\ds -> + constr 6 + [ (unBData (forced ds)) + , (unIData (forced (forced ds))) ]) + , (\ds -> constr 3 []) + , (\ds -> constr 4 []) ] + args) ])) + (\d -> case - index - [ (\ds -> - constr 0 - [ (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` - (force headList ds)) ]) - , (\ds -> - (\l -> - constr 1 - [ (unIData (force headList ds)) - , (unIData (force headList l)) - , (unIData - (force headList (force tailList l))) ]) - (force tailList ds)) ] - args) ])) - (\d -> - case - (unConstrData d) - [ (\index args -> + (unConstrData d) + [ (\index + args -> + case + index + [ (\ds -> + constr 0 + [ (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData` + (forced ds)) ]) + , (\ds -> + (\l -> + constr 1 + [ (unIData (forced ds)) + , (unIData (forced l)) + , (unIData (forced (forced l))) ]) + (forced ds)) ] + args) ])) + (\d -> + case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unBData (forced ds))]) + , (\ds -> constr 1 [(unBData (forced ds))]) ] + args) ])) + ((\s -> s s) + (\s xs -> case - index - [ (\ds -> constr 0 [(unBData (force headList ds))]) - , (\ds -> constr 1 [(unBData (force headList ds))]) ] - args) ])) - ((\s -> s s) - (\s xs -> - case - xs - [(\x xs -> constr 1 [(unBData x), (s s xs)]), (constr 0 [])])))) \ No newline at end of file + xs + [ (\x xs -> constr 1 [(unBData x), (s s xs)]) + , (constr 0 []) ]))) ])) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.golden.eval index e00dd793d0e..7853c5070e3 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_957_669 -Memory: 33_766 -AST Size: 74 -Flat Size: 706 +CPU: 8_069_669 +Memory: 34_466 +AST Size: 80 +Flat Size: 714 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.golden.eval index 399485f81b6..f303c97ced3 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_754_341 -Memory: 11_334 -AST Size: 74 -Flat Size: 272 +CPU: 2_866_341 +Memory: 12_034 +AST Size: 80 +Flat Size: 280 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.golden.astsize index 0aeb5485442..e3f1e9b791c 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -74 \ No newline at end of file +80 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.golden.eval index a8813881893..932990e4a2e 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 32_395_261 -Memory: 1_401 -AST Size: 22 -Flat Size: 1_277 +CPU: 32_459_261 +Memory: 1_801 +AST Size: 25 +Flat Size: 1_280 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.golden.eval index 96942618dc0..3b59d76738c 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 126_006_507 -Memory: 612_122 -AST Size: 1_819 -Flat Size: 2_372 +CPU: 121_846_507 +Memory: 586_122 +AST Size: 1_656 +Flat Size: 2_317 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.golden.eval index 3a159741171..46f6a227a7a 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 39_352_843 -Memory: 187_514 -AST Size: 1_819 -Flat Size: 1_938 +CPU: 38_008_843 +Memory: 179_114 +AST Size: 1_656 +Flat Size: 1_883 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.golden.astsize index 00682940bc3..df9863308dd 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -1819 \ No newline at end of file +1656 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.golden.eval b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.golden.eval index 79d7c9ae67e..c1abf60a9cf 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 118_613_673 -Memory: 579_680 -AST Size: 1_755 -Flat Size: 2_294 +CPU: 114_453_673 +Memory: 553_680 +AST Size: 1_593 +Flat Size: 2_239 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.golden.eval b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.golden.eval index 45e2892a53c..e0598043e3b 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 37_163_337 -Memory: 177_504 -AST Size: 1_755 -Flat Size: 1_860 +CPU: 35_819_337 +Memory: 169_104 +AST Size: 1_593 +Flat Size: 1_805 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.golden.astsize b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.golden.astsize index 9daaac15aab..30ab5448a9b 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.golden.astsize @@ -1 +1 @@ -1755 \ No newline at end of file +1593 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.golden.eval index 52a58d7f33f..643073f811d 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 37_926_283 -Memory: 32_901 -AST Size: 337 -Flat Size: 1_287 +CPU: 37_990_283 +Memory: 33_301 +AST Size: 340 +Flat Size: 1_290 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.golden.eval b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.golden.eval index 4cd4ab58e1b..9069fe77066 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_957_669 -Memory: 33_766 -AST Size: 74 -Flat Size: 712 +CPU: 8_069_669 +Memory: 34_466 +AST Size: 80 +Flat Size: 720 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.golden.eval b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.golden.eval index 49dd32aac1f..d93500aa99f 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_754_341 -Memory: 11_334 -AST Size: 74 -Flat Size: 278 +CPU: 2_866_341 +Memory: 12_034 +AST Size: 80 +Flat Size: 286 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.golden.astsize b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.golden.astsize index 0aeb5485442..e3f1e9b791c 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.golden.astsize @@ -1 +1 @@ -74 \ No newline at end of file +80 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.golden.eval b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.golden.eval index 8ead54a3b1b..f4c9b3400f0 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.golden.eval @@ -1,6 +1,6 @@ -CPU: 32_886_283 -Memory: 1_401 -AST Size: 22 -Flat Size: 1_289 +CPU: 32_950_283 +Memory: 1_801 +AST Size: 25 +Flat Size: 1_292 (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.golden.eval b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.golden.eval index c141a95cbbd..45d2d873b5b 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.golden.eval +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.golden.eval @@ -1,6 +1,6 @@ -CPU: 19_371_399 -Memory: 78_330 -AST Size: 517 +CPU: 19_250_664 +Memory: 77_530 +AST Size: 497 Flat Size: 726 (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.astsize b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.astsize index 37e6f1741c6..755ab3c2b53 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.astsize +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.astsize @@ -1 +1 @@ -515 \ No newline at end of file +495 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.pir b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.pir index 829aec76f34..731944356d2 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.pir +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed.golden.pir @@ -399,10 +399,7 @@ in (\(x : integer) -> case (all dead. Maybe integer) - (case - bool - (lessThanEqualsInteger x 0) - [True, False]) + (lessThanInteger 0 x) [ (/\dead -> Nothing {integer}) , (/\dead -> Just {integer} x) ] {all dead. dead}) diff --git a/plutus-core/changelog.d/20260512_094205_unsafeFixIO_polybuiltin.md b/plutus-core/changelog.d/20260512_094205_unsafeFixIO_polybuiltin.md new file mode 100644 index 00000000000..69e969667ef --- /dev/null +++ b/plutus-core/changelog.d/20260512_094205_unsafeFixIO_polybuiltin.md @@ -0,0 +1,4 @@ +### Added + +- A new UPLC optimization that hoists forced polymorphic builtins, which can reduce + the number of forces. diff --git a/plutus-core/plutus-core.cabal b/plutus-core/plutus-core.cabal index 6c228e739f5..66a825e77e1 100644 --- a/plutus-core/plutus-core.cabal +++ b/plutus-core/plutus-core.cabal @@ -242,6 +242,7 @@ library UntypedPlutusCore.Transform.Inline UntypedPlutusCore.Transform.LetFloatOut UntypedPlutusCore.Transform.Optimizer + UntypedPlutusCore.Transform.PolyBuiltin other-modules: Data.Aeson.Flatten diff --git a/plutus-core/plutus-ir/test/PlutusIR/Compiler/Recursion/factorial.golden b/plutus-core/plutus-ir/test/PlutusIR/Compiler/Recursion/factorial.golden index 7e3ec8c1e19..1ae3fe06e54 100644 --- a/plutus-core/plutus-ir/test/PlutusIR/Compiler/Recursion/factorial.golden +++ b/plutus-core/plutus-ir/test/PlutusIR/Compiler/Recursion/factorial.golden @@ -1,11 +1,14 @@ program 1.1.0 - ((\s -> s s 5) - (\s i -> - case - (constr 0 - [ (equalsInteger 0 i) - , (\u -> 1) - , (\u -> multiplyInteger i ((\x -> s s x) (subtractInteger i 1))) - , () ]) - [(force ifThenElse)])) \ No newline at end of file + ((\forced -> + (\s -> s s 5) + (\s i -> + case + (constr 0 + [ (equalsInteger 0 i) + , (\u -> 1) + , (\u -> + multiplyInteger i ((\x -> s s x) (subtractInteger i 1))) + , () ]) + [forced])) + (force ifThenElse)) \ No newline at end of file diff --git a/plutus-core/plutus-ir/test/PlutusIR/Transform/StrictLetRec/strictLetRec.golden b/plutus-core/plutus-ir/test/PlutusIR/Transform/StrictLetRec/strictLetRec.golden index 7d06755f761..d93c75c6574 100644 --- a/plutus-core/plutus-ir/test/PlutusIR/Transform/StrictLetRec/strictLetRec.golden +++ b/plutus-core/plutus-ir/test/PlutusIR/Transform/StrictLetRec/strictLetRec.golden @@ -1 +1,2 @@ -(\xxx -> 1) ((\s -> s s) (\s -> force trace "hello" (\z -> s s z))) \ No newline at end of file +(\forced -> (\xxx -> 1) ((\s -> s s) (\s -> forced "hello" (\z -> s s z)))) + (force trace) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize.hs index ce63fea4776..d038ca3d171 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize.hs @@ -32,6 +32,7 @@ import UntypedPlutusCore.Transform.ForceDelay (forceDelay) import UntypedPlutusCore.Transform.Inline (InlineHints (..), inline) import UntypedPlutusCore.Transform.LetFloatOut (letFloatOut) import UntypedPlutusCore.Transform.Optimizer +import UntypedPlutusCore.Transform.PolyBuiltin (polyBuiltin) import Control.Lens ((&), (.~)) import Control.Monad @@ -84,6 +85,7 @@ termOptimizer termOptimizer opts builtinSemanticsVariant = simplifyNTimes (_ooMaxSimplifierIterations opts) >=> runStage CseStage + >=> runStage PolyBuiltinStage >=> runStage ApplyToCaseStage where -- Run the simplifier @n@ times @@ -158,6 +160,7 @@ termOptimizer opts builtinSemanticsVariant = ((def :: BuiltinsInfo PLC.DefaultUni DefaultFun) & biSemanticsVariant .~ builtinSemanticsVariant) (def :: CostingPart PLC.DefaultUni DefaultFun) _ -> pure + PolyBuiltinStage -> if _ooHoistPolyBuiltins opts then polyBuiltinStep else pure caseOfCase' :: Term name uni fun a @@ -176,3 +179,10 @@ termOptimizer opts builtinSemanticsVariant = _ -> pure cseTimes = if _ooConservativeOpts opts then 0 else _ooMaxCseIterations opts + + polyBuiltinStep + :: Term name uni fun a + -> OptimizerT name uni fun a m (Term name uni fun a) + polyBuiltinStep = case (eqT @name @Name, eqT @uni @PLC.DefaultUni) of + (Just Refl, Just Refl) -> polyBuiltin builtinSemanticsVariant + _ -> pure diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize/Opts.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize/Opts.hs index de5374ad6a2..1119166b9ed 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize/Opts.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Optimize/Opts.hs @@ -3,6 +3,7 @@ module UntypedPlutusCore.Optimize.Opts ( OptimizeOpts (..) , ooApplyToCase + , ooHoistPolyBuiltins , ooMaxSimplifierIterations , ooMaxCseIterations , ooCseWhichSubterms @@ -43,6 +44,7 @@ data OptimizeOpts name a = OptimizeOpts , _ooInlineCallsiteGrowth :: AstSize , _ooPreserveLogging :: Bool , _ooApplyToCase :: Bool + , _ooHoistPolyBuiltins :: Bool , _ooCertifiedOptsOnly :: Bool } deriving stock (Show) @@ -62,5 +64,6 @@ defaultOptimizeOpts = , _ooInlineCallsiteGrowth = 5 , _ooPreserveLogging = True , _ooApplyToCase = True + , _ooHoistPolyBuiltins = True , _ooCertifiedOptsOnly = False } diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Certify/Trace.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Certify/Trace.hs index f7a9e250ed6..8539c3e9a51 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Certify/Trace.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Certify/Trace.hs @@ -44,6 +44,7 @@ at https://github.com/IntersectMBO/plutus/issues. -} data UncertifiedOptStage = CaseOfCase | ConstantFolding + | PolyBuiltin deriving stock (Show, Generic) deriving anyclass (NFData) @@ -79,6 +80,9 @@ pattern LetFloatOutStage = Right LetFloatOut pattern ConstantFoldingStage :: OptStage pattern ConstantFoldingStage = Left ConstantFolding +pattern PolyBuiltinStage :: OptStage +pattern PolyBuiltinStage = Left PolyBuiltin + {-# COMPLETE FloatDelayStage , ForceDelayStage @@ -90,6 +94,7 @@ pattern ConstantFoldingStage = Left ConstantFolding , CaseOfCaseStage , LetFloatOutStage , ConstantFoldingStage + , PolyBuiltinStage #-} data Optimization name uni fun a diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Optimizer.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Optimizer.hs index b404da5d0b7..f7f60d74ba8 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Optimizer.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Optimizer.hs @@ -13,6 +13,7 @@ module UntypedPlutusCore.Transform.Optimizer , pattern Trace.CaseOfCaseStage , pattern Trace.LetFloatOutStage , pattern Trace.ConstantFoldingStage + , pattern Trace.PolyBuiltinStage , Trace.OptimizerTrace (..) , Trace.Optimization (..) , runOptimizerT diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/PolyBuiltin.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/PolyBuiltin.hs new file mode 100644 index 00000000000..8eda0a1415a --- /dev/null +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/PolyBuiltin.hs @@ -0,0 +1,107 @@ +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeApplications #-} + +{-| Hoist fully-forced polymorphic builtins. + +Before: @...force (force fstPair)...@ +After: @(\fstPairForced -> ...fstPairForced...) (force (force fstPair))@ -} +module UntypedPlutusCore.Transform.PolyBuiltin + ( polyBuiltin + ) where + +import PlutusCore (Name, getAnn) +import PlutusCore.Arity (Param (..), builtinArity) +import PlutusCore.Builtin (ToBuiltinMeaning (BuiltinSemanticsVariant)) +import PlutusCore.Quote (MonadQuote, freshName) +import UntypedPlutusCore.Core.Plated (termSubterms, termSubtermsDeep) +import UntypedPlutusCore.Core.Type (Term (..)) +import UntypedPlutusCore.Transform.Optimizer + ( OptimizerT + , recordOptimization + , pattern PolyBuiltinStage + ) + +import Control.Lens (foldlOf', transformOf) +import Data.Foldable qualified as F +import Data.HashMap.Strict (HashMap) +import Data.HashMap.Strict qualified as Map +import Data.Hashable (Hashable) +import Data.Proxy (Proxy (..)) +import Data.Traversable (for) + +polyBuiltin + :: forall m uni fun a + . ( MonadQuote m + , Hashable fun + , ToBuiltinMeaning uni fun + ) + => BuiltinSemanticsVariant fun + -> Term Name uni fun a + -> OptimizerT Name uni fun a m (Term Name uni fun a) +polyBuiltin semvar term = do + let numForces :: fun -> Int + numForces = length . takeWhile (== TypeParam) . builtinArity (Proxy @uni) semvar + + -- If it is a fully forced polymorphic builtin, return `Just (ann, fun, number of forces)`. + checkFullyForced :: Term Name uni fun a -> Maybe (a, fun, Int) + checkFullyForced t = case t' of + Builtin _ fun + | n >= 1 + , n == numForces fun -> + Just (getAnn t, fun, n) + _ -> Nothing + where + (n, t') = peelForces t + + candidates :: HashMap fun Int + candidates = + foldlOf' termSubtermsDeep alg Map.empty term + where + alg !acc t = case checkFullyForced t of + Just (_, fun, n) -> Map.insert fun n acc + Nothing -> acc + + result <- + if Map.null candidates + then pure term + else do + named <- for (Map.toList candidates) $ \(fun, n) -> do + name <- freshName "forced" + pure (fun, (name, n)) + let binders = Map.fromList named + subst t = case checkFullyForced t of + Just (ann, fun, _) + | Just (name, _) <- Map.lookup fun binders -> + Var ann name + _ -> t + rewritten = transformOf termSubterms subst term + pure $ wrap (getAnn term) named rewritten + + recordOptimization term PolyBuiltinStage result + pure result + +peelForces :: Term name uni fun a -> (Int, Term name uni fun a) +peelForces = go 0 + where + go !k (Force _ t) = go (k + 1) t + go !k t = (k, t) + +wrap + :: forall uni fun a + . a + -> [(fun, (Name, Int))] + -> Term Name uni fun a + -> Term Name uni fun a +wrap ann entries body = + let lams = foldr (\(_, (name, _)) -> LamAbs ann name) body entries + in F.foldl' + (\acc (fun, (_, n)) -> Apply ann acc (applyForces n (Builtin ann fun))) + lams + entries + where + applyForces :: Int -> Term Name uni fun a -> Term Name uni fun a + applyForces 0 = id + applyForces n = applyForces (n - 1) . Force ann diff --git a/plutus-core/untyped-plutus-core/test/Transform/basic.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/basic.golden.certifier-hints index 19e35b323c0..940facc7293 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/basic.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/basic.golden.certifier-hints @@ -23,6 +23,9 @@ InlCon -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/basicInline.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/basicInline.golden.certifier-hints index 223be4d95c3..6a9ec1b4271 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/basicInline.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/basicInline.golden.certifier-hints @@ -25,6 +25,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/callsiteInline.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/callsiteInline.golden.certifier-hints index 13d9e8ca088..a36f3c738c7 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/callsiteInline.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/callsiteInline.golden.certifier-hints @@ -49,6 +49,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/extraDelays.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/extraDelays.golden.certifier-hints index 7068e974f39..501627b4733 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/extraDelays.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/extraDelays.golden.certifier-hints @@ -24,6 +24,9 @@ InlDelay -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/floatDelay1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/floatDelay1.golden.certifier-hints index 470659bfd2c..83571091c93 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/floatDelay1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/floatDelay1.golden.certifier-hints @@ -30,6 +30,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/floatDelay2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/floatDelay2.golden.certifier-hints index fd0c254cc7d..a9e968eb113 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/floatDelay2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/floatDelay2.golden.certifier-hints @@ -37,6 +37,9 @@ InlApply -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/floatDelay3.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/floatDelay3.golden.certifier-hints index 4c83101e022..098d96b1f36 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/floatDelay3.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/floatDelay3.golden.certifier-hints @@ -36,6 +36,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps1.golden.certifier-hints index cfd19e4902f..bfaed3e51f6 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps1.golden.certifier-hints @@ -26,6 +26,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2.golden.certifier-hints index 82087a258ff..673c21dbaa0 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2.golden.certifier-hints @@ -27,6 +27,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2Fail.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2Fail.golden.certifier-hints index 2fd40583a19..8c4971b2554 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2Fail.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayNoApps2Fail.golden.certifier-hints @@ -29,6 +29,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps1.golden.certifier-hints index 29e1948f8a6..73296ef4686 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps1.golden.certifier-hints @@ -27,6 +27,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2.golden.certifier-hints index b7c480f86b9..95c6cc12901 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2.golden.certifier-hints @@ -28,6 +28,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2Fail.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2Fail.golden.certifier-hints index b8a06436af1..6e8b5cd5463 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2Fail.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceCaseDelayWithApps2Fail.golden.certifier-hints @@ -32,6 +32,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelayComplex.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelayComplex.golden.certifier-hints index 6354915df6a..ee4e6a2f0fb 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelayComplex.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelayComplex.golden.certifier-hints @@ -50,6 +50,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiApply.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiApply.golden.certifier-hints index 82389d83365..09bf5bfff97 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiApply.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiApply.golden.certifier-hints @@ -38,6 +38,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiForce.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiForce.golden.certifier-hints index 223be4d95c3..6a9ec1b4271 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiForce.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelayMultiForce.golden.certifier-hints @@ -25,6 +25,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoApps.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoApps.golden.certifier-hints index 19e35b323c0..940facc7293 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoApps.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoApps.golden.certifier-hints @@ -23,6 +23,9 @@ InlCon -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoAppsLayered.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoAppsLayered.golden.certifier-hints index 19e35b323c0..940facc7293 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoAppsLayered.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelayNoAppsLayered.golden.certifier-hints @@ -23,6 +23,9 @@ InlCon -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/forceDelaySimple.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/forceDelaySimple.golden.certifier-hints index a5948093d45..f38d119dd4a 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/forceDelaySimple.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/forceDelaySimple.golden.certifier-hints @@ -27,6 +27,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure1.golden.certifier-hints index c60fcdbbc66..e8d7e6a4150 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure1.golden.certifier-hints @@ -27,6 +27,9 @@ InlApply -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure2.golden.certifier-hints index c60fcdbbc66..e8d7e6a4150 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure2.golden.certifier-hints @@ -27,6 +27,9 @@ InlApply -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure3.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure3.golden.certifier-hints index c60fcdbbc66..e8d7e6a4150 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure3.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure3.golden.certifier-hints @@ -27,6 +27,9 @@ InlApply -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure4.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure4.golden.certifier-hints index bba104fbabc..ea8cc1c864a 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlineImpure4.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlineImpure4.golden.certifier-hints @@ -29,6 +29,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlinePure1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlinePure1.golden.certifier-hints index 2095279a87d..4c105e3deed 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlinePure1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlinePure1.golden.certifier-hints @@ -27,6 +27,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlinePure2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlinePure2.golden.certifier-hints index 2095279a87d..4c105e3deed 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlinePure2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlinePure2.golden.certifier-hints @@ -27,6 +27,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlinePure3.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlinePure3.golden.certifier-hints index 74e3d62f8f8..fb150209b4e 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlinePure3.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlinePure3.golden.certifier-hints @@ -32,6 +32,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/inlinePure4.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/inlinePure4.golden.certifier-hints index b116e05f906..be492797632 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/inlinePure4.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/inlinePure4.golden.certifier-hints @@ -35,6 +35,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/interveningLambda.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/interveningLambda.golden.certifier-hints index 8744a8f2922..651f6428ef4 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/interveningLambda.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/interveningLambda.golden.certifier-hints @@ -28,6 +28,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase1.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase1.golden.certifier-hints index fa97f87b88e..da0d2e09e86 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase1.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase1.golden.certifier-hints @@ -24,6 +24,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase2.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase2.golden.certifier-hints index f454a74cc83..ee025173d8f 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase2.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutCase2.golden.certifier-hints @@ -31,6 +31,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutForce.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutForce.golden.certifier-hints index 591ef2b5395..2e9f3f5b434 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/letFloatOutForce.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/letFloatOutForce.golden.certifier-hints @@ -26,6 +26,9 @@ InlLam -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/multiApp.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/multiApp.golden.certifier-hints index 042dfb3b9d0..6f84dab4f9c 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/multiApp.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/multiApp.golden.certifier-hints @@ -33,6 +33,9 @@ InlDrop -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-core/untyped-plutus-core/test/Transform/nested.golden.certifier-hints b/plutus-core/untyped-plutus-core/test/Transform/nested.golden.certifier-hints index 19e35b323c0..940facc7293 100644 --- a/plutus-core/untyped-plutus-core/test/Transform/nested.golden.certifier-hints +++ b/plutus-core/untyped-plutus-core/test/Transform/nested.golden.certifier-hints @@ -23,6 +23,9 @@ InlCon -- Certifier hints #8 (Left ConstantFolding) -- NoHints --- Certifier hints #9 (Right ApplyToCase) -- +-- Certifier hints #9 (Left PolyBuiltin) -- +NoHints + +-- Certifier hints #10 (Right ApplyToCase) -- NoHints diff --git a/plutus-ledger-api/executables/src/PlutusCore/Executable/Parsers.hs b/plutus-ledger-api/executables/src/PlutusCore/Executable/Parsers.hs index fd2504d6a77..6d69a23489e 100644 --- a/plutus-ledger-api/executables/src/PlutusCore/Executable/Parsers.hs +++ b/plutus-ledger-api/executables/src/PlutusCore/Executable/Parsers.hs @@ -278,6 +278,13 @@ optimizeOpts = do ( long "opt-no-apply-to-case" <> help "Disable apply-to-case optimization" ) + _ooHoistPolyBuiltins <- + flag + True + False + ( long "opt-no-hoist-polymorphic-builtins" + <> help "Disable hoist-polymorphic-builtins optimization" + ) _ooCertifiedOptsOnly <- flag False diff --git a/plutus-metatheory/src/CertifierReport.lagda.md b/plutus-metatheory/src/CertifierReport.lagda.md index a9aa670a8e2..e4e7221547d 100644 --- a/plutus-metatheory/src/CertifierReport.lagda.md +++ b/plutus-metatheory/src/CertifierReport.lagda.md @@ -51,6 +51,7 @@ showCertifiedOptTag letFloatOutT = "Float bindings outwards" showUncertifiedOptTag : UncertifiedOptTag → String showUncertifiedOptTag caseOfCaseT = "Case-of-Case" showUncertifiedOptTag constantFoldingT = "Constant Folding" +showUncertifiedOptTag polyBuiltinT = "Hoist Polymorphic Builtins" showTag : OptTag → String showTag (inj₁ tag) = showUncertifiedOptTag tag ++ " ⚠ (certifier unavailable)" diff --git a/plutus-metatheory/src/FFI/AgdaUnparse.hs b/plutus-metatheory/src/FFI/AgdaUnparse.hs index 21d3231a8fb..2af7cf8a6ef 100644 --- a/plutus-metatheory/src/FFI/AgdaUnparse.hs +++ b/plutus-metatheory/src/FFI/AgdaUnparse.hs @@ -66,6 +66,7 @@ instance AgdaUnparse CertifiedOptStage where instance AgdaUnparse UncertifiedOptStage where agdaUnparse CaseOfCase = "caseOfCaseT" agdaUnparse ConstantFolding = "constantFoldingT" + agdaUnparse PolyBuiltin = "polyBuiltinT" instance AgdaUnparse Hints.Hints where agdaUnparse = \case diff --git a/plutus-metatheory/src/MAlonzo/Code/Certifier.hs b/plutus-metatheory/src/MAlonzo/Code/Certifier.hs index 9f397525666..0ce9c1dfcbb 100644 --- a/plutus-metatheory/src/MAlonzo/Code/Certifier.hs +++ b/plutus-metatheory/src/MAlonzo/Code/Certifier.hs @@ -33,9 +33,9 @@ d_runCertifier_2 :: [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_76 + MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> @@ -47,7 +47,7 @@ d_runCertifier_2 v0 MAlonzo.Code.Utils.du_eitherBind_54 (coe MAlonzo.Code.Utils.du_try_102 - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_toTrace_102 (coe v0)) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_toTrace_106 (coe v0)) (coe MAlonzo.Code.VerifiedCompilation.C_emptyDump_4)) (coe (\ v1 -> @@ -77,14 +77,14 @@ runCertifierMain :: (MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_76 + MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))) -> MAlonzo.Code.Agda.Builtin.List.T_List_10 - () MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138 -> + () MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142 -> MAlonzo.Code.Agda.Builtin.Maybe.T_Maybe_10 () (MAlonzo.Code.Utils.T__'215'__436 @@ -94,13 +94,13 @@ d_runCertifierMain_12 :: [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_76 + MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142] -> Maybe (MAlonzo.Code.Utils.T__'215'__436 Bool MAlonzo.Code.Agda.Builtin.String.T_String_6) diff --git a/plutus-metatheory/src/MAlonzo/Code/CertifierReport.hs b/plutus-metatheory/src/MAlonzo/Code/CertifierReport.hs index 9bbeaf7ae3d..364f049dda1 100644 --- a/plutus-metatheory/src/MAlonzo/Code/CertifierReport.hs +++ b/plutus-metatheory/src/MAlonzo/Code/CertifierReport.hs @@ -54,29 +54,29 @@ d_hl_8 Data.Text.Text) -- CertifierReport.showCertifiedOptTag d_showCertifiedOptTag_10 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_showCertifiedOptTag_10 v0 = case coe v0 of - MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_12 + MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_14 -> coe ("Float Delay" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_14 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_16 -> coe ("Force-Delay Cancellation" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_16 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_18 -> coe ("Float Force into Case Branches" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_18 + MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_20 -> coe ("Inlining" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_20 + MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_22 -> coe ("Common Subexpression Elimination" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_22 + MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_24 -> coe ("Transform multi-argument applications into case-constr form" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_24 + MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_26 -> coe ("Case-Constr and Case-Constant Cancellation" :: Data.Text.Text) - MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_26 + MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_28 -> coe ("Float bindings outwards" :: Data.Text.Text) _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.showUncertifiedOptTag @@ -89,12 +89,14 @@ d_showUncertifiedOptTag_12 v0 -> coe ("Case-of-Case" :: Data.Text.Text) MAlonzo.Code.VerifiedCompilation.Trace.C_constantFoldingT_8 -> coe ("Constant Folding" :: Data.Text.Text) + MAlonzo.Code.VerifiedCompilation.Trace.C_polyBuiltinT_10 + -> coe ("Hoist Polymorphic Builtins" :: Data.Text.Text) _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.showTag d_showTag_14 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_showTag_14 v0 = case coe v0 of @@ -805,34 +807,34 @@ d_numSitesCaseReduce'42'_186 v0 v1 v2 v3 d_numSites_222 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> Integer d_numSites_222 v0 v1 v2 v3 = case coe v2 of - MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_12 + MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_14 -> coe du_numSites'8242'_26 v0 v1 v3 - MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_14 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_16 -> coe du_numSites'8242'_26 v0 v1 v3 - MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_16 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_18 -> coe du_numSites'8242'_26 v0 v1 v3 - MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_18 + MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_20 -> coe d_numSitesInline_140 (coe (0 :: Integer)) erased (coe MAlonzo.Code.VerifiedCompilation.UInline.C_'9633'_32) (coe MAlonzo.Code.VerifiedCompilation.UInline.C_'9633'_32) (coe MAlonzo.Code.VerifiedCompilation.UInline.C_'9633'_106) (coe v0) (coe v1) (coe v3) - MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_20 + MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_22 -> coe du_numSites'8242'_26 v0 v1 v3 - MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_22 + MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_24 -> coe du_numSites'8242'_26 v0 v1 v3 - MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_24 + MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_26 -> coe d_numSitesCaseReduce_178 (coe (0 :: Integer)) (coe v0) (coe v1) (coe MAlonzo.Code.VerifiedCompilation.UCaseReduce.du_sound_568 (coe (0 :: Integer)) (coe v0)) - MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_26 + MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_28 -> coe (0 :: Integer) _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.showSites @@ -841,7 +843,7 @@ d_showSites_248 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_showSites_248 v0 v1 v2 v3 = case coe v2 of @@ -907,11 +909,11 @@ d_termSize'7510''695'_260 v0 v1 _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.showEvalResult d_showEvalResult_282 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142 -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_showEvalResult_282 v0 = case coe v0 of - MAlonzo.Code.VerifiedCompilation.Trace.C_success_140 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.C_success_144 v1 v2 -> coe MAlonzo.Code.Data.String.Base.d__'43''43'__20 (d_'8649'__2 (coe ("Execution Cost: CPU = " :: Data.Text.Text))) @@ -922,7 +924,7 @@ d_showEvalResult_282 v0 MAlonzo.Code.Data.String.Base.d__'43''43'__20 (", MEM = " :: Data.Text.Text) (coe MAlonzo.Code.Data.Nat.Show.d_show_56 v2))) - MAlonzo.Code.VerifiedCompilation.Trace.C_failure_142 v1 v2 v3 + MAlonzo.Code.VerifiedCompilation.Trace.C_failure_146 v1 v2 v3 -> coe MAlonzo.Code.Data.String.Base.d__'43''43'__20 (d_'8649'__2 (coe ("Evaluation FAILED: " :: Data.Text.Text))) @@ -943,7 +945,7 @@ d_showEvalResult_282 v0 _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.showCostPair d_showCostPair_294 :: - [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142] -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_showCostPair_294 v0 = let v1 = "" :: Data.Text.Text in @@ -977,13 +979,13 @@ du_tail_302 v0 -- CertifierReport.reportPasses d_reportPasses_312 :: Integer -> - MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 -> AgdaAny -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142] -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_reportPasses_312 v0 v1 v2 v3 = case coe v1 of - MAlonzo.Code.VerifiedCompilation.Trace.C_step_88 v4 v5 v6 v7 + MAlonzo.Code.VerifiedCompilation.Trace.C_step_92 v4 v5 v6 v7 -> case coe v2 of MAlonzo.Code.Utils.C__'44'__450 v8 v9 -> coe @@ -1026,7 +1028,7 @@ d_reportPasses_312 v0 v1 v2 v3 (d_termSize_256 (coe (0 :: Integer)) (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_head_94 + MAlonzo.Code.VerifiedCompilation.Trace.d_head_98 (coe v7)))) (coe MAlonzo.Code.Data.String.Base.d__'43''43'__20 @@ -1045,7 +1047,7 @@ d_reportPasses_312 v0 v1 v2 v3 (d_showSites_248 (coe v6) (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_head_94 + MAlonzo.Code.VerifiedCompilation.Trace.d_head_98 (coe v7)) (coe v4) (coe v8)) (coe @@ -1062,7 +1064,7 @@ d_reportPasses_312 v0 v1 v2 v3 (coe v3)))))))))))))))))))) _ -> MAlonzo.RTE.mazUnreachableError - MAlonzo.Code.VerifiedCompilation.Trace.C_done_90 v4 + MAlonzo.Code.VerifiedCompilation.Trace.C_done_94 v4 -> coe ("" :: Data.Text.Text) _ -> MAlonzo.RTE.mazUnreachableError -- CertifierReport.reportFailure @@ -1117,7 +1119,7 @@ d_makeReport_334 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.T_Error_2 MAlonzo.Code.Agda.Builtin.Sigma.T_Σ_14 -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_138] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_EvalResult_142] -> MAlonzo.Code.Agda.Builtin.String.T_String_6 d_makeReport_334 v0 v1 = coe diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation.hs index b4562fe42ad..b83269476e4 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation.hs @@ -41,13 +41,13 @@ data T_Error_2 = C_emptyDump_4 | C_illScoped_6 | C_counterExample_8 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) | + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) | C_abort_10 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) -- VerifiedCompilation.tagToRelation d_tagToRelation_12 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> () d_tagToRelation_12 = erased @@ -55,7 +55,7 @@ d_tagToRelation_12 = erased d_RelationOf_14 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> () d_RelationOf_14 = erased @@ -63,15 +63,15 @@ d_RelationOf_14 = erased d_hasRelation_18 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> Bool d_hasRelation_18 = coe MAlonzo.Code.Utils.du_is'45'inj'8322'_46 -- VerifiedCompilation.certifyPass d_certifyPass_26 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_76 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_Hints_80 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.VerifiedCompilation.Certificate.T_CertResult_12 @@ -84,56 +84,56 @@ d_certifyPass_26 v0 v1 MAlonzo.Code.VerifiedCompilation.NotImplemented.du_certNotImplemented_22) MAlonzo.Code.Utils.C_inj'8322'_14 v2 -> case coe v2 of - MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_12 + MAlonzo.Code.VerifiedCompilation.Trace.C_floatDelayT_14 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UFloatDelay.d_isFloatDelay'63'_488 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_14 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceDelayT_16 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UForceDelay.d_isForceDelay'63'_178 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_16 + MAlonzo.Code.VerifiedCompilation.Trace.C_forceCaseDelayT_18 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UForceCaseDelay.d_isForceCaseDelay'63'_94 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_18 + MAlonzo.Code.VerifiedCompilation.Trace.C_inlineT_20 -> case coe v1 of - MAlonzo.Code.VerifiedCompilation.Trace.C_inline_78 v3 + MAlonzo.Code.VerifiedCompilation.Trace.C_inline_82 v3 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_checker_156 (coe MAlonzo.Code.VerifiedCompilation.UInline.d_top'45'check_718 (coe v3)) - MAlonzo.Code.VerifiedCompilation.Trace.C_none_80 + MAlonzo.Code.VerifiedCompilation.Trace.C_none_84 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38) _ -> MAlonzo.RTE.mazUnreachableError - MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_20 + MAlonzo.Code.VerifiedCompilation.Trace.C_cseT_22 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UCSE.d_isUntypedCSE'63'_22 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_22 + MAlonzo.Code.VerifiedCompilation.Trace.C_applyToCaseT_24 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UApplyToCase.d_a2c'63''7580''7580'_24 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_24 + MAlonzo.Code.VerifiedCompilation.Trace.C_caseReduceT_26 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe MAlonzo.Code.VerifiedCompilation.UCaseReduce.d_decide_526 (coe (0 :: Integer))) - MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_26 + MAlonzo.Code.VerifiedCompilation.Trace.C_letFloatOutT_28 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du_decider_192 (coe @@ -143,19 +143,19 @@ d_certifyPass_26 v0 v1 _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.Certificate d_Certificate_34 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 -> () + MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 -> () d_Certificate_34 = erased -- VerifiedCompilation.certify d_certify_46 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 -> MAlonzo.Code.Utils.T_Either_6 T_Error_2 AgdaAny d_certify_46 v0 = case coe v0 of - MAlonzo.Code.VerifiedCompilation.Trace.C_step_88 v1 v2 v3 v4 + MAlonzo.Code.VerifiedCompilation.Trace.C_step_92 v1 v2 v3 v4 -> let v5 = coe d_certifyPass_26 v1 v2 v3 - (MAlonzo.Code.VerifiedCompilation.Trace.d_head_94 (coe v4)) in + (MAlonzo.Code.VerifiedCompilation.Trace.d_head_98 (coe v4)) in coe (case coe v5 of MAlonzo.Code.VerifiedCompilation.Certificate.C_proof_18 v6 @@ -172,14 +172,14 @@ d_certify_46 v0 MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_32 v8 v9 v10 -> coe MAlonzo.Code.Utils.C_inj'8321'_12 (coe C_abort_10 (coe v8)) _ -> MAlonzo.RTE.mazUnreachableError) - MAlonzo.Code.VerifiedCompilation.Trace.C_done_90 v1 + MAlonzo.Code.VerifiedCompilation.Trace.C_done_94 v1 -> coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe MAlonzo.Code.Agda.Builtin.Unit.C_tt_8) _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.cert d_cert_96 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 -> MAlonzo.Code.Utils.T_Either_6 T_Error_2 AgdaAny -> AgdaAny -> AgdaAny d_cert_96 ~v0 v1 v2 = du_cert_96 v1 v2 @@ -200,11 +200,11 @@ d_checkScope_100 v0 (coe MAlonzo.Code.Untyped.d_scopeCheckU0_288 (coe v0)) -- VerifiedCompilation.checkScopeᵗ d_checkScope'7511'_102 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 -> - Maybe MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_84 + MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 -> + Maybe MAlonzo.Code.VerifiedCompilation.Trace.T_Trace_88 d_checkScope'7511'_102 v0 = case coe v0 of - MAlonzo.Code.VerifiedCompilation.Trace.C_step_88 v1 v2 v3 v4 + MAlonzo.Code.VerifiedCompilation.Trace.C_step_92 v1 v2 v3 v4 -> coe MAlonzo.Code.Data.Maybe.Base.du__'62''62''61'__72 (coe d_checkScope_100 (coe v3)) @@ -218,9 +218,9 @@ d_checkScope'7511'_102 v0 coe MAlonzo.Code.Agda.Builtin.Maybe.C_just_16 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_step_88 (coe v1) (coe v2) + MAlonzo.Code.VerifiedCompilation.Trace.C_step_92 (coe v1) (coe v2) (coe v5) (coe v6)))))) - MAlonzo.Code.VerifiedCompilation.Trace.C_done_90 v1 + MAlonzo.Code.VerifiedCompilation.Trace.C_done_94 v1 -> coe MAlonzo.Code.Data.Maybe.Base.du__'62''62''61'__72 (coe d_checkScope_100 (coe v1)) @@ -228,5 +228,5 @@ d_checkScope'7511'_102 v0 (\ v2 -> coe MAlonzo.Code.Agda.Builtin.Maybe.C_just_16 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_done_90 (coe v2)))) + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_done_94 (coe v2)))) _ -> MAlonzo.RTE.mazUnreachableError diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Certificate.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Certificate.hs index 74b444bfe0f..75f7bdc10c4 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Certificate.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Certificate.hs @@ -33,11 +33,11 @@ data T_CertResult_12 = C_proof_18 AgdaAny | C_ce_26 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) AgdaAny AgdaAny | C_abort_32 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) AgdaAny AgdaAny -- VerifiedCompilation.Certificate.ProofOrCE d_ProofOrCE_38 a0 a1 = () @@ -45,7 +45,7 @@ data T_ProofOrCE_38 = C_proof_44 AgdaAny | C_ce_52 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) AgdaAny AgdaAny -- VerifiedCompilation.Certificate.isProof? d_isProof'63'_56 :: @@ -74,7 +74,7 @@ data T_Proof'63'_66 = C_proof_72 AgdaAny | C_abort_78 (MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10) + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12) AgdaAny AgdaAny -- VerifiedCompilation.Certificate._>>=_ d__'62''62''61'__88 :: @@ -145,14 +145,14 @@ d_decToPCE_234 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Relation.Nullary.Decidable.Core.T_Dec_20 -> AgdaAny -> AgdaAny -> T_ProofOrCE_38 d_decToPCE_234 ~v0 ~v1 v2 v3 v4 v5 = du_decToPCE_234 v2 v3 v4 v5 du_decToPCE_234 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> MAlonzo.Code.Relation.Nullary.Decidable.Core.T_Dec_20 -> AgdaAny -> AgdaAny -> T_ProofOrCE_38 du_decToPCE_234 v0 v1 v2 v3 @@ -195,7 +195,7 @@ d_matchOrCE_262 :: (AgdaAny -> AgdaAny -> ()) -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (AgdaAny -> AgdaAny -> MAlonzo.Code.Relation.Nullary.Decidable.Core.T_Dec_20) -> @@ -205,7 +205,7 @@ d_matchOrCE_262 ~v0 ~v1 ~v2 ~v3 v4 v5 v6 v7 du_matchOrCE_262 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (AgdaAny -> AgdaAny -> MAlonzo.Code.Relation.Nullary.Decidable.Core.T_Dec_20) -> @@ -230,7 +230,7 @@ d_pcePointwise_304 :: (AgdaAny -> AgdaAny -> ()) -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (AgdaAny -> AgdaAny -> T_ProofOrCE_38) -> [AgdaAny] -> [AgdaAny] -> T_ProofOrCE_38 d_pcePointwise_304 ~v0 ~v1 ~v2 ~v3 v4 v5 v6 v7 @@ -238,7 +238,7 @@ d_pcePointwise_304 ~v0 ~v1 ~v2 ~v3 v4 v5 v6 v7 du_pcePointwise_304 :: MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (AgdaAny -> AgdaAny -> T_ProofOrCE_38) -> [AgdaAny] -> [AgdaAny] -> T_ProofOrCE_38 du_pcePointwise_304 v0 v1 v2 v3 diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/FloatOut.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/FloatOut.hs index 1f51afbacd9..e071727992e 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/FloatOut.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/FloatOut.hs @@ -551,5 +551,5 @@ d_decide_312 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_LetFloatOutT_42 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_LetFloatOutT_44 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Trace.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Trace.hs index 8469da9f5c5..cf790d6141c 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Trace.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/Trace.hs @@ -31,44 +31,48 @@ d_UncertifiedOptTag_4 = () type T_UncertifiedOptTag_4 = UncertifiedOptStage pattern C_caseOfCaseT_6 = CaseOfCase pattern C_constantFoldingT_8 = ConstantFolding +pattern C_polyBuiltinT_10 = PolyBuiltin check_caseOfCaseT_6 :: T_UncertifiedOptTag_4 check_caseOfCaseT_6 = CaseOfCase check_constantFoldingT_8 :: T_UncertifiedOptTag_4 check_constantFoldingT_8 = ConstantFolding +check_polyBuiltinT_10 :: T_UncertifiedOptTag_4 +check_polyBuiltinT_10 = PolyBuiltin cover_UncertifiedOptTag_4 :: UncertifiedOptStage -> () cover_UncertifiedOptTag_4 x = case x of CaseOfCase -> () ConstantFolding -> () + PolyBuiltin -> () -- VerifiedCompilation.Trace.CertifiedOptTag -d_CertifiedOptTag_10 = () -type T_CertifiedOptTag_10 = CertifiedOptStage -pattern C_floatDelayT_12 = FloatDelay -pattern C_forceDelayT_14 = ForceDelay -pattern C_forceCaseDelayT_16 = ForceCaseDelay -pattern C_inlineT_18 = Inline -pattern C_cseT_20 = CSE -pattern C_applyToCaseT_22 = ApplyToCase -pattern C_caseReduceT_24 = CaseReduce -pattern C_letFloatOutT_26 = LetFloatOut -check_floatDelayT_12 :: T_CertifiedOptTag_10 -check_floatDelayT_12 = FloatDelay -check_forceDelayT_14 :: T_CertifiedOptTag_10 -check_forceDelayT_14 = ForceDelay -check_forceCaseDelayT_16 :: T_CertifiedOptTag_10 -check_forceCaseDelayT_16 = ForceCaseDelay -check_inlineT_18 :: T_CertifiedOptTag_10 -check_inlineT_18 = Inline -check_cseT_20 :: T_CertifiedOptTag_10 -check_cseT_20 = CSE -check_applyToCaseT_22 :: T_CertifiedOptTag_10 -check_applyToCaseT_22 = ApplyToCase -check_caseReduceT_24 :: T_CertifiedOptTag_10 -check_caseReduceT_24 = CaseReduce -check_letFloatOutT_26 :: T_CertifiedOptTag_10 -check_letFloatOutT_26 = LetFloatOut -cover_CertifiedOptTag_10 :: CertifiedOptStage -> () -cover_CertifiedOptTag_10 x +d_CertifiedOptTag_12 = () +type T_CertifiedOptTag_12 = CertifiedOptStage +pattern C_floatDelayT_14 = FloatDelay +pattern C_forceDelayT_16 = ForceDelay +pattern C_forceCaseDelayT_18 = ForceCaseDelay +pattern C_inlineT_20 = Inline +pattern C_cseT_22 = CSE +pattern C_applyToCaseT_24 = ApplyToCase +pattern C_caseReduceT_26 = CaseReduce +pattern C_letFloatOutT_28 = LetFloatOut +check_floatDelayT_14 :: T_CertifiedOptTag_12 +check_floatDelayT_14 = FloatDelay +check_forceDelayT_16 :: T_CertifiedOptTag_12 +check_forceDelayT_16 = ForceDelay +check_forceCaseDelayT_18 :: T_CertifiedOptTag_12 +check_forceCaseDelayT_18 = ForceCaseDelay +check_inlineT_20 :: T_CertifiedOptTag_12 +check_inlineT_20 = Inline +check_cseT_22 :: T_CertifiedOptTag_12 +check_cseT_22 = CSE +check_applyToCaseT_24 :: T_CertifiedOptTag_12 +check_applyToCaseT_24 = ApplyToCase +check_caseReduceT_26 :: T_CertifiedOptTag_12 +check_caseReduceT_26 = CaseReduce +check_letFloatOutT_28 :: T_CertifiedOptTag_12 +check_letFloatOutT_28 = LetFloatOut +cover_CertifiedOptTag_12 :: CertifiedOptStage -> () +cover_CertifiedOptTag_12 x = case x of FloatDelay -> () ForceDelay -> () @@ -79,114 +83,120 @@ cover_CertifiedOptTag_10 x CaseReduce -> () LetFloatOut -> () -- VerifiedCompilation.Trace.OptTag -d_OptTag_28 :: () -d_OptTag_28 = erased +d_OptTag_30 :: () +d_OptTag_30 = erased -- VerifiedCompilation.Trace.FloatDelayT -d_FloatDelayT_30 :: +d_FloatDelayT_32 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_FloatDelayT_30 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_floatDelayT_12) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_FloatDelayT_32 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_floatDelayT_14) -- VerifiedCompilation.Trace.ForceDelayT -d_ForceDelayT_32 :: +d_ForceDelayT_34 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_ForceDelayT_32 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_forceDelayT_14) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_ForceDelayT_34 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_forceDelayT_16) -- VerifiedCompilation.Trace.ForceCaseDelayT -d_ForceCaseDelayT_34 :: +d_ForceCaseDelayT_36 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_ForceCaseDelayT_34 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_forceCaseDelayT_16) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_ForceCaseDelayT_36 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_forceCaseDelayT_18) -- VerifiedCompilation.Trace.InlineT -d_InlineT_36 :: +d_InlineT_38 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_InlineT_36 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_inlineT_18) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_InlineT_38 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_inlineT_20) -- VerifiedCompilation.Trace.CseT -d_CseT_38 :: +d_CseT_40 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_CseT_38 = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_cseT_20) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_CseT_40 = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_cseT_22) -- VerifiedCompilation.Trace.ApplyToCaseT -d_ApplyToCaseT_40 :: +d_ApplyToCaseT_42 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_ApplyToCaseT_40 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_applyToCaseT_22) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_ApplyToCaseT_42 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_applyToCaseT_24) -- VerifiedCompilation.Trace.LetFloatOutT -d_LetFloatOutT_42 :: +d_LetFloatOutT_44 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_LetFloatOutT_42 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_letFloatOutT_26) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_LetFloatOutT_44 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_letFloatOutT_28) -- VerifiedCompilation.Trace.CaseReduceT -d_CaseReduceT_44 :: +d_CaseReduceT_46 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_CaseReduceT_44 - = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_caseReduceT_24) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_CaseReduceT_46 + = coe MAlonzo.Code.Utils.C_inj'8322'_14 (coe C_caseReduceT_26) -- VerifiedCompilation.Trace.CaseOfCaseT -d_CaseOfCaseT_46 :: +d_CaseOfCaseT_48 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_CaseOfCaseT_46 + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_CaseOfCaseT_48 = coe MAlonzo.Code.Utils.C_inj'8321'_12 (coe C_caseOfCaseT_6) -- VerifiedCompilation.Trace.ConstantFoldingT -d_ConstantFoldingT_48 :: +d_ConstantFoldingT_50 :: MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10 -d_ConstantFoldingT_48 + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_ConstantFoldingT_50 = coe MAlonzo.Code.Utils.C_inj'8321'_12 (coe C_constantFoldingT_8) +-- VerifiedCompilation.Trace.PolyBuiltinT +d_PolyBuiltinT_52 :: + MAlonzo.Code.Utils.T_Either_6 + T_UncertifiedOptTag_4 T_CertifiedOptTag_12 +d_PolyBuiltinT_52 + = coe MAlonzo.Code.Utils.C_inj'8321'_12 (coe C_polyBuiltinT_10) -- VerifiedCompilation.Trace.InlineHints -d_InlineHints_50 = () -type T_InlineHints_50 = Hints.Inline -pattern C_var_52 = Hints.InlVar -pattern C_expand_54 a0 = Hints.InlExpand a0 -pattern C_ƛ_56 a0 = Hints.InlLam a0 -pattern C__'183'__58 a0 a1 = Hints.InlApply a0 a1 -pattern C__'183''8595'_60 a0 = Hints.InlDrop a0 -pattern C_force_62 a0 = Hints.InlForce a0 -pattern C_delay_64 a0 = Hints.InlDelay a0 -pattern C_con_66 = Hints.InlCon -pattern C_builtin_68 = Hints.InlBuiltin -pattern C_error_70 = Hints.InlError -pattern C_constr_72 a0 = Hints.InlConstr a0 -pattern C_case_74 a0 a1 = Hints.InlCase a0 a1 -check_var_52 :: T_InlineHints_50 -check_var_52 = Hints.InlVar -check_expand_54 :: T_InlineHints_50 -> T_InlineHints_50 -check_expand_54 = Hints.InlExpand -check_ƛ_56 :: T_InlineHints_50 -> T_InlineHints_50 -check_ƛ_56 = Hints.InlLam -check__'183'__58 :: - T_InlineHints_50 -> T_InlineHints_50 -> T_InlineHints_50 -check__'183'__58 = Hints.InlApply -check__'183''8595'_60 :: T_InlineHints_50 -> T_InlineHints_50 -check__'183''8595'_60 = Hints.InlDrop -check_force_62 :: T_InlineHints_50 -> T_InlineHints_50 -check_force_62 = Hints.InlForce -check_delay_64 :: T_InlineHints_50 -> T_InlineHints_50 -check_delay_64 = Hints.InlDelay -check_con_66 :: T_InlineHints_50 -check_con_66 = Hints.InlCon -check_builtin_68 :: T_InlineHints_50 -check_builtin_68 = Hints.InlBuiltin -check_error_70 :: T_InlineHints_50 -check_error_70 = Hints.InlError -check_constr_72 :: - MAlonzo.Code.Agda.Builtin.List.T_List_10 () T_InlineHints_50 -> - T_InlineHints_50 -check_constr_72 = Hints.InlConstr -check_case_74 :: - T_InlineHints_50 -> - MAlonzo.Code.Agda.Builtin.List.T_List_10 () T_InlineHints_50 -> - T_InlineHints_50 -check_case_74 = Hints.InlCase -cover_InlineHints_50 :: Hints.Inline -> () -cover_InlineHints_50 x +d_InlineHints_54 = () +type T_InlineHints_54 = Hints.Inline +pattern C_var_56 = Hints.InlVar +pattern C_expand_58 a0 = Hints.InlExpand a0 +pattern C_ƛ_60 a0 = Hints.InlLam a0 +pattern C__'183'__62 a0 a1 = Hints.InlApply a0 a1 +pattern C__'183''8595'_64 a0 = Hints.InlDrop a0 +pattern C_force_66 a0 = Hints.InlForce a0 +pattern C_delay_68 a0 = Hints.InlDelay a0 +pattern C_con_70 = Hints.InlCon +pattern C_builtin_72 = Hints.InlBuiltin +pattern C_error_74 = Hints.InlError +pattern C_constr_76 a0 = Hints.InlConstr a0 +pattern C_case_78 a0 a1 = Hints.InlCase a0 a1 +check_var_56 :: T_InlineHints_54 +check_var_56 = Hints.InlVar +check_expand_58 :: T_InlineHints_54 -> T_InlineHints_54 +check_expand_58 = Hints.InlExpand +check_ƛ_60 :: T_InlineHints_54 -> T_InlineHints_54 +check_ƛ_60 = Hints.InlLam +check__'183'__62 :: + T_InlineHints_54 -> T_InlineHints_54 -> T_InlineHints_54 +check__'183'__62 = Hints.InlApply +check__'183''8595'_64 :: T_InlineHints_54 -> T_InlineHints_54 +check__'183''8595'_64 = Hints.InlDrop +check_force_66 :: T_InlineHints_54 -> T_InlineHints_54 +check_force_66 = Hints.InlForce +check_delay_68 :: T_InlineHints_54 -> T_InlineHints_54 +check_delay_68 = Hints.InlDelay +check_con_70 :: T_InlineHints_54 +check_con_70 = Hints.InlCon +check_builtin_72 :: T_InlineHints_54 +check_builtin_72 = Hints.InlBuiltin +check_error_74 :: T_InlineHints_54 +check_error_74 = Hints.InlError +check_constr_76 :: + MAlonzo.Code.Agda.Builtin.List.T_List_10 () T_InlineHints_54 -> + T_InlineHints_54 +check_constr_76 = Hints.InlConstr +check_case_78 :: + T_InlineHints_54 -> + MAlonzo.Code.Agda.Builtin.List.T_List_10 () T_InlineHints_54 -> + T_InlineHints_54 +check_case_78 = Hints.InlCase +cover_InlineHints_54 :: Hints.Inline -> () +cover_InlineHints_54 x = case x of Hints.InlVar -> () Hints.InlExpand _ -> () @@ -201,110 +211,110 @@ cover_InlineHints_50 x Hints.InlConstr _ -> () Hints.InlCase _ _ -> () -- VerifiedCompilation.Trace.Hints -d_Hints_76 = () -type T_Hints_76 = Hints.Hints -pattern C_inline_78 a0 = Hints.Inline a0 -pattern C_none_80 = Hints.NoHints -check_inline_78 :: T_InlineHints_50 -> T_Hints_76 -check_inline_78 = Hints.Inline -check_none_80 :: T_Hints_76 -check_none_80 = Hints.NoHints -cover_Hints_76 :: Hints.Hints -> () -cover_Hints_76 x +d_Hints_80 = () +type T_Hints_80 = Hints.Hints +pattern C_inline_82 a0 = Hints.Inline a0 +pattern C_none_84 = Hints.NoHints +check_inline_82 :: T_InlineHints_54 -> T_Hints_80 +check_inline_82 = Hints.Inline +check_none_84 :: T_Hints_80 +check_none_84 = Hints.NoHints +cover_Hints_80 :: Hints.Hints -> () +cover_Hints_80 x = case x of Hints.Inline _ -> () Hints.NoHints -> () -- VerifiedCompilation.Trace.Trace -d_Trace_84 a0 = () -data T_Trace_84 - = C_step_88 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) - T_Hints_76 AgdaAny T_Trace_84 | - C_done_90 AgdaAny +d_Trace_88 a0 = () +data T_Trace_88 + = C_step_92 (MAlonzo.Code.Utils.T_Either_6 + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) + T_Hints_80 AgdaAny T_Trace_88 | + C_done_94 AgdaAny -- VerifiedCompilation.Trace.head -d_head_94 :: T_Trace_84 -> AgdaAny -d_head_94 v0 +d_head_98 :: T_Trace_88 -> AgdaAny +d_head_98 v0 = case coe v0 of - C_step_88 v1 v2 v3 v4 -> coe v3 - C_done_90 v1 -> coe v1 + C_step_92 v1 v2 v3 v4 -> coe v3 + C_done_94 v1 -> coe v1 _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.Trace.Dump -d_Dump_100 :: () -d_Dump_100 = erased +d_Dump_104 :: () +d_Dump_104 = erased -- VerifiedCompilation.Trace.toTrace -d_toTrace_102 :: +d_toTrace_106 :: [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> - Maybe T_Trace_84 -d_toTrace_102 v0 + Maybe T_Trace_88 +d_toTrace_106 v0 = case coe v0 of [] -> coe MAlonzo.Code.Agda.Builtin.Maybe.C_nothing_18 (:) v1 v2 -> coe MAlonzo.Code.Agda.Builtin.Maybe.C_just_16 - (coe du_go_112 (coe v1) (coe v2)) + (coe du_go_116 (coe v1) (coe v2)) _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.Trace._.go -d_go_112 :: +d_go_116 :: MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208)) -> [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208)) -> [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> - T_Trace_84 -d_go_112 ~v0 ~v1 v2 v3 = du_go_112 v2 v3 -du_go_112 :: + T_Trace_88 +d_go_116 ~v0 ~v1 v2 v3 = du_go_116 v2 v3 +du_go_116 :: MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208)) -> [MAlonzo.Code.Utils.T__'215'__436 (MAlonzo.Code.Utils.T_Either_6 - T_UncertifiedOptTag_4 T_CertifiedOptTag_10) + T_UncertifiedOptTag_4 T_CertifiedOptTag_12) (MAlonzo.Code.Utils.T__'215'__436 - T_Hints_76 + T_Hints_80 (MAlonzo.Code.Utils.T__'215'__436 MAlonzo.Code.RawU.T_Untyped_208 MAlonzo.Code.RawU.T_Untyped_208))] -> - T_Trace_84 -du_go_112 v0 v1 + T_Trace_88 +du_go_116 v0 v1 = case coe v0 of MAlonzo.Code.Utils.C__'44'__450 v2 v3 -> case coe v3 of @@ -314,7 +324,7 @@ du_go_112 v0 v1 -> case coe v1 of [] -> coe - C_step_88 (coe v2) (coe v4) (coe v6) (coe C_done_90 (coe v7)) + C_step_92 (coe v2) (coe v4) (coe v6) (coe C_done_94 (coe v7)) (:) v8 v9 -> case coe v8 of MAlonzo.Code.Utils.C__'44'__450 v10 v11 @@ -323,9 +333,9 @@ du_go_112 v0 v1 -> case coe v13 of MAlonzo.Code.Utils.C__'44'__450 v14 v15 -> coe - C_step_88 (coe v2) (coe v4) (coe v6) + C_step_92 (coe v2) (coe v4) (coe v6) (coe - du_go_112 + du_go_116 (coe MAlonzo.Code.Utils.C__'44'__450 (coe v10) @@ -344,18 +354,18 @@ du_go_112 v0 v1 _ -> MAlonzo.RTE.mazUnreachableError _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.Trace.EvalResult -d_EvalResult_138 = () -type T_EvalResult_138 = EvalResult -pattern C_success_140 a0 a1 = EvalSuccess a0 a1 -pattern C_failure_142 a0 a1 a2 = EvalFailure a0 a1 a2 -check_success_140 :: Integer -> Integer -> T_EvalResult_138 -check_success_140 = EvalSuccess -check_failure_142 :: +d_EvalResult_142 = () +type T_EvalResult_142 = EvalResult +pattern C_success_144 a0 a1 = EvalSuccess a0 a1 +pattern C_failure_146 a0 a1 a2 = EvalFailure a0 a1 a2 +check_success_144 :: Integer -> Integer -> T_EvalResult_142 +check_success_144 = EvalSuccess +check_failure_146 :: MAlonzo.Code.Agda.Builtin.String.T_String_6 -> - Integer -> Integer -> T_EvalResult_138 -check_failure_142 = EvalFailure -cover_EvalResult_138 :: EvalResult -> () -cover_EvalResult_138 x + Integer -> Integer -> T_EvalResult_142 +check_failure_146 = EvalFailure +cover_EvalResult_142 :: EvalResult -> () +cover_EvalResult_142 x = case x of EvalSuccess _ _ -> () EvalFailure _ _ _ -> () diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UApplyToCase.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UApplyToCase.hs index 8cf849a9249..03d5ea72ad3 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UApplyToCase.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UApplyToCase.hs @@ -44,7 +44,7 @@ d_a2c'63''7580''7580'_24 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 (coe v0) - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42) (coe d_a2c'63'_32) -- VerifiedCompilation.UApplyToCase.a2c? d_a2c'63'_32 :: @@ -75,31 +75,31 @@ d_a2c'63'_32 v0 v1 v2 MAlonzo.Code.Untyped.C_'96'_18 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_ƛ_20 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C__'183'__22 v5 v6 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_force_24 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_delay_26 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_con_28 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_constr_34 v5 v6 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_case_40 v5 v6 -> let v7 = coe @@ -241,18 +241,18 @@ d_a2c'63'_32 v0 v1 v2 seq (coe v12) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError) MAlonzo.Code.Untyped.C_builtin_44 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 MAlonzo.Code.Untyped.C_error_46 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_40 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_ApplyToCaseT_42 v1 v2 _ -> MAlonzo.RTE.mazUnreachableError)) -- VerifiedCompilation.UApplyToCase..extendedlambda0 d_'46'extendedlambda0_48 :: @@ -276,7 +276,7 @@ d_'46'extendedlambda1_94 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> T_ApplyToCase_4 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20 diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCSE.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCSE.hs index dfdfd4db1af..3ed0b0b8c92 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCSE.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCSE.hs @@ -54,7 +54,7 @@ d_isUntypedCSE'63'_22 :: d_isUntypedCSE'63'_22 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 - (coe v0) (coe MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38) + (coe v0) (coe MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40) (coe d_isUCSE'63'_24) -- VerifiedCompilation.UCSE.isUCSE? d_isUCSE'63'_24 :: @@ -75,17 +75,17 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Untyped.C_'96'_18 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_ƛ_20 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C__'183'__22 v5 v6 -> case coe v5 of MAlonzo.Code.Untyped.C_'96'_18 v7 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_ƛ_20 v7 -> let v8 = coe @@ -199,7 +199,7 @@ d_isUCSE'63'_24 v0 v1 v2 v21) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -311,7 +311,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -372,7 +372,7 @@ d_isUCSE'63'_24 v0 v1 v2 v23) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -385,7 +385,7 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Agda.Builtin.Bool.C_false_8) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C__'183'__22 v14 v15 -> case coe v14 of @@ -592,7 +592,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -805,7 +805,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -866,7 +866,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -1025,7 +1025,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1188,7 +1188,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1253,7 +1253,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -1462,7 +1462,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1675,7 +1675,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1736,7 +1736,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -1945,7 +1945,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -2158,7 +2158,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -2219,7 +2219,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -2428,7 +2428,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -2641,7 +2641,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -2702,7 +2702,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -2911,7 +2911,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -3124,7 +3124,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -3185,7 +3185,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -3394,7 +3394,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -3607,7 +3607,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -3668,7 +3668,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -3877,7 +3877,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -4090,7 +4090,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -4151,7 +4151,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -4360,7 +4360,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -4573,7 +4573,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -4634,7 +4634,7 @@ d_isUCSE'63'_24 v0 v1 v2 v25) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -4843,7 +4843,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5056,7 +5056,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5117,7 +5117,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -5226,7 +5226,7 @@ d_isUCSE'63'_24 v0 v1 v2 v21) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5345,7 +5345,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5406,7 +5406,7 @@ d_isUCSE'63'_24 v0 v1 v2 v23) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -5419,7 +5419,7 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Agda.Builtin.Bool.C_false_8) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_con_28 v14 -> coe @@ -5428,7 +5428,7 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Agda.Builtin.Bool.C_false_8) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_constr_34 v14 v15 -> let v16 @@ -5539,7 +5539,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5659,7 +5659,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5720,7 +5720,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -5835,7 +5835,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -5955,7 +5955,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -6016,7 +6016,7 @@ d_isUCSE'63'_24 v0 v1 v2 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -6029,7 +6029,7 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Agda.Builtin.Bool.C_false_8) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_error_46 -> coe @@ -6038,7 +6038,7 @@ d_isUCSE'63'_24 v0 v1 v2 MAlonzo.Code.Agda.Builtin.Bool.C_false_8) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError @@ -6162,7 +6162,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -6274,7 +6274,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -6335,7 +6335,7 @@ d_isUCSE'63'_24 v0 v1 v2 v28) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -6346,7 +6346,7 @@ d_isUCSE'63'_24 v0 v1 v2 seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C__'183'__22 v19 v20 -> case coe @@ -6556,7 +6556,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -6769,7 +6769,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -6830,7 +6830,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -6991,7 +6991,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -7154,7 +7154,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -7219,7 +7219,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -7430,7 +7430,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -7643,7 +7643,7 @@ d_isUCSE'63'_24 v0 v1 v2 v36) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -7704,7 +7704,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -7915,7 +7915,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -8128,7 +8128,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -8189,7 +8189,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -8400,7 +8400,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -8613,7 +8613,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -8674,7 +8674,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -8885,7 +8885,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -9098,7 +9098,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -9159,7 +9159,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -9370,7 +9370,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -9583,7 +9583,7 @@ d_isUCSE'63'_24 v0 v1 v2 v36) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -9644,7 +9644,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -9855,7 +9855,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -10068,7 +10068,7 @@ d_isUCSE'63'_24 v0 v1 v2 v36) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -10129,7 +10129,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -10340,7 +10340,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -10553,7 +10553,7 @@ d_isUCSE'63'_24 v0 v1 v2 v35) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -10614,7 +10614,7 @@ d_isUCSE'63'_24 v0 v1 v2 v30) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -10825,7 +10825,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11038,7 +11038,7 @@ d_isUCSE'63'_24 v0 v1 v2 v34) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11099,7 +11099,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -11211,7 +11211,7 @@ d_isUCSE'63'_24 v0 v1 v2 v26) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11330,7 +11330,7 @@ d_isUCSE'63'_24 v0 v1 v2 v31) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11391,7 +11391,7 @@ d_isUCSE'63'_24 v0 v1 v2 v28) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -11402,14 +11402,14 @@ d_isUCSE'63'_24 v0 v1 v2 seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_con_28 v19 -> coe seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_constr_34 v19 v20 -> let v21 @@ -11523,7 +11523,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11643,7 +11643,7 @@ d_isUCSE'63'_24 v0 v1 v2 v34) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11704,7 +11704,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -11822,7 +11822,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -11942,7 +11942,7 @@ d_isUCSE'63'_24 v0 v1 v2 v34) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -12003,7 +12003,7 @@ d_isUCSE'63'_24 v0 v1 v2 v29) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -12014,14 +12014,14 @@ d_isUCSE'63'_24 v0 v1 v2 seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) MAlonzo.Code.Untyped.C_error_46 -> coe seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError @@ -12030,71 +12030,71 @@ d_isUCSE'63'_24 v0 v1 v2 seq (coe v13) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError) MAlonzo.Code.Untyped.C__'183'__22 v7 v8 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_force_24 v7 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_delay_26 v7 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_con_28 v7 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_constr_34 v7 v8 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_case_40 v7 v8 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_builtin_44 v7 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_error_46 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 _ -> MAlonzo.RTE.mazUnreachableError MAlonzo.Code.Untyped.C_force_24 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_delay_26 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_con_28 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_constr_34 v5 v6 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_case_40 v5 v6 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_builtin_44 v5 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 MAlonzo.Code.Untyped.C_error_46 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_38 v1 v2 + MAlonzo.Code.VerifiedCompilation.Trace.d_CseT_40 v1 v2 _ -> MAlonzo.RTE.mazUnreachableError)) -- VerifiedCompilation.UCSE..extendedlambda0 d_'46'extendedlambda0_40 :: @@ -12127,7 +12127,7 @@ d_'46'extendedlambda2_106 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.Strictness.T__'8712''8595'__10 -> diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseOfCase.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseOfCase.hs index 6ddd6cdeabf..3c578e35dad 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseOfCase.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseOfCase.hs @@ -560,7 +560,7 @@ d_isCaseOfCase'63'_256 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 (coe v0) - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48) (coe d_isCoC'63'_264) -- VerifiedCompilation.UCaseOfCase.isCoC? d_isCoC'63'_264 :: @@ -671,7 +671,7 @@ d_isCoC'63'_264 v0 v1 v2 = coe MAlonzo.Code.VerifiedCompilation.Certificate.du_pcePointwise_304 (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48) (coe d_isCaseOfCase'63'_256 (coe @@ -688,7 +688,7 @@ d_isCoC'63'_264 v0 v1 v2 = coe MAlonzo.Code.VerifiedCompilation.Certificate.du_pcePointwise_304 (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48) (coe d_isCaseOfCase'63'_256 (coe @@ -705,7 +705,7 @@ d_isCoC'63'_264 v0 v1 v2 = coe MAlonzo.Code.VerifiedCompilation.Certificate.du_pcePointwise_304 (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48) (coe d_isCaseOfCase'63'_256 (coe @@ -754,7 +754,7 @@ d_isCoC'63'_264 v0 v1 v2 v40) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46 + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48 (coe MAlonzo.Code.Untyped.C_case_40 (coe @@ -826,7 +826,7 @@ d_isCoC'63'_264 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_46 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseOfCaseT_48 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) -- VerifiedCompilation.UCaseOfCase..extendedlambda4 d_'46'extendedlambda4_280 :: @@ -867,7 +867,7 @@ d_'46'extendedlambda6_444 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -890,7 +890,7 @@ d_'46'extendedlambda7_524 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> [MAlonzo.Code.Untyped.T__'8866'_14] -> @@ -914,7 +914,7 @@ d_'46'extendedlambda8_608 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> [MAlonzo.Code.Untyped.T__'8866'_14] -> diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseReduce.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseReduce.hs index ebfe78e7512..236640668b0 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseReduce.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UCaseReduce.hs @@ -2497,7 +2497,7 @@ d_decide_526 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseReduceT_44 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseReduceT_46 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) -- VerifiedCompilation.UCaseReduce.case-reduce-refines d_case'45'reduce'45'refines_550 :: @@ -3292,5 +3292,5 @@ du_decide'45''126'_604 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_CaseReduceT_44 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_CaseReduceT_46 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UFloatDelay.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UFloatDelay.hs index 30375befea6..8720a7b7f19 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UFloatDelay.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UFloatDelay.hs @@ -541,7 +541,7 @@ d_isFloatDelay'63'_488 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 (coe v0) - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_30) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_32) (coe d_isFlD'63'_492) -- VerifiedCompilation.UFloatDelay.isFlD? d_isFlD'63'_492 :: @@ -697,7 +697,7 @@ d_isFlD'63'_492 v0 v1 v2 v38) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_30 + MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_32 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) @@ -726,7 +726,7 @@ d_isFlD'63'_492 v0 v1 v2 v21) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_30 + MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_32 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -741,7 +741,7 @@ d_isFlD'63'_492 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_30 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_FloatDelayT_32 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) -- VerifiedCompilation.UFloatDelay..extendedlambda8 d_'46'extendedlambda8_508 :: @@ -773,7 +773,7 @@ d_'46'extendedlambda10_582 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -791,7 +791,7 @@ d_'46'extendedlambda11_630 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceCaseDelay.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceCaseDelay.hs index 7fdd343f527..0b9349b2325 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceCaseDelay.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceCaseDelay.hs @@ -167,7 +167,7 @@ d_isForceCaseDelay'63'_94 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 (coe v0) - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36) (coe d_isFCD'63'_96) -- VerifiedCompilation.UForceCaseDelay.isFCD? d_isFCD'63'_96 :: @@ -271,7 +271,7 @@ d_isFCD'63'_96 v0 v1 v2 = coe MAlonzo.Code.VerifiedCompilation.Certificate.du_pcePointwise_304 (coe - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34) + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36) (coe d_isForceCaseDelay'63'_94 (coe @@ -298,14 +298,14 @@ d_isFCD'63'_96 v0 v1 v2 MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 v36 v37 v38 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36 v1 v2 _ -> MAlonzo.RTE.mazUnreachableError) MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 v34 v35 v36 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36 v1 v2 _ -> MAlonzo.RTE.mazUnreachableError) @@ -316,7 +316,7 @@ d_isFCD'63'_96 v0 v1 v2 v28) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError))) @@ -327,7 +327,7 @@ d_isFCD'63'_96 v0 v1 v2 seq (coe v18) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError))) _ -> MAlonzo.RTE.mazUnreachableError @@ -339,7 +339,7 @@ d_isFCD'63'_96 v0 v1 v2 seq (coe v5) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_34 v1 v2) + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceCaseDelayT_36 v1 v2) _ -> MAlonzo.RTE.mazUnreachableError) -- VerifiedCompilation.UForceCaseDelay..extendedlambda1 d_'46'extendedlambda1_112 :: @@ -382,7 +382,7 @@ d_'46'extendedlambda4_228 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> [MAlonzo.Code.Untyped.T__'8866'_14] -> @@ -401,7 +401,7 @@ d_'46'extendedlambda5_280 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceDelay.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceDelay.hs index ceddcb16d09..36edfea7654 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceDelay.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UForceDelay.hs @@ -583,7 +583,7 @@ d_isForceDelay'63'_178 v0 = coe MAlonzo.Code.VerifiedCompilation.UntypedTranslation.du_translation'63'_160 (coe v0) - (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32) + (coe MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34) (coe (\ v1 -> d_isFD'63'_184 (coe v1) (coe C_'9633'_82))) -- VerifiedCompilation.UForceDelay.isFD? d_isFD'63'_184 :: @@ -745,7 +745,7 @@ d_isFD'63'_184 v0 v1 v2 v3 seq (coe v9) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v2 v3) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1114,7 +1114,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v87) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v2 v3) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1146,7 +1146,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v80) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v16 v22) _ -> MAlonzo.RTE.mazUnreachableError @@ -1157,7 +1157,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v77) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v43 v59) _ -> MAlonzo.RTE.mazUnreachableError))))) @@ -1329,7 +1329,7 @@ d_isFD'63'_184 v0 v1 v2 v3 seq (coe v13) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v2 v3) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -1851,7 +1851,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v98) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v15 v3) _ -> MAlonzo.RTE.mazUnreachableError) @@ -1883,7 +1883,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v91) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v27 v33) _ -> MAlonzo.RTE.mazUnreachableError @@ -1894,7 +1894,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v88) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v54 v70) _ -> MAlonzo.RTE.mazUnreachableError))))) @@ -2085,7 +2085,7 @@ d_isFD'63'_184 v0 v1 v2 v3 v24) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v15 v3) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -2228,7 +2228,7 @@ d_isFD'63'_184 v0 v1 v2 v3 seq (coe v14) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_ce_52 - MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_32 + MAlonzo.Code.VerifiedCompilation.Trace.d_ForceDelayT_34 v2 v3) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError)) @@ -2255,7 +2255,7 @@ d_'46'extendedlambda2_246 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> T_FD_112 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20 d_'46'extendedlambda2_246 = erased @@ -2273,7 +2273,7 @@ d_'46'extendedlambda3_320 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.VerifiedCompilation.UntypedViews.T_isForce_270 -> @@ -2292,7 +2292,7 @@ d_'46'extendedlambda4_348 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2322,7 +2322,7 @@ d_'46'extendedlambda6_476 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2334,7 +2334,7 @@ d_'46'extendedlambda6_476 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> T_FD_112 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20 d_'46'extendedlambda6_476 = erased @@ -2354,7 +2354,7 @@ d_'46'extendedlambda7_518 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> T_FD_112 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20 d_'46'extendedlambda7_518 = erased @@ -2381,7 +2381,7 @@ d_'46'extendedlambda8_634 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2410,7 +2410,7 @@ d_'46'extendedlambda9_688 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2434,7 +2434,7 @@ d_'46'extendedlambda10_750 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2446,7 +2446,7 @@ d_'46'extendedlambda10_750 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2470,7 +2470,7 @@ d_'46'extendedlambda11_814 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2481,7 +2481,7 @@ d_'46'extendedlambda11_814 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2506,7 +2506,7 @@ d_'46'extendedlambda12_880 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Builtin.T_Builtin_2 -> @@ -2516,7 +2516,7 @@ d_'46'extendedlambda12_880 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2546,7 +2546,7 @@ d_'46'extendedlambda13_1034 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2567,7 +2567,7 @@ d_'46'extendedlambda14_1074 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> @@ -2584,7 +2584,7 @@ d_'46'extendedlambda15_1190 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (T_FD_112 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20) -> @@ -2592,7 +2592,7 @@ d_'46'extendedlambda15_1190 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.Agda.Builtin.Sigma.T_Σ_14 -> @@ -2610,7 +2610,7 @@ d_'46'extendedlambda16_1214 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.Agda.Builtin.Sigma.T_Σ_14 -> @@ -2629,7 +2629,7 @@ d_'46'extendedlambda17_1238 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.Agda.Builtin.Sigma.T_Σ_14 -> @@ -2661,7 +2661,7 @@ d_'46'extendedlambda19_1340 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.VerifiedCompilation.UntypedViews.T_isDelay_356 -> @@ -2681,7 +2681,7 @@ d_'46'extendedlambda20_1454 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (T_FD_112 -> MAlonzo.Code.Data.Irrelevant.T_Irrelevant_20) -> @@ -2689,7 +2689,7 @@ d_'46'extendedlambda20_1454 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2706,7 +2706,7 @@ d_'46'extendedlambda21_1480 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2724,7 +2724,7 @@ d_'46'extendedlambda22_1506 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2742,7 +2742,7 @@ d_'46'extendedlambda23_1574 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.Agda.Builtin.Sigma.T_Σ_14 -> @@ -2780,7 +2780,7 @@ d_'46'extendedlambda25_1698 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> (MAlonzo.Code.VerifiedCompilation.UntypedViews.T_isForce_270 -> @@ -2803,7 +2803,7 @@ d_'46'extendedlambda26_1732 :: () -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> AgdaAny -> AgdaAny -> MAlonzo.Code.VerifiedCompilation.Certificate.T_ProofOrCE_38 -> diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UInline.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UInline.hs index 0849ffcea40..00ffcf815ec 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UInline.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UInline.hs @@ -297,7 +297,7 @@ d_checkPointwise_304 :: Integer -> T__'8605'_28 -> T__'8605'_28 -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54] -> (MAlonzo.Code.Data.Fin.Base.T_Fin_10 -> MAlonzo.Code.Untyped.T__'8866'_14) -> T__'8829'__102 -> @@ -308,7 +308,7 @@ d_checkPointwise_304 v0 v1 v2 v3 v4 v5 v6 v7 = let v8 = coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 v6 v7 in + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v6 v7 in coe (case coe v3 of [] @@ -358,19 +358,19 @@ d_check_316 :: MAlonzo.Code.Untyped.T__'8866'_14) -> MAlonzo.Code.Untyped.T__'8866'_14 -> T__'8829'__102 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.VerifiedCompilation.Certificate.T_Proof'63'_66 d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 = let v8 = coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 v4 v7 in + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7 in coe (case coe v4 of MAlonzo.Code.Untyped.C_'96'_18 v9 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_var_52 + MAlonzo.Code.VerifiedCompilation.Trace.C_var_56 -> case coe v7 of MAlonzo.Code.Untyped.C_'96'_18 v10 -> let v11 @@ -385,7 +385,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 -> let v15 = coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7 in coe (case coe v13 of @@ -418,7 +418,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 MAlonzo.Code.Agda.Builtin.Maybe.C_nothing_18 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v4 _ -> MAlonzo.RTE.mazUnreachableError) _ -> coe v15 @@ -428,7 +428,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v15) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> coe v8 - MAlonzo.Code.VerifiedCompilation.Trace.C_expand_54 v10 + MAlonzo.Code.VerifiedCompilation.Trace.C_expand_58 v10 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du__'62''62''61'__88 (coe @@ -444,7 +444,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 -> case coe v5 of C_'9633'_106 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_56 v10 + MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_60 v10 -> case coe v7 of MAlonzo.Code.Untyped.C_ƛ_20 v11 -> coe @@ -469,7 +469,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 -> case coe v2 of C__'183'__34 v16 v17 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_56 v18 + MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_60 v18 -> case coe v7 of MAlonzo.Code.Untyped.C_ƛ_20 v19 -> coe @@ -537,7 +537,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> MAlonzo.RTE.mazUnreachableError MAlonzo.Code.Untyped.C__'183'__22 v9 v10 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C__'183'__58 v11 v12 + MAlonzo.Code.VerifiedCompilation.Trace.C__'183'__62 v11 v12 -> case coe v7 of MAlonzo.Code.Untyped.C__'183'__22 v13 v14 -> coe @@ -559,7 +559,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 MAlonzo.Code.VerifiedCompilation.Certificate.C_proof_72 (coe C__'183'__250 v15 v16))))) _ -> coe v8 - MAlonzo.Code.VerifiedCompilation.Trace.C__'183''8595'_60 v11 + MAlonzo.Code.VerifiedCompilation.Trace.C__'183''8595'_64 v11 -> coe MAlonzo.Code.VerifiedCompilation.Certificate.du__'62''62''61'__88 (coe @@ -574,7 +574,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v8 MAlonzo.Code.Untyped.C_force_24 v9 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_force_62 v10 + MAlonzo.Code.VerifiedCompilation.Trace.C_force_66 v10 -> case coe v7 of MAlonzo.Code.Untyped.C_force_24 v11 -> coe @@ -591,7 +591,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v8 MAlonzo.Code.Untyped.C_delay_26 v9 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_delay_64 v10 + MAlonzo.Code.VerifiedCompilation.Trace.C_delay_68 v10 -> case coe v7 of MAlonzo.Code.Untyped.C_delay_26 v11 -> coe @@ -608,7 +608,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v8 MAlonzo.Code.Untyped.C_con_28 v9 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_con_66 + MAlonzo.Code.VerifiedCompilation.Trace.C_con_70 -> case coe v7 of MAlonzo.Code.Untyped.C_con_28 v10 -> let v11 @@ -627,14 +627,14 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 seq (coe v13) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7) _ -> MAlonzo.RTE.mazUnreachableError) _ -> coe v8 _ -> coe v8 MAlonzo.Code.Untyped.C_constr_34 v9 v10 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_constr_72 v11 + MAlonzo.Code.VerifiedCompilation.Trace.C_constr_76 v11 -> case coe v7 of MAlonzo.Code.Untyped.C_constr_34 v12 v13 -> let v14 @@ -669,14 +669,14 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 seq (coe v16) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7) _ -> MAlonzo.RTE.mazUnreachableError) _ -> coe v8 _ -> coe v8 MAlonzo.Code.Untyped.C_case_40 v9 v10 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_case_74 v11 v12 + MAlonzo.Code.VerifiedCompilation.Trace.C_case_78 v11 v12 -> case coe v7 of MAlonzo.Code.Untyped.C_case_40 v13 v14 -> coe @@ -701,7 +701,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v8 MAlonzo.Code.Untyped.C_builtin_44 v9 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_builtin_68 + MAlonzo.Code.VerifiedCompilation.Trace.C_builtin_72 -> case coe v7 of MAlonzo.Code.Untyped.C_builtin_44 v10 -> let v11 @@ -752,7 +752,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 seq (coe v16) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7) _ -> MAlonzo.RTE.mazUnreachableError) else (let v14 @@ -776,7 +776,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 seq (coe v16) (coe MAlonzo.Code.VerifiedCompilation.Certificate.C_abort_78 - MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_36 + MAlonzo.Code.VerifiedCompilation.Trace.d_InlineT_38 v4 v7) _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError) @@ -784,7 +784,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> coe v8 MAlonzo.Code.Untyped.C_error_46 -> case coe v6 of - MAlonzo.Code.VerifiedCompilation.Trace.C_error_70 + MAlonzo.Code.VerifiedCompilation.Trace.C_error_74 -> case coe v7 of MAlonzo.Code.Untyped.C_error_46 -> coe @@ -795,7 +795,7 @@ d_check_316 v0 v1 v2 v3 v4 v5 v6 v7 _ -> MAlonzo.RTE.mazUnreachableError) -- VerifiedCompilation.UInline.top-check d_top'45'check_718 :: - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.VerifiedCompilation.Certificate.T_Proof'63'_66 @@ -885,7 +885,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 C_'96'_230 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_var_52) erased + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_var_56) erased C_'96''8595'_234 v14 -> case coe v5 of MAlonzo.Code.Untyped.C_'96'_18 v15 @@ -898,7 +898,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 v17 v18 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_expand_54 (coe v17)) + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_expand_58 (coe v17)) erased _ -> MAlonzo.RTE.mazUnreachableError) _ -> MAlonzo.RTE.mazUnreachableError @@ -923,7 +923,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_56 (coe v15)) + MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_60 (coe v15)) erased _ -> MAlonzo.RTE.mazUnreachableError)) _ -> MAlonzo.RTE.mazUnreachableError @@ -962,7 +962,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_56 + MAlonzo.Code.VerifiedCompilation.Trace.C_ƛ_60 (coe v27)) erased _ -> MAlonzo.RTE.mazUnreachableError) @@ -1027,7 +1027,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C__'183'__58 + MAlonzo.Code.VerifiedCompilation.Trace.C__'183'__62 (coe v24) (coe v26)) erased _ -> MAlonzo.RTE.mazUnreachableError @@ -1048,7 +1048,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C__'183''8595'_60 (coe v19)) + MAlonzo.Code.VerifiedCompilation.Trace.C__'183''8595'_64 (coe v19)) erased _ -> MAlonzo.RTE.mazUnreachableError) _ -> MAlonzo.RTE.mazUnreachableError @@ -1067,7 +1067,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_force_62 (coe v18)) + MAlonzo.Code.VerifiedCompilation.Trace.C_force_66 (coe v18)) erased _ -> MAlonzo.RTE.mazUnreachableError) _ -> MAlonzo.RTE.mazUnreachableError @@ -1087,7 +1087,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_delay_64 (coe v18)) + MAlonzo.Code.VerifiedCompilation.Trace.C_delay_68 (coe v18)) erased _ -> MAlonzo.RTE.mazUnreachableError) _ -> MAlonzo.RTE.mazUnreachableError @@ -1095,11 +1095,11 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 C_con_266 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_con_66) erased + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_con_70) erased C_builtin_270 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_builtin_68) erased + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_builtin_72) erased C_constr_280 v15 -> case coe v5 of MAlonzo.Code.Untyped.C_constr_34 v16 v17 @@ -1115,7 +1115,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_constr_72 + MAlonzo.Code.VerifiedCompilation.Trace.C_constr_76 (coe v21)) erased _ -> MAlonzo.RTE.mazUnreachableError) @@ -1143,7 +1143,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 -> coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 (coe - MAlonzo.Code.VerifiedCompilation.Trace.C_case_74 + MAlonzo.Code.VerifiedCompilation.Trace.C_case_78 (coe v24) (coe v26)) erased _ -> MAlonzo.RTE.mazUnreachableError @@ -1157,7 +1157,7 @@ d_complete_806 v0 v1 v2 v3 v4 v5 v6 v7 seq (coe v6) (coe MAlonzo.Code.Agda.Builtin.Sigma.C__'44'__32 - (coe MAlonzo.Code.VerifiedCompilation.Trace.C_error_70) erased)) + (coe MAlonzo.Code.VerifiedCompilation.Trace.C_error_74) erased)) _ -> MAlonzo.RTE.mazUnreachableError -- VerifiedCompilation.UInline._.e′ d_e'8242'_818 :: @@ -1179,7 +1179,7 @@ d_e'8242'_864 :: MAlonzo.Code.Data.Fin.Base.T_Fin_10 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8242'_864 = erased @@ -1191,7 +1191,7 @@ d_e'8242'_898 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8242'_898 = erased @@ -1207,7 +1207,7 @@ d_e'8242'_940 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8242'_940 = erased @@ -1223,7 +1223,7 @@ d_e'8242'_982 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8242'_982 = erased @@ -1241,9 +1241,9 @@ d_e'8243'_1036 :: MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8243'_1036 = erased @@ -1259,7 +1259,7 @@ d_e'8242'_1082 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8242'_1082 = erased @@ -1271,7 +1271,7 @@ d_e'8242'_1120 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> T__'8605'_28 -> T__'8605'_28 -> @@ -1285,7 +1285,7 @@ d_e'8242'_1158 :: MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> T_Inline_224 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> T__'8605'_28 -> T__'8605'_28 -> @@ -1321,7 +1321,7 @@ d_e'8242'_1232 :: [MAlonzo.Code.Untyped.T__'8866'_14] -> [MAlonzo.Code.Untyped.T__'8866'_14] -> MAlonzo.Code.Data.List.Relation.Binary.Pointwise.Base.T_Pointwise_48 -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54] -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> T__'8605'_28 -> T__'8605'_28 -> @@ -1339,9 +1339,9 @@ d_e'8243'_1290 :: [MAlonzo.Code.Untyped.T__'8866'_14] -> T_Inline_224 -> MAlonzo.Code.Data.List.Relation.Binary.Pointwise.Base.T_Pointwise_48 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54] -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> T__'8605'_28 -> T__'8605'_28 -> @@ -1361,9 +1361,9 @@ d_e'8243'_1356 :: [MAlonzo.Code.Untyped.T__'8866'_14] -> T_Inline_224 -> MAlonzo.Code.Data.List.Relation.Binary.Pointwise.Base.T_Pointwise_48 -> - MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> - [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_50] -> + [MAlonzo.Code.VerifiedCompilation.Trace.T_InlineHints_54] -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 -> MAlonzo.Code.Agda.Builtin.Equality.T__'8801'__12 d_e'8243'_1356 = erased diff --git a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UntypedTranslation.hs b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UntypedTranslation.hs index fedeaa818c9..bc9bed5d942 100644 --- a/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UntypedTranslation.hs +++ b/plutus-metatheory/src/MAlonzo/Code/VerifiedCompilation/UntypedTranslation.hs @@ -84,7 +84,7 @@ d_translation'63'_160 :: MAlonzo.Code.Untyped.T__'8866'_14 -> ()) -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (Integer -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -98,7 +98,7 @@ du_translation'63'_160 :: Integer -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (Integer -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2924,7 +2924,7 @@ d_decPointwiseTranslation'63'_172 :: MAlonzo.Code.Untyped.T__'8866'_14 -> ()) -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (Integer -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> @@ -2938,7 +2938,7 @@ du_decPointwiseTranslation'63'_172 :: Integer -> MAlonzo.Code.Utils.T_Either_6 MAlonzo.Code.VerifiedCompilation.Trace.T_UncertifiedOptTag_4 - MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_10 -> + MAlonzo.Code.VerifiedCompilation.Trace.T_CertifiedOptTag_12 -> (Integer -> MAlonzo.Code.Untyped.T__'8866'_14 -> MAlonzo.Code.Untyped.T__'8866'_14 -> diff --git a/plutus-metatheory/src/VerifiedCompilation/Trace.lagda.md b/plutus-metatheory/src/VerifiedCompilation/Trace.lagda.md index 9bc150a4cf9..7f9910b0163 100644 --- a/plutus-metatheory/src/VerifiedCompilation/Trace.lagda.md +++ b/plutus-metatheory/src/VerifiedCompilation/Trace.lagda.md @@ -20,7 +20,7 @@ open Maybe ``` ## Pass tags We enumerate the known passes and partition them into two categories: -- those which are not yet (fully) implemented in the certifier +- those which are not yet (fully) implemented in the certifier - those which are implemented in the certifier and we know they are correct. ### IMPORTANT @@ -32,6 +32,7 @@ pragmas MUST be the same as the order of their counterparts in data UncertifiedOptTag : Set where caseOfCaseT : UncertifiedOptTag constantFoldingT : UncertifiedOptTag + polyBuiltinT : UncertifiedOptTag data CertifiedOptTag : Set where floatDelayT : CertifiedOptTag @@ -66,6 +67,8 @@ CaseOfCaseT : OptTag CaseOfCaseT = Utils.inj₁ caseOfCaseT ConstantFoldingT : OptTag ConstantFoldingT = Utils.inj₁ constantFoldingT +PolyBuiltinT : OptTag +PolyBuiltinT = Utils.inj₁ polyBuiltinT {-# COMPILE GHC CertifiedOptTag @@ -85,6 +88,7 @@ ConstantFoldingT = Utils.inj₁ constantFoldingT = data UncertifiedOptStage ( CaseOfCase | ConstantFolding + | PolyBuiltin ) #-} ``` diff --git a/plutus-metatheory/test/certifier-report/golden/n-queens.golden.report b/plutus-metatheory/test/certifier-report/golden/n-queens.golden.report index 3c11573026e..f5498a3a86f 100644 --- a/plutus-metatheory/test/certifier-report/golden/n-queens.golden.report +++ b/plutus-metatheory/test/certifier-report/golden/n-queens.golden.report @@ -1189,10 +1189,19 @@ Pass 132: Constant Folding ⚠ (certifier unavailable) ────────────────────────────────────────────────────── -Pass 133: Transform multi-argument applications into case-constr form ✅ +Pass 133: Hoist Polymorphic Builtins ⚠ (certifier unavailable) ────────────────────────────────────────────────────── Program Size: 1756 (before) - Program Size: 1738 (after) + Program Size: 1759 (after) Execution Cost: CPU = 117353781782, MEM = 683404055 (before) - Execution Cost: CPU = 115517029782, MEM = 671924355 (after) + Execution Cost: CPU = 117353845782, MEM = 683404455 (after) + + +────────────────────────────────────────────────────── +Pass 134: Transform multi-argument applications into case-constr form ✅ +────────────────────────────────────────────────────── + Program Size: 1759 (before) + Program Size: 1741 (after) + Execution Cost: CPU = 117353845782, MEM = 683404455 (before) + Execution Cost: CPU = 115517093782, MEM = 671924755 (after) Optimization sites: 15 diff --git a/plutus-metatheory/test/optimizer-report/golden/n-queens.golden.report b/plutus-metatheory/test/optimizer-report/golden/n-queens.golden.report index 38ee8b89750..ffe5f2f56c8 100644 --- a/plutus-metatheory/test/optimizer-report/golden/n-queens.golden.report +++ b/plutus-metatheory/test/optimizer-report/golden/n-queens.golden.report @@ -134,5 +134,6 @@ CaseOfCase 1756 0 117353781782 0 683 CaseReduce 1756 0 117353781782 0 683404055 0 Inline 1756 0 117353781782 0 683404055 0 ConstantFolding 1756 0 117353781782 0 683404055 0 -ApplyToCase 1738 -18 115517029782 -1836752000 671924355 -11479700 +PolyBuiltin 1759 +3 117353845782 +64000 683404455 +400 +ApplyToCase 1741 -18 115517093782 -1836752000 671924755 -11479700 diff --git a/plutus-tx-plugin/changelog.d/20260512_094252_unsafeFixIO_polybuiltin.md b/plutus-tx-plugin/changelog.d/20260512_094252_unsafeFixIO_polybuiltin.md new file mode 100644 index 00000000000..7dbfcfff11d --- /dev/null +++ b/plutus-tx-plugin/changelog.d/20260512_094252_unsafeFixIO_polybuiltin.md @@ -0,0 +1,4 @@ +### Added + +- A new plugin flag `hoist-polymorphic-builtins` that controls whether to run the optimization + that hoists forced polymorphic built-in functions (on by default). diff --git a/plutus-tx-plugin/src/PlutusTx/Options.hs b/plutus-tx-plugin/src/PlutusTx/Options.hs index 91ee3c4a01f..c56d66892d7 100644 --- a/plutus-tx-plugin/src/PlutusTx/Options.hs +++ b/plutus-tx-plugin/src/PlutusTx/Options.hs @@ -28,7 +28,7 @@ import Data.Either.Validation import Data.Foldable (toList) #else import Data.Foldable (foldl', toList) -#endif +#endif import Data.List qualified as List import Data.List.NonEmpty (NonEmpty) import Data.Map (Map) @@ -65,6 +65,7 @@ data PluginOptions = PluginOptions , _posDoSimplifierStrictifyBindings :: Bool , _posDoSimplifierRemoveDeadBindings :: Bool , _posApplyToCase :: Bool + , _posHoistPolyBuiltins :: Bool , _posProfile :: ProfileOpts , _posCoverageAll :: Bool , _posCoverageLocation :: Bool @@ -307,6 +308,9 @@ pluginOptions = , let k = "apply-to-case" desc = "Run the apply-to-case pass, turning multi-argument applications into case-constr form." in (k, PluginOption typeRep (setTrue k) posApplyToCase desc []) + , let k = "hoist-polymorphic-builtins" + desc = "Run the hoist-polymorphic-builtins pass, reducing the number of forces." + in (k, PluginOption typeRep (setTrue k) posHoistPolyBuiltins desc []) , let k = "profile-all" desc = "Set profiling options to All, which adds tracing when entering and exiting a term." in (k, PluginOption typeRep (flag (const All) k) posProfile desc []) @@ -425,6 +429,7 @@ defaultPluginOptions = , _posDoSimplifierStrictifyBindings = True , _posDoSimplifierRemoveDeadBindings = True , _posApplyToCase = True + , _posHoistPolyBuiltins = True , _posProfile = None , _posCoverageAll = False , _posCoverageLocation = False diff --git a/plutus-tx-plugin/src/PlutusTx/Plugin/Common.hs b/plutus-tx-plugin/src/PlutusTx/Plugin/Common.hs index 9262b07b44b..950001ec717 100644 --- a/plutus-tx-plugin/src/PlutusTx/Plugin/Common.hs +++ b/plutus-tx-plugin/src/PlutusTx/Plugin/Common.hs @@ -826,6 +826,9 @@ runCompiler packageName moduleName opts expr = do & set (PLC.coOptimizeOpts . UPLC.ooApplyToCase) (opts ^. posApplyToCase) + & set + (PLC.coOptimizeOpts . UPLC.ooHoistPolyBuiltins) + (opts ^. posHoistPolyBuiltins) & set (PLC.coOptimizeOpts . UPLC.ooCertifiedOptsOnly) (opts ^. posCertifiedOptsOnly) @@ -908,7 +911,8 @@ generateCertificate packageName moduleName opts simplTrace certifyPath = do Right _ -> do writeFile (dir "plinth-certifier-PASS.txt") "" when verbose $ - hPutStrLn stderr $ "Certifier result: PASS — " ++ dir + hPutStrLn stderr $ + "Certifier result: PASS — " ++ dir Left err -> do let errMsg = prettyCertifierError err writeFile (dir "plinth-certifier-FAIL.txt") (errMsg ++ "\n") @@ -918,17 +922,18 @@ generateCertificate packageName moduleName opts simplTrace certifyPath = do where sanitise '.' = '_' sanitise '-' = '_' - sanitise c = c + sanitise c = c -- Agda parses `_` in identifiers as a mixfix hole, so module names like -- `BLS12_381` are rejected. Collapse any underscore between two digits. collapseDigitUnderscores s = case s =~ ("([0-9])_([0-9])" :: String) :: (String, String, String, [String]) of (before, _, after, [a, b]) -> before ++ a ++ b ++ collapseDigitUnderscores after - _ -> s + _ -> s certDir hash absCertifyPath | null absCertifyPath = name - | otherwise = absCertifyPath name - where name = certName ++ "-" ++ hash ++ ".agda-cert" + | otherwise = absCertifyPath name + where + name = certName ++ "-" ++ hash ++ ".agda-cert" alphabet :: [Char] alphabet = ['a' .. 'z'] ++ ['0' .. '9'] diff --git a/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.12/triple.golden.uplc b/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.12/triple.golden.uplc index 41cb310933d..9e2b378a790 100644 --- a/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.12/triple.golden.uplc +++ b/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.12/triple.golden.uplc @@ -1,61 +1,63 @@ (program 1.1.0 - ((\factorial -> - (\fibonacci -> - (\total n -> - (\tot -> - (\fac -> - (\fib -> - case - (lessThanInteger n 0) - [ (constr 0 [fib, fac, tot]) - , ((\x -> error) - (force trace - "triple: negative input" - (constr 0 []))) ]) - (fibonacci n)) - (factorial n)) - (total n)) + ((\forced -> + (\factorial -> + (\fibonacci -> + (\total n -> + (\tot -> + (\fac -> + (\fib -> + case + (lessThanInteger n 0) + [ (constr 0 [fib, fac, tot]) + , ((\x -> error) + (forced + "triple: negative input" + (constr 0 []))) ]) + (fibonacci n)) + (factorial n)) + (total n)) + ((\s -> s s) + (\s n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (addInteger + n + ((\x -> s s x) (subtractInteger n 1))) + , 0 ]) + , ((\x -> error) + (forced "total: negative input" (constr 0 []))) ]))) ((\s -> s s) - (\s n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (addInteger n ((\x -> s s x) (subtractInteger n 1))) - , 0 ]) - , ((\x -> error) - (force trace - "total: negative input" - (constr 0 []))) ]))) + (\s -> + (\fibonacci n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (case + (equalsInteger 1 n) + [ (addInteger + (fibonacci (subtractInteger n 1)) + (fibonacci (subtractInteger n 2))) + , 1 ]) + , 0 ]) + , ((\x -> error) + (forced + "fibonacci: negative input" + (constr 0 []))) ]) + (\x -> s s x)))) ((\s -> s s) - (\s -> - (\fibonacci n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (case - (equalsInteger 1 n) - [ (addInteger - (fibonacci (subtractInteger n 1)) - (fibonacci (subtractInteger n 2))) - , 1 ]) - , 0 ]) - , ((\x -> error) - (force trace - "fibonacci: negative input" - (constr 0 []))) ]) - (\x -> s s x)))) - ((\s -> s s) - (\s n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (multiplyInteger n ((\x -> s s x) (subtractInteger n 1))) - , 1 ]) - , ((\x -> error) - (force trace - "factorial: negative input" - (constr 0 []))) ])))) \ No newline at end of file + (\s n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (multiplyInteger + n + ((\x -> s s x) (subtractInteger n 1))) + , 1 ]) + , ((\x -> error) + (forced "factorial: negative input" (constr 0 []))) ]))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.6/triple.golden.uplc b/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.6/triple.golden.uplc index 41cb310933d..9e2b378a790 100644 --- a/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.6/triple.golden.uplc +++ b/plutus-tx-plugin/test-frontend-plugin/Inlineable/9.6/triple.golden.uplc @@ -1,61 +1,63 @@ (program 1.1.0 - ((\factorial -> - (\fibonacci -> - (\total n -> - (\tot -> - (\fac -> - (\fib -> - case - (lessThanInteger n 0) - [ (constr 0 [fib, fac, tot]) - , ((\x -> error) - (force trace - "triple: negative input" - (constr 0 []))) ]) - (fibonacci n)) - (factorial n)) - (total n)) + ((\forced -> + (\factorial -> + (\fibonacci -> + (\total n -> + (\tot -> + (\fac -> + (\fib -> + case + (lessThanInteger n 0) + [ (constr 0 [fib, fac, tot]) + , ((\x -> error) + (forced + "triple: negative input" + (constr 0 []))) ]) + (fibonacci n)) + (factorial n)) + (total n)) + ((\s -> s s) + (\s n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (addInteger + n + ((\x -> s s x) (subtractInteger n 1))) + , 0 ]) + , ((\x -> error) + (forced "total: negative input" (constr 0 []))) ]))) ((\s -> s s) - (\s n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (addInteger n ((\x -> s s x) (subtractInteger n 1))) - , 0 ]) - , ((\x -> error) - (force trace - "total: negative input" - (constr 0 []))) ]))) + (\s -> + (\fibonacci n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (case + (equalsInteger 1 n) + [ (addInteger + (fibonacci (subtractInteger n 1)) + (fibonacci (subtractInteger n 2))) + , 1 ]) + , 0 ]) + , ((\x -> error) + (forced + "fibonacci: negative input" + (constr 0 []))) ]) + (\x -> s s x)))) ((\s -> s s) - (\s -> - (\fibonacci n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (case - (equalsInteger 1 n) - [ (addInteger - (fibonacci (subtractInteger n 1)) - (fibonacci (subtractInteger n 2))) - , 1 ]) - , 0 ]) - , ((\x -> error) - (force trace - "fibonacci: negative input" - (constr 0 []))) ]) - (\x -> s s x)))) - ((\s -> s s) - (\s n -> - case - (lessThanInteger n 0) - [ (case - (equalsInteger 0 n) - [ (multiplyInteger n ((\x -> s s x) (subtractInteger n 1))) - , 1 ]) - , ((\x -> error) - (force trace - "factorial: negative input" - (constr 0 []))) ])))) \ No newline at end of file + (\s n -> + case + (lessThanInteger n 0) + [ (case + (equalsInteger 0 n) + [ (multiplyInteger + n + ((\x -> s s x) (subtractInteger n 1))) + , 1 ]) + , ((\x -> error) + (forced "factorial: negative input" (constr 0 []))) ]))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq1.golden.eval index 2de3fe005af..652b9494418 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq1.golden.eval @@ -1,6 +1,6 @@ -CPU: 84_154_450 -Memory: 503_915 -AST Size: 550 -Flat Size: 913 +CPU: 83_652_655 +Memory: 500_915 +AST Size: 541 +Flat Size: 902 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq2.golden.eval index 40770217de2..fd1f617121a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq2.golden.eval @@ -1,6 +1,6 @@ -CPU: 90_567_890 -Memory: 542_821 -AST Size: 578 -Flat Size: 1_007 +CPU: 90_032_642 +Memory: 539_621 +AST Size: 569 +Flat Size: 996 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq3.golden.eval index c11483c9a6e..8b5fe39929a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq3.golden.eval @@ -1,6 +1,6 @@ -CPU: 92_858_340 -Memory: 555_726 -AST Size: 578 -Flat Size: 1_008 +CPU: 92_155_827 +Memory: 551_526 +AST Size: 569 +Flat Size: 997 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq4.golden.eval index 5257e2221c9..d198f78112a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq4.golden.eval @@ -1,6 +1,6 @@ -CPU: 81_558_620 -Memory: 489_410 -AST Size: 554 -Flat Size: 927 +CPU: 81_324_449 +Memory: 488_010 +AST Size: 545 +Flat Size: 916 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq5.golden.eval index d9f12adc12b..ff67910b8d6 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/geq5.golden.eval @@ -1,6 +1,6 @@ -CPU: 86_670_230 -Memory: 518_819 -AST Size: 554 -Flat Size: 927 +CPU: 86_134_982 +Memory: 515_619 +AST Size: 545 +Flat Size: 916 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt.golden.pir b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt.golden.pir index 4208b594b63..d0402486fa9 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt.golden.pir +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt.golden.pir @@ -30,8 +30,6 @@ letrec {all dead. dead})) in let - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] data (These :: * -> * -> *) a b | These_match where That : b -> These a b These : a -> b -> These a b @@ -97,23 +95,11 @@ letrec x {bool} (\(b : integer) -> - ifThenElse - {bool} - (lessThanInteger 0 b) - False - True) + lessThanEqualsInteger b 0) (\(a : integer) (b : integer) -> - ifThenElse - {bool} - (lessThanInteger a b) - False - True) + lessThanEqualsInteger b a) (\(a : integer) -> - ifThenElse - {bool} - (lessThanInteger a 0) - False - True)) + lessThanEqualsInteger 0 a)) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead})) {all dead. dead} diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt1.golden.eval index 6a5162db6ed..d650cc626d0 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt1.golden.eval @@ -1,6 +1,6 @@ -CPU: 104_140_045 -Memory: 620_350 -AST Size: 829 -Flat Size: 1_202 +CPU: 103_638_250 +Memory: 617_350 +AST Size: 820 +Flat Size: 1_191 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt2.golden.eval index 9734e7a4c9e..9b5b63cffd6 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt2.golden.eval @@ -1,6 +1,6 @@ -CPU: 90_743_890 -Memory: 543_921 -AST Size: 857 -Flat Size: 1_296 +CPU: 90_208_642 +Memory: 540_721 +AST Size: 848 +Flat Size: 1_285 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt3.golden.eval index be1c0bb3287..6ab0763dfd5 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt3.golden.eval @@ -1,6 +1,6 @@ -CPU: 113_408_268 -Memory: 675_362 -AST Size: 857 -Flat Size: 1_297 +CPU: 112_705_755 +Memory: 671_162 +AST Size: 848 +Flat Size: 1_286 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt4.golden.eval index b2d0131a65c..bd3384a208b 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt4.golden.eval @@ -1,6 +1,6 @@ -CPU: 81_734_620 -Memory: 490_510 -AST Size: 833 -Flat Size: 1_216 +CPU: 81_500_449 +Memory: 489_110 +AST Size: 824 +Flat Size: 1_205 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt5.golden.eval index 727a46cc36f..e2d84064334 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.12/gt5.golden.eval @@ -1,6 +1,6 @@ -CPU: 96_720_031 -Memory: 577_735 -AST Size: 833 -Flat Size: 1_216 +CPU: 96_184_783 +Memory: 574_535 +AST Size: 824 +Flat Size: 1_205 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq1.golden.eval index 2de3fe005af..652b9494418 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq1.golden.eval @@ -1,6 +1,6 @@ -CPU: 84_154_450 -Memory: 503_915 -AST Size: 550 -Flat Size: 913 +CPU: 83_652_655 +Memory: 500_915 +AST Size: 541 +Flat Size: 902 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq2.golden.eval index 40770217de2..fd1f617121a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq2.golden.eval @@ -1,6 +1,6 @@ -CPU: 90_567_890 -Memory: 542_821 -AST Size: 578 -Flat Size: 1_007 +CPU: 90_032_642 +Memory: 539_621 +AST Size: 569 +Flat Size: 996 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq3.golden.eval index c11483c9a6e..8b5fe39929a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq3.golden.eval @@ -1,6 +1,6 @@ -CPU: 92_858_340 -Memory: 555_726 -AST Size: 578 -Flat Size: 1_008 +CPU: 92_155_827 +Memory: 551_526 +AST Size: 569 +Flat Size: 997 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq4.golden.eval index 5257e2221c9..d198f78112a 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq4.golden.eval @@ -1,6 +1,6 @@ -CPU: 81_558_620 -Memory: 489_410 -AST Size: 554 -Flat Size: 927 +CPU: 81_324_449 +Memory: 488_010 +AST Size: 545 +Flat Size: 916 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq5.golden.eval index d9f12adc12b..ff67910b8d6 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/geq5.golden.eval @@ -1,6 +1,6 @@ -CPU: 86_670_230 -Memory: 518_819 -AST Size: 554 -Flat Size: 927 +CPU: 86_134_982 +Memory: 515_619 +AST Size: 545 +Flat Size: 916 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt.golden.pir b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt.golden.pir index 446139d1538..be2c8b6f0df 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt.golden.pir +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt.golden.pir @@ -30,8 +30,6 @@ letrec {all dead. dead})) in let - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] data (These :: * -> * -> *) a b | These_match where That : b -> These a b These : a -> b -> These a b @@ -97,23 +95,11 @@ letrec x {bool} (\(b : integer) -> - ifThenElse - {bool} - (lessThanInteger 0 b) - False - True) + lessThanEqualsInteger b 0) (\(a : integer) (b : integer) -> - ifThenElse - {bool} - (lessThanInteger a b) - False - True) + lessThanEqualsInteger b a) (\(a : integer) -> - ifThenElse - {bool} - (lessThanInteger a 0) - False - True)) + lessThanEqualsInteger 0 a)) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead})) {all dead. dead} diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt1.golden.eval index 6a5162db6ed..d650cc626d0 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt1.golden.eval @@ -1,6 +1,6 @@ -CPU: 104_140_045 -Memory: 620_350 -AST Size: 829 -Flat Size: 1_202 +CPU: 103_638_250 +Memory: 617_350 +AST Size: 820 +Flat Size: 1_191 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt2.golden.eval index 9734e7a4c9e..9b5b63cffd6 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt2.golden.eval @@ -1,6 +1,6 @@ -CPU: 90_743_890 -Memory: 543_921 -AST Size: 857 -Flat Size: 1_296 +CPU: 90_208_642 +Memory: 540_721 +AST Size: 848 +Flat Size: 1_285 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt3.golden.eval index be1c0bb3287..6ab0763dfd5 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt3.golden.eval @@ -1,6 +1,6 @@ -CPU: 113_408_268 -Memory: 675_362 -AST Size: 857 -Flat Size: 1_297 +CPU: 112_705_755 +Memory: 671_162 +AST Size: 848 +Flat Size: 1_286 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt4.golden.eval index b2d0131a65c..bd3384a208b 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt4.golden.eval @@ -1,6 +1,6 @@ -CPU: 81_734_620 -Memory: 490_510 -AST Size: 833 -Flat Size: 1_216 +CPU: 81_500_449 +Memory: 489_110 +AST Size: 824 +Flat Size: 1_205 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt5.golden.eval index 727a46cc36f..e2d84064334 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Budget/9.6/gt5.golden.eval @@ -1,6 +1,6 @@ -CPU: 96_720_031 -Memory: 577_735 -AST Size: 833 -Flat Size: 1_216 +CPU: 96_184_783 +Memory: 574_535 +AST Size: 824 +Flat Size: 1_205 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq1.golden.eval index 305c4bb9f8e..45eb8c5e640 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq1.golden.eval @@ -1,6 +1,6 @@ -CPU: 337_547_895 -Memory: 988_745 -AST Size: 639 -Flat Size: 949 +CPU: 333_462_100 +Memory: 963_345 +AST Size: 625 +Flat Size: 942 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq2.golden.eval index 7df13110969..c8645f0cc91 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq2.golden.eval @@ -1,6 +1,6 @@ -CPU: 355_097_594 -Memory: 1_055_015 -AST Size: 639 -Flat Size: 1_000 +CPU: 350_706_346 +Memory: 1_027_715 +AST Size: 625 +Flat Size: 993 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq3.golden.eval index d7e1cb55530..e7d411ba6d7 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq3.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_720_887 -Memory: 1_100_329 -AST Size: 639 -Flat Size: 1_000 +CPU: 363_986_374 +Memory: 1_070_929 +AST Size: 625 +Flat Size: 993 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq4.golden.eval index 92bd54c53ab..99413c67607 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq4.golden.eval @@ -1,6 +1,6 @@ -CPU: 331_212_553 -Memory: 946_336 -AST Size: 639 -Flat Size: 956 +CPU: 327_778_382 +Memory: 924_936 +AST Size: 625 +Flat Size: 949 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq5.golden.eval index 5747005a96f..8b7b7ebad3e 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/geq5.golden.eval @@ -1,6 +1,6 @@ -CPU: 349_612_383 -Memory: 1_021_500 -AST Size: 639 -Flat Size: 956 +CPU: 345_381_135 +Memory: 995_200 +AST Size: 625 +Flat Size: 949 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt.golden.pir b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt.golden.pir index ee74ddedcc5..5b7a2eee382 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt.golden.pir +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt.golden.pir @@ -48,8 +48,6 @@ let {integer} `$fToDataInteger_$ctoBuiltinData` `$fToDataInteger_$ctoBuiltinData` - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] !`$fUnsafeFromDataThese_$cunsafeFromBuiltinData` : all a b. (\a -> data -> a) a -> (\a -> data -> a) b -> data -> These a b = /\a b -> @@ -103,12 +101,9 @@ letrec {integer} k' {bool} - (\(b : integer) -> - ifThenElse {bool} (lessThanInteger 0 b) False True) - (\(a : integer) (b : integer) -> - ifThenElse {bool} (lessThanInteger a b) False True) - (\(a : integer) -> - ifThenElse {bool} (lessThanInteger a 0) False True)) + (\(b : integer) -> lessThanEqualsInteger b 0) + (\(a : integer) (b : integer) -> lessThanEqualsInteger b a) + (\(a : integer) -> lessThanEqualsInteger 0 a)) [ (/\dead -> \(ds : list (pair data data)) -> False) , (/\dead -> go) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval index d5495f9b829..78b538a086f 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt1.golden.eval @@ -1,6 +1,6 @@ -CPU: 388_148_300 -Memory: 1_166_660 -AST Size: 1_023 -Flat Size: 1_324 +CPU: 384_062_505 +Memory: 1_141_260 +AST Size: 1_006 +Flat Size: 1_316 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval index eaef2037302..7739a9714ce 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt2.golden.eval @@ -1,6 +1,6 @@ -CPU: 355_465_594 -Memory: 1_057_315 -AST Size: 1_023 -Flat Size: 1_375 +CPU: 351_074_346 +Memory: 1_030_015 +AST Size: 1_006 +Flat Size: 1_367 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval index 5bbeabe17a0..efe0e10e62d 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt3.golden.eval @@ -1,6 +1,6 @@ -CPU: 420_042_992 -Memory: 1_282_209 -AST Size: 1_023 -Flat Size: 1_375 +CPU: 415_308_479 +Memory: 1_252_809 +AST Size: 1_006 +Flat Size: 1_367 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval index e1d6a166af4..f03788378df 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt4.golden.eval @@ -1,6 +1,6 @@ -CPU: 331_580_553 -Memory: 948_636 -AST Size: 1_023 -Flat Size: 1_331 +CPU: 328_146_382 +Memory: 927_236 +AST Size: 1_006 +Flat Size: 1_323 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval index 45be5fc853e..a26a16efbbd 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/gt5.golden.eval @@ -1,6 +1,6 @@ -CPU: 373_819_011 -Memory: 1_110_324 -AST Size: 1_023 -Flat Size: 1_331 +CPU: 369_587_763 +Memory: 1_084_024 +AST Size: 1_006 +Flat Size: 1_323 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueBurned.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueBurned.golden.eval index db996c79d85..d1e93b504d7 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueBurned.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueBurned.golden.eval @@ -1,7 +1,7 @@ -CPU: 21_540_429 -Memory: 111_210 -AST Size: 109 -Flat Size: 278 +CPU: 21_364_429 +Memory: 110_110 +AST Size: 115 +Flat Size: 283 (con (list (pair data data)) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueMinted.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueMinted.golden.eval index 5dea4412f52..a22da043886 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueMinted.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.12/mintValueMinted.golden.eval @@ -1,7 +1,7 @@ -CPU: 17_191_587 -Memory: 92_608 -AST Size: 99 -Flat Size: 267 +CPU: 17_102_835 +Memory: 91_908 +AST Size: 105 +Flat Size: 272 (con (list (pair data data)) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq1.golden.eval index 305c4bb9f8e..45eb8c5e640 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq1.golden.eval @@ -1,6 +1,6 @@ -CPU: 337_547_895 -Memory: 988_745 -AST Size: 639 -Flat Size: 949 +CPU: 333_462_100 +Memory: 963_345 +AST Size: 625 +Flat Size: 942 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq2.golden.eval index 7df13110969..c8645f0cc91 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq2.golden.eval @@ -1,6 +1,6 @@ -CPU: 355_097_594 -Memory: 1_055_015 -AST Size: 639 -Flat Size: 1_000 +CPU: 350_706_346 +Memory: 1_027_715 +AST Size: 625 +Flat Size: 993 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq3.golden.eval index d7e1cb55530..e7d411ba6d7 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq3.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_720_887 -Memory: 1_100_329 -AST Size: 639 -Flat Size: 1_000 +CPU: 363_986_374 +Memory: 1_070_929 +AST Size: 625 +Flat Size: 993 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq4.golden.eval index 92bd54c53ab..99413c67607 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq4.golden.eval @@ -1,6 +1,6 @@ -CPU: 331_212_553 -Memory: 946_336 -AST Size: 639 -Flat Size: 956 +CPU: 327_778_382 +Memory: 924_936 +AST Size: 625 +Flat Size: 949 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq5.golden.eval index 5747005a96f..8b7b7ebad3e 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/geq5.golden.eval @@ -1,6 +1,6 @@ -CPU: 349_612_383 -Memory: 1_021_500 -AST Size: 639 -Flat Size: 956 +CPU: 345_381_135 +Memory: 995_200 +AST Size: 625 +Flat Size: 949 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt.golden.pir b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt.golden.pir index ee74ddedcc5..5b7a2eee382 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt.golden.pir +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt.golden.pir @@ -48,8 +48,6 @@ let {integer} `$fToDataInteger_$ctoBuiltinData` `$fToDataInteger_$ctoBuiltinData` - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] !`$fUnsafeFromDataThese_$cunsafeFromBuiltinData` : all a b. (\a -> data -> a) a -> (\a -> data -> a) b -> data -> These a b = /\a b -> @@ -103,12 +101,9 @@ letrec {integer} k' {bool} - (\(b : integer) -> - ifThenElse {bool} (lessThanInteger 0 b) False True) - (\(a : integer) (b : integer) -> - ifThenElse {bool} (lessThanInteger a b) False True) - (\(a : integer) -> - ifThenElse {bool} (lessThanInteger a 0) False True)) + (\(b : integer) -> lessThanEqualsInteger b 0) + (\(a : integer) (b : integer) -> lessThanEqualsInteger b a) + (\(a : integer) -> lessThanEqualsInteger 0 a)) [ (/\dead -> \(ds : list (pair data data)) -> False) , (/\dead -> go) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval index d5495f9b829..78b538a086f 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt1.golden.eval @@ -1,6 +1,6 @@ -CPU: 388_148_300 -Memory: 1_166_660 -AST Size: 1_023 -Flat Size: 1_324 +CPU: 384_062_505 +Memory: 1_141_260 +AST Size: 1_006 +Flat Size: 1_316 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval index eaef2037302..7739a9714ce 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt2.golden.eval @@ -1,6 +1,6 @@ -CPU: 355_465_594 -Memory: 1_057_315 -AST Size: 1_023 -Flat Size: 1_375 +CPU: 351_074_346 +Memory: 1_030_015 +AST Size: 1_006 +Flat Size: 1_367 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval index 5bbeabe17a0..efe0e10e62d 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt3.golden.eval @@ -1,6 +1,6 @@ -CPU: 420_042_992 -Memory: 1_282_209 -AST Size: 1_023 -Flat Size: 1_375 +CPU: 415_308_479 +Memory: 1_252_809 +AST Size: 1_006 +Flat Size: 1_367 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval index e1d6a166af4..f03788378df 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt4.golden.eval @@ -1,6 +1,6 @@ -CPU: 331_580_553 -Memory: 948_636 -AST Size: 1_023 -Flat Size: 1_331 +CPU: 328_146_382 +Memory: 927_236 +AST Size: 1_006 +Flat Size: 1_323 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval index 45be5fc853e..a26a16efbbd 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/gt5.golden.eval @@ -1,6 +1,6 @@ -CPU: 373_819_011 -Memory: 1_110_324 -AST Size: 1_023 -Flat Size: 1_331 +CPU: 369_587_763 +Memory: 1_084_024 +AST Size: 1_006 +Flat Size: 1_323 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueBurned.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueBurned.golden.eval index db996c79d85..d1e93b504d7 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueBurned.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueBurned.golden.eval @@ -1,7 +1,7 @@ -CPU: 21_540_429 -Memory: 111_210 -AST Size: 109 -Flat Size: 278 +CPU: 21_364_429 +Memory: 110_110 +AST Size: 115 +Flat Size: 283 (con (list (pair data data)) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueMinted.golden.eval b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueMinted.golden.eval index 5dea4412f52..a22da043886 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueMinted.golden.eval +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Budget/9.6/mintValueMinted.golden.eval @@ -1,7 +1,7 @@ -CPU: 17_191_587 -Memory: 92_608 -AST Size: 99 -Flat Size: 267 +CPU: 17_102_835 +Memory: 91_908 +AST Size: 105 +Flat Size: 272 (con (list (pair data data)) diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.12/succeedsIfHasDatum.golden.uplc b/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.12/succeedsIfHasDatum.golden.uplc index 47b48ff4f8f..028b72aaffc 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.12/succeedsIfHasDatum.golden.uplc +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.12/succeedsIfHasDatum.golden.uplc @@ -1,25 +1,26 @@ (program 1.1.0 - (\d -> - (\tup -> - case - (case - (equalsInteger 1 (case tup [(\l r -> l)])) - [ False - , (case - (case - (unConstrData - (force headList - (force tailList (case tup [(\l r -> r)])))) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(force headList ds)]) - , (\ds -> constr 1 []) ] - args) ]) - [(\ds -> True), False]) ]) - [((\x -> error) (force trace "PT5" (constr 0 []))), ()]) - (unConstrData - (force headList - (force tailList - (force tailList (case (unConstrData d) [(\l r -> r)]))))))) \ No newline at end of file + (case + (constr 0 [(force tailList), (force headList), (force trace)]) + [ (\forced forced forced d -> + (\tup -> + case + (case + (equalsInteger 1 (case tup [(\l r -> l)])) + [ False + , (case + (case + (unConstrData + (forced (forced (case tup [(\l r -> r)])))) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(forced ds)]) + , (\ds -> constr 1 []) ] + args) ]) + [(\ds -> True), False]) ]) + [((\x -> error) (forced "PT5" (constr 0 []))), ()]) + (unConstrData + (forced + (forced + (forced (case (unConstrData d) [(\l r -> r)])))))) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.6/succeedsIfHasDatum.golden.uplc b/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.6/succeedsIfHasDatum.golden.uplc index 47b48ff4f8f..028b72aaffc 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.6/succeedsIfHasDatum.golden.uplc +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/ScriptContext/9.6/succeedsIfHasDatum.golden.uplc @@ -1,25 +1,26 @@ (program 1.1.0 - (\d -> - (\tup -> - case - (case - (equalsInteger 1 (case tup [(\l r -> l)])) - [ False - , (case - (case - (unConstrData - (force headList - (force tailList (case tup [(\l r -> r)])))) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(force headList ds)]) - , (\ds -> constr 1 []) ] - args) ]) - [(\ds -> True), False]) ]) - [((\x -> error) (force trace "PT5" (constr 0 []))), ()]) - (unConstrData - (force headList - (force tailList - (force tailList (case (unConstrData d) [(\l r -> r)]))))))) \ No newline at end of file + (case + (constr 0 [(force tailList), (force headList), (force trace)]) + [ (\forced forced forced d -> + (\tup -> + case + (case + (equalsInteger 1 (case tup [(\l r -> l)])) + [ False + , (case + (case + (unConstrData + (forced (forced (case tup [(\l r -> r)])))) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(forced ds)]) + , (\ds -> constr 1 []) ] + args) ]) + [(\ds -> True), False]) ]) + [((\x -> error) (forced "PT5" (constr 0 []))), ()]) + (unConstrData + (forced + (forced + (forced (case (unConstrData d) [(\l r -> r)])))))) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat index 782ae0e6c2d..b334d9c6280 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Long.golden.stat @@ -1,15 +1,15 @@ -({cpu: 6392088758 | mem: 6589783}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 937764827 | mem: 624403}) \ No newline at end of file +({cpu: 6392152758 | mem: 6590183}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 937828827 | mem: 624803}) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat index 123c19e304a..e508293ef2c 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.12/Short.golden.stat @@ -1,21 +1,21 @@ -({cpu: 1344100 | mem: 8500}) -({cpu: 1896723 | mem: 11832}) -({cpu: 4363889 | mem: 20665}) -({cpu: 4948966 | mem: 23898}) -({cpu: 6644253 | mem: 27931}) -({cpu: 7365953 | mem: 31896}) -({cpu: 12135359 | mem: 47362}) -({cpu: 11417772 | mem: 48894}) -({cpu: 15155148 | mem: 59527}) -({cpu: 9087449 | mem: 34997}) -({cpu: 23117571 | mem: 86224}) -({cpu: 7004283 | mem: 28564}) -({cpu: 33360358 | mem: 120187}) -({cpu: 36299622 | mem: 133713}) -({cpu: 48365898 | mem: 161416}) -({cpu: 51305162 | mem: 174942}) -({cpu: 65842755 | mem: 209911}) -({cpu: 66564455 | mem: 213876}) -({cpu: 85790929 | mem: 265672}) -({cpu: 28863149 | mem: 108476}) -({cpu: 937764827 | mem: 624403}) \ No newline at end of file +({cpu: 1408100 | mem: 8900}) +({cpu: 1960723 | mem: 12232}) +({cpu: 4427889 | mem: 21065}) +({cpu: 5012966 | mem: 24298}) +({cpu: 6708253 | mem: 28331}) +({cpu: 7429953 | mem: 32296}) +({cpu: 12199359 | mem: 47762}) +({cpu: 11481772 | mem: 49294}) +({cpu: 15219148 | mem: 59927}) +({cpu: 9151449 | mem: 35397}) +({cpu: 23181571 | mem: 86624}) +({cpu: 7068283 | mem: 28964}) +({cpu: 33424358 | mem: 120587}) +({cpu: 36331622 | mem: 133913}) +({cpu: 48429898 | mem: 161816}) +({cpu: 51337162 | mem: 175142}) +({cpu: 65906755 | mem: 210311}) +({cpu: 66628455 | mem: 214276}) +({cpu: 85854929 | mem: 266072}) +({cpu: 28831149 | mem: 108276}) +({cpu: 937828827 | mem: 624803}) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat index 782ae0e6c2d..b334d9c6280 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Long.golden.stat @@ -1,15 +1,15 @@ -({cpu: 6392088758 | mem: 6589783}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 4573980781 | mem: 4601323}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 2755872804 | mem: 2612863}) -({cpu: 4532966 | mem: 21298}) -({cpu: 937764827 | mem: 624403}) \ No newline at end of file +({cpu: 6392152758 | mem: 6590183}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 4574044781 | mem: 4601723}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 2755936804 | mem: 2613263}) +({cpu: 4596966 | mem: 21698}) +({cpu: 937828827 | mem: 624803}) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat index 123c19e304a..e508293ef2c 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat +++ b/plutus-tx-plugin/test-ledger-api/Spec/Data/Value/9.6/Short.golden.stat @@ -1,21 +1,21 @@ -({cpu: 1344100 | mem: 8500}) -({cpu: 1896723 | mem: 11832}) -({cpu: 4363889 | mem: 20665}) -({cpu: 4948966 | mem: 23898}) -({cpu: 6644253 | mem: 27931}) -({cpu: 7365953 | mem: 31896}) -({cpu: 12135359 | mem: 47362}) -({cpu: 11417772 | mem: 48894}) -({cpu: 15155148 | mem: 59527}) -({cpu: 9087449 | mem: 34997}) -({cpu: 23117571 | mem: 86224}) -({cpu: 7004283 | mem: 28564}) -({cpu: 33360358 | mem: 120187}) -({cpu: 36299622 | mem: 133713}) -({cpu: 48365898 | mem: 161416}) -({cpu: 51305162 | mem: 174942}) -({cpu: 65842755 | mem: 209911}) -({cpu: 66564455 | mem: 213876}) -({cpu: 85790929 | mem: 265672}) -({cpu: 28863149 | mem: 108476}) -({cpu: 937764827 | mem: 624403}) \ No newline at end of file +({cpu: 1408100 | mem: 8900}) +({cpu: 1960723 | mem: 12232}) +({cpu: 4427889 | mem: 21065}) +({cpu: 5012966 | mem: 24298}) +({cpu: 6708253 | mem: 28331}) +({cpu: 7429953 | mem: 32296}) +({cpu: 12199359 | mem: 47762}) +({cpu: 11481772 | mem: 49294}) +({cpu: 15219148 | mem: 59927}) +({cpu: 9151449 | mem: 35397}) +({cpu: 23181571 | mem: 86624}) +({cpu: 7068283 | mem: 28964}) +({cpu: 33424358 | mem: 120587}) +({cpu: 36331622 | mem: 133913}) +({cpu: 48429898 | mem: 161816}) +({cpu: 51337162 | mem: 175142}) +({cpu: 65906755 | mem: 210311}) +({cpu: 66628455 | mem: 214276}) +({cpu: 85854929 | mem: 266072}) +({cpu: 28831149 | mem: 108276}) +({cpu: 937828827 | mem: 624803}) \ No newline at end of file diff --git a/plutus-tx-plugin/test-ledger-api/Spec/ScriptSize.hs b/plutus-tx-plugin/test-ledger-api/Spec/ScriptSize.hs index e5580d9f49a..707342d4eb8 100644 --- a/plutus-tx-plugin/test-ledger-api/Spec/ScriptSize.hs +++ b/plutus-tx-plugin/test-ledger-api/Spec/ScriptSize.hs @@ -4,6 +4,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# OPTIONS_GHC -fplugin Plinth.Plugin #-} {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:datatypes=BuiltinCasing #-} +{-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-hoist-polymorphic-builtins #-} module Spec.ScriptSize where diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.eval index c1ccd5bda90..4b6a26ad284 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_305_583 -Memory: 24_595 -AST Size: 214 -Flat Size: 229 +CPU: 6_145_583 +Memory: 23_595 +AST Size: 209 +Flat Size: 233 (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.uplc index e0dfdf1ea76..e8d09ff281f 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum-manual.golden.uplc @@ -1,81 +1,88 @@ (program 1.1.0 - (\d -> - (\cse -> - case - (equalsInteger 0 (case cse [(\l r -> l)])) - [ (case - (equalsInteger 1 (case cse [(\l r -> l)])) + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced + d -> + (\cse -> + case + (equalsInteger 0 (case cse [(\l r -> l)])) [ (case - (equalsInteger 2 (case cse [(\l r -> l)])) - [ ((\cse -> case cse [cse]) error) - , ((\args -> - (\y -> - (\`$mInts` -> - case - (constr 0 - [ (force headList args) - , (\x - y - z - w -> - case - (constr 0 - [ y - , (\x - y - z - w -> - constrData - 0 - (force - mkCons - (iData - (addInteger x x)) - (force - mkCons - (iData - (addInteger - y - y)) - (force - mkCons - (iData - (addInteger - z - z)) - (force - mkCons - (iData - (addInteger - w - w)) - []))))) - , (\void -> - (\cse -> case cse [cse]) - error) ]) - [`$mInts`]) - , (\void -> - (\cse -> case cse [cse]) error) ]) - [`$mInts`]) - (\scrut cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData - (force headList - (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case (unConstrData scrut) [(\l r -> r)]))) - (force headList (force tailList args))) - (case cse [(\l r -> r)])) ]) - , (force headList (case cse [(\l r -> r)])) ]) - , (force headList (case cse [(\l r -> r)])) ]) - (unConstrData d))) \ No newline at end of file + (equalsInteger 1 (case cse [(\l r -> l)])) + [ (case + (equalsInteger 2 (case cse [(\l r -> l)])) + [ ((\cse -> case cse [cse]) error) + , ((\args -> + (\y -> + (\`$mInts` -> + case + (constr 0 + [ (forced args) + , (\x + y + z + w -> + case + (constr 0 + [ y + , (\x + y + z + w -> + constrData + 0 + (forced + (iData + (addInteger + x + x)) + (forced + (iData + (addInteger + y + y)) + (forced + (iData + (addInteger + z + z)) + (forced + (iData + (addInteger + w + w)) + []))))) + , (\void -> + (\cse -> + case cse [cse]) + error) ]) + [`$mInts`]) + , (\void -> + (\cse -> case cse [cse]) + error) ]) + [`$mInts`]) + (\scrut cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData + (forced + (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case + (unConstrData scrut) + [(\l r -> r)]))) + (forced (forced args))) + (case cse [(\l r -> r)])) ]) + , (forced (case cse [(\l r -> r)])) ]) + , (forced (case cse [(\l r -> r)])) ]) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.eval index c0973ffc5e2..82de0daccad 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_359_771 -Memory: 20_628 -AST Size: 161 -Flat Size: 180 +CPU: 5_231_771 +Memory: 19_828 +AST Size: 158 +Flat Size: 185 (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.uplc index 1ed2985bcaa..03e7341e90e 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/destructSum.golden.uplc @@ -1,61 +1,80 @@ (program 1.1.0 - (\d -> - case - (unConstrData d) - [ (\idx args -> - case - idx - [ (force headList args) - , (force headList args) - , (case - args - [ (\hd tl -> - (\`$mInts` -> - case - (constr 0 - [ hd - , (\x y z w -> - case - (constr 0 - [ (force headList tl) - , (\x y z w -> - constrData - 0 - (force mkCons - (iData (addInteger x x)) - (force mkCons - (iData (addInteger y y)) - (force mkCons - (iData - (addInteger z z)) - (force mkCons - (iData - (addInteger - w - w)) - []))))) - , (\void -> - (\cse -> case cse [cse]) - error) ]) - [`$mInts`]) - , (\void -> (\cse -> case cse [cse]) error) ]) - [`$mInts`]) - (\scrut cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData - (force headList - (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case - (unConstrData scrut) - [(\l r -> r)]))) ]) ]) ])) \ No newline at end of file + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced + d -> + case + (unConstrData d) + [ (\idx + args -> + case + idx + [ (forced args) + , (forced args) + , (case + args + [ (\hd + tl -> + (\`$mInts` -> + case + (constr 0 + [ hd + , (\x + y + z + w -> + case + (constr 0 + [ (forced tl) + , (\x + y + z + w -> + constrData + 0 + (forced + (iData + (addInteger x x)) + (forced + (iData + (addInteger + y + y)) + (forced + (iData + (addInteger + z + z)) + (forced + (iData + (addInteger + w + w)) + []))))) + , (\void -> + (\cse -> case cse [cse]) + error) ]) + [`$mInts`]) + , (\void -> + (\cse -> case cse [cse]) error) ]) + [`$mInts`]) + (\scrut cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData + (forced (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case + (unConstrData scrut) + [(\l r -> r)]))) ]) ]) ]) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.eval index a8b12c678b5..afb98b49202 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_582 -Memory: 1_696 -AST Size: 15 -Flat Size: 32 +CPU: 416_582 +Memory: 1_996 +AST Size: 18 +Flat Size: 34 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.uplc index 2c9e6d4b3a4..2826a5c4343 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField-manual.golden.uplc @@ -1,3 +1,4 @@ (program 1.1.0 - (\d -> unIData (force headList (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced d -> unIData (forced (case (unConstrData d) [(\l r -> r)]))) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.eval index a8b12c678b5..afb98b49202 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_582 -Memory: 1_696 -AST Size: 15 -Flat Size: 32 +CPU: 416_582 +Memory: 1_996 +AST Size: 18 +Flat Size: 34 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.uplc index 2c9e6d4b3a4..2826a5c4343 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/onlyUseFirstField.golden.uplc @@ -1,3 +1,4 @@ (program 1.1.0 - (\d -> unIData (force headList (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced d -> unIData (forced (case (unConstrData d) [(\l r -> r)]))) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.eval index c31a81be8de..bfa859adc5a 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_745_121 -Memory: 12_108 -AST Size: 126 -Flat Size: 135 +CPU: 3_761_121 +Memory: 12_208 +AST Size: 127 +Flat Size: 138 (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.uplc index a9148fa393b..698fb512599 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/patternMatching.golden.uplc @@ -1,30 +1,32 @@ (program 1.1.0 - (\d -> - (\l -> - (\l -> - (\l -> - (\x -> - (\y -> - (\z -> - (\w -> - addInteger - (addInteger - (addInteger (addInteger (addInteger x y) z) w) - (case - (lessThanInteger - (addInteger y z) - (addInteger x w)) - [(addInteger y w), (addInteger x z)])) - (case - (lessThanInteger - (addInteger z y) - (addInteger w x)) - [(addInteger w y), (addInteger z x)])) - (unIData (force headList (force tailList l)))) - (unIData (force headList l))) - (unIData (force headList l))) - (unIData (force headList l))) - (force tailList l)) - (force tailList l)) - (case (unConstrData d) [(\l r -> r)]))) \ No newline at end of file + ((\forced forced d -> + (\l -> + (\l -> + (\l -> + (\x -> + (\y -> + (\z -> + (\w -> + addInteger + (addInteger + (addInteger (addInteger (addInteger x y) z) w) + (case + (lessThanInteger + (addInteger y z) + (addInteger x w)) + [(addInteger y w), (addInteger x z)])) + (case + (lessThanInteger + (addInteger z y) + (addInteger w x)) + [(addInteger w y), (addInteger z x)])) + (unIData (forced (forced l)))) + (unIData (forced l))) + (unIData (forced l))) + (unIData (forced l))) + (forced l)) + (forced l)) + (case (unConstrData d) [(\l r -> r)])) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.eval index 175dd8fd4b2..659bd9b9a8a 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.eval @@ -1,6 +1,6 @@ -CPU: 8_984_580 -Memory: 33_160 -AST Size: 173 -Flat Size: 169 +CPU: 8_664_580 +Memory: 31_160 +AST Size: 174 +Flat Size: 172 (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.uplc index e1ae9e5299d..bfe11df1c32 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.12/recordFields.golden.uplc @@ -1,39 +1,43 @@ (program 1.1.0 - (\d -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - addInteger - (addInteger - (addInteger (addInteger (addInteger cse cse) cse) cse) - (case - (lessThanInteger - (addInteger cse cse) - (addInteger cse cse)) - [(addInteger cse cse), (addInteger cse cse)])) - (case - (lessThanInteger - (addInteger cse cse) - (addInteger cse cse)) - [(addInteger cse cse), (addInteger cse cse)])) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (\cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced forced d -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + addInteger + (addInteger + (addInteger + (addInteger (addInteger cse cse) cse) + cse) + (case + (lessThanInteger + (addInteger cse cse) + (addInteger cse cse)) + [(addInteger cse cse), (addInteger cse cse)])) + (case + (lessThanInteger + (addInteger cse cse) + (addInteger cse cse)) + [(addInteger cse cse), (addInteger cse cse)])) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (\cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case (unConstrData d) [(\l r -> r)]))) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.eval index c1ccd5bda90..4b6a26ad284 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_305_583 -Memory: 24_595 -AST Size: 214 -Flat Size: 229 +CPU: 6_145_583 +Memory: 23_595 +AST Size: 209 +Flat Size: 233 (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.uplc index e0dfdf1ea76..e8d09ff281f 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.golden.uplc @@ -1,81 +1,88 @@ (program 1.1.0 - (\d -> - (\cse -> - case - (equalsInteger 0 (case cse [(\l r -> l)])) - [ (case - (equalsInteger 1 (case cse [(\l r -> l)])) + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced + d -> + (\cse -> + case + (equalsInteger 0 (case cse [(\l r -> l)])) [ (case - (equalsInteger 2 (case cse [(\l r -> l)])) - [ ((\cse -> case cse [cse]) error) - , ((\args -> - (\y -> - (\`$mInts` -> - case - (constr 0 - [ (force headList args) - , (\x - y - z - w -> - case - (constr 0 - [ y - , (\x - y - z - w -> - constrData - 0 - (force - mkCons - (iData - (addInteger x x)) - (force - mkCons - (iData - (addInteger - y - y)) - (force - mkCons - (iData - (addInteger - z - z)) - (force - mkCons - (iData - (addInteger - w - w)) - []))))) - , (\void -> - (\cse -> case cse [cse]) - error) ]) - [`$mInts`]) - , (\void -> - (\cse -> case cse [cse]) error) ]) - [`$mInts`]) - (\scrut cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData - (force headList - (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case (unConstrData scrut) [(\l r -> r)]))) - (force headList (force tailList args))) - (case cse [(\l r -> r)])) ]) - , (force headList (case cse [(\l r -> r)])) ]) - , (force headList (case cse [(\l r -> r)])) ]) - (unConstrData d))) \ No newline at end of file + (equalsInteger 1 (case cse [(\l r -> l)])) + [ (case + (equalsInteger 2 (case cse [(\l r -> l)])) + [ ((\cse -> case cse [cse]) error) + , ((\args -> + (\y -> + (\`$mInts` -> + case + (constr 0 + [ (forced args) + , (\x + y + z + w -> + case + (constr 0 + [ y + , (\x + y + z + w -> + constrData + 0 + (forced + (iData + (addInteger + x + x)) + (forced + (iData + (addInteger + y + y)) + (forced + (iData + (addInteger + z + z)) + (forced + (iData + (addInteger + w + w)) + []))))) + , (\void -> + (\cse -> + case cse [cse]) + error) ]) + [`$mInts`]) + , (\void -> + (\cse -> case cse [cse]) + error) ]) + [`$mInts`]) + (\scrut cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData + (forced + (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case + (unConstrData scrut) + [(\l r -> r)]))) + (forced (forced args))) + (case cse [(\l r -> r)])) ]) + , (forced (case cse [(\l r -> r)])) ]) + , (forced (case cse [(\l r -> r)])) ]) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.eval index c0973ffc5e2..82de0daccad 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_359_771 -Memory: 20_628 -AST Size: 161 -Flat Size: 180 +CPU: 5_231_771 +Memory: 19_828 +AST Size: 158 +Flat Size: 185 (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.uplc index 1ed2985bcaa..03e7341e90e 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.golden.uplc @@ -1,61 +1,80 @@ (program 1.1.0 - (\d -> - case - (unConstrData d) - [ (\idx args -> - case - idx - [ (force headList args) - , (force headList args) - , (case - args - [ (\hd tl -> - (\`$mInts` -> - case - (constr 0 - [ hd - , (\x y z w -> - case - (constr 0 - [ (force headList tl) - , (\x y z w -> - constrData - 0 - (force mkCons - (iData (addInteger x x)) - (force mkCons - (iData (addInteger y y)) - (force mkCons - (iData - (addInteger z z)) - (force mkCons - (iData - (addInteger - w - w)) - []))))) - , (\void -> - (\cse -> case cse [cse]) - error) ]) - [`$mInts`]) - , (\void -> (\cse -> case cse [cse]) error) ]) - [`$mInts`]) - (\scrut cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData - (force headList - (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case - (unConstrData scrut) - [(\l r -> r)]))) ]) ]) ])) \ No newline at end of file + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced + d -> + case + (unConstrData d) + [ (\idx + args -> + case + idx + [ (forced args) + , (forced args) + , (case + args + [ (\hd + tl -> + (\`$mInts` -> + case + (constr 0 + [ hd + , (\x + y + z + w -> + case + (constr 0 + [ (forced tl) + , (\x + y + z + w -> + constrData + 0 + (forced + (iData + (addInteger x x)) + (forced + (iData + (addInteger + y + y)) + (forced + (iData + (addInteger + z + z)) + (forced + (iData + (addInteger + w + w)) + []))))) + , (\void -> + (\cse -> case cse [cse]) + error) ]) + [`$mInts`]) + , (\void -> + (\cse -> case cse [cse]) error) ]) + [`$mInts`]) + (\scrut cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData + (forced (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case + (unConstrData scrut) + [(\l r -> r)]))) ]) ]) ]) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.eval index a8b12c678b5..afb98b49202 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_582 -Memory: 1_696 -AST Size: 15 -Flat Size: 32 +CPU: 416_582 +Memory: 1_996 +AST Size: 18 +Flat Size: 34 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.uplc index 2c9e6d4b3a4..2826a5c4343 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.golden.uplc @@ -1,3 +1,4 @@ (program 1.1.0 - (\d -> unIData (force headList (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced d -> unIData (forced (case (unConstrData d) [(\l r -> r)]))) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.eval index a8b12c678b5..afb98b49202 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.eval @@ -1,6 +1,6 @@ -CPU: 368_582 -Memory: 1_696 -AST Size: 15 -Flat Size: 32 +CPU: 416_582 +Memory: 1_996 +AST Size: 18 +Flat Size: 34 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.uplc index 2c9e6d4b3a4..2826a5c4343 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.golden.uplc @@ -1,3 +1,4 @@ (program 1.1.0 - (\d -> unIData (force headList (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced d -> unIData (forced (case (unConstrData d) [(\l r -> r)]))) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.eval index c31a81be8de..bfa859adc5a 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_745_121 -Memory: 12_108 -AST Size: 126 -Flat Size: 135 +CPU: 3_761_121 +Memory: 12_208 +AST Size: 127 +Flat Size: 138 (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.uplc index a9148fa393b..698fb512599 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.golden.uplc @@ -1,30 +1,32 @@ (program 1.1.0 - (\d -> - (\l -> - (\l -> - (\l -> - (\x -> - (\y -> - (\z -> - (\w -> - addInteger - (addInteger - (addInteger (addInteger (addInteger x y) z) w) - (case - (lessThanInteger - (addInteger y z) - (addInteger x w)) - [(addInteger y w), (addInteger x z)])) - (case - (lessThanInteger - (addInteger z y) - (addInteger w x)) - [(addInteger w y), (addInteger z x)])) - (unIData (force headList (force tailList l)))) - (unIData (force headList l))) - (unIData (force headList l))) - (unIData (force headList l))) - (force tailList l)) - (force tailList l)) - (case (unConstrData d) [(\l r -> r)]))) \ No newline at end of file + ((\forced forced d -> + (\l -> + (\l -> + (\l -> + (\x -> + (\y -> + (\z -> + (\w -> + addInteger + (addInteger + (addInteger (addInteger (addInteger x y) z) w) + (case + (lessThanInteger + (addInteger y z) + (addInteger x w)) + [(addInteger y w), (addInteger x z)])) + (case + (lessThanInteger + (addInteger z y) + (addInteger w x)) + [(addInteger w y), (addInteger z x)])) + (unIData (forced (forced l)))) + (unIData (forced l))) + (unIData (forced l))) + (unIData (forced l))) + (forced l)) + (forced l)) + (case (unConstrData d) [(\l r -> r)])) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.eval b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.eval index 175dd8fd4b2..659bd9b9a8a 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.eval +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.eval @@ -1,6 +1,6 @@ -CPU: 8_984_580 -Memory: 33_160 -AST Size: 173 -Flat Size: 169 +CPU: 8_664_580 +Memory: 31_160 +AST Size: 174 +Flat Size: 172 (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.uplc b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.uplc index e1ae9e5299d..bfe11df1c32 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.uplc +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.golden.uplc @@ -1,39 +1,43 @@ (program 1.1.0 - (\d -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - (\cse -> - addInteger - (addInteger - (addInteger (addInteger (addInteger cse cse) cse) cse) - (case - (lessThanInteger - (addInteger cse cse) - (addInteger cse cse)) - [(addInteger cse cse), (addInteger cse cse)])) - (case - (lessThanInteger - (addInteger cse cse) - (addInteger cse cse)) - [(addInteger cse cse), (addInteger cse cse)])) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (cse (\ds ds ds ds -> ds) (\void -> error))) - (\cont fail -> - (\l -> - (\l -> - (\l -> - case - (constr 0 - [ (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList l)) - , (unIData (force headList (force tailList l))) ]) - [cont]) - (force tailList l)) - (force tailList l)) - (case (unConstrData d) [(\l r -> r)])))) \ No newline at end of file + ((\forced forced d -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + (\cse -> + addInteger + (addInteger + (addInteger + (addInteger (addInteger cse cse) cse) + cse) + (case + (lessThanInteger + (addInteger cse cse) + (addInteger cse cse)) + [(addInteger cse cse), (addInteger cse cse)])) + (case + (lessThanInteger + (addInteger cse cse) + (addInteger cse cse)) + [(addInteger cse cse), (addInteger cse cse)])) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (cse (\ds ds ds ds -> ds) (\void -> error))) + (\cont fail -> + (\l -> + (\l -> + (\l -> + case + (constr 0 + [ (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced l)) + , (unIData (forced (forced l))) ]) + [cont]) + (forced l)) + (forced l)) + (case (unConstrData d) [(\l r -> r)]))) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/ratio.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/ratio.golden.astsize index acfba60953b..70e1a64c23f 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/ratio.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/ratio.golden.astsize @@ -1 +1 @@ -141 \ No newline at end of file +144 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/unsafeRatio.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/unsafeRatio.golden.astsize index a46c9d2265d..bd753ccc4b9 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/unsafeRatio.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Construction/unsafeRatio.golden.astsize @@ -1 +1 @@ -91 \ No newline at end of file +94 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Other/recip.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Other/recip.golden.astsize index 86ee83a4a26..ac4213d6e97 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Other/recip.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Other/recip.golden.astsize @@ -1 +1 @@ -40 \ No newline at end of file +43 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/fromBuiltinData.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/fromBuiltinData.golden.astsize index 37c3b662e16..7df2addf7bc 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/fromBuiltinData.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/fromBuiltinData.golden.astsize @@ -1 +1 @@ -227 \ No newline at end of file +232 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/toBuiltinData.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/toBuiltinData.golden.astsize index cabf43b5ddf..978b4e8e518 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/toBuiltinData.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/toBuiltinData.golden.astsize @@ -1 +1 @@ -24 \ No newline at end of file +26 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/unsafeFromBuiltinData.golden.astsize b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/unsafeFromBuiltinData.golden.astsize index 6d3e9dc78d4..d55f9f7457c 100644 --- a/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/unsafeFromBuiltinData.golden.astsize +++ b/plutus-tx-plugin/test/AstSize/Golden/Rational/Serialization/unsafeFromBuiltinData.golden.astsize @@ -1 +1 @@ -129 \ No newline at end of file +136 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.eval index d63a97763a5..1f6b4aa427d 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 683_937 +CPU: 685_390 Memory: 4_101 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.pir index e621a30d6e7..d4b22a59ce8 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.uplc index d35830b0bf0..1dbe202c69a 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/allCheap.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 1 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 1) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.pir index 8aac40efc07..6956dca1940 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.uplc index b4730d0f0c2..441647966e1 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/allEmptyList.golden.uplc @@ -4,5 +4,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 1 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 1) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.eval index d888fd7590a..f6cf8dd951c 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.pir index 2a2ed92d545..79de2a75b28 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 11 x) [True, False]) + (lessThanInteger x 11) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.uplc index befa69ac9a5..3ad18cfff1c 100644 --- a/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/allExpensive.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 11 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 11) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/andWithoutGHCOpts.golden.pir b/plutus-tx-plugin/test/Budget/9.12/andWithoutGHCOpts.golden.pir index 960ccf045bb..12d44e15651 100644 --- a/plutus-tx-plugin/test/Budget/9.12/andWithoutGHCOpts.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/andWithoutGHCOpts.golden.pir @@ -14,8 +14,6 @@ (a -> a -> a) -> (a -> a -> a) -> Ord a - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] !`$fOrdInteger` : Ord integer = CConsOrd {integer} @@ -34,10 +32,8 @@ {all dead. dead}) (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanEqualsInteger x y) False True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + (\(x : integer) (y : integer) -> lessThanInteger y x) + (\(x : integer) (y : integer) -> lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) diff --git a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.eval index fd9a8f13ff8..05490e3de46 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 683_937 +CPU: 685_390 Memory: 4_101 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.pir index 757b0939f18..fcf7a9aeb86 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.uplc index f44ecbf8acc..55b693b479e 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/anyCheap.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 10 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 10) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.pir index 8fa096faeb8..983e0ff414f 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.uplc index 00b13abb459..f98fe02c873 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/anyEmptyList.golden.uplc @@ -4,5 +4,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 1 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 1) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.eval index d1c86281f3a..b206b869637 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.pir index 01436b4239d..8f8fcae64ad 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.uplc index f8d8fc4bc28..37f74e68a78 100644 --- a/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/anyExpensive.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 1 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 1) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.eval index 089ead9d2bc..b4a4b64f961 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 699_937 +CPU: 701_390 Memory: 4_201 AST Size: 47 Flat Size: 75 diff --git a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.pir index 24138328755..01f294af33b 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.uplc index c74cba568c6..a8572c44155 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findCheap.golden.uplc @@ -30,6 +30,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 10 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 10) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.pir index ebb833ba437..10d0a242338 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.uplc index 5e15b1ae1d3..0e4233381b3 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findEmptyList.golden.uplc @@ -6,6 +6,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 1 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 1) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.eval index 8f5c457dc0b..89a8b9510a1 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 47 Flat Size: 75 diff --git a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.pir index cc12c6000ba..b3f6c7977cb 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.uplc index 1e5ce4b8def..2e79b143945 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findExpensive.golden.uplc @@ -30,6 +30,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 1 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 1) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.eval index d00db747f58..00bc02a9fbf 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 731_937 +CPU: 733_390 Memory: 4_401 AST Size: 57 Flat Size: 90 diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.pir index fd1a552fef2..95bec4b4fb8 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.uplc index 1664c67222e..c03735688ac 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexCheap.golden.uplc @@ -34,7 +34,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 10 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 10) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.pir index f90f2262776..daec5cd7f5e 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.uplc index 9ffc8819b2b..2f5cd3eebf3 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexEmptyList.golden.uplc @@ -7,7 +7,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 1 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 1) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.eval index ce1e4d12b85..7e7f7b70661 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 5_994_550 +CPU: 6_009_080 Memory: 28_530 AST Size: 57 Flat Size: 90 diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.pir index 894c9aa7bc0..475017d2ad2 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.uplc index 24c45af94e8..b9f594af2ee 100644 --- a/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/findIndexExpensive.golden.uplc @@ -34,7 +34,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 1 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 1) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.eval b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.eval index 44c7ec85650..83de539ee65 100644 --- a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.eval @@ -1,4 +1,4 @@ -CPU: 782_810_937 +CPU: 781_357_937 Memory: 3_706_801 AST Size: 55 Flat Size: 65 diff --git a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.pir b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.pir index 1f2e4db8805..7be6a11d978 100644 --- a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanInteger x 0) [True, False]) + (lessThanEqualsInteger 0 x) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.uplc index 36055a421ec..981af217d3b 100644 --- a/plutus-tx-plugin/test/Budget/9.12/gte0.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/gte0.golden.uplc @@ -12,4 +12,5 @@ (\s ds -> case ds - [True, (\x xs -> case (lessThanInteger x 0) [(s s xs), False])]))) \ No newline at end of file + [ True + , (\x xs -> case (lessThanEqualsInteger 0 x) [False, (s s xs)]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.eval b/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.eval index 074998b8d95..da46769df12 100644 --- a/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_604_138 -Memory: 17_516 -AST Size: 71 -Flat Size: 134 +CPU: 3_668_138 +Memory: 17_916 +AST Size: 74 +Flat Size: 136 (con data (I 6)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.uplc index 92ec1bad0e6..ca206c8e1e1 100644 --- a/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/listIndexing.golden.uplc @@ -1,14 +1,16 @@ (program 1.1.0 - ((\go xs -> go 5 xs) - ((\s -> s s) - (\s ds ds -> - case - ds - [ ((\x -> error) (force trace "PT7" (constr 0 []))) - , (\x xs -> - case - (equalsInteger 0 ds) - [ ((\x -> case (constr 0 [s, x, xs]) [s]) - (subtractInteger ds 1)) - , x ]) ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go 5 xs) + ((\s -> s s) + (\s ds ds -> + case + ds + [ ((\x -> error) (forced "PT7" (constr 0 []))) + , (\x xs -> + case + (equalsInteger 0 ds) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) + (subtractInteger ds 1)) + , x ]) ]))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/map1.golden.eval b/plutus-tx-plugin/test/Budget/9.12/map1.golden.eval index 5ce0fd02492..b33eed0bec4 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map1.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/map1.golden.eval @@ -1,7 +1,7 @@ -CPU: 155_357_381 -Memory: 318_370 -AST Size: 312 -Flat Size: 338 +CPU: 154_285_364 +Memory: 311_570 +AST Size: 311 +Flat Size: 339 (constr 0 diff --git a/plutus-tx-plugin/test/Budget/9.12/map1.golden.pir b/plutus-tx-plugin/test/Budget/9.12/map1.golden.pir index d2fd8929693..16789b854fa 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map1.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/map1.golden.pir @@ -8,7 +8,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.12/map1.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/map1.golden.uplc index 67a9cf1dbdb..1b28ac28716 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map1.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/map1.golden.uplc @@ -1,94 +1,99 @@ (program 1.1.0 - ((\`$dmenumFromTo_$cenumFromTo` n -> - (\nt -> + ((\forced -> + (\`$dmenumFromTo_$cenumFromTo` n -> (\nt -> - (\lookup -> - constr 0 - [ (case (constr 0 [(\i -> iData i), unIData, n, nt]) [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 5 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 10 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 20 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 5 n), nt]) - [lookup]) ]) - (\`$dToData` `$dUnsafeFromData` ds ds -> - (\k -> - (\s -> + (\nt -> + (\lookup -> + constr 0 + [ (case + (constr 0 [(\i -> iData i), unIData, n, nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 5 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 10 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 20 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 5 n), nt]) + [lookup]) ]) + (\`$dToData` `$dUnsafeFromData` ds ds -> + (\k -> + (\s -> + case + (s s ds) + [ (\a -> constr 0 [(`$dUnsafeFromData` a)]) + , (constr 1 []) ]) + (\s xs -> + case + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 + [(case hd [(\l r -> r)])]) ]) + , (constr 1 []) ])) + (`$dToData` ds))) + ((\k -> + (\s -> s s nt) + (\s xs -> case - (s s ds) - [ (\a -> constr 0 [(`$dUnsafeFromData` a)]) - , (constr 1 []) ]) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData k (case hd [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> - constr 0 [(case hd [(\l r -> r)])]) ]) - , (constr 1 []) ])) - (`$dToData` ds))) - ((\k -> - (\s -> s s nt) - (\s xs -> + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [(\eta -> forced hd (s s eta)), (\x -> x)]) + , [] ])) + (iData (addInteger 5 n)))) + ((\z -> + (\s -> s s (`$dmenumFromTo_$cenumFromTo` 1 10)) + (\s ds -> case - xs - [ (\hd -> - case - (equalsData k (case hd [(\l r -> l)])) - [(\eta -> force mkCons hd (s s eta)), (\x -> x)]) - , [] ])) - (iData (addInteger 5 n)))) - ((\z -> - (\s -> s s (`$dmenumFromTo_$cenumFromTo` 1 10)) - (\s ds -> - case - ds - [ z - , (\y ys -> - (\ds -> - (\k -> - (\a -> - (\nilCase -> - (\s -> s s ds) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData - k - (case hd [(\l r -> l)])) - [ (\eta -> - force mkCons - hd - (s s eta)) - , (force mkCons - (mkPairData k a)) ]) - , nilCase ])) - (force mkCons (mkPairData k a) [])) - (iData y)) - (iData (addInteger n y))) - (s s ys)) ])) - (force mkCons (mkPairData (iData n) (I 0)) []))) - ((\s -> s s) - (\s x lim -> - case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 - [ x - , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ])))) \ No newline at end of file + ds + [ z + , (\y ys -> + (\ds -> + (\k -> + (\a -> + (\nilCase -> + (\s -> s s ds) + (\s xs -> + case + xs + [ (\hd -> + case + (equalsData + k + (case + hd + [(\l r -> l)])) + [ (\eta -> + forced hd (s s eta)) + , (forced + (mkPairData k a)) ]) + , nilCase ])) + (forced (mkPairData k a) [])) + (iData y)) + (iData (addInteger n y))) + (s s ys)) ])) + (forced (mkPairData (iData n) (I 0)) []))) + ((\s -> s s) + (\s x lim -> + case + (lessThanInteger lim x) + [ (constr 1 + [ x + , ((\x -> case (constr 0 [s, x, lim]) [s]) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/map2.golden.eval b/plutus-tx-plugin/test/Budget/9.12/map2.golden.eval index 7efa7cc75ef..4acf8057090 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map2.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/map2.golden.eval @@ -1,7 +1,7 @@ -CPU: 67_827_382 -Memory: 197_790 -AST Size: 423 -Flat Size: 458 +CPU: 67_555_382 +Memory: 196_090 +AST Size: 422 +Flat Size: 459 (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.12/map2.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/map2.golden.uplc index a3fe621186f..dc9adb9551e 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map2.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/map2.golden.uplc @@ -1,163 +1,175 @@ (program 1.1.0 - ((\go -> + ((\forced -> (\go -> - (\goList - n -> - (\unsafeFromSOPList -> - (\nt -> - (\go -> - (\nt -> - go - ((\rs' -> (\ls' -> go rs' ls') (go nt)) - ((\s -> s s nt) - (\s xs -> - case - xs - [ (\hd tl -> - (\tl' -> - (\k -> - (\s -> - case - (s s nt) - [ (force mkCons hd tl') - , tl' ]) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData - k - (case + (\go -> + (\goList + n -> + (\unsafeFromSOPList -> + (\nt -> + (\go -> + (\nt -> + go + ((\rs' -> + (\ls' -> go rs' ls') (go nt)) + ((\s -> + s s nt) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\tl' -> + (\k -> + (\s -> + case + (s s nt) + [(forced hd tl'), tl']) + (\s + xs -> + case + xs + [ (\hd -> + case + (equalsData + k + (case + hd + [ (\l + r -> + l) ])) + [ (\x -> + s s x) + , (\ds -> + True) ]) + , False ])) + (case hd [(\l r -> l)])) + (s s tl)) + , [] ])))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 1 n), 1]) + , (constr 1 + [ (constr 0 [(addInteger 2 n), 2]) + , (constr 1 + [ (constr 0 + [(addInteger 3 n), 3]) + , (constr 1 + [ (constr 0 + [(addInteger 4 n), 4]) + , (constr 1 + [ (constr 0 + [ (addInteger + 5 + n) + , 5 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + ((\s -> + s s) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\v' -> + (\k' -> + (\s -> + case + (s s nt) + [ (\r -> + forced + (mkPairData + k' + (iData + (addInteger + (unIData v') + (unIData r)))) + (s s tl)) + , (forced + (mkPairData k' v') + (s s tl)) ]) + (\s + xs -> + case + xs + [ (\hd -> + case + (equalsData + k' + (case + hd + [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 + [ (case hd - [ (\l r -> - l) ])) - [ (\x -> s s x) - , (\ds -> - True) ]) - , False ])) - (case hd [(\l r -> l)])) - (s s tl)) - , [] ])))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 1 n), 1]) - , (constr 1 - [ (constr 0 [(addInteger 2 n), 2]) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 3]) - , (constr 1 - [ (constr 0 - [(addInteger 4 n), 4]) - , (constr 1 - [ (constr 0 - [ (addInteger 5 n) - , 5 ]) - , (constr 0 - [ ]) ]) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v' -> - (\k' -> - (\s -> - case - (s s nt) - [ (\r -> - force mkCons - (mkPairData - k' - (iData - (addInteger - (unIData v') - (unIData r)))) - (s s tl)) - , (force mkCons - (mkPairData k' v') - (s s tl)) ]) - (\s - xs -> - case - xs - [ (\hd -> - case - (equalsData - k' - (case - hd - [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> - constr 0 - [ (case - hd - [ (\l - r -> - r) ]) ]) ]) - , (constr 1 []) ])) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 33]) - , (constr 1 - [ (constr 0 [(addInteger 4 n), 44]) - , (constr 1 - [ (constr 0 [(addInteger 6 n), 66]) - , (constr 1 - [ (constr 0 [(addInteger 7 n), 77]) - , (constr 0 []) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - (\`$dToData` `$dToData` -> - (\go eta -> goList (go eta)) - ((\s -> s s) - (\s ds -> - case - ds - [ (constr 0 []) - , (\x xs -> - constr 1 - [ (case - x - [ (\k a -> - constr 0 - [ (`$dToData` k) - , (`$dToData` a) ]) ]) - , (s s xs) ]) ])))) + [ (\l + r -> + r) ]) ]) ]) + , (constr 1 []) ])) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 3 n), 33]) + , (constr 1 + [ (constr 0 [(addInteger 4 n), 44]) + , (constr 1 + [ (constr 0 [(addInteger 6 n), 66]) + , (constr 1 + [ (constr 0 + [(addInteger 7 n), 77]) + , (constr 0 []) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + (\`$dToData` `$dToData` -> + (\go eta -> goList (go eta)) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + constr 1 + [ (case + x + [ (\k a -> + constr 0 + [ (`$dToData` k) + , (`$dToData` a) ]) ]) + , (s s xs) ]) ])))) + ((\s -> s s) + (\s ds -> + case + ds + [ [] + , (\d ds -> + forced + (case d [(\d d -> mkPairData d d)]) + (s s ds)) ]))) ((\s -> s s) - (\s ds -> - case - ds - [ [] - , (\d ds -> - force mkCons - (case d [(\d d -> mkPairData d d)]) - (s s ds)) ]))) + (\s acc xs -> + case xs [(\hd -> (\x -> s s x) (forced hd acc)), acc]))) ((\s -> s s) - (\s acc xs -> - case xs [(\hd -> (\x -> s s x) (force mkCons hd acc)), acc]))) - ((\s -> s s) - (\s xs -> - case - xs - [ (\hd tl -> - constr 1 - [ (constr 0 - [ (unIData (case hd [(\l r -> l)])) - , (unIData (case hd [(\l r -> r)])) ]) - , (s s tl) ]) - , (constr 0 []) ])))) \ No newline at end of file + (\s xs -> + case + xs + [ (\hd tl -> + constr 1 + [ (constr 0 + [ (unIData (case hd [(\l r -> l)])) + , (unIData (case hd [(\l r -> r)])) ]) + , (s s tl) ]) + , (constr 0 []) ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/map3.golden.eval b/plutus-tx-plugin/test/Budget/9.12/map3.golden.eval index 706b9483d42..06a899191e8 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map3.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/map3.golden.eval @@ -1,7 +1,7 @@ -CPU: 111_907_732 -Memory: 333_684 -AST Size: 664 -Flat Size: 705 +CPU: 111_043_732 +Memory: 328_284 +AST Size: 658 +Flat Size: 709 (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.12/map3.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/map3.golden.uplc index 56d7e41ebe4..755e224259d 100644 --- a/plutus-tx-plugin/test/Budget/9.12/map3.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/map3.golden.uplc @@ -1,311 +1,326 @@ (program 1.1.0 - ((\safeAppend -> - (\lookup' -> - (\`$fToDataThese_$ctoBuiltinData` -> - (\`$dToData` -> - (\`$dToData` -> - (\goList - n -> - (\unsafeFromSOPList -> - (\nt -> - (\goLeft -> - (\nt -> - (\goRight -> - (\nt -> - (\s -> - s - s - ((\s -> - s s nt) - (\s - xs -> - case - xs - [ (\hd - tl -> - constr 1 - [ (constr 0 - [ (unIData - (case - hd - [ (\l - r -> - l) ])) - , (case - (unConstrData - (case - hd - [ (\l - r -> - r) ])) - [ (\index - args -> - case - index - [ (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ]) - , (\ds -> - constr 0 - [ (unIData - (force - headList - ds)) ]) - , (\ds -> - constr 1 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ]) ] - args) ]) ]) - , (s s tl) ]) - , (constr 0 []) ]))) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (case - a - [ (\b -> - b) - , (\a - b -> - addInteger + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced -> + (\safeAppend -> + (\lookup' -> + (\`$fToDataThese_$ctoBuiltinData` -> + (\`$dToData` -> + (\`$dToData` -> + (\goList + n -> + (\unsafeFromSOPList -> + (\nt -> + (\goLeft -> + (\nt -> + (\goRight -> + (\nt -> + (\s -> + s + s + ((\s -> + s s nt) + (\s + xs -> + case + xs + [ (\hd + tl -> + constr 1 + [ (constr 0 + [ (unIData + (case + hd + [ (\l + r -> + l) ])) + , (case + (unConstrData + (case + hd + [ (\l + r -> + r) ])) + [ (\index + args -> + case + index + [ (\ds -> + constr 2 + [ (unIData + (forced + ds)) ]) + , (\ds -> + constr 0 + [ (unIData + (forced + ds)) ]) + , (\ds -> + constr 1 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ]) ] + args) ]) ]) + , (s s tl) ]) + , (constr 0 []) ]))) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> + constr 1 + [ (case + x + [ (\c + a -> + constr 0 + [ c + , (case a - b) - , (\a -> - a) ]) ]) ]) - , (s s xs) ]) ])) - (safeAppend (goLeft nt) (goRight nt))) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v -> - (\k -> - case - (lookup' k nt) - [ (\r -> - force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 1 - [ (unIData - v) - , (unIData - r) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) - , (force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 0 - [ (unIData - v) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) ]) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 1 n), 1]) - , (constr 1 - [ (constr 0 - [(addInteger 2 n), 2]) - , (constr 1 - [ (constr 0 - [ (addInteger 3 n) - , 3 ]) - , (constr 1 - [ (constr 0 - [ (addInteger - 4 - n) - , 4 ]) - , (constr 1 - [ (constr 0 - [ (addInteger - 5 - n) - , 5 ]) - , (constr 0 - [ ]) ]) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v -> - (\k -> + [ (\b -> + b) + , (\a + b -> + addInteger + a + b) + , (\a -> + a) ]) ]) ]) + , (s s xs) ]) ])) + (safeAppend + (goLeft nt) + (goRight nt))) + ((\s -> + s s) + (\s + xs -> case - (lookup' k nt) - [ (\r -> - force - mkCons - (mkPairData - k + xs + [ (\hd + tl -> + (\v -> + (\k -> + case + (lookup' k nt) + [ (\r -> + forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 1 + [ (unIData + v) + , (unIData + r) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) + , (forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 0 + [ (unIData + v) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s + s + tl)) ]) (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 1 - [ (unIData - v) - , (unIData - r) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) - , (force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 2 - [ (unIData - v) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) ]) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 30]) - , (constr 1 - [ (constr 0 [(addInteger 4 n), 40]) - , (constr 1 - [ (constr 0 - [(addInteger 6 n), 60]) - , (constr 1 - [ (constr 0 - [ (addInteger 7 n) - , 70 ]) - , (constr 0 - []) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - (\`$dToData` `$dToData` -> - (\go eta -> goList (go eta)) - ((\s -> s s) - (\s ds -> - case - ds - [ (constr 0 []) - , (\x xs -> - constr 1 - [ (case - x - [ (\k a -> - constr 0 - [ (`$dToData` k) - , (`$dToData` a) ]) ]) - , (s s xs) ]) ])))) + hd + [(\l r -> l)])) + (case + hd + [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 + [(addInteger 1 n), 1]) + , (constr 1 + [ (constr 0 + [ (addInteger 2 n) + , 2 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 3 + n) + , 3 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 4 + n) + , 4 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 5 + n) + , 5 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + ((\s -> + s s) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\v -> + (\k -> + case + (lookup' k nt) + [ (\r -> + forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 1 + [ (unIData + v) + , (unIData + r) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) + , (forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 2 + [ (unIData + v) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) ]) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 3 n), 30]) + , (constr 1 + [ (constr 0 + [(addInteger 4 n), 40]) + , (constr 1 + [ (constr 0 + [ (addInteger 6 n) + , 60 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 7 + n) + , 70 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + (\`$dToData` `$dToData` -> + (\go eta -> goList (go eta)) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + constr 1 + [ (case + x + [ (\k a -> + constr 0 + [ (`$dToData` k) + , (`$dToData` + a) ]) ]) + , (s s xs) ]) ])))) + ((\s -> s s) + (\s ds -> + case + ds + [ [] + , (\d ds -> + forced + (case d [(\d d -> mkPairData d d)]) + (s s ds)) ]))) + (\i -> iData i)) + (\i -> iData i)) + (\`$dToData` `$dToData` ds -> + case + ds + [ (\arg -> constrData 1 (forced (`$dToData` arg) [])) + , (\arg arg -> + constrData + 2 + (forced + (`$dToData` arg) + (forced (`$dToData` arg) []))) + , (\arg -> + constrData 0 (forced (`$dToData` arg) [])) ])) + (\k -> + (\go m -> go m) ((\s -> s s) - (\s ds -> - case - ds - [ [] - , (\d ds -> - force mkCons - (case d [(\d d -> mkPairData d d)]) - (s s ds)) ]))) - (\i -> iData i)) - (\i -> iData i)) - (\`$dToData` `$dToData` ds -> - case - ds - [ (\arg -> constrData 1 (force mkCons (`$dToData` arg) [])) - , (\arg arg -> - constrData - 2 - (force mkCons - (`$dToData` arg) - (force mkCons (`$dToData` arg) []))) - , (\arg -> constrData 0 (force mkCons (`$dToData` arg) [])) ])) - (\k -> - (\go m -> go m) - ((\s -> s s) - (\s xs -> - case - xs - [ (\hd -> + (\s xs -> case - (equalsData k (case hd [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> constr 0 [(case hd [(\l r -> r)])]) ]) - , (constr 1 []) ])))) - ((\s -> s s) - (\s xs xs -> - case - xs - [ (\hd tl -> - (\v -> - (\k -> - (\eta -> - (\nilCase -> - (\s -> s s eta) - (\s xs -> - case - xs - [ (\hd -> + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 [(case hd [(\l r -> r)])]) ]) + , (constr 1 []) ])))) + ((\s -> s s) + (\s xs xs -> + case + xs + [ (\hd tl -> + (\v -> + (\k -> + (\eta -> + (\nilCase -> + (\s -> s s eta) + (\s xs -> case - (equalsData - k - (case hd [(\l r -> l)])) - [ (\eta -> - force mkCons hd (s s eta)) - , (force mkCons - (mkPairData k v)) ]) - , nilCase ])) - (force mkCons (mkPairData k v) [])) - (case (constr 0 [s, tl, xs]) [s])) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , xs ])))) \ No newline at end of file + xs + [ (\hd -> + case + (equalsData + k + (case hd [(\l r -> l)])) + [ (\eta -> + forced hd (s s eta)) + , (forced + (mkPairData k v)) ]) + , nilCase ])) + (forced (mkPairData k v) [])) + (case (constr 0 [s, tl, xs]) [s])) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , xs ]))) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.eval b/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.eval index c45f92cee70..0364d0326a6 100644 --- a/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.eval @@ -1,6 +1,6 @@ -CPU: 676_915 -Memory: 3_297 -AST Size: 55 -Flat Size: 65 +CPU: 724_915 +Memory: 3_597 +AST Size: 58 +Flat Size: 68 (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.uplc index 2cd29aa11c2..8fd77998161 100644 --- a/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/matchAsDataE.golden.uplc @@ -1,6 +1,6 @@ (program 1.1.0 - ((\ds -> + ((\forced ds -> (\cse -> (\ds -> case @@ -10,7 +10,8 @@ (equalsInteger 1 (case cse [(\l r -> l)])) [((\cse -> case cse [cse]) error), 1]) (case cse [(\l r -> r)])) - , (unIData (force headList ds)) ]) + , (unIData (forced ds)) ]) (case cse [(\l r -> r)])) (unConstrData ds)) + (force headList) (Constr 0 [I 1]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.eval b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.eval index 9dc2a6458c8..5d06ef81ca7 100644 --- a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.eval @@ -1,6 +1,6 @@ -CPU: 991_082_937 -Memory: 5_008_501 -AST Size: 87 -Flat Size: 91 +CPU: 957_629_937 +Memory: 4_808_501 +AST Size: 84 +Flat Size: 87 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.pir b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.pir index cbdb1646e11..189ba06eb4e 100644 --- a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.pir @@ -32,7 +32,4 @@ in let !ls : List integer = go 1000 in -recursiveAll - {integer} - (\(v : integer) -> case bool (lessThanInteger v 0) [True, False]) - ls \ No newline at end of file +recursiveAll {integer} (\(v : integer) -> lessThanEqualsInteger 0 v) ls \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.uplc index 0a43a11b30e..e0488d4a6bf 100644 --- a/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/recursiveGte0.golden.uplc @@ -2,10 +2,7 @@ 1.1.0 ((\go -> (\recursiveAll -> - (\ls -> - force recursiveAll - (\v -> case (lessThanInteger v 0) [True, False]) - ls) + (\ls -> force recursiveAll (\v -> lessThanEqualsInteger 0 v) ls) (go 1000)) ((\s -> s s (delay (\x -> x))) (\s arg -> diff --git a/plutus-tx-plugin/test/Budget/9.12/show.golden.eval b/plutus-tx-plugin/test/Budget/9.12/show.golden.eval index a3618b582f1..780dab5c4e1 100644 --- a/plutus-tx-plugin/test/Budget/9.12/show.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/show.golden.eval @@ -1,6 +1,6 @@ -CPU: 985_752_867 -Memory: 4_516_711 -AST Size: 678 -Flat Size: 940 +CPU: 985_749_927 +Memory: 4_516_511 +AST Size: 676 +Flat Size: 941 (con integer -2469135780) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/show.golden.pir b/plutus-tx-plugin/test/Budget/9.12/show.golden.pir index 1648fbd86ef..cdc7f8b4105 100644 --- a/plutus-tx-plugin/test/Budget/9.12/show.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/show.golden.pir @@ -216,16 +216,12 @@ letrec (acc eta)) {all dead. dead} in -let - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] -in letrec !`$dmenumFromTo_$cenumFromTo` : integer -> integer -> List integer = \(x : integer) (lim : integer) -> case (all dead. List integer) - (ifThenElse {bool} (lessThanEqualsInteger x lim) False True) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} @@ -364,13 +360,7 @@ let (go (`$dmenumFromTo_$cenumFromTo` 0 17) (Nil {string}))) b !d : integer - = trace - {integer} - (case - string - (ifThenElse {bool} (lessThanEqualsInteger c 0) False True) - ["False", "True"]) - c + = trace {integer} (case string (lessThanInteger 0 c) ["False", "True"]) c !e : integer = trace {integer} diff --git a/plutus-tx-plugin/test/Budget/9.12/show.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/show.golden.uplc index f98d191bb51..26711f98be0 100644 --- a/plutus-tx-plugin/test/Budget/9.12/show.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/show.golden.uplc @@ -1,337 +1,343 @@ (program 1.1.0 - ((\go -> + ((\forced -> (\go -> - (\`$fShowBuiltinByteString_$cshowsPrec` -> - (\toHex -> - (\go -> - (\`$dmenumFromTo_$cenumFromTo` -> - (\go -> + (\go -> + (\`$fShowBuiltinByteString_$cshowsPrec` -> + (\toHex -> + (\go -> + (\`$dmenumFromTo_$cenumFromTo` -> (\go -> - (\concatBuiltinStrings -> - (\`$fShowInteger_$cshow` -> - (\`$fShowInteger` -> - (\a -> - (\b -> - (\c -> - (\d -> - (\e -> - multiplyInteger - 2 - (force - trace + (\go -> + (\concatBuiltinStrings -> + (\`$fShowInteger_$cshow` -> + (\`$fShowInteger` -> + (\a -> + (\b -> + (\c -> + (\d -> + (\e -> + multiplyInteger + 2 + (forced + (concatBuiltinStrings + (constr 1 + [ "(" + , (case + (constr 0 + [ 0 + , a + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , b + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , c + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , d + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , e + , (constr 1 + [ ")" + , (constr 0 + [ ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ])) + e)) + (forced (concatBuiltinStrings - (constr 1 - [ "(" - , (case - (constr 0 - [ 0 - , a - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , b - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , c - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , d - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , e - , (constr 1 - [ ")" - , (constr 0 - [ ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ])) - e)) - (force - trace - (concatBuiltinStrings - ((\showElem -> - (\go -> - constr 1 - [ "[" - , (showElem - a - (go - (constr 1 - [ b - , (constr 1 - [ c - , (constr 1 - [ d - , (constr 0 - [ ]) ]) ]) ]) - (constr 1 - [ "]" - , (constr 0 - [ ]) ]))) ]) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (\x -> - x) - , (\x - xs -> - (\acc - eta -> - constr 1 - [ "," - , (showElem - x - (acc - eta)) ]) - (s - s - xs)) ]))) - (case - `$fShowInteger` - [(\v v -> v)] - 0))) - d)) - (force trace - (case - (lessThanEqualsInteger - c - 0) - ["True", "False"]) - c)) - (force - trace - (concatBuiltinStrings - (go - (`$dmenumFromTo_$cenumFromTo` - 0 - 17) - (constr 0 []))) - b)) - (force trace "This is an example" a)) - (force trace - (`$fShowInteger_$cshow` -1234567890) - -1234567890)) - (constr 0 - [ `$fShowBuiltinByteString_$cshowsPrec` - , `$fShowInteger_$cshow` ])) - (\x -> - concatBuiltinStrings - (case - (constr 0 [0, x, (constr 0 [])]) - [ `$fShowBuiltinByteString_$cshowsPrec` ]))) + ((\showElem -> + (\go -> + constr 1 + [ "[" + , (showElem + a + (go + (constr 1 + [ b + , (constr 1 + [ c + , (constr 1 + [ d + , (constr 0 + [ ]) ]) ]) ]) + (constr 1 + [ "]" + , (constr 0 + [ ]) ]))) ]) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (\x -> + x) + , (\x + xs -> + (\acc + eta -> + constr 1 + [ "," + , (showElem + x + (acc + eta)) ]) + (s + s + xs)) ]))) + (case + `$fShowInteger` + [(\v v -> v)] + 0))) + d)) + (forced + (case + (lessThanInteger 0 c) + ["False", "True"]) + c)) + (forced + (concatBuiltinStrings + (go + (`$dmenumFromTo_$cenumFromTo` + 0 + 17) + (constr 0 []))) + b)) + (forced "This is an example" a)) + (forced + (`$fShowInteger_$cshow` + -1234567890) + -1234567890)) + (constr 0 + [ `$fShowBuiltinByteString_$cshowsPrec` + , `$fShowInteger_$cshow` ])) + (\x -> + concatBuiltinStrings + (case + (constr 0 [0, x, (constr 0 [])]) + [ `$fShowBuiltinByteString_$cshowsPrec` ]))) + ((\s -> + s s) + (\s + ds -> + case + ds + [ "" + , (\x + ds -> + case + ds + [ x + , (\ipv + ipv -> + (\n -> + case + (case + (lessThanEqualsInteger + n + 0) + [ (go n ds) + , (constr 0 + [ (constr 0 + []) + , ds ]) ]) + [ (\ipv ipv -> + (\cse -> + appendString + (cse ipv) + (cse ipv)) + (s s)) ]) + (divideInteger + (go ds) + 2)) ]) ]))) ((\s -> s s) (\s ds -> case ds - [ "" - , (\x ds -> - case - ds - [ x - , (\ipv ipv -> - (\n -> - case - (case - (lessThanEqualsInteger - n - 0) - [ (go n ds) - , (constr 0 - [ (constr 0 []) - , ds ]) ]) - [ (\ipv ipv -> - (\cse -> - appendString - (cse ipv) - (cse ipv)) - (s s)) ]) - (divideInteger - (go ds) - 2)) ]) ]))) + [0, (\ds xs -> addInteger 1 (s s xs))]))) ((\s -> s s) - (\s ds -> + (\s ds ds -> case ds - [0, (\ds xs -> addInteger 1 (s s xs))]))) + [ (constr 0 [(constr 0 []), (constr 0 [])]) + , (\y ys -> + case + (equalsInteger 1 ds) + [ ((\x -> + case + (case + (constr 0 [s, x, ys]) + [s]) + [ (\zs ws -> + constr 0 + [ (constr 1 [y, zs]) + , ws ]) ]) + (subtractInteger ds 1)) + , (constr 0 + [ (constr 1 [y, (constr 0 [])]) + , ys ]) ]) ]))) ((\s -> s s) - (\s ds ds -> + (\s x lim -> case - ds - [ (constr 0 [(constr 0 []), (constr 0 [])]) - , (\y ys -> - case - (equalsInteger 1 ds) - [ ((\x -> - case - (case (constr 0 [s, x, ys]) [s]) - [ (\zs ws -> - constr 0 - [ (constr 1 [y, zs]) - , ws ]) ]) - (subtractInteger ds 1)) - , (constr 0 - [ (constr 1 [y, (constr 0 [])]) - , ys ]) ]) ]))) + (lessThanInteger lim x) + [ (constr 1 + [ x + , ((\x -> case (constr 0 [s, x, lim]) [s]) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) ((\s -> s s) - (\s x lim -> + (\s ds -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 - [ x - , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) - ((\s -> s s) - (\s ds -> - case - ds - [ (\x -> x) - , (\x xs -> - (\acc eta -> - (\x -> - (\eta -> - toHex - (divideInteger x 16) - (toHex (modInteger x 16) eta)) - (acc eta)) - (indexByteString - #5468697320697320616e206578616d706c65 - x)) - (s s xs)) ]))) - (\x -> + ds + [ (\x -> x) + , (\x xs -> + (\acc eta -> + (\x -> + (\eta -> + toHex + (divideInteger x 16) + (toHex (modInteger x 16) eta)) + (acc eta)) + (indexByteString + #5468697320697320616e206578616d706c65 + x)) + (s s xs)) ]))) + (\x -> + case + (lessThanEqualsInteger x 9) + [ (case + (equalsInteger 10 x) + [ (case + (equalsInteger 11 x) + [ (case + (equalsInteger 12 x) + [ (case + (equalsInteger 13 x) + [ (case + (equalsInteger 14 x) + [ (case + (equalsInteger 15 x) + [ (\ds -> + constr 1 + [ "" + , ds ]) + , (\ds -> + constr 1 ["f", ds]) ]) + , (\ds -> constr 1 ["e", ds]) ]) + , (\ds -> constr 1 ["d", ds]) ]) + , (\ds -> constr 1 ["c", ds]) ]) + , (\ds -> constr 1 ["b", ds]) ]) + , (\ds -> constr 1 ["a", ds]) ]) + , (`$fShowBuiltinByteString_$cshowsPrec` 0 x) ])) + ((\s -> s s) + (\s p n -> + case + (lessThanInteger n 0) + [ (go (go (constr 0 []) n)) + , (\eta -> + constr 1 + [ "-" + , (case + (constr 0 [s, p, (subtractInteger 0 n), eta]) + [s]) ]) ]))) + ((\s -> + s s) + (\s + ds -> case - (lessThanEqualsInteger x 9) - [ (case - (equalsInteger 10 x) - [ (case - (equalsInteger 11 x) + ds + [ (\x -> x) + , (\x + xs -> + (\acc + eta -> + constr 1 [ (case - (equalsInteger 12 x) + (equalsInteger 0 x) [ (case - (equalsInteger 13 x) + (equalsInteger 1 x) [ (case - (equalsInteger 14 x) + (equalsInteger 2 x) [ (case - (equalsInteger 15 x) - [ (\ds -> - constr 1 - ["", ds]) - , (\ds -> - constr 1 ["f", ds]) ]) - , (\ds -> constr 1 ["e", ds]) ]) - , (\ds -> constr 1 ["d", ds]) ]) - , (\ds -> constr 1 ["c", ds]) ]) - , (\ds -> constr 1 ["b", ds]) ]) - , (\ds -> constr 1 ["a", ds]) ]) - , (`$fShowBuiltinByteString_$cshowsPrec` 0 x) ])) - ((\s -> s s) - (\s p n -> + (equalsInteger 3 x) + [ (case + (equalsInteger 4 x) + [ (case + (equalsInteger 5 x) + [ (case + (equalsInteger + 6 + x) + [ (case + (equalsInteger + 7 + x) + [ (case + (equalsInteger + 8 + x) + [ (case + (equalsInteger + 9 + x) + [ "" + , "9" ]) + , "8" ]) + , "7" ]) + , "6" ]) + , "5" ]) + , "4" ]) + , "3" ]) + , "2" ]) + , "1" ]) + , "0" ]) + , (acc eta) ]) + (s s xs)) ]))) + ((\s -> s s) + (\s acc n -> + (\x -> case - (lessThanInteger n 0) - [ (go (go (constr 0 []) n)) - , (\eta -> - constr 1 - [ "-" - , (case - (constr 0 [s, p, (subtractInteger 0 n), eta]) - [s]) ]) ]))) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (\x -> x) - , (\x - xs -> - (\acc - eta -> - constr 1 - [ (case - (equalsInteger 0 x) - [ (case - (equalsInteger 1 x) - [ (case - (equalsInteger 2 x) - [ (case - (equalsInteger 3 x) - [ (case - (equalsInteger 4 x) - [ (case - (equalsInteger 5 x) - [ (case - (equalsInteger - 6 - x) - [ (case - (equalsInteger - 7 - x) - [ (case - (equalsInteger - 8 - x) - [ (case - (equalsInteger - 9 - x) - [ "" - , "9" ]) - , "8" ]) - , "7" ]) - , "6" ]) - , "5" ]) - , "4" ]) - , "3" ]) - , "2" ]) - , "1" ]) - , "0" ]) - , (acc eta) ]) - (s s xs)) ]))) - ((\s -> s s) - (\s acc n -> - (\x -> - case - (equalsInteger 0 x) - [ ((\x -> case (constr 0 [s, x, x]) [s]) - (constr 1 [(remainderInteger n 10), acc])) - , (constr 1 [(remainderInteger n 10), acc]) ]) - (quotientInteger n 10))))) \ No newline at end of file + (equalsInteger 0 x) + [ ((\x -> case (constr 0 [s, x, x]) [s]) + (constr 1 [(remainderInteger n 10), acc])) + , (constr 1 [(remainderInteger n 10), acc]) ]) + (quotientInteger n 10)))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.eval b/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.eval index 8212424a314..4c55cf79f7b 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.eval @@ -1,6 +1,6 @@ CPU: 1_892_446 Memory: 6_388 AST Size: 59 -Flat Size: 72 +Flat Size: 75 (con integer 100) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.uplc index f8365fdef90..a7f2f83d59b 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/sumAtIndices.golden.uplc @@ -1,13 +1,15 @@ (program 1.1.0 - (\d -> - (\nt -> - (\s -> - (\nt -> - (\s -> - (\s -> addInteger (addInteger s s) s) - (unIData (force headList (force tailList nt)))) - (unIData (force headList nt))) - (force tailList (force tailList (force tailList nt)))) - (unIData (force headList nt))) - (force tailList (unListData d)))) \ No newline at end of file + ((\forced forced d -> + (\nt -> + (\s -> + (\nt -> + (\s -> + (\s -> addInteger (addInteger s s) s) + (unIData (forced (forced nt)))) + (unIData (forced nt))) + (forced (forced (forced nt)))) + (unIData (forced nt))) + (forced (unListData d))) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.eval b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.eval index cc01c5d3273..d153ae93915 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.eval @@ -1,4 +1,4 @@ -CPU: 918_904_937 +CPU: 920_359_390 Memory: 4_208_901 AST Size: 68 Flat Size: 81 diff --git a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.pir b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.pir index f85dfbd7a81..93788a6dc96 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.pir @@ -20,7 +20,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.uplc index 0e295992109..c0daf706f81 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumL.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/sumL.golden.uplc @@ -5,12 +5,12 @@ ((\s -> case (constr 0 [s, 1, 1000]) [s]) (\s x lim -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 + (lessThanInteger lim x) + [ (constr 1 [ x , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) ((\s -> s s) (\s acc ds -> case diff --git a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.eval b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.eval index ef0507a24a0..6d1533352dd 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.eval @@ -1,4 +1,4 @@ -CPU: 838_760_937 +CPU: 840_215_390 Memory: 3_708_001 AST Size: 55 Flat Size: 67 diff --git a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.pir b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.pir index 39cd7c70e9a..923c1fb7ef0 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.pir @@ -19,7 +19,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.uplc b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.uplc index c18d2b5cc74..24ab15da654 100644 --- a/plutus-tx-plugin/test/Budget/9.12/sumR.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.12/sumR.golden.uplc @@ -6,10 +6,10 @@ ((\s -> case (constr 0 [s, 1, 1000]) [s]) (\s x lim -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 + (lessThanInteger lim x) + [ (constr 1 [ x , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) (\s ds -> case ds [0, (\x xs -> addInteger x (s s xs))]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.eval index d63a97763a5..1f6b4aa427d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 683_937 +CPU: 685_390 Memory: 4_101 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.pir index e621a30d6e7..d4b22a59ce8 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.uplc index d35830b0bf0..1dbe202c69a 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 1 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 1) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.pir index 8aac40efc07..6956dca1940 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.uplc index b4730d0f0c2..441647966e1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.golden.uplc @@ -4,5 +4,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 1 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 1) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.eval index d888fd7590a..f6cf8dd951c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.pir index 2a2ed92d545..79de2a75b28 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 11 x) [True, False]) + (lessThanInteger x 11) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.uplc index befa69ac9a5..3ad18cfff1c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ True - , (\x xs -> case (lessThanEqualsInteger 11 x) [(s s xs), False]) ]))) \ No newline at end of file + [True, (\x xs -> case (lessThanInteger x 11) [False, (s s xs)])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.golden.pir b/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.golden.pir index 960ccf045bb..12d44e15651 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.golden.pir @@ -14,8 +14,6 @@ (a -> a -> a) -> (a -> a -> a) -> Ord a - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] !`$fOrdInteger` : Ord integer = CConsOrd {integer} @@ -34,10 +32,8 @@ {all dead. dead}) (\(x : integer) (y : integer) -> lessThanInteger x y) (\(x : integer) (y : integer) -> lessThanEqualsInteger x y) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanEqualsInteger x y) False True) - (\(x : integer) (y : integer) -> - ifThenElse {bool} (lessThanInteger x y) False True) + (\(x : integer) (y : integer) -> lessThanInteger y x) + (\(x : integer) (y : integer) -> lessThanEqualsInteger y x) (\(x : integer) (y : integer) -> case (all dead. integer) diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.eval index fd9a8f13ff8..05490e3de46 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 683_937 +CPU: 685_390 Memory: 4_101 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.pir index 757b0939f18..fcf7a9aeb86 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.uplc index f44ecbf8acc..55b693b479e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 10 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 10) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.pir index 8fa096faeb8..983e0ff414f 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.uplc index 00b13abb459..f98fe02c873 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.golden.uplc @@ -4,5 +4,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 1 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 1) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.eval index d1c86281f3a..b206b869637 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 46 Flat Size: 73 diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.pir index 01436b4239d..8f8fcae64ad 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> True)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.uplc index f8d8fc4bc28..37f74e68a78 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.golden.uplc @@ -28,5 +28,4 @@ (\s ds -> case ds - [ False - , (\x xs -> case (lessThanEqualsInteger 1 x) [True, (s s xs)]) ]))) \ No newline at end of file + [False, (\x xs -> case (lessThanInteger x 1) [(s s xs), True])]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.eval index 089ead9d2bc..b4a4b64f961 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 699_937 +CPU: 701_390 Memory: 4_201 AST Size: 47 Flat Size: 75 diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.pir index 24138328755..01f294af33b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.uplc index c74cba568c6..a8572c44155 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.golden.uplc @@ -30,6 +30,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 10 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 10) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.pir index ebb833ba437..10d0a242338 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.uplc index 5e15b1ae1d3..0e4233381b3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.golden.uplc @@ -6,6 +6,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 1 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 1) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.eval index 8f5c457dc0b..89a8b9510a1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 3_510_470 +CPU: 3_525_000 Memory: 19_310 AST Size: 47 Flat Size: 75 diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.pir index cc12c6000ba..b3f6c7977cb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [(/\dead -> go xs), (/\dead -> Just {integer} x)] {all dead. dead}) {all dead. dead} diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.uplc index 1e5ce4b8def..2e79b143945 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.golden.uplc @@ -30,6 +30,4 @@ ds [ (constr 1 []) , (\x xs -> - case - (lessThanEqualsInteger 1 x) - [(constr 0 [x]), (s s xs)]) ]))) \ No newline at end of file + case (lessThanInteger x 1) [(s s xs), (constr 0 [x])]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.eval b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.eval index d00db747f58..00bc02a9fbf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.eval @@ -1,4 +1,4 @@ -CPU: 731_937 +CPU: 733_390 Memory: 4_401 AST Size: 57 Flat Size: 90 diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.pir index fd1a552fef2..95bec4b4fb8 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 10 x) [True, False]) + (lessThanInteger x 10) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.uplc index 1664c67222e..c03735688ac 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.golden.uplc @@ -34,7 +34,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 10 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 10) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.pir index f90f2262776..daec5cd7f5e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.uplc index 9ffc8819b2b..2f5cd3eebf3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.golden.uplc @@ -7,7 +7,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 1 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 1) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.eval b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.eval index ce1e4d12b85..7e7f7b70661 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.eval @@ -1,4 +1,4 @@ -CPU: 5_994_550 +CPU: 6_009_080 Memory: 28_530 AST Size: 57 Flat Size: 90 diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.pir b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.pir index 894c9aa7bc0..475017d2ad2 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.pir @@ -20,7 +20,7 @@ letrec /\dead -> case (all dead. Maybe integer) - (case bool (lessThanEqualsInteger 1 x) [True, False]) + (lessThanInteger x 1) [ (/\dead -> go (addInteger 1 i) xs) , (/\dead -> Just {integer} i) ] {all dead. dead}) diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.uplc index 24c45af94e8..b9f594af2ee 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.golden.uplc @@ -34,7 +34,6 @@ [ (constr 1 []) , (\x xs -> case - (lessThanEqualsInteger 1 x) - [ (constr 0 [i]) - , ((\x -> case (constr 0 [s, x, xs]) [s]) - (addInteger 1 i)) ]) ]))) \ No newline at end of file + (lessThanInteger x 1) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i)) + , (constr 0 [i]) ]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.eval b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.eval index 44c7ec85650..83de539ee65 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.eval @@ -1,4 +1,4 @@ -CPU: 782_810_937 +CPU: 781_357_937 Memory: 3_706_801 AST Size: 55 Flat Size: 65 diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.pir b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.pir index 1f2e4db8805..7be6a11d978 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.pir @@ -14,7 +14,7 @@ letrec (\(x : integer) (xs : List integer) -> case (all dead. bool) - (case bool (lessThanInteger x 0) [True, False]) + (lessThanEqualsInteger 0 x) [(/\dead -> False), (/\dead -> go xs)] {all dead. dead}) in diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.uplc index 36055a421ec..981af217d3b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.golden.uplc @@ -12,4 +12,5 @@ (\s ds -> case ds - [True, (\x xs -> case (lessThanInteger x 0) [(s s xs), False])]))) \ No newline at end of file + [ True + , (\x xs -> case (lessThanEqualsInteger 0 x) [False, (s s xs)]) ]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.eval b/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.eval index 074998b8d95..da46769df12 100644 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_604_138 -Memory: 17_516 -AST Size: 71 -Flat Size: 134 +CPU: 3_668_138 +Memory: 17_916 +AST Size: 74 +Flat Size: 136 (con data (I 6)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.uplc index 92ec1bad0e6..ca206c8e1e1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/listIndexing.golden.uplc @@ -1,14 +1,16 @@ (program 1.1.0 - ((\go xs -> go 5 xs) - ((\s -> s s) - (\s ds ds -> - case - ds - [ ((\x -> error) (force trace "PT7" (constr 0 []))) - , (\x xs -> - case - (equalsInteger 0 ds) - [ ((\x -> case (constr 0 [s, x, xs]) [s]) - (subtractInteger ds 1)) - , x ]) ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go 5 xs) + ((\s -> s s) + (\s ds ds -> + case + ds + [ ((\x -> error) (forced "PT7" (constr 0 []))) + , (\x xs -> + case + (equalsInteger 0 ds) + [ ((\x -> case (constr 0 [s, x, xs]) [s]) + (subtractInteger ds 1)) + , x ]) ]))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.golden.eval b/plutus-tx-plugin/test/Budget/9.6/map1.golden.eval index 5ce0fd02492..b33eed0bec4 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/map1.golden.eval @@ -1,7 +1,7 @@ -CPU: 155_357_381 -Memory: 318_370 -AST Size: 312 -Flat Size: 338 +CPU: 154_285_364 +Memory: 311_570 +AST Size: 311 +Flat Size: 339 (constr 0 diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.golden.pir b/plutus-tx-plugin/test/Budget/9.6/map1.golden.pir index c54345225f3..ca499ec28f6 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/map1.golden.pir @@ -8,7 +8,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/map1.golden.uplc index 67a9cf1dbdb..1b28ac28716 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/map1.golden.uplc @@ -1,94 +1,99 @@ (program 1.1.0 - ((\`$dmenumFromTo_$cenumFromTo` n -> - (\nt -> + ((\forced -> + (\`$dmenumFromTo_$cenumFromTo` n -> (\nt -> - (\lookup -> - constr 0 - [ (case (constr 0 [(\i -> iData i), unIData, n, nt]) [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 5 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 10 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 20 n), nt]) - [lookup]) - , (case - (constr 0 - [(\i -> iData i), unIData, (addInteger 5 n), nt]) - [lookup]) ]) - (\`$dToData` `$dUnsafeFromData` ds ds -> - (\k -> - (\s -> + (\nt -> + (\lookup -> + constr 0 + [ (case + (constr 0 [(\i -> iData i), unIData, n, nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 5 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 10 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 20 n), nt]) + [lookup]) + , (case + (constr 0 + [(\i -> iData i), unIData, (addInteger 5 n), nt]) + [lookup]) ]) + (\`$dToData` `$dUnsafeFromData` ds ds -> + (\k -> + (\s -> + case + (s s ds) + [ (\a -> constr 0 [(`$dUnsafeFromData` a)]) + , (constr 1 []) ]) + (\s xs -> + case + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 + [(case hd [(\l r -> r)])]) ]) + , (constr 1 []) ])) + (`$dToData` ds))) + ((\k -> + (\s -> s s nt) + (\s xs -> case - (s s ds) - [ (\a -> constr 0 [(`$dUnsafeFromData` a)]) - , (constr 1 []) ]) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData k (case hd [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> - constr 0 [(case hd [(\l r -> r)])]) ]) - , (constr 1 []) ])) - (`$dToData` ds))) - ((\k -> - (\s -> s s nt) - (\s xs -> + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [(\eta -> forced hd (s s eta)), (\x -> x)]) + , [] ])) + (iData (addInteger 5 n)))) + ((\z -> + (\s -> s s (`$dmenumFromTo_$cenumFromTo` 1 10)) + (\s ds -> case - xs - [ (\hd -> - case - (equalsData k (case hd [(\l r -> l)])) - [(\eta -> force mkCons hd (s s eta)), (\x -> x)]) - , [] ])) - (iData (addInteger 5 n)))) - ((\z -> - (\s -> s s (`$dmenumFromTo_$cenumFromTo` 1 10)) - (\s ds -> - case - ds - [ z - , (\y ys -> - (\ds -> - (\k -> - (\a -> - (\nilCase -> - (\s -> s s ds) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData - k - (case hd [(\l r -> l)])) - [ (\eta -> - force mkCons - hd - (s s eta)) - , (force mkCons - (mkPairData k a)) ]) - , nilCase ])) - (force mkCons (mkPairData k a) [])) - (iData y)) - (iData (addInteger n y))) - (s s ys)) ])) - (force mkCons (mkPairData (iData n) (I 0)) []))) - ((\s -> s s) - (\s x lim -> - case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 - [ x - , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ])))) \ No newline at end of file + ds + [ z + , (\y ys -> + (\ds -> + (\k -> + (\a -> + (\nilCase -> + (\s -> s s ds) + (\s xs -> + case + xs + [ (\hd -> + case + (equalsData + k + (case + hd + [(\l r -> l)])) + [ (\eta -> + forced hd (s s eta)) + , (forced + (mkPairData k a)) ]) + , nilCase ])) + (forced (mkPairData k a) [])) + (iData y)) + (iData (addInteger n y))) + (s s ys)) ])) + (forced (mkPairData (iData n) (I 0)) []))) + ((\s -> s s) + (\s x lim -> + case + (lessThanInteger lim x) + [ (constr 1 + [ x + , ((\x -> case (constr 0 [s, x, lim]) [s]) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.golden.eval b/plutus-tx-plugin/test/Budget/9.6/map2.golden.eval index 7efa7cc75ef..4acf8057090 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/map2.golden.eval @@ -1,7 +1,7 @@ -CPU: 67_827_382 -Memory: 197_790 -AST Size: 423 -Flat Size: 458 +CPU: 67_555_382 +Memory: 196_090 +AST Size: 422 +Flat Size: 459 (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/map2.golden.uplc index a3fe621186f..dc9adb9551e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/map2.golden.uplc @@ -1,163 +1,175 @@ (program 1.1.0 - ((\go -> + ((\forced -> (\go -> - (\goList - n -> - (\unsafeFromSOPList -> - (\nt -> - (\go -> - (\nt -> - go - ((\rs' -> (\ls' -> go rs' ls') (go nt)) - ((\s -> s s nt) - (\s xs -> - case - xs - [ (\hd tl -> - (\tl' -> - (\k -> - (\s -> - case - (s s nt) - [ (force mkCons hd tl') - , tl' ]) - (\s xs -> - case - xs - [ (\hd -> - case - (equalsData - k - (case + (\go -> + (\goList + n -> + (\unsafeFromSOPList -> + (\nt -> + (\go -> + (\nt -> + go + ((\rs' -> + (\ls' -> go rs' ls') (go nt)) + ((\s -> + s s nt) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\tl' -> + (\k -> + (\s -> + case + (s s nt) + [(forced hd tl'), tl']) + (\s + xs -> + case + xs + [ (\hd -> + case + (equalsData + k + (case + hd + [ (\l + r -> + l) ])) + [ (\x -> + s s x) + , (\ds -> + True) ]) + , False ])) + (case hd [(\l r -> l)])) + (s s tl)) + , [] ])))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 1 n), 1]) + , (constr 1 + [ (constr 0 [(addInteger 2 n), 2]) + , (constr 1 + [ (constr 0 + [(addInteger 3 n), 3]) + , (constr 1 + [ (constr 0 + [(addInteger 4 n), 4]) + , (constr 1 + [ (constr 0 + [ (addInteger + 5 + n) + , 5 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + ((\s -> + s s) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\v' -> + (\k' -> + (\s -> + case + (s s nt) + [ (\r -> + forced + (mkPairData + k' + (iData + (addInteger + (unIData v') + (unIData r)))) + (s s tl)) + , (forced + (mkPairData k' v') + (s s tl)) ]) + (\s + xs -> + case + xs + [ (\hd -> + case + (equalsData + k' + (case + hd + [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 + [ (case hd - [ (\l r -> - l) ])) - [ (\x -> s s x) - , (\ds -> - True) ]) - , False ])) - (case hd [(\l r -> l)])) - (s s tl)) - , [] ])))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 1 n), 1]) - , (constr 1 - [ (constr 0 [(addInteger 2 n), 2]) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 3]) - , (constr 1 - [ (constr 0 - [(addInteger 4 n), 4]) - , (constr 1 - [ (constr 0 - [ (addInteger 5 n) - , 5 ]) - , (constr 0 - [ ]) ]) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v' -> - (\k' -> - (\s -> - case - (s s nt) - [ (\r -> - force mkCons - (mkPairData - k' - (iData - (addInteger - (unIData v') - (unIData r)))) - (s s tl)) - , (force mkCons - (mkPairData k' v') - (s s tl)) ]) - (\s - xs -> - case - xs - [ (\hd -> - case - (equalsData - k' - (case - hd - [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> - constr 0 - [ (case - hd - [ (\l - r -> - r) ]) ]) ]) - , (constr 1 []) ])) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 33]) - , (constr 1 - [ (constr 0 [(addInteger 4 n), 44]) - , (constr 1 - [ (constr 0 [(addInteger 6 n), 66]) - , (constr 1 - [ (constr 0 [(addInteger 7 n), 77]) - , (constr 0 []) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - (\`$dToData` `$dToData` -> - (\go eta -> goList (go eta)) - ((\s -> s s) - (\s ds -> - case - ds - [ (constr 0 []) - , (\x xs -> - constr 1 - [ (case - x - [ (\k a -> - constr 0 - [ (`$dToData` k) - , (`$dToData` a) ]) ]) - , (s s xs) ]) ])))) + [ (\l + r -> + r) ]) ]) ]) + , (constr 1 []) ])) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 3 n), 33]) + , (constr 1 + [ (constr 0 [(addInteger 4 n), 44]) + , (constr 1 + [ (constr 0 [(addInteger 6 n), 66]) + , (constr 1 + [ (constr 0 + [(addInteger 7 n), 77]) + , (constr 0 []) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + (\`$dToData` `$dToData` -> + (\go eta -> goList (go eta)) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + constr 1 + [ (case + x + [ (\k a -> + constr 0 + [ (`$dToData` k) + , (`$dToData` a) ]) ]) + , (s s xs) ]) ])))) + ((\s -> s s) + (\s ds -> + case + ds + [ [] + , (\d ds -> + forced + (case d [(\d d -> mkPairData d d)]) + (s s ds)) ]))) ((\s -> s s) - (\s ds -> - case - ds - [ [] - , (\d ds -> - force mkCons - (case d [(\d d -> mkPairData d d)]) - (s s ds)) ]))) + (\s acc xs -> + case xs [(\hd -> (\x -> s s x) (forced hd acc)), acc]))) ((\s -> s s) - (\s acc xs -> - case xs [(\hd -> (\x -> s s x) (force mkCons hd acc)), acc]))) - ((\s -> s s) - (\s xs -> - case - xs - [ (\hd tl -> - constr 1 - [ (constr 0 - [ (unIData (case hd [(\l r -> l)])) - , (unIData (case hd [(\l r -> r)])) ]) - , (s s tl) ]) - , (constr 0 []) ])))) \ No newline at end of file + (\s xs -> + case + xs + [ (\hd tl -> + constr 1 + [ (constr 0 + [ (unIData (case hd [(\l r -> l)])) + , (unIData (case hd [(\l r -> r)])) ]) + , (s s tl) ]) + , (constr 0 []) ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.golden.eval b/plutus-tx-plugin/test/Budget/9.6/map3.golden.eval index 706b9483d42..06a899191e8 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/map3.golden.eval @@ -1,7 +1,7 @@ -CPU: 111_907_732 -Memory: 333_684 -AST Size: 664 -Flat Size: 705 +CPU: 111_043_732 +Memory: 328_284 +AST Size: 658 +Flat Size: 709 (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/map3.golden.uplc index 56d7e41ebe4..755e224259d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/map3.golden.uplc @@ -1,311 +1,326 @@ (program 1.1.0 - ((\safeAppend -> - (\lookup' -> - (\`$fToDataThese_$ctoBuiltinData` -> - (\`$dToData` -> - (\`$dToData` -> - (\goList - n -> - (\unsafeFromSOPList -> - (\nt -> - (\goLeft -> - (\nt -> - (\goRight -> - (\nt -> - (\s -> - s - s - ((\s -> - s s nt) - (\s - xs -> - case - xs - [ (\hd - tl -> - constr 1 - [ (constr 0 - [ (unIData - (case - hd - [ (\l - r -> - l) ])) - , (case - (unConstrData - (case - hd - [ (\l - r -> - r) ])) - [ (\index - args -> - case - index - [ (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ]) - , (\ds -> - constr 0 - [ (unIData - (force - headList - ds)) ]) - , (\ds -> - constr 1 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ]) ] - args) ]) ]) - , (s s tl) ]) - , (constr 0 []) ]))) - (\s - ds -> - case - ds - [ (constr 0 []) - , (\x - xs -> - constr 1 - [ (case - x - [ (\c - a -> - constr 0 - [ c - , (case - a - [ (\b -> - b) - , (\a - b -> - addInteger + (case + (constr 0 [(force mkCons), (force tailList), (force headList)]) + [ (\forced + forced + forced -> + (\safeAppend -> + (\lookup' -> + (\`$fToDataThese_$ctoBuiltinData` -> + (\`$dToData` -> + (\`$dToData` -> + (\goList + n -> + (\unsafeFromSOPList -> + (\nt -> + (\goLeft -> + (\nt -> + (\goRight -> + (\nt -> + (\s -> + s + s + ((\s -> + s s nt) + (\s + xs -> + case + xs + [ (\hd + tl -> + constr 1 + [ (constr 0 + [ (unIData + (case + hd + [ (\l + r -> + l) ])) + , (case + (unConstrData + (case + hd + [ (\l + r -> + r) ])) + [ (\index + args -> + case + index + [ (\ds -> + constr 2 + [ (unIData + (forced + ds)) ]) + , (\ds -> + constr 0 + [ (unIData + (forced + ds)) ]) + , (\ds -> + constr 1 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ]) ] + args) ]) ]) + , (s s tl) ]) + , (constr 0 []) ]))) + (\s + ds -> + case + ds + [ (constr 0 []) + , (\x + xs -> + constr 1 + [ (case + x + [ (\c + a -> + constr 0 + [ c + , (case a - b) - , (\a -> - a) ]) ]) ]) - , (s s xs) ]) ])) - (safeAppend (goLeft nt) (goRight nt))) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v -> - (\k -> - case - (lookup' k nt) - [ (\r -> - force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 1 - [ (unIData - v) - , (unIData - r) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) - , (force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 0 - [ (unIData - v) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) ]) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 1 n), 1]) - , (constr 1 - [ (constr 0 - [(addInteger 2 n), 2]) - , (constr 1 - [ (constr 0 - [ (addInteger 3 n) - , 3 ]) - , (constr 1 - [ (constr 0 - [ (addInteger - 4 - n) - , 4 ]) - , (constr 1 - [ (constr 0 - [ (addInteger - 5 - n) - , 5 ]) - , (constr 0 - [ ]) ]) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - ((\s -> - s s) - (\s - xs -> - case - xs - [ (\hd - tl -> - (\v -> - (\k -> + [ (\b -> + b) + , (\a + b -> + addInteger + a + b) + , (\a -> + a) ]) ]) ]) + , (s s xs) ]) ])) + (safeAppend + (goLeft nt) + (goRight nt))) + ((\s -> + s s) + (\s + xs -> case - (lookup' k nt) - [ (\r -> - force - mkCons - (mkPairData - k + xs + [ (\hd + tl -> + (\v -> + (\k -> + case + (lookup' k nt) + [ (\r -> + forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 1 + [ (unIData + v) + , (unIData + r) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) + , (forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 0 + [ (unIData + v) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s + s + tl)) ]) (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 1 - [ (unIData - v) - , (unIData - r) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) - , (force - mkCons - (mkPairData - k - (case - (constr 0 - [ `$dToData` - , `$dToData` - , (constr 2 - [ (unIData - v) ]) ]) - [ `$fToDataThese_$ctoBuiltinData` ])) - (s s tl)) ]) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , [] ]))) - (case - (constr 0 - [ (\i -> iData i) - , (\i -> iData i) - , (constr 1 - [ (constr 0 [(addInteger 3 n), 30]) - , (constr 1 - [ (constr 0 [(addInteger 4 n), 40]) - , (constr 1 - [ (constr 0 - [(addInteger 6 n), 60]) - , (constr 1 - [ (constr 0 - [ (addInteger 7 n) - , 70 ]) - , (constr 0 - []) ]) ]) ]) ]) ]) - [unsafeFromSOPList])) - (\`$dToData` `$dToData` -> - (\go eta -> goList (go eta)) - ((\s -> s s) - (\s ds -> - case - ds - [ (constr 0 []) - , (\x xs -> - constr 1 - [ (case - x - [ (\k a -> - constr 0 - [ (`$dToData` k) - , (`$dToData` a) ]) ]) - , (s s xs) ]) ])))) + hd + [(\l r -> l)])) + (case + hd + [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 + [(addInteger 1 n), 1]) + , (constr 1 + [ (constr 0 + [ (addInteger 2 n) + , 2 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 3 + n) + , 3 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 4 + n) + , 4 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 5 + n) + , 5 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + ((\s -> + s s) + (\s + xs -> + case + xs + [ (\hd + tl -> + (\v -> + (\k -> + case + (lookup' k nt) + [ (\r -> + forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 1 + [ (unIData + v) + , (unIData + r) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) + , (forced + (mkPairData + k + (case + (constr 0 + [ `$dToData` + , `$dToData` + , (constr 2 + [ (unIData + v) ]) ]) + [ `$fToDataThese_$ctoBuiltinData` ])) + (s s tl)) ]) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , [] ]))) + (case + (constr 0 + [ (\i -> iData i) + , (\i -> iData i) + , (constr 1 + [ (constr 0 [(addInteger 3 n), 30]) + , (constr 1 + [ (constr 0 + [(addInteger 4 n), 40]) + , (constr 1 + [ (constr 0 + [ (addInteger 6 n) + , 60 ]) + , (constr 1 + [ (constr 0 + [ (addInteger + 7 + n) + , 70 ]) + , (constr 0 + [ ]) ]) ]) ]) ]) ]) + [unsafeFromSOPList])) + (\`$dToData` `$dToData` -> + (\go eta -> goList (go eta)) + ((\s -> s s) + (\s ds -> + case + ds + [ (constr 0 []) + , (\x xs -> + constr 1 + [ (case + x + [ (\k a -> + constr 0 + [ (`$dToData` k) + , (`$dToData` + a) ]) ]) + , (s s xs) ]) ])))) + ((\s -> s s) + (\s ds -> + case + ds + [ [] + , (\d ds -> + forced + (case d [(\d d -> mkPairData d d)]) + (s s ds)) ]))) + (\i -> iData i)) + (\i -> iData i)) + (\`$dToData` `$dToData` ds -> + case + ds + [ (\arg -> constrData 1 (forced (`$dToData` arg) [])) + , (\arg arg -> + constrData + 2 + (forced + (`$dToData` arg) + (forced (`$dToData` arg) []))) + , (\arg -> + constrData 0 (forced (`$dToData` arg) [])) ])) + (\k -> + (\go m -> go m) ((\s -> s s) - (\s ds -> - case - ds - [ [] - , (\d ds -> - force mkCons - (case d [(\d d -> mkPairData d d)]) - (s s ds)) ]))) - (\i -> iData i)) - (\i -> iData i)) - (\`$dToData` `$dToData` ds -> - case - ds - [ (\arg -> constrData 1 (force mkCons (`$dToData` arg) [])) - , (\arg arg -> - constrData - 2 - (force mkCons - (`$dToData` arg) - (force mkCons (`$dToData` arg) []))) - , (\arg -> constrData 0 (force mkCons (`$dToData` arg) [])) ])) - (\k -> - (\go m -> go m) - ((\s -> s s) - (\s xs -> - case - xs - [ (\hd -> + (\s xs -> case - (equalsData k (case hd [(\l r -> l)])) - [ (\x -> s s x) - , (\ds -> constr 0 [(case hd [(\l r -> r)])]) ]) - , (constr 1 []) ])))) - ((\s -> s s) - (\s xs xs -> - case - xs - [ (\hd tl -> - (\v -> - (\k -> - (\eta -> - (\nilCase -> - (\s -> s s eta) - (\s xs -> - case - xs - [ (\hd -> + xs + [ (\hd -> + case + (equalsData k (case hd [(\l r -> l)])) + [ (\x -> s s x) + , (\ds -> + constr 0 [(case hd [(\l r -> r)])]) ]) + , (constr 1 []) ])))) + ((\s -> s s) + (\s xs xs -> + case + xs + [ (\hd tl -> + (\v -> + (\k -> + (\eta -> + (\nilCase -> + (\s -> s s eta) + (\s xs -> case - (equalsData - k - (case hd [(\l r -> l)])) - [ (\eta -> - force mkCons hd (s s eta)) - , (force mkCons - (mkPairData k v)) ]) - , nilCase ])) - (force mkCons (mkPairData k v) [])) - (case (constr 0 [s, tl, xs]) [s])) - (case hd [(\l r -> l)])) - (case hd [(\l r -> r)])) - , xs ])))) \ No newline at end of file + xs + [ (\hd -> + case + (equalsData + k + (case hd [(\l r -> l)])) + [ (\eta -> + forced hd (s s eta)) + , (forced + (mkPairData k v)) ]) + , nilCase ])) + (forced (mkPairData k v) [])) + (case (constr 0 [s, tl, xs]) [s])) + (case hd [(\l r -> l)])) + (case hd [(\l r -> r)])) + , xs ]))) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.eval b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.eval index c45f92cee70..0364d0326a6 100644 --- a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.eval @@ -1,6 +1,6 @@ -CPU: 676_915 -Memory: 3_297 -AST Size: 55 -Flat Size: 65 +CPU: 724_915 +Memory: 3_597 +AST Size: 58 +Flat Size: 68 (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.uplc index 2cd29aa11c2..8fd77998161 100644 --- a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.golden.uplc @@ -1,6 +1,6 @@ (program 1.1.0 - ((\ds -> + ((\forced ds -> (\cse -> (\ds -> case @@ -10,7 +10,8 @@ (equalsInteger 1 (case cse [(\l r -> l)])) [((\cse -> case cse [cse]) error), 1]) (case cse [(\l r -> r)])) - , (unIData (force headList ds)) ]) + , (unIData (forced ds)) ]) (case cse [(\l r -> r)])) (unConstrData ds)) + (force headList) (Constr 0 [I 1]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.eval b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.eval index 9dc2a6458c8..5d06ef81ca7 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.eval @@ -1,6 +1,6 @@ -CPU: 991_082_937 -Memory: 5_008_501 -AST Size: 87 -Flat Size: 91 +CPU: 957_629_937 +Memory: 4_808_501 +AST Size: 84 +Flat Size: 87 (con bool True) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.pir b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.pir index cbdb1646e11..189ba06eb4e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.pir @@ -32,7 +32,4 @@ in let !ls : List integer = go 1000 in -recursiveAll - {integer} - (\(v : integer) -> case bool (lessThanInteger v 0) [True, False]) - ls \ No newline at end of file +recursiveAll {integer} (\(v : integer) -> lessThanEqualsInteger 0 v) ls \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.uplc index 0a43a11b30e..e0488d4a6bf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.golden.uplc @@ -2,10 +2,7 @@ 1.1.0 ((\go -> (\recursiveAll -> - (\ls -> - force recursiveAll - (\v -> case (lessThanInteger v 0) [True, False]) - ls) + (\ls -> force recursiveAll (\v -> lessThanEqualsInteger 0 v) ls) (go 1000)) ((\s -> s s (delay (\x -> x))) (\s arg -> diff --git a/plutus-tx-plugin/test/Budget/9.6/show.golden.eval b/plutus-tx-plugin/test/Budget/9.6/show.golden.eval index a3618b582f1..780dab5c4e1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/show.golden.eval @@ -1,6 +1,6 @@ -CPU: 985_752_867 -Memory: 4_516_711 -AST Size: 678 -Flat Size: 940 +CPU: 985_749_927 +Memory: 4_516_511 +AST Size: 676 +Flat Size: 941 (con integer -2469135780) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/show.golden.pir b/plutus-tx-plugin/test/Budget/9.6/show.golden.pir index 6cb659aa981..dab23b221da 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/show.golden.pir @@ -216,16 +216,12 @@ letrec (acc eta)) {all dead. dead} in -let - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] -in letrec !`$dmenumFromTo_$cenumFromTo` : integer -> integer -> List integer = \(x : integer) (lim : integer) -> case (all dead. List integer) - (ifThenElse {bool} (lessThanEqualsInteger x lim) False True) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} @@ -364,13 +360,7 @@ let (go (`$dmenumFromTo_$cenumFromTo` 0 17) (Nil {string}))) b !d : integer - = trace - {integer} - (case - string - (ifThenElse {bool} (lessThanEqualsInteger c 0) False True) - ["False", "True"]) - c + = trace {integer} (case string (lessThanInteger 0 c) ["False", "True"]) c !e : integer = trace {integer} diff --git a/plutus-tx-plugin/test/Budget/9.6/show.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/show.golden.uplc index f98d191bb51..26711f98be0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/show.golden.uplc @@ -1,337 +1,343 @@ (program 1.1.0 - ((\go -> + ((\forced -> (\go -> - (\`$fShowBuiltinByteString_$cshowsPrec` -> - (\toHex -> - (\go -> - (\`$dmenumFromTo_$cenumFromTo` -> - (\go -> + (\go -> + (\`$fShowBuiltinByteString_$cshowsPrec` -> + (\toHex -> + (\go -> + (\`$dmenumFromTo_$cenumFromTo` -> (\go -> - (\concatBuiltinStrings -> - (\`$fShowInteger_$cshow` -> - (\`$fShowInteger` -> - (\a -> - (\b -> - (\c -> - (\d -> - (\e -> - multiplyInteger - 2 - (force - trace + (\go -> + (\concatBuiltinStrings -> + (\`$fShowInteger_$cshow` -> + (\`$fShowInteger` -> + (\a -> + (\b -> + (\c -> + (\d -> + (\e -> + multiplyInteger + 2 + (forced + (concatBuiltinStrings + (constr 1 + [ "(" + , (case + (constr 0 + [ 0 + , a + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , b + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , c + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , d + , (constr 1 + [ "," + , (case + (constr 0 + [ 0 + , e + , (constr 1 + [ ")" + , (constr 0 + [ ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ]) ]) + [ (case + `$fShowInteger` + [ (\v + v -> + v) ]) ]) ])) + e)) + (forced (concatBuiltinStrings - (constr 1 - [ "(" - , (case - (constr 0 - [ 0 - , a - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , b - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , c - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , d - , (constr 1 - [ "," - , (case - (constr 0 - [ 0 - , e - , (constr 1 - [ ")" - , (constr 0 - [ ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ]) ]) - [ (case - `$fShowInteger` - [ (\v - v -> - v) ]) ]) ])) - e)) - (force - trace - (concatBuiltinStrings - ((\showElem -> - (\go -> - constr 1 - [ "[" - , (showElem - a - (go - (constr 1 - [ b - , (constr 1 - [ c - , (constr 1 - [ d - , (constr 0 - [ ]) ]) ]) ]) - (constr 1 - [ "]" - , (constr 0 - [ ]) ]))) ]) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (\x -> - x) - , (\x - xs -> - (\acc - eta -> - constr 1 - [ "," - , (showElem - x - (acc - eta)) ]) - (s - s - xs)) ]))) - (case - `$fShowInteger` - [(\v v -> v)] - 0))) - d)) - (force trace - (case - (lessThanEqualsInteger - c - 0) - ["True", "False"]) - c)) - (force - trace - (concatBuiltinStrings - (go - (`$dmenumFromTo_$cenumFromTo` - 0 - 17) - (constr 0 []))) - b)) - (force trace "This is an example" a)) - (force trace - (`$fShowInteger_$cshow` -1234567890) - -1234567890)) - (constr 0 - [ `$fShowBuiltinByteString_$cshowsPrec` - , `$fShowInteger_$cshow` ])) - (\x -> - concatBuiltinStrings - (case - (constr 0 [0, x, (constr 0 [])]) - [ `$fShowBuiltinByteString_$cshowsPrec` ]))) + ((\showElem -> + (\go -> + constr 1 + [ "[" + , (showElem + a + (go + (constr 1 + [ b + , (constr 1 + [ c + , (constr 1 + [ d + , (constr 0 + [ ]) ]) ]) ]) + (constr 1 + [ "]" + , (constr 0 + [ ]) ]))) ]) + ((\s -> + s s) + (\s + ds -> + case + ds + [ (\x -> + x) + , (\x + xs -> + (\acc + eta -> + constr 1 + [ "," + , (showElem + x + (acc + eta)) ]) + (s + s + xs)) ]))) + (case + `$fShowInteger` + [(\v v -> v)] + 0))) + d)) + (forced + (case + (lessThanInteger 0 c) + ["False", "True"]) + c)) + (forced + (concatBuiltinStrings + (go + (`$dmenumFromTo_$cenumFromTo` + 0 + 17) + (constr 0 []))) + b)) + (forced "This is an example" a)) + (forced + (`$fShowInteger_$cshow` + -1234567890) + -1234567890)) + (constr 0 + [ `$fShowBuiltinByteString_$cshowsPrec` + , `$fShowInteger_$cshow` ])) + (\x -> + concatBuiltinStrings + (case + (constr 0 [0, x, (constr 0 [])]) + [ `$fShowBuiltinByteString_$cshowsPrec` ]))) + ((\s -> + s s) + (\s + ds -> + case + ds + [ "" + , (\x + ds -> + case + ds + [ x + , (\ipv + ipv -> + (\n -> + case + (case + (lessThanEqualsInteger + n + 0) + [ (go n ds) + , (constr 0 + [ (constr 0 + []) + , ds ]) ]) + [ (\ipv ipv -> + (\cse -> + appendString + (cse ipv) + (cse ipv)) + (s s)) ]) + (divideInteger + (go ds) + 2)) ]) ]))) ((\s -> s s) (\s ds -> case ds - [ "" - , (\x ds -> - case - ds - [ x - , (\ipv ipv -> - (\n -> - case - (case - (lessThanEqualsInteger - n - 0) - [ (go n ds) - , (constr 0 - [ (constr 0 []) - , ds ]) ]) - [ (\ipv ipv -> - (\cse -> - appendString - (cse ipv) - (cse ipv)) - (s s)) ]) - (divideInteger - (go ds) - 2)) ]) ]))) + [0, (\ds xs -> addInteger 1 (s s xs))]))) ((\s -> s s) - (\s ds -> + (\s ds ds -> case ds - [0, (\ds xs -> addInteger 1 (s s xs))]))) + [ (constr 0 [(constr 0 []), (constr 0 [])]) + , (\y ys -> + case + (equalsInteger 1 ds) + [ ((\x -> + case + (case + (constr 0 [s, x, ys]) + [s]) + [ (\zs ws -> + constr 0 + [ (constr 1 [y, zs]) + , ws ]) ]) + (subtractInteger ds 1)) + , (constr 0 + [ (constr 1 [y, (constr 0 [])]) + , ys ]) ]) ]))) ((\s -> s s) - (\s ds ds -> + (\s x lim -> case - ds - [ (constr 0 [(constr 0 []), (constr 0 [])]) - , (\y ys -> - case - (equalsInteger 1 ds) - [ ((\x -> - case - (case (constr 0 [s, x, ys]) [s]) - [ (\zs ws -> - constr 0 - [ (constr 1 [y, zs]) - , ws ]) ]) - (subtractInteger ds 1)) - , (constr 0 - [ (constr 1 [y, (constr 0 [])]) - , ys ]) ]) ]))) + (lessThanInteger lim x) + [ (constr 1 + [ x + , ((\x -> case (constr 0 [s, x, lim]) [s]) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) ((\s -> s s) - (\s x lim -> + (\s ds -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 - [ x - , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) - ((\s -> s s) - (\s ds -> - case - ds - [ (\x -> x) - , (\x xs -> - (\acc eta -> - (\x -> - (\eta -> - toHex - (divideInteger x 16) - (toHex (modInteger x 16) eta)) - (acc eta)) - (indexByteString - #5468697320697320616e206578616d706c65 - x)) - (s s xs)) ]))) - (\x -> + ds + [ (\x -> x) + , (\x xs -> + (\acc eta -> + (\x -> + (\eta -> + toHex + (divideInteger x 16) + (toHex (modInteger x 16) eta)) + (acc eta)) + (indexByteString + #5468697320697320616e206578616d706c65 + x)) + (s s xs)) ]))) + (\x -> + case + (lessThanEqualsInteger x 9) + [ (case + (equalsInteger 10 x) + [ (case + (equalsInteger 11 x) + [ (case + (equalsInteger 12 x) + [ (case + (equalsInteger 13 x) + [ (case + (equalsInteger 14 x) + [ (case + (equalsInteger 15 x) + [ (\ds -> + constr 1 + [ "" + , ds ]) + , (\ds -> + constr 1 ["f", ds]) ]) + , (\ds -> constr 1 ["e", ds]) ]) + , (\ds -> constr 1 ["d", ds]) ]) + , (\ds -> constr 1 ["c", ds]) ]) + , (\ds -> constr 1 ["b", ds]) ]) + , (\ds -> constr 1 ["a", ds]) ]) + , (`$fShowBuiltinByteString_$cshowsPrec` 0 x) ])) + ((\s -> s s) + (\s p n -> + case + (lessThanInteger n 0) + [ (go (go (constr 0 []) n)) + , (\eta -> + constr 1 + [ "-" + , (case + (constr 0 [s, p, (subtractInteger 0 n), eta]) + [s]) ]) ]))) + ((\s -> + s s) + (\s + ds -> case - (lessThanEqualsInteger x 9) - [ (case - (equalsInteger 10 x) - [ (case - (equalsInteger 11 x) + ds + [ (\x -> x) + , (\x + xs -> + (\acc + eta -> + constr 1 [ (case - (equalsInteger 12 x) + (equalsInteger 0 x) [ (case - (equalsInteger 13 x) + (equalsInteger 1 x) [ (case - (equalsInteger 14 x) + (equalsInteger 2 x) [ (case - (equalsInteger 15 x) - [ (\ds -> - constr 1 - ["", ds]) - , (\ds -> - constr 1 ["f", ds]) ]) - , (\ds -> constr 1 ["e", ds]) ]) - , (\ds -> constr 1 ["d", ds]) ]) - , (\ds -> constr 1 ["c", ds]) ]) - , (\ds -> constr 1 ["b", ds]) ]) - , (\ds -> constr 1 ["a", ds]) ]) - , (`$fShowBuiltinByteString_$cshowsPrec` 0 x) ])) - ((\s -> s s) - (\s p n -> + (equalsInteger 3 x) + [ (case + (equalsInteger 4 x) + [ (case + (equalsInteger 5 x) + [ (case + (equalsInteger + 6 + x) + [ (case + (equalsInteger + 7 + x) + [ (case + (equalsInteger + 8 + x) + [ (case + (equalsInteger + 9 + x) + [ "" + , "9" ]) + , "8" ]) + , "7" ]) + , "6" ]) + , "5" ]) + , "4" ]) + , "3" ]) + , "2" ]) + , "1" ]) + , "0" ]) + , (acc eta) ]) + (s s xs)) ]))) + ((\s -> s s) + (\s acc n -> + (\x -> case - (lessThanInteger n 0) - [ (go (go (constr 0 []) n)) - , (\eta -> - constr 1 - [ "-" - , (case - (constr 0 [s, p, (subtractInteger 0 n), eta]) - [s]) ]) ]))) - ((\s -> - s s) - (\s - ds -> - case - ds - [ (\x -> x) - , (\x - xs -> - (\acc - eta -> - constr 1 - [ (case - (equalsInteger 0 x) - [ (case - (equalsInteger 1 x) - [ (case - (equalsInteger 2 x) - [ (case - (equalsInteger 3 x) - [ (case - (equalsInteger 4 x) - [ (case - (equalsInteger 5 x) - [ (case - (equalsInteger - 6 - x) - [ (case - (equalsInteger - 7 - x) - [ (case - (equalsInteger - 8 - x) - [ (case - (equalsInteger - 9 - x) - [ "" - , "9" ]) - , "8" ]) - , "7" ]) - , "6" ]) - , "5" ]) - , "4" ]) - , "3" ]) - , "2" ]) - , "1" ]) - , "0" ]) - , (acc eta) ]) - (s s xs)) ]))) - ((\s -> s s) - (\s acc n -> - (\x -> - case - (equalsInteger 0 x) - [ ((\x -> case (constr 0 [s, x, x]) [s]) - (constr 1 [(remainderInteger n 10), acc])) - , (constr 1 [(remainderInteger n 10), acc]) ]) - (quotientInteger n 10))))) \ No newline at end of file + (equalsInteger 0 x) + [ ((\x -> case (constr 0 [s, x, x]) [s]) + (constr 1 [(remainderInteger n 10), acc])) + , (constr 1 [(remainderInteger n 10), acc]) ]) + (quotientInteger n 10)))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.eval b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.eval index 8212424a314..4c55cf79f7b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.eval @@ -1,6 +1,6 @@ CPU: 1_892_446 Memory: 6_388 AST Size: 59 -Flat Size: 72 +Flat Size: 75 (con integer 100) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.uplc index f8365fdef90..a7f2f83d59b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.golden.uplc @@ -1,13 +1,15 @@ (program 1.1.0 - (\d -> - (\nt -> - (\s -> - (\nt -> - (\s -> - (\s -> addInteger (addInteger s s) s) - (unIData (force headList (force tailList nt)))) - (unIData (force headList nt))) - (force tailList (force tailList (force tailList nt)))) - (unIData (force headList nt))) - (force tailList (unListData d)))) \ No newline at end of file + ((\forced forced d -> + (\nt -> + (\s -> + (\nt -> + (\s -> + (\s -> addInteger (addInteger s s) s) + (unIData (forced (forced nt)))) + (unIData (forced nt))) + (forced (forced (forced nt)))) + (unIData (forced nt))) + (forced (unListData d))) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.eval b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.eval index cc01c5d3273..d153ae93915 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.eval @@ -1,4 +1,4 @@ -CPU: 918_904_937 +CPU: 920_359_390 Memory: 4_208_901 AST Size: 68 Flat Size: 81 diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.pir b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.pir index f85dfbd7a81..93788a6dc96 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.pir @@ -20,7 +20,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.uplc index 0e295992109..c0daf706f81 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.golden.uplc @@ -5,12 +5,12 @@ ((\s -> case (constr 0 [s, 1, 1000]) [s]) (\s x lim -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 + (lessThanInteger lim x) + [ (constr 1 [ x , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) ((\s -> s s) (\s acc ds -> case diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.eval b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.eval index ef0507a24a0..6d1533352dd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.eval +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.eval @@ -1,4 +1,4 @@ -CPU: 838_760_937 +CPU: 840_215_390 Memory: 3_708_001 AST Size: 55 Flat Size: 67 diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.pir b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.pir index 39cd7c70e9a..923c1fb7ef0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.pir +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.pir @@ -19,7 +19,7 @@ letrec = \(x : integer) (lim : integer) -> case (all dead. List integer) - (case bool (lessThanEqualsInteger x lim) [True, False]) + (lessThanInteger lim x) [ (/\dead -> Cons {integer} diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.uplc b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.uplc index c18d2b5cc74..24ab15da654 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.golden.uplc +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.golden.uplc @@ -6,10 +6,10 @@ ((\s -> case (constr 0 [s, 1, 1000]) [s]) (\s x lim -> case - (lessThanEqualsInteger x lim) - [ (constr 0 []) - , (constr 1 + (lessThanInteger lim x) + [ (constr 1 [ x , ((\x -> case (constr 0 [s, x, lim]) [s]) - (addInteger 1 x)) ]) ]))) + (addInteger 1 x)) ]) + , (constr 0 []) ]))) (\s ds -> case ds [0, (\x xs -> addInteger x (s s xs))]))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.eval index fbb7cda8a91..0cf7ce182d3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_658_290 -Memory: 26_111 -AST Size: 55 -Flat Size: 74 +CPU: 4_290_307 +Memory: 23_911 +AST Size: 49 +Flat Size: 67 (constr 0 (con bool False) (con bool True)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.pir index 9326164129d..3eb79fb5e44 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.pir @@ -24,11 +24,5 @@ in Tuple2 {bool} {bool} - (all - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (all - {integer} - (\(v : integer) -> case bool (lessThanInteger v 0) [True, False]) - xs) \ No newline at end of file + (all {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (all {integer} (\(v : integer) -> lessThanEqualsInteger 0 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.uplc index d98946bd735..c86f6bdcaa1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/all.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\all -> constr 0 - [ (all (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (all (\v -> case (lessThanInteger v 0) [True, False]) xs) ]) + [ (all (\v -> lessThanEqualsInteger 8 v) xs) + , (all (\v -> lessThanEqualsInteger 0 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.eval index c3354a40498..b4730e7b9ec 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_327_320 -Memory: 40_818 -AST Size: 55 -Flat Size: 74 +CPU: 6_725_166 +Memory: 37_218 +AST Size: 49 +Flat Size: 67 (constr 0 (con bool True) (con bool False)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.pir index 8fdb3e02115..bde93077cf6 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.pir @@ -24,11 +24,5 @@ in Tuple2 {bool} {bool} - (any - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (any - {integer} - (\(v : integer) -> case bool (lessThanInteger v 12) [True, False]) - xs) \ No newline at end of file + (any {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (any {integer} (\(v : integer) -> lessThanEqualsInteger 12 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.uplc index 03589f8f876..902b47a01c9 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/any.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\any -> constr 0 - [ (any (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (any (\v -> case (lessThanInteger v 12) [True, False]) xs) ]) + [ (any (\v -> lessThanEqualsInteger 8 v) xs) + , (any (\v -> lessThanEqualsInteger 12 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.eval index e488db07eeb..fa9143807b3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_363_720 -Memory: 16_920 -AST Size: 27 -Flat Size: 43 +CPU: 3_267_720 +Memory: 16_320 +AST Size: 30 +Flat Size: 45 (con (list integer) [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.uplc index fe57800e173..a4dd4c180d4 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/append.golden.uplc @@ -1,5 +1,5 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.eval index 5051bfc45d9..1ce03f51230 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.eval @@ -1,6 +1,6 @@ CPU: 2_305_548 Memory: 12_828 -AST Size: 51 -Flat Size: 60 +AST Size: 54 +Flat Size: 63 (con (list integer) [1,2,3,4]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.uplc index 208a832aa29..86e553d0289 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat.golden.uplc @@ -1,14 +1,16 @@ (program 1.1.0 - ((\go xss -> go xss) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - (\acc -> - (\s -> s s x) - (\s xs -> - case xs [(\x xs -> force mkCons x (s s xs)), acc])) - (s s xs)) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xss -> go xss) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + (\acc -> + (\s -> s s x) + (\s xs -> + case xs [(\x xs -> forced x (s s xs)), acc])) + (s s xs)) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.eval index 4143213e814..e044b8492da 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.eval @@ -1,6 +1,6 @@ -CPU: 26_201_850 -Memory: 126_250 -AST Size: 89 -Flat Size: 104 +CPU: 25_625_850 +Memory: 122_650 +AST Size: 91 +Flat Size: 106 (con (list integer) [1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.uplc index 879f5e68215..6691b8ee87d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concatMap.golden.uplc @@ -1,27 +1,27 @@ (program 1.1.0 - ((\go xss -> go xss) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x -> - (\go xs -> - (\ys -> - (\l -> - (\s -> s s l) - (\s xs -> - case - xs - [(\x xs -> force mkCons x (s s xs)), ys])) - (go 2)) - (s s xs)) - ((\s -> s s) - (\s n -> - case - (lessThanEqualsInteger n 0) - [ (force mkCons - x - ((\x -> s s x) (subtractInteger n 1))) - , [] ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xss -> go xss) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x -> + (\go xs -> + (\ys -> + (\l -> + (\s -> s s l) + (\s xs -> + case xs [(\x xs -> forced x (s s xs)), ys])) + (go 2)) + (s s xs)) + ((\s -> s s) + (\s n -> + case + (lessThanEqualsInteger n 0) + [ (forced + x + ((\x -> s s x) (subtractInteger n 1))) + , [] ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.eval index e488db07eeb..fa9143807b3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_363_720 -Memory: 16_920 -AST Size: 27 -Flat Size: 43 +CPU: 3_267_720 +Memory: 16_320 +AST Size: 30 +Flat Size: 45 (con (list integer) [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.uplc index fe57800e173..a4dd4c180d4 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/concat_operator.golden.uplc @@ -1,5 +1,5 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.eval index 8adca900cdb..3269a8c0748 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.eval @@ -1,6 +1,6 @@ -CPU: 216_462 -Memory: 1_032 -AST Size: 9 -Flat Size: 27 +CPU: 264_462 +Memory: 1_332 +AST Size: 12 +Flat Size: 30 (con (list integer) [0,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.uplc index f4626f1cdc2..797bd763918 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force mkCons 0 xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced 0 xs) (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.eval index b95b7a68c6c..f17f37a2200 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.eval @@ -1,6 +1,6 @@ -CPU: 216_462 -Memory: 1_032 -AST Size: 9 -Flat Size: 27 +CPU: 264_462 +Memory: 1_332 +AST Size: 12 +Flat Size: 30 (con (list integer) [42,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.uplc index 5d97b79876d..04686ac4161 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/cons_operator.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force mkCons 42 xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced 42 xs) (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.eval index 980a46e38fb..5acf785bdd9 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_528_650 -Memory: 27_280 -AST Size: 41 -Flat Size: 59 +CPU: 6_512_650 +Memory: 27_180 +AST Size: 44 +Flat Size: 62 (con (list integer) [2,4,6,8,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.uplc index d6dd966c53e..3956ab62aa6 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/filter.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> - case - xs - [ (\x xs -> - (\xs -> - case - (equalsInteger 0 (modInteger x 2)) - [xs, (force mkCons x xs)]) - (s s xs)) - , [] ]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) + (\s xs -> + case + xs + [ (\x xs -> + (\xs -> + case + (equalsInteger 0 (modInteger x 2)) + [xs, (forced x xs)]) + (s s xs)) + , [] ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.eval index dde71be8881..a0cb776a7ce 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_343_320 -Memory: 40_918 -AST Size: 56 -Flat Size: 76 +CPU: 6_741_166 +Memory: 37_318 +AST Size: 50 +Flat Size: 69 (constr 0 (constr 0 (con integer 8)) (constr 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.pir index 9abf6ba0a1c..ebd074fe50e 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.pir @@ -28,11 +28,5 @@ in Tuple2 {Maybe integer} {Maybe integer} - (find - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (find - {integer} - (\(v : integer) -> case bool (lessThanInteger v 12) [True, False]) - xs) \ No newline at end of file + (find {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (find {integer} (\(v : integer) -> lessThanEqualsInteger 12 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.uplc index e28d8051733..fbcd729c44e 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/find.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\find -> constr 0 - [ (find (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (find (\v -> case (lessThanInteger v 12) [True, False]) xs) ]) + [ (find (\v -> lessThanEqualsInteger 8 v) xs) + , (find (\v -> lessThanEqualsInteger 12 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.eval index 80bdf3026be..430dc7bcaeb 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.eval @@ -1,6 +1,6 @@ -CPU: 9_076_730 -Memory: 36_900 -AST Size: 55 -Flat Size: 76 +CPU: 9_060_730 +Memory: 36_800 +AST Size: 58 +Flat Size: 78 (con (list integer) [0,2,4,6,8]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.uplc index 4ad2bcb5f03..c7a6c52f62c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/findIndices.golden.uplc @@ -1,14 +1,17 @@ (program 1.1.0 - ((\go xs -> go 0 xs) - ((\s -> s s) - (\s i xs -> - case - xs - [ (\x xs -> - (\indices -> - case - (equalsInteger 0 (modInteger x 2)) - [(force mkCons i indices), indices]) - ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go 0 xs) + ((\s -> s s) + (\s i xs -> + case + xs + [ (\x xs -> + (\indices -> + case + (equalsInteger 0 (modInteger x 2)) + [(forced i indices), indices]) + ((\x -> case (constr 0 [s, x, xs]) [s]) + (addInteger 1 i))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headEmpty.golden.uplc index 8c923e35ad8..78f6a9910f8 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headEmpty.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\ds -> (\x -> error) (force trace "PT23" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced ds -> (\x -> error) (forced "PT23" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.eval index c3fbe55d8e9..7da91485678 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 176_100 -Memory: 1_200 -AST Size: 21 -Flat Size: 42 +CPU: 240_100 +Memory: 1_600 +AST Size: 24 +Flat Size: 45 (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.uplc index ae6cf6c227b..c2ec41e8fc3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/headOk.golden.uplc @@ -1,8 +1,8 @@ (program 1.1.0 - (\xs -> - case - xs - [ (\x xs ds -> x) - , (\ds -> (\x -> error) (force trace "PT23" (constr 0 []))) ] - (constr 0 []))) \ No newline at end of file + ((\forced xs -> + case + xs + [(\x xs ds -> x), (\ds -> (\x -> error) (forced "PT23" (constr 0 [])))] + (constr 0 [])) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.eval index 68586922b76..dcb4045387a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.eval @@ -1,6 +1,6 @@ -CPU: 430_596 -Memory: 2_004 -AST Size: 29 -Flat Size: 50 +CPU: 542_596 +Memory: 2_704 +AST Size: 35 +Flat Size: 55 (con integer 6) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.uplc index e08ff937752..4903ab337ca 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/index.golden.uplc @@ -1,9 +1,11 @@ (program 1.1.0 - (\xs -> - case - (force dropList 5 xs) - [ (\x xs ds _ann -> x) - , (\_ann -> (\x -> error) (force trace "PT22" (constr 0 []))) ] - (constr 0 []) - (constr 0 []))) \ No newline at end of file + ((\forced forced xs -> + case + (forced 5 xs) + [ (\x xs ds _ann -> x) + , (\_ann -> (\x -> error) (forced "PT22" (constr 0 []))) ] + (constr 0 []) + (constr 0 [])) + (force trace) + (force dropList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexNegative.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexNegative.golden.uplc index 59f1aaeb038..9b0c35a0b52 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexNegative.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexNegative.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\xs -> (\x -> error) (force trace "PT21" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced xs -> (\x -> error) (forced "PT21" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexTooLarge.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexTooLarge.golden.uplc index 669c39e7364..53d5e71eb32 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexTooLarge.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/indexTooLarge.golden.uplc @@ -1,9 +1,11 @@ (program 1.1.0 - (\xs -> - case - (force dropList 10 xs) - [ (\x xs ds _ann -> x) - , (\_ann -> (\x -> error) (force trace "PT22" (constr 0 []))) ] - (constr 0 []) - (constr 0 []))) \ No newline at end of file + ((\forced forced xs -> + case + (forced 10 xs) + [ (\x xs ds _ann -> x) + , (\_ann -> (\x -> error) (forced "PT22" (constr 0 []))) ] + (constr 0 []) + (constr 0 [])) + (force trace) + (force dropList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastEmpty.golden.uplc index eebd0e9091c..20b0defd452 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastEmpty.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\last ds -> force last []) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\eta -> - case - eta - [ (\x xs ds -> - case - xs - [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 [])))))) \ No newline at end of file + ((\forced -> + (\last ds -> force last []) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\eta -> + case + eta + [ (\x xs ds -> + case + xs + [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 []))))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.eval index 5318300fc7b..dd252859aee 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_648_100 -Memory: 22_900 -AST Size: 54 -Flat Size: 69 +CPU: 3_712_100 +Memory: 23_300 +AST Size: 57 +Flat Size: 72 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.uplc index 3368401c122..793e1bad817 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/lastOk.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\last xs -> force last xs) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\eta -> - case - eta - [ (\x xs ds -> - case - xs - [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 [])))))) \ No newline at end of file + ((\forced -> + (\last xs -> force last xs) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\eta -> + case + eta + [ (\x xs ds -> + case + xs + [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 []))))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.eval index 585d518ae4e..4178067ef74 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_967_800 -Memory: 20_640 -AST Size: 28 -Flat Size: 46 +CPU: 4_871_800 +Memory: 20_040 +AST Size: 31 +Flat Size: 48 (con (list integer) [2,3,4,5,6,7,8,9,10,11]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.uplc index 19ba236e8d0..6aff3c57ccb 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/map.golden.uplc @@ -1,5 +1,6 @@ (program 1.1.0 - ((\s -> s s) - (\s xs -> - case xs [(\x xs -> force mkCons (addInteger 1 x) (s s xs)), []]))) \ No newline at end of file + ((\forced -> + (\s -> s s) + (\s xs -> case xs [(\x xs -> forced (addInteger 1 x) (s s xs)), []])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.eval index 57116a23a4b..13c4423fd65 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_048_650 -Memory: 24_280 -AST Size: 42 -Flat Size: 61 +CPU: 6_032_650 +Memory: 24_180 +AST Size: 45 +Flat Size: 63 (con (list integer) [1,3,5,7,9]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.uplc index 44e5c762ef5..1fe0d38079a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/mapMaybe.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> - case - xs - [ (\x xs -> - case - (equalsInteger 0 (modInteger x 2)) - [(force mkCons x (s s xs)), (s s xs)]) - , [] ]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) + (\s xs -> + case + xs + [ (\x xs -> + case + (equalsInteger 0 (modInteger x 2)) + [(forced x (s s xs)), (s s xs)]) + , [] ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.eval index 3616c15d17f..31784bebab5 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.eval @@ -1,6 +1,6 @@ -CPU: 45_196_260 -Memory: 237_360 -AST Size: 98 -Flat Size: 116 +CPU: 44_780_260 +Memory: 234_760 +AST Size: 99 +Flat Size: 118 (con (list integer) [1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.uplc index af8e7401ce6..f7b5bf894f6 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nub.golden.uplc @@ -1,27 +1,29 @@ (program 1.1.0 - ((\go xs -> - go - ((\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs])) - []) - ((\s -> s s) - (\s l xs -> - case - l - [ (\y -> - (\go ys -> - case - (go xs) - [ (force mkCons - y - (case (constr 0 [s, ys, (force mkCons y xs)]) [s])) - , (case (constr 0 [s, ys, xs]) [s]) ]) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - case (equalsInteger x y) [(s s xs), True]) - , False ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> + go + ((\s -> s s xs) + (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + []) + ((\s -> s s) + (\s l xs -> + case + l + [ (\y -> + (\go ys -> + case + (go xs) + [ (forced + y + (case (constr 0 [s, ys, (forced y xs)]) [s])) + , (case (constr 0 [s, ys, xs]) [s]) ]) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + case (equalsInteger x y) [(s s xs), True]) + , False ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.eval index a9049dd190d..7fa8909b134 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_667_357 -Memory: 38_473 -AST Size: 75 -Flat Size: 95 +CPU: 6_699_357 +Memory: 38_673 +AST Size: 77 +Flat Size: 97 (con (list integer) [1]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.uplc index d1722efd7ce..17601d8406e 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/nubBy.golden.uplc @@ -1,25 +1,27 @@ (program 1.1.0 - ((\go xs -> go xs []) - ((\s -> s s) - (\s l xs -> - case - l - [ (\y -> - (\go ys -> - case - (go xs) - [ (force mkCons - y - (case (constr 0 [s, ys, (force mkCons y xs)]) [s])) - , (case (constr 0 [s, ys, xs]) [s]) ]) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - case - (lessThanEqualsInteger x y) - [(s s xs), True]) - , False ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go xs []) + ((\s -> s s) + (\s l xs -> + case + l + [ (\y -> + (\go ys -> + case + (go xs) + [ (forced + y + (case (constr 0 [s, ys, (forced y xs)]) [s])) + , (case (constr 0 [s, ys, xs]) [s]) ]) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + case + (lessThanEqualsInteger x y) + [(s s xs), True]) + , False ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.eval index 3b57f8ca299..b4ffded2c53 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.eval @@ -1,6 +1,6 @@ -CPU: 186_533 -Memory: 832 -AST Size: 7 -Flat Size: 23 +CPU: 234_533 +Memory: 1_132 +AST Size: 10 +Flat Size: 27 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.uplc index 9b1e32cfe90..ac40ef6ee68 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/null.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force nullList xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced xs) (force nullList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.eval index 2dab43de4e5..c2c45a8b16d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_410_007 -Memory: 26_651 -AST Size: 39 -Flat Size: 59 +CPU: 6_314_007 +Memory: 26_051 +AST Size: 42 +Flat Size: 61 (con (list integer) [0,0,0,0,0,0,0,0,0,0]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.uplc index 2794a5f3130..67874ce88a1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/replicate.golden.uplc @@ -1,8 +1,10 @@ (program 1.1.0 - ((\go ds -> go 10) - ((\s -> s s) - (\s n -> - case - (lessThanEqualsInteger n 0) - [(force mkCons 0 ((\x -> s s x) (subtractInteger n 1))), []])))) \ No newline at end of file + ((\forced -> + (\go ds -> go 10) + ((\s -> s s) + (\s n -> + case + (lessThanEqualsInteger n 0) + [(forced 0 ((\x -> s s x) (subtractInteger n 1))), []]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.eval index 10cf7b56102..8d8664ab9c1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_819_720 -Memory: 26_020 -AST Size: 47 -Flat Size: 58 +CPU: 4_723_720 +Memory: 25_420 +AST Size: 50 +Flat Size: 60 (con (list integer) [10,9,8,7,6,5,4,3,2,1,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.uplc index c1ee2518eb3..b8f4e98109c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/revAppend.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - ((\revAppend xs -> force revAppend xs xs) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\l r -> - case - l - [ (\x xs -> - force (s s (delay (\x -> x))) xs (force mkCons x r)) - , r ]))))) \ No newline at end of file + ((\forced -> + (\revAppend xs -> force revAppend xs xs) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\l r -> + case + l + [ (\x xs -> force (s s (delay (\x -> x))) xs (forced x r)) + , r ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.eval index 05d26600fc9..f07657fd6a2 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_819_720 -Memory: 26_020 -AST Size: 47 -Flat Size: 59 +CPU: 4_723_720 +Memory: 25_420 +AST Size: 50 +Flat Size: 61 (con (list integer) [10,9,8,7,6,5,4,3,2,1]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.uplc index a79bdbe4937..3332b87a8cd 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/reverse.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - ((\revAppend xs -> force revAppend xs []) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\l r -> - case - l - [ (\x xs -> - force (s s (delay (\x -> x))) xs (force mkCons x r)) - , r ]))))) \ No newline at end of file + ((\forced -> + (\revAppend xs -> force revAppend xs []) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\l r -> + case + l + [ (\x xs -> force (s s (delay (\x -> x))) xs (forced x r)) + , r ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailEmpty.golden.uplc index a6d9dffb651..bbfd93bb716 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailEmpty.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\ds -> (\x -> error) (force trace "PT25" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced ds -> (\x -> error) (forced "PT25" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.eval index 5cbc0c47103..e2753c1eca0 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 176_100 -Memory: 1_200 -AST Size: 21 -Flat Size: 42 +CPU: 240_100 +Memory: 1_600 +AST Size: 24 +Flat Size: 45 (con (list integer) [2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.uplc index 3c2115eeca9..fc0790c6567 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/tailOk.golden.uplc @@ -1,8 +1,9 @@ (program 1.1.0 - (\xs -> - case - xs - [ (\x xs ds -> xs) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 []))) \ No newline at end of file + ((\forced xs -> + case + xs + [ (\x xs ds -> xs) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 [])) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.eval index 7a3d9c2dca4..3d42f200b84 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_442_972 -Memory: 20_976 -AST Size: 61 -Flat Size: 80 +CPU: 4_426_972 +Memory: 20_876 +AST Size: 64 +Flat Size: 82 (con (list integer) [1,2,3,4,5]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.uplc index ddada167c33..62bce60d84c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/take.golden.uplc @@ -1,20 +1,22 @@ (program 1.1.0 - ((\take xs -> case (constr 0 [[], 5, xs]) [(force take)]) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\`$dMkNil` n l -> - case - (lessThanEqualsInteger n 0) - [ (case - l - [ (\x xs -> - force mkCons - x - (case - (constr 0 - [`$dMkNil`, (subtractInteger n 1), xs]) - [(force (s s (delay (\x -> x))))])) - , `$dMkNil` ]) - , `$dMkNil` ]))))) \ No newline at end of file + ((\forced -> + (\take xs -> case (constr 0 [[], 5, xs]) [(force take)]) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\`$dMkNil` n l -> + case + (lessThanEqualsInteger n 0) + [ (case + l + [ (\x xs -> + forced + x + (case + (constr 0 + [`$dMkNil`, (subtractInteger n 1), xs]) + [(force (s s (delay (\x -> x))))])) + , `$dMkNil` ]) + , `$dMkNil` ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.eval index 2dba77ef95a..d3e608ada1a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_445_344 -Memory: 7_536 -AST Size: 72 -Flat Size: 91 +CPU: 1_493_344 +Memory: 7_836 +AST Size: 75 +Flat Size: 94 (constr 0 (con integer 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.uplc index bb1fbbbefc0..ffc5c3a7d89 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/uniqueElementJust.golden.uplc @@ -1,24 +1,26 @@ (program 1.1.0 - ((\take xs -> - case - (case (constr 0 [[], 1, xs]) [(force take)]) - [ (\x xs -> case xs [(\ds ds -> constr 1 []), (constr 0 [x])]) - , (constr 1 []) ]) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\`$dMkNil` n l -> - case - (lessThanEqualsInteger n 0) - [ (case - l - [ (\x xs -> - force mkCons - x - (case - (constr 0 - [`$dMkNil`, (subtractInteger n 1), xs]) - [(force (s s (delay (\x -> x))))])) - , `$dMkNil` ]) - , `$dMkNil` ]))))) \ No newline at end of file + ((\forced -> + (\take xs -> + case + (case (constr 0 [[], 1, xs]) [(force take)]) + [ (\x xs -> case xs [(\ds ds -> constr 1 []), (constr 0 [x])]) + , (constr 1 []) ]) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\`$dMkNil` n l -> + case + (lessThanEqualsInteger n 0) + [ (case + l + [ (\x xs -> + forced + x + (case + (constr 0 + [`$dMkNil`, (subtractInteger n 1), xs]) + [(force (s s (delay (\x -> x))))])) + , `$dMkNil` ]) + , `$dMkNil` ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.eval index f820b9aecf9..c8516fdeb73 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_071_800 -Memory: 27_540 -AST Size: 43 -Flat Size: 62 +CPU: 5_975_800 +Memory: 26_940 +AST Size: 46 +Flat Size: 64 (con (list integer) [2,4,6,8,10,12,14,16,18,20]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.uplc index 455f49e15a0..6955c10fa1d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.12/zipWith.golden.uplc @@ -1,16 +1,18 @@ (program 1.1.0 - ((\go xs -> go xs xs) - ((\s -> s s) - (\s xs ys -> - case - xs - [ (\x xs' -> - case - ys - [ (\y ys' -> - force mkCons - (addInteger x y) - (case (constr 0 [s, xs', ys']) [s])) - , [] ]) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go xs xs) + ((\s -> s s) + (\s xs ys -> + case + xs + [ (\x xs' -> + case + ys + [ (\y ys' -> + forced + (addInteger x y) + (case (constr 0 [s, xs', ys']) [s])) + , [] ]) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.eval index fbb7cda8a91..0cf7ce182d3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_658_290 -Memory: 26_111 -AST Size: 55 -Flat Size: 74 +CPU: 4_290_307 +Memory: 23_911 +AST Size: 49 +Flat Size: 67 (constr 0 (con bool False) (con bool True)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.pir index cdf44105097..5aa9d8abd9c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.pir @@ -24,11 +24,5 @@ in Tuple2 {bool} {bool} - (all - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (all - {integer} - (\(v : integer) -> case bool (lessThanInteger v 0) [True, False]) - xs) \ No newline at end of file + (all {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (all {integer} (\(v : integer) -> lessThanEqualsInteger 0 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.uplc index d98946bd735..c86f6bdcaa1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\all -> constr 0 - [ (all (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (all (\v -> case (lessThanInteger v 0) [True, False]) xs) ]) + [ (all (\v -> lessThanEqualsInteger 8 v) xs) + , (all (\v -> lessThanEqualsInteger 0 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.eval index c3354a40498..b4730e7b9ec 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_327_320 -Memory: 40_818 -AST Size: 55 -Flat Size: 74 +CPU: 6_725_166 +Memory: 37_218 +AST Size: 49 +Flat Size: 67 (constr 0 (con bool True) (con bool False)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.pir index 190416b6bb9..a3e62c0dbfc 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.pir @@ -24,11 +24,5 @@ in Tuple2 {bool} {bool} - (any - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (any - {integer} - (\(v : integer) -> case bool (lessThanInteger v 12) [True, False]) - xs) \ No newline at end of file + (any {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (any {integer} (\(v : integer) -> lessThanEqualsInteger 12 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.uplc index 03589f8f876..902b47a01c9 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\any -> constr 0 - [ (any (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (any (\v -> case (lessThanInteger v 12) [True, False]) xs) ]) + [ (any (\v -> lessThanEqualsInteger 8 v) xs) + , (any (\v -> lessThanEqualsInteger 12 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.eval index e488db07eeb..fa9143807b3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_363_720 -Memory: 16_920 -AST Size: 27 -Flat Size: 43 +CPU: 3_267_720 +Memory: 16_320 +AST Size: 30 +Flat Size: 45 (con (list integer) [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.uplc index fe57800e173..a4dd4c180d4 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/append.golden.uplc @@ -1,5 +1,5 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.eval index 5051bfc45d9..1ce03f51230 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.eval @@ -1,6 +1,6 @@ CPU: 2_305_548 Memory: 12_828 -AST Size: 51 -Flat Size: 60 +AST Size: 54 +Flat Size: 63 (con (list integer) [1,2,3,4]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.uplc index 208a832aa29..86e553d0289 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat.golden.uplc @@ -1,14 +1,16 @@ (program 1.1.0 - ((\go xss -> go xss) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - (\acc -> - (\s -> s s x) - (\s xs -> - case xs [(\x xs -> force mkCons x (s s xs)), acc])) - (s s xs)) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xss -> go xss) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + (\acc -> + (\s -> s s x) + (\s xs -> + case xs [(\x xs -> forced x (s s xs)), acc])) + (s s xs)) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.eval index 4143213e814..e044b8492da 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.eval @@ -1,6 +1,6 @@ -CPU: 26_201_850 -Memory: 126_250 -AST Size: 89 -Flat Size: 104 +CPU: 25_625_850 +Memory: 122_650 +AST Size: 91 +Flat Size: 106 (con (list integer) [1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.uplc index 879f5e68215..6691b8ee87d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concatMap.golden.uplc @@ -1,27 +1,27 @@ (program 1.1.0 - ((\go xss -> go xss) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x -> - (\go xs -> - (\ys -> - (\l -> - (\s -> s s l) - (\s xs -> - case - xs - [(\x xs -> force mkCons x (s s xs)), ys])) - (go 2)) - (s s xs)) - ((\s -> s s) - (\s n -> - case - (lessThanEqualsInteger n 0) - [ (force mkCons - x - ((\x -> s s x) (subtractInteger n 1))) - , [] ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xss -> go xss) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x -> + (\go xs -> + (\ys -> + (\l -> + (\s -> s s l) + (\s xs -> + case xs [(\x xs -> forced x (s s xs)), ys])) + (go 2)) + (s s xs)) + ((\s -> s s) + (\s n -> + case + (lessThanEqualsInteger n 0) + [ (forced + x + ((\x -> s s x) (subtractInteger n 1))) + , [] ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.eval index e488db07eeb..fa9143807b3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_363_720 -Memory: 16_920 -AST Size: 27 -Flat Size: 43 +CPU: 3_267_720 +Memory: 16_320 +AST Size: 30 +Flat Size: 45 (con (list integer) [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.uplc index fe57800e173..a4dd4c180d4 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/concat_operator.golden.uplc @@ -1,5 +1,5 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.eval index 8adca900cdb..3269a8c0748 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.eval @@ -1,6 +1,6 @@ -CPU: 216_462 -Memory: 1_032 -AST Size: 9 -Flat Size: 27 +CPU: 264_462 +Memory: 1_332 +AST Size: 12 +Flat Size: 30 (con (list integer) [0,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.uplc index f4626f1cdc2..797bd763918 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force mkCons 0 xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced 0 xs) (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.eval index b95b7a68c6c..f17f37a2200 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.eval @@ -1,6 +1,6 @@ -CPU: 216_462 -Memory: 1_032 -AST Size: 9 -Flat Size: 27 +CPU: 264_462 +Memory: 1_332 +AST Size: 12 +Flat Size: 30 (con (list integer) [42,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.uplc index 5d97b79876d..04686ac4161 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/cons_operator.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force mkCons 42 xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced 42 xs) (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.eval index 980a46e38fb..5acf785bdd9 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_528_650 -Memory: 27_280 -AST Size: 41 -Flat Size: 59 +CPU: 6_512_650 +Memory: 27_180 +AST Size: 44 +Flat Size: 62 (con (list integer) [2,4,6,8,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.uplc index d6dd966c53e..3956ab62aa6 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/filter.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> - case - xs - [ (\x xs -> - (\xs -> - case - (equalsInteger 0 (modInteger x 2)) - [xs, (force mkCons x xs)]) - (s s xs)) - , [] ]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) + (\s xs -> + case + xs + [ (\x xs -> + (\xs -> + case + (equalsInteger 0 (modInteger x 2)) + [xs, (forced x xs)]) + (s s xs)) + , [] ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.eval index dde71be8881..a0cb776a7ce 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.eval @@ -1,6 +1,6 @@ -CPU: 7_343_320 -Memory: 40_918 -AST Size: 56 -Flat Size: 76 +CPU: 6_741_166 +Memory: 37_318 +AST Size: 50 +Flat Size: 69 (constr 0 (constr 0 (con integer 8)) (constr 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.pir b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.pir index eaf32ac1076..f420c8dfef4 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.pir +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.pir @@ -28,11 +28,5 @@ in Tuple2 {Maybe integer} {Maybe integer} - (find - {integer} - (\(v : integer) -> case bool (lessThanInteger v 8) [True, False]) - xs) - (find - {integer} - (\(v : integer) -> case bool (lessThanInteger v 12) [True, False]) - xs) \ No newline at end of file + (find {integer} (\(v : integer) -> lessThanEqualsInteger 8 v) xs) + (find {integer} (\(v : integer) -> lessThanEqualsInteger 12 v) xs) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.uplc index e28d8051733..fbcd729c44e 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.golden.uplc @@ -3,8 +3,8 @@ (\xs -> (\find -> constr 0 - [ (find (\v -> case (lessThanInteger v 8) [True, False]) xs) - , (find (\v -> case (lessThanInteger v 12) [True, False]) xs) ]) + [ (find (\v -> lessThanEqualsInteger 8 v) xs) + , (find (\v -> lessThanEqualsInteger 12 v) xs) ]) (\p -> (\s -> s s) (\s xs -> diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.eval index 80bdf3026be..430dc7bcaeb 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.eval @@ -1,6 +1,6 @@ -CPU: 9_076_730 -Memory: 36_900 -AST Size: 55 -Flat Size: 76 +CPU: 9_060_730 +Memory: 36_800 +AST Size: 58 +Flat Size: 78 (con (list integer) [0,2,4,6,8]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.uplc index 4ad2bcb5f03..c7a6c52f62c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/findIndices.golden.uplc @@ -1,14 +1,17 @@ (program 1.1.0 - ((\go xs -> go 0 xs) - ((\s -> s s) - (\s i xs -> - case - xs - [ (\x xs -> - (\indices -> - case - (equalsInteger 0 (modInteger x 2)) - [(force mkCons i indices), indices]) - ((\x -> case (constr 0 [s, x, xs]) [s]) (addInteger 1 i))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go 0 xs) + ((\s -> s s) + (\s i xs -> + case + xs + [ (\x xs -> + (\indices -> + case + (equalsInteger 0 (modInteger x 2)) + [(forced i indices), indices]) + ((\x -> case (constr 0 [s, x, xs]) [s]) + (addInteger 1 i))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headEmpty.golden.uplc index 8c923e35ad8..78f6a9910f8 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headEmpty.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\ds -> (\x -> error) (force trace "PT23" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced ds -> (\x -> error) (forced "PT23" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.eval index c3fbe55d8e9..7da91485678 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 176_100 -Memory: 1_200 -AST Size: 21 -Flat Size: 42 +CPU: 240_100 +Memory: 1_600 +AST Size: 24 +Flat Size: 45 (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.uplc index ae6cf6c227b..c2ec41e8fc3 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/headOk.golden.uplc @@ -1,8 +1,8 @@ (program 1.1.0 - (\xs -> - case - xs - [ (\x xs ds -> x) - , (\ds -> (\x -> error) (force trace "PT23" (constr 0 []))) ] - (constr 0 []))) \ No newline at end of file + ((\forced xs -> + case + xs + [(\x xs ds -> x), (\ds -> (\x -> error) (forced "PT23" (constr 0 [])))] + (constr 0 [])) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.eval index 68586922b76..dcb4045387a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.eval @@ -1,6 +1,6 @@ -CPU: 430_596 -Memory: 2_004 -AST Size: 29 -Flat Size: 50 +CPU: 542_596 +Memory: 2_704 +AST Size: 35 +Flat Size: 55 (con integer 6) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.uplc index e08ff937752..4903ab337ca 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.golden.uplc @@ -1,9 +1,11 @@ (program 1.1.0 - (\xs -> - case - (force dropList 5 xs) - [ (\x xs ds _ann -> x) - , (\_ann -> (\x -> error) (force trace "PT22" (constr 0 []))) ] - (constr 0 []) - (constr 0 []))) \ No newline at end of file + ((\forced forced xs -> + case + (forced 5 xs) + [ (\x xs ds _ann -> x) + , (\_ann -> (\x -> error) (forced "PT22" (constr 0 []))) ] + (constr 0 []) + (constr 0 [])) + (force trace) + (force dropList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexNegative.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexNegative.golden.uplc index 59f1aaeb038..9b0c35a0b52 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexNegative.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexNegative.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\xs -> (\x -> error) (force trace "PT21" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced xs -> (\x -> error) (forced "PT21" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexTooLarge.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexTooLarge.golden.uplc index 669c39e7364..53d5e71eb32 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexTooLarge.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/indexTooLarge.golden.uplc @@ -1,9 +1,11 @@ (program 1.1.0 - (\xs -> - case - (force dropList 10 xs) - [ (\x xs ds _ann -> x) - , (\_ann -> (\x -> error) (force trace "PT22" (constr 0 []))) ] - (constr 0 []) - (constr 0 []))) \ No newline at end of file + ((\forced forced xs -> + case + (forced 10 xs) + [ (\x xs ds _ann -> x) + , (\_ann -> (\x -> error) (forced "PT22" (constr 0 []))) ] + (constr 0 []) + (constr 0 [])) + (force trace) + (force dropList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastEmpty.golden.uplc index eebd0e9091c..20b0defd452 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastEmpty.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\last ds -> force last []) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\eta -> - case - eta - [ (\x xs ds -> - case - xs - [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 [])))))) \ No newline at end of file + ((\forced -> + (\last ds -> force last []) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\eta -> + case + eta + [ (\x xs ds -> + case + xs + [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 []))))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.eval index 5318300fc7b..dd252859aee 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 3_648_100 -Memory: 22_900 -AST Size: 54 -Flat Size: 69 +CPU: 3_712_100 +Memory: 23_300 +AST Size: 57 +Flat Size: 72 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.uplc index 3368401c122..793e1bad817 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/lastOk.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\last xs -> force last xs) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\eta -> - case - eta - [ (\x xs ds -> - case - xs - [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 [])))))) \ No newline at end of file + ((\forced -> + (\last xs -> force last xs) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\eta -> + case + eta + [ (\x xs ds -> + case + xs + [(\ds ds -> force (s s (delay (\x -> x))) xs), x]) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 []))))) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.eval index 585d518ae4e..4178067ef74 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_967_800 -Memory: 20_640 -AST Size: 28 -Flat Size: 46 +CPU: 4_871_800 +Memory: 20_040 +AST Size: 31 +Flat Size: 48 (con (list integer) [2,3,4,5,6,7,8,9,10,11]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.uplc index 19ba236e8d0..6aff3c57ccb 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.golden.uplc @@ -1,5 +1,6 @@ (program 1.1.0 - ((\s -> s s) - (\s xs -> - case xs [(\x xs -> force mkCons (addInteger 1 x) (s s xs)), []]))) \ No newline at end of file + ((\forced -> + (\s -> s s) + (\s xs -> case xs [(\x xs -> forced (addInteger 1 x) (s s xs)), []])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.eval index 57116a23a4b..13c4423fd65 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_048_650 -Memory: 24_280 -AST Size: 42 -Flat Size: 61 +CPU: 6_032_650 +Memory: 24_180 +AST Size: 45 +Flat Size: 63 (con (list integer) [1,3,5,7,9]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.uplc index 44e5c762ef5..1fe0d38079a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/mapMaybe.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - (\xs -> - (\s -> s s xs) - (\s xs -> - case - xs - [ (\x xs -> - case - (equalsInteger 0 (modInteger x 2)) - [(force mkCons x (s s xs)), (s s xs)]) - , [] ]))) \ No newline at end of file + ((\forced xs -> + (\s -> s s xs) + (\s xs -> + case + xs + [ (\x xs -> + case + (equalsInteger 0 (modInteger x 2)) + [(forced x (s s xs)), (s s xs)]) + , [] ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.eval index 3616c15d17f..31784bebab5 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.eval @@ -1,6 +1,6 @@ -CPU: 45_196_260 -Memory: 237_360 -AST Size: 98 -Flat Size: 116 +CPU: 44_780_260 +Memory: 234_760 +AST Size: 99 +Flat Size: 118 (con (list integer) [1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.uplc index af8e7401ce6..f7b5bf894f6 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nub.golden.uplc @@ -1,27 +1,29 @@ (program 1.1.0 - ((\go xs -> - go - ((\s -> s s xs) - (\s xs -> case xs [(\x xs -> force mkCons x (s s xs)), xs])) - []) - ((\s -> s s) - (\s l xs -> - case - l - [ (\y -> - (\go ys -> - case - (go xs) - [ (force mkCons - y - (case (constr 0 [s, ys, (force mkCons y xs)]) [s])) - , (case (constr 0 [s, ys, xs]) [s]) ]) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - case (equalsInteger x y) [(s s xs), True]) - , False ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> + go + ((\s -> s s xs) + (\s xs -> case xs [(\x xs -> forced x (s s xs)), xs])) + []) + ((\s -> s s) + (\s l xs -> + case + l + [ (\y -> + (\go ys -> + case + (go xs) + [ (forced + y + (case (constr 0 [s, ys, (forced y xs)]) [s])) + , (case (constr 0 [s, ys, xs]) [s]) ]) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + case (equalsInteger x y) [(s s xs), True]) + , False ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.eval index a9049dd190d..7fa8909b134 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_667_357 -Memory: 38_473 -AST Size: 75 -Flat Size: 95 +CPU: 6_699_357 +Memory: 38_673 +AST Size: 77 +Flat Size: 97 (con (list integer) [1]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.uplc index d1722efd7ce..17601d8406e 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/nubBy.golden.uplc @@ -1,25 +1,27 @@ (program 1.1.0 - ((\go xs -> go xs []) - ((\s -> s s) - (\s l xs -> - case - l - [ (\y -> - (\go ys -> - case - (go xs) - [ (force mkCons - y - (case (constr 0 [s, ys, (force mkCons y xs)]) [s])) - , (case (constr 0 [s, ys, xs]) [s]) ]) - ((\s -> s s) - (\s xs -> - case - xs - [ (\x xs -> - case - (lessThanEqualsInteger x y) - [(s s xs), True]) - , False ]))) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go xs []) + ((\s -> s s) + (\s l xs -> + case + l + [ (\y -> + (\go ys -> + case + (go xs) + [ (forced + y + (case (constr 0 [s, ys, (forced y xs)]) [s])) + , (case (constr 0 [s, ys, xs]) [s]) ]) + ((\s -> s s) + (\s xs -> + case + xs + [ (\x xs -> + case + (lessThanEqualsInteger x y) + [(s s xs), True]) + , False ]))) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.eval index 3b57f8ca299..b4ffded2c53 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.eval @@ -1,6 +1,6 @@ -CPU: 186_533 -Memory: 832 -AST Size: 7 -Flat Size: 23 +CPU: 234_533 +Memory: 1_132 +AST Size: 10 +Flat Size: 27 (con bool False) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.uplc index 9b1e32cfe90..ac40ef6ee68 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/null.golden.uplc @@ -1 +1 @@ -(program 1.1.0 (\xs -> force nullList xs)) \ No newline at end of file +(program 1.1.0 ((\forced xs -> forced xs) (force nullList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.eval index 2dab43de4e5..c2c45a8b16d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_410_007 -Memory: 26_651 -AST Size: 39 -Flat Size: 59 +CPU: 6_314_007 +Memory: 26_051 +AST Size: 42 +Flat Size: 61 (con (list integer) [0,0,0,0,0,0,0,0,0,0]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.uplc index 2794a5f3130..67874ce88a1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/replicate.golden.uplc @@ -1,8 +1,10 @@ (program 1.1.0 - ((\go ds -> go 10) - ((\s -> s s) - (\s n -> - case - (lessThanEqualsInteger n 0) - [(force mkCons 0 ((\x -> s s x) (subtractInteger n 1))), []])))) \ No newline at end of file + ((\forced -> + (\go ds -> go 10) + ((\s -> s s) + (\s n -> + case + (lessThanEqualsInteger n 0) + [(forced 0 ((\x -> s s x) (subtractInteger n 1))), []]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.eval index 10cf7b56102..8d8664ab9c1 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_819_720 -Memory: 26_020 -AST Size: 47 -Flat Size: 58 +CPU: 4_723_720 +Memory: 25_420 +AST Size: 50 +Flat Size: 60 (con (list integer) [10,9,8,7,6,5,4,3,2,1,1,2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.uplc index c1ee2518eb3..b8f4e98109c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/revAppend.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - ((\revAppend xs -> force revAppend xs xs) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\l r -> - case - l - [ (\x xs -> - force (s s (delay (\x -> x))) xs (force mkCons x r)) - , r ]))))) \ No newline at end of file + ((\forced -> + (\revAppend xs -> force revAppend xs xs) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\l r -> + case + l + [ (\x xs -> force (s s (delay (\x -> x))) xs (forced x r)) + , r ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.eval index 05d26600fc9..f07657fd6a2 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_819_720 -Memory: 26_020 -AST Size: 47 -Flat Size: 59 +CPU: 4_723_720 +Memory: 25_420 +AST Size: 50 +Flat Size: 61 (con (list integer) [10,9,8,7,6,5,4,3,2,1]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.uplc index a79bdbe4937..3332b87a8cd 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/reverse.golden.uplc @@ -1,12 +1,13 @@ (program 1.1.0 - ((\revAppend xs -> force revAppend xs []) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\l r -> - case - l - [ (\x xs -> - force (s s (delay (\x -> x))) xs (force mkCons x r)) - , r ]))))) \ No newline at end of file + ((\forced -> + (\revAppend xs -> force revAppend xs []) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\l r -> + case + l + [ (\x xs -> force (s s (delay (\x -> x))) xs (forced x r)) + , r ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailEmpty.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailEmpty.golden.uplc index a6d9dffb651..bbfd93bb716 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailEmpty.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailEmpty.golden.uplc @@ -1 +1,3 @@ -(program 1.1.0 (\ds -> (\x -> error) (force trace "PT25" (constr 0 [])))) \ No newline at end of file +(program + 1.1.0 + ((\forced ds -> (\x -> error) (forced "PT25" (constr 0 []))) (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.eval index 5cbc0c47103..e2753c1eca0 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 176_100 -Memory: 1_200 -AST Size: 21 -Flat Size: 42 +CPU: 240_100 +Memory: 1_600 +AST Size: 24 +Flat Size: 45 (con (list integer) [2,3,4,5,6,7,8,9,10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.uplc index 3c2115eeca9..fc0790c6567 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/tailOk.golden.uplc @@ -1,8 +1,9 @@ (program 1.1.0 - (\xs -> - case - xs - [ (\x xs ds -> xs) - , (\ds -> (\x -> error) (force trace "PT25" (constr 0 []))) ] - (constr 0 []))) \ No newline at end of file + ((\forced xs -> + case + xs + [ (\x xs ds -> xs) + , (\ds -> (\x -> error) (forced "PT25" (constr 0 []))) ] + (constr 0 [])) + (force trace))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.eval index 7a3d9c2dca4..3d42f200b84 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.eval @@ -1,6 +1,6 @@ -CPU: 4_442_972 -Memory: 20_976 -AST Size: 61 -Flat Size: 80 +CPU: 4_426_972 +Memory: 20_876 +AST Size: 64 +Flat Size: 82 (con (list integer) [1,2,3,4,5]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.uplc index ddada167c33..62bce60d84c 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/take.golden.uplc @@ -1,20 +1,22 @@ (program 1.1.0 - ((\take xs -> case (constr 0 [[], 5, xs]) [(force take)]) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\`$dMkNil` n l -> - case - (lessThanEqualsInteger n 0) - [ (case - l - [ (\x xs -> - force mkCons - x - (case - (constr 0 - [`$dMkNil`, (subtractInteger n 1), xs]) - [(force (s s (delay (\x -> x))))])) - , `$dMkNil` ]) - , `$dMkNil` ]))))) \ No newline at end of file + ((\forced -> + (\take xs -> case (constr 0 [[], 5, xs]) [(force take)]) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\`$dMkNil` n l -> + case + (lessThanEqualsInteger n 0) + [ (case + l + [ (\x xs -> + forced + x + (case + (constr 0 + [`$dMkNil`, (subtractInteger n 1), xs]) + [(force (s s (delay (\x -> x))))])) + , `$dMkNil` ]) + , `$dMkNil` ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.eval index 2dba77ef95a..d3e608ada1a 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_445_344 -Memory: 7_536 -AST Size: 72 -Flat Size: 91 +CPU: 1_493_344 +Memory: 7_836 +AST Size: 75 +Flat Size: 94 (constr 0 (con integer 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.uplc index bb1fbbbefc0..ffc5c3a7d89 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/uniqueElementJust.golden.uplc @@ -1,24 +1,26 @@ (program 1.1.0 - ((\take xs -> - case - (case (constr 0 [[], 1, xs]) [(force take)]) - [ (\x xs -> case xs [(\ds ds -> constr 1 []), (constr 0 [x])]) - , (constr 1 []) ]) - ((\s -> s s (delay (\x -> x))) - (\s arg -> - delay - (\`$dMkNil` n l -> - case - (lessThanEqualsInteger n 0) - [ (case - l - [ (\x xs -> - force mkCons - x - (case - (constr 0 - [`$dMkNil`, (subtractInteger n 1), xs]) - [(force (s s (delay (\x -> x))))])) - , `$dMkNil` ]) - , `$dMkNil` ]))))) \ No newline at end of file + ((\forced -> + (\take xs -> + case + (case (constr 0 [[], 1, xs]) [(force take)]) + [ (\x xs -> case xs [(\ds ds -> constr 1 []), (constr 0 [x])]) + , (constr 1 []) ]) + ((\s -> s s (delay (\x -> x))) + (\s arg -> + delay + (\`$dMkNil` n l -> + case + (lessThanEqualsInteger n 0) + [ (case + l + [ (\x xs -> + forced + x + (case + (constr 0 + [`$dMkNil`, (subtractInteger n 1), xs]) + [(force (s s (delay (\x -> x))))])) + , `$dMkNil` ]) + , `$dMkNil` ])))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.eval b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.eval index f820b9aecf9..c8516fdeb73 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.eval @@ -1,6 +1,6 @@ -CPU: 6_071_800 -Memory: 27_540 -AST Size: 43 -Flat Size: 62 +CPU: 5_975_800 +Memory: 26_940 +AST Size: 46 +Flat Size: 64 (con (list integer) [2,4,6,8,10,12,14,16,18,20]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.uplc b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.uplc index 455f49e15a0..6955c10fa1d 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/zipWith.golden.uplc @@ -1,16 +1,18 @@ (program 1.1.0 - ((\go xs -> go xs xs) - ((\s -> s s) - (\s xs ys -> - case - xs - [ (\x xs' -> - case - ys - [ (\y ys' -> - force mkCons - (addInteger x y) - (case (constr 0 [s, xs', ys']) [s])) - , [] ]) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go xs -> go xs xs) + ((\s -> s s) + (\s xs ys -> + case + xs + [ (\x xs' -> + case + ys + [ (\y ys' -> + forced + (addInteger x y) + (case (constr 0 [s, xs', ys']) [s])) + , [] ]) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.eval index 8d99cf09143..1270e0be3c9 100644 --- a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 356_913 -Memory: 1_364 -AST Size: 12 -Flat Size: 30 +CPU: 452_913 +Memory: 1_964 +AST Size: 18 +Flat Size: 35 (constr 0 (con integer 1) (con (list integer) [2,3,4,5,6,7,8,9,10])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.uplc index c3a8f13f1ad..b52552b77a2 100644 --- a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.12/unsafeUnconsOk.golden.uplc @@ -1 +1,5 @@ -(program 1.1.0 (\xs -> constr 0 [(force headList xs), (force tailList xs)])) \ No newline at end of file +(program + 1.1.0 + ((\forced forced xs -> constr 0 [(forced xs), (forced xs)]) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.eval b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.eval index 8d99cf09143..1270e0be3c9 100644 --- a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.eval +++ b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.eval @@ -1,6 +1,6 @@ -CPU: 356_913 -Memory: 1_364 -AST Size: 12 -Flat Size: 30 +CPU: 452_913 +Memory: 1_964 +AST Size: 18 +Flat Size: 35 (constr 0 (con integer 1) (con (list integer) [2,3,4,5,6,7,8,9,10])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.uplc b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.uplc index c3a8f13f1ad..b52552b77a2 100644 --- a/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.uplc +++ b/plutus-tx-plugin/test/BuiltinList/NoCasing/9.6/unsafeUnconsOk.golden.uplc @@ -1 +1,5 @@ -(program 1.1.0 (\xs -> constr 0 [(force headList xs), (force tailList xs)])) \ No newline at end of file +(program + 1.1.0 + ((\forced forced xs -> constr 0 [(forced xs), (forced xs)]) + (force tailList) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/CallTrace/9.12/successfullEvaluationYieldsNoTraceLog.golden.eval b/plutus-tx-plugin/test/CallTrace/9.12/successfullEvaluationYieldsNoTraceLog.golden.eval index 595ef84055e..de65b98a556 100644 --- a/plutus-tx-plugin/test/CallTrace/9.12/successfullEvaluationYieldsNoTraceLog.golden.eval +++ b/plutus-tx-plugin/test/CallTrace/9.12/successfullEvaluationYieldsNoTraceLog.golden.eval @@ -1,7 +1,7 @@ -CPU: 1_653_088 -Memory: 8_392 -AST Size: 90 -Flat Size: 451 +CPU: 1_621_088 +Memory: 8_192 +AST Size: 88 +Flat Size: 452 No Trace Produced diff --git a/plutus-tx-plugin/test/CallTrace/9.6/successfullEvaluationYieldsNoTraceLog.golden.eval b/plutus-tx-plugin/test/CallTrace/9.6/successfullEvaluationYieldsNoTraceLog.golden.eval index 595ef84055e..de65b98a556 100644 --- a/plutus-tx-plugin/test/CallTrace/9.6/successfullEvaluationYieldsNoTraceLog.golden.eval +++ b/plutus-tx-plugin/test/CallTrace/9.6/successfullEvaluationYieldsNoTraceLog.golden.eval @@ -1,7 +1,7 @@ -CPU: 1_653_088 -Memory: 8_392 -AST Size: 90 -Flat Size: 451 +CPU: 1_621_088 +Memory: 8_192 +AST Size: 88 +Flat Size: 452 No Trace Produced diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.eval index 88e613655b6..3778602b77e 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.eval @@ -1,4 +1,4 @@ -CPU: 2_992_372 +CPU: 2_980_748 Memory: 15_764 AST Size: 34 Flat Size: 80 diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.pir index caed166b431..133082cb7f6 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.pir @@ -7,7 +7,7 @@ letrec [ (\(x : data) (eta : list data) -> case (all dead. bool) - (case bool (lessThanInteger (unIData x) 8) [True, False]) + (lessThanEqualsInteger 8 (unIData x)) [(/\dead -> go eta), (/\dead -> True)] {all dead. dead}) , False ] diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.uplc index b013f2de850..0e3aeaf103e 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/any.golden.uplc @@ -6,5 +6,5 @@ case ds [ (\x eta -> - case (lessThanInteger (unIData x) 8) [True, (s s eta)]) + case (lessThanEqualsInteger 8 (unIData x)) [(s s eta), True]) , False ])))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.eval index 4523d1eaf5e..507102a2d40 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_051_423 -Memory: 26_422 -AST Size: 51 -Flat Size: 96 +CPU: 5_052_893 +Memory: 26_522 +AST Size: 54 +Flat Size: 99 (con (list data) [I 8, I 9, I 10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.pir index 6656c2f1dc3..b5deee8abdf 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.pir @@ -13,7 +13,7 @@ letrec in case (all dead. (\a -> list data) integer) - (case bool (lessThanInteger h 8) [True, False]) + (lessThanEqualsInteger 8 h) [ (/\dead -> go eta) , (/\dead -> let diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.uplc index 0141ef853e0..cf1df7fb0b0 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/filter.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\go eta -> go eta) - ((\s -> s s) - (\s ds -> - case - ds - [ (\x eta -> - (\h -> - case - (lessThanInteger h 8) - [ ((\nt -> force mkCons (iData h) nt) (s s eta)) - , (s s eta) ]) - (unIData x)) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go eta -> go eta) + ((\s -> s s) + (\s ds -> + case + ds + [ (\x eta -> + (\h -> + case + (lessThanEqualsInteger 8 h) + [ (s s eta) + , ((\nt -> forced (iData h) nt) (s s eta)) ]) + (unIData x)) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.eval index 8bc97990d85..a8d4d7ae9bf 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_159_083 -Memory: 5_892 -AST Size: 46 -Flat Size: 54 +CPU: 1_175_083 +Memory: 5_992 +AST Size: 48 +Flat Size: 56 (con (list data) [I 1, I 2, I 3]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.uplc index 006eb80261d..bd6806c59e1 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/makeList.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\x y z -> - (\cons -> - case - (constr 0 - [ (\i -> iData i) - , x - , (case - (constr 0 [(\i -> iData i), y, (force mkCons (iData z) [])]) - [cons]) ]) - [cons]) - (\`$dToData` h eta -> force mkCons (`$dToData` h) eta))) \ No newline at end of file + ((\forced x y z -> + (\cons -> + case + (constr 0 + [ (\i -> iData i) + , x + , (case + (constr 0 [(\i -> iData i), y, (forced (iData z) [])]) + [cons]) ]) + [cons]) + (\`$dToData` h eta -> forced (`$dToData` h) eta)) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.eval index 980127251a2..64d6716f4c7 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.eval @@ -1,7 +1,7 @@ -CPU: 6_296_060 -Memory: 31_450 -AST Size: 51 -Flat Size: 102 +CPU: 6_185_530 +Memory: 30_850 +AST Size: 53 +Flat Size: 104 (constr 0 diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.pir index 4c5faa19bdc..eb858a642a1 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.pir @@ -20,7 +20,7 @@ in (\(ipv : list data) (ipv : list data) -> case (all dead. Tuple (list data) (list data)) - (case bool (lessThanInteger (unIData h) 8) [True, False]) + (lessThanEqualsInteger 8 (unIData h)) [ (/\dead -> Tuple2 {list data} diff --git a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.uplc index 778bae2ffef..375c3c22302 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.12/partition.golden.uplc @@ -1,16 +1,17 @@ (program 1.1.0 - (\l -> - (\s -> s s l) - (\s xs -> - case - xs - [ (\h t -> - case - (s s t) - [ (\ipv ipv -> - case - (lessThanInteger (unIData h) 8) - [ (constr 0 [(force mkCons h ipv), ipv]) - , (constr 0 [ipv, (force mkCons h ipv)]) ]) ]) - , (constr 0 [[], []]) ]))) \ No newline at end of file + ((\forced l -> + (\s -> s s l) + (\s xs -> + case + xs + [ (\h t -> + case + (s s t) + [ (\ipv ipv -> + case + (lessThanEqualsInteger 8 (unIData h)) + [ (constr 0 [ipv, (forced h ipv)]) + , (constr 0 [(forced h ipv), ipv]) ]) ]) + , (constr 0 [[], []]) ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.eval index 88e613655b6..3778602b77e 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.eval @@ -1,4 +1,4 @@ -CPU: 2_992_372 +CPU: 2_980_748 Memory: 15_764 AST Size: 34 Flat Size: 80 diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.pir index caed166b431..133082cb7f6 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.pir @@ -7,7 +7,7 @@ letrec [ (\(x : data) (eta : list data) -> case (all dead. bool) - (case bool (lessThanInteger (unIData x) 8) [True, False]) + (lessThanEqualsInteger 8 (unIData x)) [(/\dead -> go eta), (/\dead -> True)] {all dead. dead}) , False ] diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.uplc index b013f2de850..0e3aeaf103e 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/any.golden.uplc @@ -6,5 +6,5 @@ case ds [ (\x eta -> - case (lessThanInteger (unIData x) 8) [True, (s s eta)]) + case (lessThanEqualsInteger 8 (unIData x)) [(s s eta), True]) , False ])))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.eval index 4523d1eaf5e..507102a2d40 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.eval @@ -1,6 +1,6 @@ -CPU: 5_051_423 -Memory: 26_422 -AST Size: 51 -Flat Size: 96 +CPU: 5_052_893 +Memory: 26_522 +AST Size: 54 +Flat Size: 99 (con (list data) [I 8, I 9, I 10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.pir index 6656c2f1dc3..b5deee8abdf 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.pir @@ -13,7 +13,7 @@ letrec in case (all dead. (\a -> list data) integer) - (case bool (lessThanInteger h 8) [True, False]) + (lessThanEqualsInteger 8 h) [ (/\dead -> go eta) , (/\dead -> let diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.uplc index 0141ef853e0..cf1df7fb0b0 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.golden.uplc @@ -1,15 +1,17 @@ (program 1.1.0 - ((\go eta -> go eta) - ((\s -> s s) - (\s ds -> - case - ds - [ (\x eta -> - (\h -> - case - (lessThanInteger h 8) - [ ((\nt -> force mkCons (iData h) nt) (s s eta)) - , (s s eta) ]) - (unIData x)) - , [] ])))) \ No newline at end of file + ((\forced -> + (\go eta -> go eta) + ((\s -> s s) + (\s ds -> + case + ds + [ (\x eta -> + (\h -> + case + (lessThanEqualsInteger 8 h) + [ (s s eta) + , ((\nt -> forced (iData h) nt) (s s eta)) ]) + (unIData x)) + , [] ]))) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.eval index 8bc97990d85..a8d4d7ae9bf 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_159_083 -Memory: 5_892 -AST Size: 46 -Flat Size: 54 +CPU: 1_175_083 +Memory: 5_992 +AST Size: 48 +Flat Size: 56 (con (list data) [I 1, I 2, I 3]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.uplc index 006eb80261d..bd6806c59e1 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\x y z -> - (\cons -> - case - (constr 0 - [ (\i -> iData i) - , x - , (case - (constr 0 [(\i -> iData i), y, (force mkCons (iData z) [])]) - [cons]) ]) - [cons]) - (\`$dToData` h eta -> force mkCons (`$dToData` h) eta))) \ No newline at end of file + ((\forced x y z -> + (\cons -> + case + (constr 0 + [ (\i -> iData i) + , x + , (case + (constr 0 [(\i -> iData i), y, (forced (iData z) [])]) + [cons]) ]) + [cons]) + (\`$dToData` h eta -> forced (`$dToData` h) eta)) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.eval b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.eval index 980127251a2..64d6716f4c7 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.eval +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.eval @@ -1,7 +1,7 @@ -CPU: 6_296_060 -Memory: 31_450 -AST Size: 51 -Flat Size: 102 +CPU: 6_185_530 +Memory: 30_850 +AST Size: 53 +Flat Size: 104 (constr 0 diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.pir b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.pir index 71332035824..62288887be9 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.pir +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.pir @@ -20,7 +20,7 @@ in (\(ipv : list data) (ipv : list data) -> case (all dead. Tuple2 (list data) (list data)) - (case bool (lessThanInteger (unIData h) 8) [True, False]) + (lessThanEqualsInteger 8 (unIData h)) [ (/\dead -> Tuple2 {list data} diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.uplc b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.uplc index 778bae2ffef..375c3c22302 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.uplc +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.golden.uplc @@ -1,16 +1,17 @@ (program 1.1.0 - (\l -> - (\s -> s s l) - (\s xs -> - case - xs - [ (\h t -> - case - (s s t) - [ (\ipv ipv -> - case - (lessThanInteger (unIData h) 8) - [ (constr 0 [(force mkCons h ipv), ipv]) - , (constr 0 [ipv, (force mkCons h ipv)]) ]) ]) - , (constr 0 [[], []]) ]))) \ No newline at end of file + ((\forced l -> + (\s -> s s l) + (\s xs -> + case + xs + [ (\h t -> + case + (s s t) + [ (\ipv ipv -> + case + (lessThanEqualsInteger 8 (unIData h)) + [ (constr 0 [ipv, (forced h ipv)]) + , (constr 0 [(forced h ipv), ipv]) ]) ]) + , (constr 0 [[], []]) ])) + (force mkCons))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.eval index 31c76961a04..6c581679148 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 52 -Flat Size: 69 +CPU: 560_582 +Memory: 2_896 +AST Size: 53 +Flat Size: 70 (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.uplc index ce44a731249..e7b9a410dea 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeA.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) - , (\ds -> constr 2 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) + , (\ds -> constr 2 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.eval index da301254da8..abf2f7a8b8e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.eval @@ -1,6 +1,6 @@ -CPU: 677_790 -Memory: 2_998 -AST Size: 52 -Flat Size: 68 +CPU: 725_790 +Memory: 3_298 +AST Size: 53 +Flat Size: 69 (con integer 207) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.uplc index ce44a731249..e7b9a410dea 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeC.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) - , (\ds -> constr 2 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) + , (\ds -> constr 2 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.eval index a3241809396..ec94655e4e4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 38 -Flat Size: 51 +CPU: 560_582 +Memory: 2_896 +AST Size: 40 +Flat Size: 53 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.uplc index e83f460ede1..d1e81350e6c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairA.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 1 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 1 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.eval index 44dc5d05f57..8f4a282d27e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.eval @@ -1,6 +1,6 @@ -CPU: 677_790 -Memory: 2_998 -AST Size: 38 -Flat Size: 51 +CPU: 725_790 +Memory: 3_298 +AST Size: 40 +Flat Size: 53 (con integer 21) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.uplc index e83f460ede1..d1e81350e6c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodePairB.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 1 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 1 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.eval index 7b41fb3134b..2f546e5db23 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 24 -Flat Size: 37 +CPU: 560_582 +Memory: 2_896 +AST Size: 27 +Flat Size: 39 (con integer 99) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.uplc index d75a2eb61c1..53b78e1da17 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.12/decodeSingle.golden.uplc @@ -1,10 +1,10 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case index [(\ds -> constr 0 [(unIData (force headList ds))])] - args) ]) - [(\x -> x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case index [(\ds -> constr 0 [(unIData (forced ds))])] args) ]) + [(\x -> x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.eval index 31c76961a04..6c581679148 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 52 -Flat Size: 69 +CPU: 560_582 +Memory: 2_896 +AST Size: 53 +Flat Size: 70 (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.uplc index ce44a731249..e7b9a410dea 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeA.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) - , (\ds -> constr 2 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) + , (\ds -> constr 2 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.eval index da301254da8..abf2f7a8b8e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.eval @@ -1,6 +1,6 @@ -CPU: 677_790 -Memory: 2_998 -AST Size: 52 -Flat Size: 68 +CPU: 725_790 +Memory: 3_298 +AST Size: 53 +Flat Size: 69 (con integer 207) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.uplc index ce44a731249..e7b9a410dea 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeC.golden.uplc @@ -1,14 +1,15 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) - , (\ds -> constr 2 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) + , (\ds -> constr 2 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 100 x), (\x -> addInteger 200 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.eval index a3241809396..ec94655e4e4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 38 -Flat Size: 51 +CPU: 560_582 +Memory: 2_896 +AST Size: 40 +Flat Size: 53 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.uplc index e83f460ede1..d1e81350e6c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairA.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 1 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 1 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.eval index 44dc5d05f57..8f4a282d27e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.eval @@ -1,6 +1,6 @@ -CPU: 677_790 -Memory: 2_998 -AST Size: 38 -Flat Size: 51 +CPU: 725_790 +Memory: 3_298 +AST Size: 40 +Flat Size: 53 (con integer 21) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.uplc index e83f460ede1..d1e81350e6c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodePairB.golden.uplc @@ -1,13 +1,14 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case - index - [ (\ds -> constr 0 [(unIData (force headList ds))]) - , (\ds -> constr 1 [(unIData (force headList ds))]) ] - args) ]) - [(\x -> x), (\x -> addInteger 1 x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case + index + [ (\ds -> constr 0 [(unIData (forced ds))]) + , (\ds -> constr 1 [(unIData (forced ds))]) ] + args) ]) + [(\x -> x), (\x -> addInteger 1 x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.eval b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.eval index 7b41fb3134b..2f546e5db23 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.eval @@ -1,6 +1,6 @@ -CPU: 512_582 -Memory: 2_596 -AST Size: 24 -Flat Size: 37 +CPU: 560_582 +Memory: 2_896 +AST Size: 27 +Flat Size: 39 (con integer 99) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.uplc index d75a2eb61c1..53b78e1da17 100644 --- a/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/BuiltinCasing/9.6/decodeSingle.golden.uplc @@ -1,10 +1,10 @@ (program 1.1.0 - (\d -> - case - (case - (unConstrData d) - [ (\index args -> - case index [(\ds -> constr 0 [(unIData (force headList ds))])] - args) ]) - [(\x -> x)])) \ No newline at end of file + ((\forced d -> + case + (case + (unConstrData d) + [ (\index args -> + case index [(\ds -> constr 0 [(unIData (forced ds))])] args) ]) + [(\x -> x)]) + (force headList))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.eval index 437010f6f4d..68ea21f6bf4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 100 -Flat Size: 113 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 106 +Flat Size: 123 (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.uplc index c07a9ef0a9c..b2dcad7889b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeA.golden.uplc @@ -1,47 +1,56 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [ (\x -> x) - , (\x -> addInteger 100 x) - , (\x -> addInteger 200 x) ]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [ (\x -> x) + , (\x -> addInteger 100 x) + , (\x -> addInteger 200 x) ]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.eval index 885c9cd3f60..080d439653c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_098_823 -Memory: 7_768 -AST Size: 100 -Flat Size: 112 +CPU: 2_226_823 +Memory: 8_568 +AST Size: 106 +Flat Size: 122 (con integer 207) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.uplc index c07a9ef0a9c..b2dcad7889b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeC.golden.uplc @@ -1,47 +1,56 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [ (\x -> x) - , (\x -> addInteger 100 x) - , (\x -> addInteger 200 x) ]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [ (\x -> x) + , (\x -> addInteger 100 x) + , (\x -> addInteger 200 x) ]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.eval index 97dd29f7c07..f761ce10dd0 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_076_957 -Memory: 4_198 -AST Size: 99 -Flat Size: 106 +CPU: 1_300_957 +Memory: 5_598 +AST Size: 107 +Flat Size: 118 (con integer 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.uplc index 2fd208c4c2e..b65102f349e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedNone.golden.uplc @@ -1,49 +1,59 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay (\ds -> constr 0 [])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [0, (\x -> x), (\x y -> addInteger x y)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force tailList) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay (\ds -> constr 0 [])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [0, (\x -> x), (\x y -> addInteger x y)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.eval index e31892500c9..e4c9bfea86a 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_444_380 -Memory: 8_864 -AST Size: 99 -Flat Size: 109 +CPU: 2_588_380 +Memory: 9_764 +AST Size: 107 +Flat Size: 121 (con integer 7) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.uplc index 2fd208c4c2e..b65102f349e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeMixedTwo.golden.uplc @@ -1,49 +1,59 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay (\ds -> constr 0 [])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [0, (\x -> x), (\x y -> addInteger x y)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force tailList) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay (\ds -> constr 0 [])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [0, (\x -> x), (\x y -> addInteger x y)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.eval index e3db4dad5ba..d61c7e4d7f4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 74 -Flat Size: 83 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 82 +Flat Size: 94 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.uplc index c434c8e7f68..bf99204b05b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairA.golden.uplc @@ -1,32 +1,36 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [(\x -> x), (\x -> addInteger 1 x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay error) ]) + [forced]))) ]) + [forced]) + args) + [(\x -> x), (\x -> addInteger 1 x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.eval index 38501ab3dec..85b4d2c1018 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_778_441 -Memory: 6_566 -AST Size: 74 -Flat Size: 83 +CPU: 1_922_441 +Memory: 7_466 +AST Size: 82 +Flat Size: 94 (con integer 21) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.uplc index c434c8e7f68..bf99204b05b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodePairB.golden.uplc @@ -1,32 +1,36 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [(\x -> x), (\x -> addInteger 1 x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay error) ]) + [forced]))) ]) + [forced]) + args) + [(\x -> x), (\x -> addInteger 1 x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.eval index aa0ec510b97..bc404a46f7e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 48 -Flat Size: 57 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 58 +Flat Size: 68 (con integer 99) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.uplc index 8c4c0a18e91..18c12f05ba3 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.12/decodeSingle.golden.uplc @@ -1,21 +1,26 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay error) ]) - [(force ifThenElse)]) - args) - [(\x -> x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay error) ]) + [forced]) + args) + [(\x -> x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.eval index 437010f6f4d..68ea21f6bf4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 100 -Flat Size: 113 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 106 +Flat Size: 123 (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.uplc index c07a9ef0a9c..b2dcad7889b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeA.golden.uplc @@ -1,47 +1,56 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [ (\x -> x) - , (\x -> addInteger 100 x) - , (\x -> addInteger 200 x) ]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [ (\x -> x) + , (\x -> addInteger 100 x) + , (\x -> addInteger 200 x) ]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.eval index 885c9cd3f60..080d439653c 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_098_823 -Memory: 7_768 -AST Size: 100 -Flat Size: 112 +CPU: 2_226_823 +Memory: 8_568 +AST Size: 106 +Flat Size: 122 (con integer 207) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.uplc index c07a9ef0a9c..b2dcad7889b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeC.golden.uplc @@ -1,47 +1,56 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [ (\x -> x) - , (\x -> addInteger 100 x) - , (\x -> addInteger 200 x) ]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [ (\x -> x) + , (\x -> addInteger 100 x) + , (\x -> addInteger 200 x) ]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.eval index 97dd29f7c07..f761ce10dd0 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_076_957 -Memory: 4_198 -AST Size: 99 -Flat Size: 106 +CPU: 1_300_957 +Memory: 5_598 +AST Size: 107 +Flat Size: 118 (con integer 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.uplc index 2fd208c4c2e..b65102f349e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedNone.golden.uplc @@ -1,49 +1,59 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay (\ds -> constr 0 [])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [0, (\x -> x), (\x y -> addInteger x y)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force tailList) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay (\ds -> constr 0 [])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [0, (\x -> x), (\x y -> addInteger x y)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.eval index e31892500c9..e4c9bfea86a 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.eval @@ -1,6 +1,6 @@ -CPU: 2_444_380 -Memory: 8_864 -AST Size: 99 -Flat Size: 109 +CPU: 2_588_380 +Memory: 9_764 +AST Size: 107 +Flat Size: 121 (con integer 7) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.uplc index 2fd208c4c2e..b65102f349e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeMixedTwo.golden.uplc @@ -1,49 +1,59 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay (\ds -> constr 0 [])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 2 index) - , (delay - (\ds -> - constr 2 - [ (unIData - (force - headList - ds)) - , (unIData - (force - headList - (force - tailList - ds))) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [0, (\x -> x), (\x y -> addInteger x y)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force tailList) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced + forced + forced + forced + forced + d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay (\ds -> constr 0 [])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger + 2 + index) + , (delay + (\ds -> + constr 2 + [ (unIData + (forced + ds)) + , (unIData + (forced + (forced + ds))) ])) + , (delay error) ]) + [forced]))) ]) + [forced]))) ]) + [forced]) + args) + [0, (\x -> x), (\x y -> addInteger x y)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.eval index e3db4dad5ba..d61c7e4d7f4 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 74 -Flat Size: 83 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 82 +Flat Size: 94 (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.uplc index c434c8e7f68..bf99204b05b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairA.golden.uplc @@ -1,32 +1,36 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [(\x -> x), (\x -> addInteger 1 x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay error) ]) + [forced]))) ]) + [forced]) + args) + [(\x -> x), (\x -> addInteger 1 x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.eval index 38501ab3dec..85b4d2c1018 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_778_441 -Memory: 6_566 -AST Size: 74 -Flat Size: 83 +CPU: 1_922_441 +Memory: 7_466 +AST Size: 82 +Flat Size: 94 (con integer 21) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.uplc index c434c8e7f68..bf99204b05b 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodePairB.golden.uplc @@ -1,32 +1,36 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay - (force - (case - (constr 0 - [ (equalsInteger 1 index) - , (delay - (\ds -> - constr 1 - [ (unIData - (force headList ds)) ])) - , (delay error) ]) - [(force ifThenElse)]))) ]) - [(force ifThenElse)]) - args) - [(\x -> x), (\x -> addInteger 1 x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay + (force + (case + (constr 0 + [ (equalsInteger 1 index) + , (delay + (\ds -> + constr 1 + [(unIData (forced ds))])) + , (delay error) ]) + [forced]))) ]) + [forced]) + args) + [(\x -> x), (\x -> addInteger 1 x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.eval b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.eval index aa0ec510b97..bc404a46f7e 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.eval +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.eval @@ -1,6 +1,6 @@ -CPU: 1_292_851 -Memory: 4_962 -AST Size: 48 -Flat Size: 57 +CPU: 1_452_851 +Memory: 5_962 +AST Size: 58 +Flat Size: 68 (con integer 99) \ No newline at end of file diff --git a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.uplc b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.uplc index 8c4c0a18e91..18c12f05ba3 100644 --- a/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.uplc +++ b/plutus-tx-plugin/test/IsData/Budget/SoP/9.6/decodeSingle.golden.uplc @@ -1,21 +1,26 @@ (program 1.1.0 - (\d -> - (\p -> - (\index -> - (\args -> - case - (force - (case - (constr 0 - [ (equalsInteger 0 index) - , (delay - (\ds -> - constr 0 [(unIData (force headList ds))])) - , (delay error) ]) - [(force ifThenElse)]) - args) - [(\x -> x)]) - (force (force sndPair) p)) - (force (force fstPair) p)) - (unConstrData d))) \ No newline at end of file + (case + (constr 0 + [ (force (force fstPair)) + , (force ifThenElse) + , (force (force sndPair)) + , (force headList) ]) + [ (\forced forced forced forced d -> + (\p -> + (\index -> + (\args -> + case + (force + (case + (constr 0 + [ (equalsInteger 0 index) + , (delay + (\ds -> constr 0 [(unIData (forced ds))])) + , (delay error) ]) + [forced]) + args) + [(\x -> x)]) + (forced p)) + (forced p)) + (unConstrData d)) ])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/NoTrace/WithPreservedLogging.hs b/plutus-tx-plugin/test/Plugin/NoTrace/WithPreservedLogging.hs index 6bf8e1ce11a..88829d081c1 100644 --- a/plutus-tx-plugin/test/Plugin/NoTrace/WithPreservedLogging.hs +++ b/plutus-tx-plugin/test/Plugin/NoTrace/WithPreservedLogging.hs @@ -3,6 +3,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# OPTIONS_GHC -fplugin Plinth.Plugin #-} {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-conservative-optimisation #-} +{-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-hoist-polymorphic-builtins #-} {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:preserve-logging #-} module Plugin.NoTrace.WithPreservedLogging where diff --git a/plutus-tx-plugin/test/Plugin/NoTrace/WithTraces.hs b/plutus-tx-plugin/test/Plugin/NoTrace/WithTraces.hs index 232dad2d51d..fa36caef4b7 100644 --- a/plutus-tx-plugin/test/Plugin/NoTrace/WithTraces.hs +++ b/plutus-tx-plugin/test/Plugin/NoTrace/WithTraces.hs @@ -5,6 +5,7 @@ -- The plugin uses non-conservative optimizations by default and they remove some traces. -- We disable them to make sure that no traces are removed. {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:conservative-optimisation #-} +{-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-hoist-polymorphic-builtins #-} {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-remove-trace #-} module Plugin.NoTrace.WithTraces where diff --git a/plutus-tx-plugin/test/Plugin/NoTrace/WithoutTraces.hs b/plutus-tx-plugin/test/Plugin/NoTrace/WithoutTraces.hs index 438067562f9..5ba03d940f6 100644 --- a/plutus-tx-plugin/test/Plugin/NoTrace/WithoutTraces.hs +++ b/plutus-tx-plugin/test/Plugin/NoTrace/WithoutTraces.hs @@ -5,6 +5,7 @@ -- The plugin uses non-conservative optimizations by default and they remove some traces. -- We disable them to make sure that traces are removed by the 'remove-traces' compiler flag. {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:conservative-optimisation #-} +{-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:no-hoist-polymorphic-builtins #-} {-# OPTIONS_GHC -fplugin-opt Plinth.Plugin:remove-trace #-} module Plugin.NoTrace.WithoutTraces where diff --git a/plutus-tx-plugin/test/Plugin/Typeclasses/9.12/compareTest.golden.pir b/plutus-tx-plugin/test/Plugin/Typeclasses/9.12/compareTest.golden.pir index c48eab5b007..86c9d9ea7f1 100644 --- a/plutus-tx-plugin/test/Plugin/Typeclasses/9.12/compareTest.golden.pir +++ b/plutus-tx-plugin/test/Plugin/Typeclasses/9.12/compareTest.golden.pir @@ -59,29 +59,19 @@ let !x : integer = x in \(y : integer) -> let !y : integer = y in equalsInteger x y - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] - !lessThanInteger : integer -> integer -> bool = lessThanInteger ~greaterThanEqualsInteger : integer -> integer -> bool = \(x : integer) -> let !x : integer = x in - \(y : integer) -> - let - !y : integer = y - in - ifThenElse {bool} (lessThanInteger x y) False True + \(y : integer) -> let !y : integer = y in lessThanEqualsInteger y x + !lessThanInteger : integer -> integer -> bool = lessThanInteger ~greaterThanInteger : integer -> integer -> bool = \(x : integer) -> let !x : integer = x in - \(y : integer) -> - let - !y : integer = y - in - ifThenElse {bool} (lessThanEqualsInteger x y) False True + \(y : integer) -> let !y : integer = y in lessThanInteger y x ~lessThanEqualsInteger : integer -> integer -> bool = \(x : integer) -> let diff --git a/plutus-tx-plugin/test/Plugin/Typeclasses/9.6/compareTest.golden.pir b/plutus-tx-plugin/test/Plugin/Typeclasses/9.6/compareTest.golden.pir index c48eab5b007..86c9d9ea7f1 100644 --- a/plutus-tx-plugin/test/Plugin/Typeclasses/9.6/compareTest.golden.pir +++ b/plutus-tx-plugin/test/Plugin/Typeclasses/9.6/compareTest.golden.pir @@ -59,29 +59,19 @@ let !x : integer = x in \(y : integer) -> let !y : integer = y in equalsInteger x y - !ifThenElse : all a. bool -> a -> a -> a - = /\a -> \(b : bool) (x : a) (y : a) -> case a b [y, x] - !lessThanInteger : integer -> integer -> bool = lessThanInteger ~greaterThanEqualsInteger : integer -> integer -> bool = \(x : integer) -> let !x : integer = x in - \(y : integer) -> - let - !y : integer = y - in - ifThenElse {bool} (lessThanInteger x y) False True + \(y : integer) -> let !y : integer = y in lessThanEqualsInteger y x + !lessThanInteger : integer -> integer -> bool = lessThanInteger ~greaterThanInteger : integer -> integer -> bool = \(x : integer) -> let !x : integer = x in - \(y : integer) -> - let - !y : integer = y - in - ifThenElse {bool} (lessThanEqualsInteger x y) False True + \(y : integer) -> let !y : integer = y in lessThanInteger y x ~lessThanEqualsInteger : integer -> integer -> bool = \(x : integer) -> let diff --git a/plutus-tx/src/PlutusTx/Builtins.hs b/plutus-tx/src/PlutusTx/Builtins.hs index 0a5b3e62d5b..5750210b7b4 100644 --- a/plutus-tx/src/PlutusTx/Builtins.hs +++ b/plutus-tx/src/PlutusTx/Builtins.hs @@ -410,12 +410,12 @@ remainderInteger x y = fromOpaque (BI.remainderInteger (toOpaque x) (toOpaque y) -- | Check whether one 'Integer' is greater than another. greaterThanInteger :: Integer -> Integer -> Bool -greaterThanInteger x y = BI.ifThenElse (BI.lessThanEqualsInteger x y) False True +greaterThanInteger x y = BI.lessThanInteger y x {-# INLINEABLE greaterThanInteger #-} -- | Check whether one 'Integer' is greater than or equal to another. greaterThanEqualsInteger :: Integer -> Integer -> Bool -greaterThanEqualsInteger x y = BI.ifThenElse (BI.lessThanInteger x y) False True +greaterThanEqualsInteger x y = BI.lessThanEqualsInteger y x {-# INLINEABLE greaterThanEqualsInteger #-} -- | Check whether one 'Integer' is less than another.