Skip to content

Commit a032835

Browse files
zeme-wanazeme-wana
committed
wip
1 parent a02cb68 commit a032835

File tree

154 files changed

+2382
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+2382
-52
lines changed

‎out.html‎

Lines changed: 563 additions & 0 deletions
Large diffs are not rendered by default.

‎plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -984,24 +984,31 @@ compileExpr e = traceCompilation 2 ("Compiling expr:" GHC.<+> GHC.ppr e) $ do
984984
-- <error func> <overall type> <message>
985985
GHC.Var (isErrorId -> True) `GHC.App` GHC.Type t `GHC.App` _ ->
986986
PIR.TyInst annMayInline <$> errorFunc <*> compileTypeNorm t
987-
(strip -> GHC.Var n) `GHC.App` GHC.Type ty
988-
| GHC.getName n == mkNilOpaqueName -> case ty of
987+
988+
(strip -> GHC.Var n) `GHC.App` GHC.Type ty | GHC.getName n == mkNilOpaqueName ->
989+
case ty of
989990
GHC.TyConApp tyCon []
990991
| tyCon == GHC.integerTyCon || tyCon == builtinIntegerTyCon ->
991992
pure $ PLC.mkConstant annMayInline ([] @Integer)
992-
| tyCon == builtinBoolTyCon -> pure $ PLC.mkConstant annMayInline ([] @Bool)
993-
| tyCon == builtinDataTyCon -> pure $ PLC.mkConstant annMayInline ([] @PLC.Data)
993+
| tyCon == builtinBoolTyCon ->
994+
pure $ PLC.mkConstant annMayInline ([] @Bool)
995+
| tyCon == builtinDataTyCon ->
996+
pure $ PLC.mkConstant annMayInline ([] @PLC.Data)
997+
994998
GHC.TyConApp tyCon [GHC.TyConApp tyArg1 [], GHC.TyConApp tyArg2 []]
995999
| (tyCon, tyArg1, tyArg2) == (builtinPairTyCon, builtinDataTyCon, builtinDataTyCon) ->
9961000
pure $ PLC.mkConstant annMayInline ([] @(PLC.Data, PLC.Data))
1001+
9971002
GHC.TyConApp tyCon [GHC.TyConApp tyArg1 []]
9981003
| (tyCon, tyArg1) == (builtinListTyCon, builtinIntegerTyCon) ->
9991004
pure $ PLC.mkConstant annMayInline ([] @[Integer])
10001005
| (tyCon, tyArg1) == (builtinListTyCon, builtinBoolTyCon) ->
10011006
pure $ PLC.mkConstant annMayInline ([] @[Bool])
10021007
| (tyCon, tyArg1) == (builtinListTyCon, builtinDataTyCon) ->
10031008
pure $ PLC.mkConstant annMayInline ([] @[PLC.Data])
1004-
_ -> throwPlain $ CompilationError "'mkNil' applied to an unknown type"
1009+
_ ->
1010+
throwPlain $ CompilationError "'mkNil' applied to an unknown type"
1011+
10051012
GHC.Var n
10061013
| GHC.getName n == useToOpaqueName ->
10071014
throwPlain $ UnsupportedError "It is no longer possible to use 'toBuiltin' with a script, use 'toOpaque' instead"

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(++).budget.golden‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cpu: 9002784
2+
mem: 33712
3+
size: 42

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(++).eval.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(con (list integer) [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10])

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(++).pir.golden‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
\(xs : list integer) ->
2+
(let
3+
b = list integer
4+
in
5+
\(f : integer -> b -> b) (acc : b) ->
6+
letrec
7+
!go : list integer -> b
8+
= \(xs : list integer) ->
9+
chooseList
10+
{integer}
11+
{all dead. b}
12+
xs
13+
(/\dead -> acc)
14+
(/\dead ->
15+
let
16+
!x : integer = headList {integer} xs
17+
!xs : list integer = tailList {integer} xs
18+
in
19+
f x (go xs))
20+
{b}
21+
in
22+
go)
23+
(mkCons {integer})
24+
xs
25+
xs

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(++).uplc.golden‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
(program
2+
1.1.0
3+
(\xs ->
4+
(\s -> s s)
5+
(\s xs ->
6+
force
7+
(force (force chooseList)
8+
xs
9+
(delay xs)
10+
(delay
11+
(force mkCons
12+
(force headList xs)
13+
((\x -> s s x) (force tailList xs))))))
14+
xs))

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(<|).budget.golden‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cpu: 216462
2+
mem: 1032
3+
size: 9

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(<|).eval.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(con (list integer) [42,1,2,3,4,5,6,7,8,9,10])

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(<|).pir.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
\(xs : list integer) -> mkCons {integer} 42 xs

‎plutus-tx-plugin/test/BuiltinList/Budget/9.6/(<|).uplc.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(program 1.1.0 (\xs -> force mkCons 42 xs))

0 commit comments

Comments
 (0)