Skip to content

Commit ec836ad

Browse files
ggreifcrusso
authored andcommitted
accept decl-clash.*.ok (#215)
1 parent 8552673 commit ec836ad

File tree

6 files changed

+66
-6
lines changed

6 files changed

+66
-6
lines changed

src/compile.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ module BoxedInt = struct
11471147
Small values (just <2^5 for now, so that both code paths are well-tested)
11481148
are stored unboxed, tagged, see BitTagged.
11491149
1150-
The heap layout of a BoxedWord is:
1150+
The heap layout of a BoxedInt is:
11511151
11521152
┌─────┬─────┬─────┐
11531153
│ tag │ i64 │

test/fail/ok/decl-clash.run-ir.ok

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
prelude:50.1-75.2: internal error, Env.Make(X).Clash("test")
1+
prelude:66.1-91.2: internal error, Env.Make(X).Clash("test")
22

33
Last environment:
44
@new_async = func
55
Array_init = func
66
Array_tabulate = func
77
abs = func
88
ignore = func
9+
intToWord16 = func
10+
intToWord32 = func
11+
intToWord8 = func
12+
natToWord16 = func
13+
natToWord32 = func
14+
natToWord8 = func
915
print = func
1016
printInt = func
1117
range = func
1218
revrange = func
19+
word16ToInt = func
20+
word16ToNat = func
21+
word32ToInt = func
22+
word32ToNat = func
23+
word8ToInt = func
24+
word8ToNat = func
1325

test/fail/ok/decl-clash.run-low.ok

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
prelude:50.1-75.2: internal error, Env.Make(X).Clash("test")
1+
prelude:66.1-91.2: internal error, Env.Make(X).Clash("test")
22

33
Last environment:
44
@new_async = func
55
Array_init = func
66
Array_tabulate = func
77
abs = func
88
ignore = func
9+
intToWord16 = func
10+
intToWord32 = func
11+
intToWord8 = func
12+
natToWord16 = func
13+
natToWord32 = func
14+
natToWord8 = func
915
print = func
1016
printInt = func
1117
range = func
1218
revrange = func
19+
word16ToInt = func
20+
word16ToNat = func
21+
word32ToInt = func
22+
word32ToNat = func
23+
word8ToInt = func
24+
word8ToNat = func
1325

test/fail/ok/decl-clash.run.ok

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
prelude:50.1-75.2: internal error, Env.Make(X).Clash("test")
1+
prelude:66.1-91.2: internal error, Env.Make(X).Clash("test")
22

33
Last environment:
44
@new_async = func
55
Array_init = func
66
Array_tabulate = func
77
abs = func
88
ignore = func
9+
intToWord16 = func
10+
intToWord32 = func
11+
intToWord8 = func
12+
natToWord16 = func
13+
natToWord32 = func
14+
natToWord8 = func
915
print = func
1016
printInt = func
1117
range = func
1218
revrange = func
19+
word16ToInt = func
20+
word16ToNat = func
21+
word32ToInt = func
22+
word32ToNat = func
23+
word8ToInt = func
24+
word8ToNat = func
1325

test/fail/ok/decl-clash.tc.ok

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
prelude:50.1-75.2: internal error, Env.Make(X).Clash("test")
1+
prelude:66.1-91.2: internal error, Env.Make(X).Clash("test")
22

33
Last environment:
44
@new_async = func
55
Array_init = func
66
Array_tabulate = func
77
abs = func
88
ignore = func
9+
intToWord16 = func
10+
intToWord32 = func
11+
intToWord8 = func
12+
natToWord16 = func
13+
natToWord32 = func
14+
natToWord8 = func
915
print = func
1016
printInt = func
1117
range = func
1218
revrange = func
19+
word16ToInt = func
20+
word16ToNat = func
21+
word32ToInt = func
22+
word32ToNat = func
23+
word8ToInt = func
24+
word8ToNat = func
1325

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
prelude:50.1-75.2: internal error, Env.Make(X).Clash("test")
1+
prelude:66.1-91.2: internal error, Env.Make(X).Clash("test")
22

33
Last environment:
44
@new_async = func
55
Array_init = func
66
Array_tabulate = func
77
abs = func
88
ignore = func
9+
intToWord16 = func
10+
intToWord32 = func
11+
intToWord8 = func
12+
natToWord16 = func
13+
natToWord32 = func
14+
natToWord8 = func
915
print = func
1016
printInt = func
1117
range = func
1218
revrange = func
19+
word16ToInt = func
20+
word16ToNat = func
21+
word32ToInt = func
22+
word32ToNat = func
23+
word8ToInt = func
24+
word8ToNat = func
1325

0 commit comments

Comments
 (0)