Skip to content

Commit de5fe1a

Browse files
UARTmanUARTman
committed
[ fix ] Fix tests broken by recent rebase
1 parent 38714ac commit de5fe1a

45 files changed

Lines changed: 5012 additions & 3935 deletions

File tree

Some content is hidden

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

‎tests/derivation/least-effort/print/specialise/00-1 simple/expected‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ LOG deptycheck.derive.least-effort:7: Prelude.Types.Nat[] S - used final order:
1616
, opts = []
1717
, type =
1818
mkTy
19-
{ name = "<DerivedGen.X>[]"
19+
{ name = "<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]"
2020
, type =
2121
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
22-
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
22+
.-> var "Test.DepTyCheck.Gen.Gen"
23+
.$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty"
24+
.$ var "DerivedGen.List^4779069909474151191.List^4779069909474151191"
2325
}
2426
})
2527
, IClaim
@@ -29,12 +31,10 @@ LOG deptycheck.derive.least-effort:7: Prelude.Types.Nat[] S - used final order:
2931
, opts = []
3032
, type =
3133
mkTy
32-
{ name = "<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]"
34+
{ name = "<DerivedGen.X>[]"
3335
, type =
3436
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
35-
.-> var "Test.DepTyCheck.Gen.Gen"
36-
.$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty"
37-
.$ var "DerivedGen.List^4779069909474151191.List^4779069909474151191"
37+
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
3838
}
3939
})
4040
, IClaim
@@ -50,47 +50,6 @@ LOG deptycheck.derive.least-effort:7: Prelude.Types.Nat[] S - used final order:
5050
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "Prelude.Types.Nat"
5151
}
5252
})
53-
, IDef
54-
emptyFC
55-
"<DerivedGen.X>[]"
56-
[ var "<DerivedGen.X>[]" .$ bindVar "^fuel_arg^"
57-
.= local
58-
{ decls =
59-
[ IClaim
60-
(MkIClaimData
61-
{ rig = MW
62-
, vis = Export
63-
, opts = []
64-
, type =
65-
mkTy
66-
{ name = "<<DerivedGen.MkX>>"
67-
, type =
68-
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
69-
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
70-
}
71-
})
72-
, IDef
73-
emptyFC
74-
"<<DerivedGen.MkX>>"
75-
[ var "<<DerivedGen.MkX>>" .$ bindVar "^cons_fuel^"
76-
.= var "Test.DepTyCheck.Gen.label"
77-
.$ (var "fromString" .$ primVal (Str "DerivedGen.MkX (orders)"))
78-
.$ ( var ">>="
79-
.$ ( var "map"
80-
.$ (var "cast" .@ var "DerivedGen.List^4779069909474151191.mToP")
81-
.$ (var "<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]" .$ var "^outmost-fuel^"))
82-
.$ ( MkArg MW ExplicitArg (Just "{arg:1}") implicitFalse
83-
.=> var "Prelude.pure"
84-
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
85-
.$ (var "DerivedGen.MkX" .$ var "{arg:1}")))
86-
]
87-
]
88-
, scope =
89-
var "Test.DepTyCheck.Gen.label"
90-
.$ (var "fromString" .$ primVal (Str "DerivedGen.X[] (non-spending)"))
91-
.$ (var "<<DerivedGen.MkX>>" .$ var "^fuel_arg^")
92-
}
93-
]
9453
, IDef
9554
emptyFC
9655
"<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]"
@@ -145,15 +104,15 @@ LOG deptycheck.derive.least-effort:7: Prelude.Types.Nat[] S - used final order:
145104
.$ (var "fromString" .$ primVal (Str "DerivedGen.List^4779069909474151191.List^4779069909474151191^Con^1 (orders)"))
146105
.$ ( var ">>="
147106
.$ (var "<Prelude.Types.Nat>[]" .$ var "^outmost-fuel^")
148-
.$ ( MkArg MW ExplicitArg (Just "{arg:2}") implicitFalse
107+
.$ ( MkArg MW ExplicitArg (Just "{arg:1}") implicitFalse
149108
.=> var ">>="
150109
.$ (var "<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]" .$ var "^cons_fuel^")
151-
.$ ( MkArg MW ExplicitArg (Just "{arg:3}") implicitFalse
110+
.$ ( MkArg MW ExplicitArg (Just "{arg:2}") implicitFalse
152111
.=> var "Prelude.pure"
153112
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
154113
.$ ( var "DerivedGen.List^4779069909474151191.List^4779069909474151191^Con^1"
155-
.$ var "{arg:2}"
156-
.$ var "{arg:3}"))))
114+
.$ var "{arg:1}"
115+
.$ var "{arg:2}"))))
157116
]
158117
]
159118
, scope =
@@ -184,6 +143,47 @@ LOG deptycheck.derive.least-effort:7: Prelude.Types.Nat[] S - used final order:
184143
}
185144
}
186145
]
146+
, IDef
147+
emptyFC
148+
"<DerivedGen.X>[]"
149+
[ var "<DerivedGen.X>[]" .$ bindVar "^fuel_arg^"
150+
.= local
151+
{ decls =
152+
[ IClaim
153+
(MkIClaimData
154+
{ rig = MW
155+
, vis = Export
156+
, opts = []
157+
, type =
158+
mkTy
159+
{ name = "<<DerivedGen.MkX>>"
160+
, type =
161+
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
162+
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
163+
}
164+
})
165+
, IDef
166+
emptyFC
167+
"<<DerivedGen.MkX>>"
168+
[ var "<<DerivedGen.MkX>>" .$ bindVar "^cons_fuel^"
169+
.= var "Test.DepTyCheck.Gen.label"
170+
.$ (var "fromString" .$ primVal (Str "DerivedGen.MkX (orders)"))
171+
.$ ( var ">>="
172+
.$ ( var "map"
173+
.$ (var "cast" .@ var "DerivedGen.List^4779069909474151191.mToP")
174+
.$ (var "<DerivedGen.List^4779069909474151191.List^4779069909474151191>[]" .$ var "^outmost-fuel^"))
175+
.$ ( MkArg MW ExplicitArg (Just "{arg:3}") implicitFalse
176+
.=> var "Prelude.pure"
177+
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
178+
.$ (var "DerivedGen.MkX" .$ var "{arg:3}")))
179+
]
180+
]
181+
, scope =
182+
var "Test.DepTyCheck.Gen.label"
183+
.$ (var "fromString" .$ primVal (Str "DerivedGen.X[] (non-spending)"))
184+
.$ (var "<<DerivedGen.MkX>>" .$ var "^fuel_arg^")
185+
}
186+
]
187187
, IDef
188188
emptyFC
189189
"<Prelude.Types.Nat>[]"

‎tests/derivation/least-effort/print/specialise/00-2 simple/expected‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ LOG deptycheck.derive.least-effort:7: DerivedGen.List^8984676908526435328.List^8
2020
, opts = []
2121
, type =
2222
mkTy
23-
{ name = "<DerivedGen.X>[]"
23+
{ name = "<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]"
2424
, type =
2525
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
26-
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
26+
.-> var "Test.DepTyCheck.Gen.Gen"
27+
.$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty"
28+
.$ var "DerivedGen.List^8984676908526435328.List^8984676908526435328"
2729
}
2830
})
2931
, IClaim
@@ -33,55 +35,12 @@ LOG deptycheck.derive.least-effort:7: DerivedGen.List^8984676908526435328.List^8
3335
, opts = []
3436
, type =
3537
mkTy
36-
{ name = "<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]"
38+
{ name = "<DerivedGen.X>[]"
3739
, type =
3840
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
39-
.-> var "Test.DepTyCheck.Gen.Gen"
40-
.$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty"
41-
.$ var "DerivedGen.List^8984676908526435328.List^8984676908526435328"
41+
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
4242
}
4343
})
44-
, IDef
45-
emptyFC
46-
"<DerivedGen.X>[]"
47-
[ var "<DerivedGen.X>[]" .$ bindVar "^fuel_arg^"
48-
.= local
49-
{ decls =
50-
[ IClaim
51-
(MkIClaimData
52-
{ rig = MW
53-
, vis = Export
54-
, opts = []
55-
, type =
56-
mkTy
57-
{ name = "<<DerivedGen.MkX>>"
58-
, type =
59-
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
60-
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
61-
}
62-
})
63-
, IDef
64-
emptyFC
65-
"<<DerivedGen.MkX>>"
66-
[ var "<<DerivedGen.MkX>>" .$ bindVar "^cons_fuel^"
67-
.= var "Test.DepTyCheck.Gen.label"
68-
.$ (var "fromString" .$ primVal (Str "DerivedGen.MkX (orders)"))
69-
.$ ( var ">>="
70-
.$ ( var "map"
71-
.$ (var "cast" .@ var "DerivedGen.List^8984676908526435328.mToP")
72-
.$ (var "<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]" .$ var "^outmost-fuel^"))
73-
.$ ( MkArg MW ExplicitArg (Just "{arg:2}") implicitFalse
74-
.=> var "Prelude.pure"
75-
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
76-
.$ (var "DerivedGen.MkX" .$ var "{arg:2}")))
77-
]
78-
]
79-
, scope =
80-
var "Test.DepTyCheck.Gen.label"
81-
.$ (var "fromString" .$ primVal (Str "DerivedGen.X[] (non-spending)"))
82-
.$ (var "<<DerivedGen.MkX>>" .$ var "^fuel_arg^")
83-
}
84-
]
8544
, IDef
8645
emptyFC
8746
"<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]"
@@ -136,15 +95,15 @@ LOG deptycheck.derive.least-effort:7: DerivedGen.List^8984676908526435328.List^8
13695
.$ (var "fromString" .$ primVal (Str "DerivedGen.List^8984676908526435328.List^8984676908526435328^Con^1 (orders)"))
13796
.$ ( var ">>="
13897
.$ (var "external^<^prim^.String>[]" .$ var "^outmost-fuel^")
139-
.$ ( MkArg MW ExplicitArg (Just "{arg:3}") implicitFalse
98+
.$ ( MkArg MW ExplicitArg (Just "{arg:2}") implicitFalse
14099
.=> var ">>="
141100
.$ (var "<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]" .$ var "^cons_fuel^")
142-
.$ ( MkArg MW ExplicitArg (Just "{arg:4}") implicitFalse
101+
.$ ( MkArg MW ExplicitArg (Just "{arg:3}") implicitFalse
143102
.=> var "Prelude.pure"
144103
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
145104
.$ ( var "DerivedGen.List^8984676908526435328.List^8984676908526435328^Con^1"
146-
.$ var "{arg:3}"
147-
.$ var "{arg:4}"))))
105+
.$ var "{arg:2}"
106+
.$ var "{arg:3}"))))
148107
]
149108
]
150109
, scope =
@@ -175,6 +134,47 @@ LOG deptycheck.derive.least-effort:7: DerivedGen.List^8984676908526435328.List^8
175134
}
176135
}
177136
]
137+
, IDef
138+
emptyFC
139+
"<DerivedGen.X>[]"
140+
[ var "<DerivedGen.X>[]" .$ bindVar "^fuel_arg^"
141+
.= local
142+
{ decls =
143+
[ IClaim
144+
(MkIClaimData
145+
{ rig = MW
146+
, vis = Export
147+
, opts = []
148+
, type =
149+
mkTy
150+
{ name = "<<DerivedGen.MkX>>"
151+
, type =
152+
MkArg MW ExplicitArg Nothing (var "Data.Fuel.Fuel")
153+
.-> var "Test.DepTyCheck.Gen.Gen" .$ var "Test.DepTyCheck.Gen.Emptiness.MaybeEmpty" .$ var "DerivedGen.X"
154+
}
155+
})
156+
, IDef
157+
emptyFC
158+
"<<DerivedGen.MkX>>"
159+
[ var "<<DerivedGen.MkX>>" .$ bindVar "^cons_fuel^"
160+
.= var "Test.DepTyCheck.Gen.label"
161+
.$ (var "fromString" .$ primVal (Str "DerivedGen.MkX (orders)"))
162+
.$ ( var ">>="
163+
.$ ( var "map"
164+
.$ (var "cast" .@ var "DerivedGen.List^8984676908526435328.mToP")
165+
.$ (var "<DerivedGen.List^8984676908526435328.List^8984676908526435328>[]" .$ var "^outmost-fuel^"))
166+
.$ ( MkArg MW ExplicitArg (Just "{arg:4}") implicitFalse
167+
.=> var "Prelude.pure"
168+
.! ("f", var "Test.DepTyCheck.Gen.Gen" .$ implicitTrue)
169+
.$ (var "DerivedGen.MkX" .$ var "{arg:4}")))
170+
]
171+
]
172+
, scope =
173+
var "Test.DepTyCheck.Gen.label"
174+
.$ (var "fromString" .$ primVal (Str "DerivedGen.X[] (non-spending)"))
175+
.$ (var "<<DerivedGen.MkX>>" .$ var "^fuel_arg^")
176+
}
177+
]
178178
]
179179
, scope = var "<DerivedGen.X>[]" .$ var "^outmost-fuel^"
180180
}

0 commit comments

Comments
 (0)