The unpac monorepo manager self-hosting as a monorepo using unpac
Merge pull request #13863 from Octachron/refactor_shape_printer
shape: tune occurrence index printer
authored by
David Allsopp
and committed by
GitHub
aef1937e
95f70213
+180
-187
+40
-40
testsuite/tests/shape-index/index.reference
+40
-40
testsuite/tests/shape-index/index.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index.31 : Out (File "index.ml", line 73, characters 9-12)
3
-
Resolved: Index.30 : Out.In (File "index.ml", lines 73-74, characters 9-4)
4
-
Resolved: Index.29 : Out.In.x (File "index.ml", lines 73-75, characters 9-4)
5
-
Resolved: Index.5 : A (File "index.ml", line 68, characters 14-15)
6
-
Resolved: Index.25 : u (File "index.ml", line 67, characters 28-29)
7
-
Resolved: Index.2 : AS (File "index.ml", line 67, characters 10-12)
8
-
Resolved: Index.5 : A (File "index.ml", line 63, characters 4-5)
9
-
Alias: Index.6 -> Resolved: Index.5 :
2
+
Resolved: Index.31: Out (File "index.ml", line 73, characters 9-12)
3
+
Resolved: Index.30: Out.In (File "index.ml", lines 73-74, characters 9-4)
4
+
Resolved: Index.29: Out.In.x (File "index.ml", lines 73-75, characters 9-4)
5
+
Resolved: Index.5: A (File "index.ml", line 68, characters 14-15)
6
+
Resolved: Index.25: u (File "index.ml", line 67, characters 28-29)
7
+
Resolved: Index.2: AS (File "index.ml", line 67, characters 10-12)
8
+
Resolved: Index.5: A (File "index.ml", line 63, characters 4-5)
9
+
Alias: Index.6 -> Resolved: Index.5:
10
10
B (File "index.ml", line 60, characters 15-16)
11
-
Resolved: Index.3 : B.t (File "index.ml", line 60, characters 15-18)
12
-
Resolved: Index.2 : AS (File "index.ml", line 59, characters 23-25)
13
-
Resolved: Index.21 : MS (File "index.ml", line 57, characters 18-20)
14
-
Resolved: Index.5 : A (File "index.ml", line 58, characters 13-14)
15
-
Resolved: Index.5 : A (File "index.ml", line 54, characters 13-14)
16
-
Resolved: Index.2 : AS (File "index.ml", line 53, characters 13-15)
17
-
Resolved: Index.14 : F (File "index.ml", line 49, characters 9-10)
18
-
Resolved: Index.5 : A (File "index.ml", line 49, characters 12-13)
19
-
Resolved: Index.3 : F(A).t (File "index.ml", line 49, characters 9-16)
20
-
Resolved: Index.5 : A (File "index.ml", line 48, characters 14-15)
21
-
Resolved: Index.14 : F (File "index.ml", line 48, characters 11-12)
22
-
Resolved: Index.13 : P (File "index.ml", line 47, characters 35-36)
23
-
Resolved: Index.2 : AS (File "index.ml", line 47, characters 14-16)
24
-
Resolved: Index.11 : a (File "index.ml", line 45, characters 16-17)
25
-
Resolved: Index.5 : A (File "index.ml", line 44, characters 16-17)
26
-
Resolved: Index.2 : AS (File "index.ml", line 44, characters 20-22)
27
-
Resolved: Index.10 : y (File "index.ml", line 42, characters 31-32)
28
-
Unresolved: CU Stdlib : Stdlib (File "index.ml", line 42, characters 20-26)
29
-
Unresolved: CU Stdlib . "+"[value] :
11
+
Resolved: Index.3: B.t (File "index.ml", line 60, characters 15-18)
12
+
Resolved: Index.2: AS (File "index.ml", line 59, characters 23-25)
13
+
Resolved: Index.21: MS (File "index.ml", line 57, characters 18-20)
14
+
Resolved: Index.5: A (File "index.ml", line 58, characters 13-14)
15
+
Resolved: Index.5: A (File "index.ml", line 54, characters 13-14)
16
+
Resolved: Index.2: AS (File "index.ml", line 53, characters 13-15)
17
+
Resolved: Index.14: F (File "index.ml", line 49, characters 9-10)
18
+
Resolved: Index.5: A (File "index.ml", line 49, characters 12-13)
19
+
Resolved: Index.3: F(A).t (File "index.ml", line 49, characters 9-16)
20
+
Resolved: Index.5: A (File "index.ml", line 48, characters 14-15)
21
+
Resolved: Index.14: F (File "index.ml", line 48, characters 11-12)
22
+
Resolved: Index.13: P (File "index.ml", line 47, characters 35-36)
23
+
Resolved: Index.2: AS (File "index.ml", line 47, characters 14-16)
24
+
Resolved: Index.11: a (File "index.ml", line 45, characters 16-17)
25
+
Resolved: Index.5: A (File "index.ml", line 44, characters 16-17)
26
+
Resolved: Index.2: AS (File "index.ml", line 44, characters 20-22)
27
+
Resolved: Index.10: y (File "index.ml", line 42, characters 31-32)
28
+
Unresolved: CU Stdlib : Stdlib (File "index.ml", line 42, characters 20-26)
29
+
Unresolved: CU Stdlib . "+"[value] :
30
30
Stdlib.(+) (File "index.ml", line 42, characters 20-30)
31
-
Unresolved: CU Stdlib . "print_int"[value] :
31
+
Unresolved: CU Stdlib . "print_int"[value] :
32
32
print_int (File "index.ml", line 42, characters 9-18)
33
-
Unresolved: CU Auxiliaire :
33
+
Unresolved: CU Auxiliaire :
34
34
Auxiliaire (File "index.ml", line 40, characters 14-24)
35
-
Unresolved: CU Auxiliaire . "z"[value] :
35
+
Unresolved: CU Auxiliaire . "z"[value] :
36
36
Auxiliaire.z (File "index.ml", line 40, characters 14-26)
37
-
Resolved: Index.5 : A (File "index.ml", line 40, characters 8-9)
38
-
Resolved: Index.4 : A.x (File "index.ml", line 40, characters 8-11)
39
-
Unresolved: CU Stdlib . "+"[value] :
37
+
Resolved: Index.5: A (File "index.ml", line 40, characters 8-9)
38
+
Resolved: Index.4: A.x (File "index.ml", line 40, characters 8-11)
39
+
Unresolved: CU Stdlib . "+"[value] :
40
40
(+) (File "index.ml", line 40, characters 12-13)
41
-
Resolved: Index.5 : A (File "index.ml", line 38, characters 5-6)
42
-
Resolved: Index.3 : t (File "index.ml", line 32, characters 10-11)
43
-
Resolved: Index.5 : A (File "index.ml", line 31, characters 7-8)
44
-
Resolved: Index.5 : A (File "index.ml", line 34, characters 10-11)
45
-
Resolved: Index.5 : A (File "index.ml", line 28, characters 11-12)
46
-
Resolved: Index.3 : t (File "index.ml", line 25, characters 11-12)
47
-
Resolved: Index.0 : t (File "index.ml", line 20, characters 10-11)
41
+
Resolved: Index.5: A (File "index.ml", line 38, characters 5-6)
42
+
Resolved: Index.3: t (File "index.ml", line 32, characters 10-11)
43
+
Resolved: Index.5: A (File "index.ml", line 31, characters 7-8)
44
+
Resolved: Index.5: A (File "index.ml", line 34, characters 10-11)
45
+
Resolved: Index.5: A (File "index.ml", line 28, characters 11-12)
46
+
Resolved: Index.3: t (File "index.ml", line 25, characters 11-12)
47
+
Resolved: Index.0: t (File "index.ml", line 20, characters 10-11)
48
48
49
49
Uid of decls:
50
50
Index.0: t (File "index.ml", line 19, characters 7-8)
+24
-24
testsuite/tests/shape-index/index_aliases.reference
+24
-24
testsuite/tests/shape-index/index_aliases.reference
···
1
1
Indexed shapes:
2
-
Missing uid : t (File "index_aliases.ml", line 52, characters 9-10)
3
-
Resolved: Index_aliases.26 :
2
+
Missing uid: t (File "index_aliases.ml", line 52, characters 9-10)
3
+
Resolved: Index_aliases.26:
4
4
FArg (File "index_aliases.ml", line 49, characters 5-9)
5
-
Resolved: Index_aliases.25 :
5
+
Resolved: Index_aliases.25:
6
6
Arg (File "index_aliases.ml", line 48, characters 19-22)
7
-
Resolved: Index_aliases.22 :
7
+
Resolved: Index_aliases.22:
8
8
X (File "index_aliases.ml", line 48, characters 14-15)
9
-
Approximated: Index_aliases.22 :
9
+
Approximated: Index_aliases.22:
10
10
X.F (File "index_aliases.ml", line 48, characters 14-17)
11
-
Alias: Index_aliases.24 -> Alias: Index_aliases.23 -> Approximated: Index_aliases.22
12
-
:
11
+
Alias: Index_aliases.24 -> Alias: Index_aliases.23 ->
12
+
Approximated: Index_aliases.22:
13
13
Z (File "index_aliases.ml", line 45, characters 8-9)
14
-
Missing uid : Z.s (File "index_aliases.ml", line 45, characters 8-11)
15
-
Alias: Index_aliases.23 -> Approximated: Index_aliases.22 :
14
+
Missing uid: Z.s (File "index_aliases.ml", line 45, characters 8-11)
15
+
Alias: Index_aliases.23 -> Approximated: Index_aliases.22:
16
16
Y (File "index_aliases.ml", line 42, characters 11-12)
17
-
Resolved: Index_aliases.22 :
17
+
Resolved: Index_aliases.22:
18
18
X (File "index_aliases.ml", line 41, characters 11-12)
19
-
Approximated: Index_aliases.22 :
19
+
Approximated: Index_aliases.22:
20
20
X.M (File "index_aliases.ml", line 41, characters 11-14)
21
-
Resolved: Index_aliases.17 :
21
+
Resolved: Index_aliases.17:
22
22
x (File "index_aliases.ml", line 40, characters 16-17)
23
-
Resolved: Index_aliases.16 :
23
+
Resolved: Index_aliases.16:
24
24
S (File "index_aliases.ml", line 38, characters 8-9)
25
-
Alias: Index_aliases.10 -> Alias: Index_aliases.2 -> Resolved: Index_aliases.1
26
-
:
25
+
Alias: Index_aliases.10 -> Alias: Index_aliases.2 ->
26
+
Resolved: Index_aliases.1:
27
27
G (File "index_aliases.ml", line 29, characters 8-9)
28
-
Alias: Index_aliases.2 -> Resolved: Index_aliases.1 :
28
+
Alias: Index_aliases.2 -> Resolved: Index_aliases.1:
29
29
B (File "index_aliases.ml", line 28, characters 11-12)
30
-
Resolved: Index_aliases.7 :
30
+
Resolved: Index_aliases.7:
31
31
C (File "index_aliases.ml", line 26, characters 11-12)
32
-
Alias: Index_aliases.2 -> Resolved: Index_aliases.1 :
32
+
Alias: Index_aliases.2 -> Resolved: Index_aliases.1:
33
33
B (File "index_aliases.ml", line 25, characters 14-15)
34
-
Resolved: Index_aliases.5 :
34
+
Resolved: Index_aliases.5:
35
35
F (File "index_aliases.ml", line 25, characters 12-13)
36
-
Resolved: Index_aliases.1 :
36
+
Resolved: Index_aliases.1:
37
37
A (File "index_aliases.ml", line 23, characters 14-15)
38
-
Alias: Index_aliases.6 -> Resolved: Index_aliases.5 :
38
+
Alias: Index_aliases.6 -> Resolved: Index_aliases.5:
39
39
F' (File "index_aliases.ml", line 23, characters 11-13)
40
-
Resolved: Index_aliases.5 :
40
+
Resolved: Index_aliases.5:
41
41
F (File "index_aliases.ml", line 22, characters 12-13)
42
-
Resolved: Index_aliases.4 :
42
+
Resolved: Index_aliases.4:
43
43
X (File "index_aliases.ml", line 21, characters 32-33)
44
-
Resolved: Index_aliases.1 :
44
+
Resolved: Index_aliases.1:
45
45
A (File "index_aliases.ml", line 19, characters 11-12)
46
46
47
47
Uid of decls:
+22
-22
testsuite/tests/shape-index/index_bindingops.reference
+22
-22
testsuite/tests/shape-index/index_bindingops.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_bindingops.3 :
2
+
Resolved: Index_bindingops.3:
3
3
(and+) (File "index_bindingops.ml", line 30, characters 8-14)
4
-
Resolved: Index_bindingops.0 :
4
+
Resolved: Index_bindingops.0:
5
5
(let+) (File "index_bindingops.ml", line 29, characters 8-14)
6
-
Resolved: Index_bindingops.11 :
6
+
Resolved: Index_bindingops.11:
7
7
man (File "index_bindingops.ml", line 27, characters 14-17)
8
-
Resolved: Index_bindingops.10 :
8
+
Resolved: Index_bindingops.10:
9
9
bar (File "index_bindingops.ml", line 27, characters 8-11)
10
-
Resolved: Index_bindingops.9 :
10
+
Resolved: Index_bindingops.9:
11
11
foo (File "index_bindingops.ml", line 27, characters 2-5)
12
-
Unresolved: CU Stdlib . "+"[value] :
12
+
Unresolved: CU Stdlib . "+"[value] :
13
13
(+) (File "index_bindingops.ml", line 27, characters 6-7)
14
-
Unresolved: CU Stdlib . "-"[value] :
14
+
Unresolved: CU Stdlib . "-"[value] :
15
15
(-) (File "index_bindingops.ml", line 27, characters 12-13)
16
-
Resolved: Index_bindingops.3 :
16
+
Resolved: Index_bindingops.3:
17
17
(and+) (File "index_bindingops.ml", line 26, characters 2-6)
18
-
Resolved: Index_bindingops.3 :
18
+
Resolved: Index_bindingops.3:
19
19
(and+) (File "index_bindingops.ml", line 25, characters 2-6)
20
-
Resolved: Index_bindingops.0 :
20
+
Resolved: Index_bindingops.0:
21
21
(let+) (File "index_bindingops.ml", line 24, characters 2-6)
22
-
Resolved: Index_bindingops.5 :
22
+
Resolved: Index_bindingops.5:
23
23
y (File "index_bindingops.ml", line 21, characters 31-32)
24
-
Resolved: Index_bindingops.7 :
24
+
Resolved: Index_bindingops.7:
25
25
y (File "index_bindingops.ml", line 21, characters 27-28)
26
-
Resolved: Index_bindingops.6 :
26
+
Resolved: Index_bindingops.6:
27
27
x (File "index_bindingops.ml", line 21, characters 24-25)
28
-
Unresolved: CU Stdlib . "Option"[module] :
28
+
Unresolved: CU Stdlib . "Option"[module] :
29
29
Option (File "index_bindingops.ml", line 21, characters 2-8)
30
-
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
30
+
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
31
31
Option.map (File "index_bindingops.ml", line 21, characters 2-12)
32
-
Resolved: Index_bindingops.4 :
32
+
Resolved: Index_bindingops.4:
33
33
x (File "index_bindingops.ml", line 20, characters 14-15)
34
-
Unresolved: CU Stdlib . "Option"[module] :
34
+
Unresolved: CU Stdlib . "Option"[module] :
35
35
Option (File "index_bindingops.ml", line 20, characters 2-8)
36
-
Unresolved: CU Stdlib . "Option"[module] . "bind"[value] :
36
+
Unresolved: CU Stdlib . "Option"[module] . "bind"[value] :
37
37
Option.bind (File "index_bindingops.ml", line 20, characters 2-13)
38
-
Resolved: Index_bindingops.1 :
38
+
Resolved: Index_bindingops.1:
39
39
x (File "index_bindingops.ml", line 17, characters 30-31)
40
-
Resolved: Index_bindingops.2 :
40
+
Resolved: Index_bindingops.2:
41
41
f (File "index_bindingops.ml", line 17, characters 28-29)
42
-
Unresolved: CU Stdlib . "Option"[module] :
42
+
Unresolved: CU Stdlib . "Option"[module] :
43
43
Option (File "index_bindingops.ml", line 17, characters 17-23)
44
-
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
44
+
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
45
45
Option.map (File "index_bindingops.ml", line 17, characters 17-27)
46
46
47
47
Uid of decls:
+9
-9
testsuite/tests/shape-index/index_constrs.reference
+9
-9
testsuite/tests/shape-index/index_constrs.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_constrs.2 :
2
+
Resolved: Index_constrs.2:
3
3
M (File "index_constrs.ml", line 32, characters 32-33)
4
-
Resolved: Index_constrs.1 :
4
+
Resolved: Index_constrs.1:
5
5
M.F (File "index_constrs.ml", line 32, characters 32-35)
6
-
Resolved: Index_constrs.0 :
6
+
Resolved: Index_constrs.0:
7
7
E (File "index_constrs.ml", line 29, characters 14-15)
8
-
Resolved: Index_constrs.4 :
8
+
Resolved: Index_constrs.4:
9
9
E (File "index_constrs.ml", line 28, characters 4-5)
10
-
Resolved: Index_constrs.7 :
10
+
Resolved: Index_constrs.7:
11
11
x (File "index_constrs.ml", line 27, characters 16-17)
12
-
Resolved: Index_constrs.0 :
12
+
Resolved: Index_constrs.0:
13
13
E (File "index_constrs.ml", line 26, characters 15-16)
14
-
Unresolved: CU Stdlib . "raise"[value] :
14
+
Unresolved: CU Stdlib . "raise"[value] :
15
15
raise (File "index_constrs.ml", line 26, characters 9-14)
16
-
Resolved: Index_constrs.4 :
16
+
Resolved: Index_constrs.4:
17
17
E (File "index_constrs.ml", line 25, characters 9-10)
18
-
Resolved: Index_constrs.0 :
18
+
Resolved: Index_constrs.0:
19
19
E (File "index_constrs.ml", line 20, characters 16-17)
20
20
21
21
Uid of decls:
+29
-29
testsuite/tests/shape-index/index_constrs_records.reference
+29
-29
testsuite/tests/shape-index/index_constrs_records.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_constrs_records.36 :
2
+
Resolved: Index_constrs_records.36:
3
3
l_exn (File "index_constrs_records.ml", line 43, characters 21-26)
4
-
Resolved: Index_constrs_records.32 :
4
+
Resolved: Index_constrs_records.32:
5
5
l_exn (File "index_constrs_records.ml", line 43, characters 10-15)
6
-
Resolved: Index_constrs_records.33 :
6
+
Resolved: Index_constrs_records.33:
7
7
Exn (File "index_constrs_records.ml", line 43, characters 4-7)
8
-
Resolved: Index_constrs_records.35 :
8
+
Resolved: Index_constrs_records.35:
9
9
e (File "index_constrs_records.ml", line 42, characters 14-15)
10
-
Resolved: Index_constrs_records.32 :
10
+
Resolved: Index_constrs_records.32:
11
11
l_exn (File "index_constrs_records.ml", line 41, characters 14-19)
12
-
Resolved: Index_constrs_records.33 :
12
+
Resolved: Index_constrs_records.33:
13
13
Exn (File "index_constrs_records.ml", line 41, characters 8-11)
14
-
Resolved: Index_constrs_records.31 :
14
+
Resolved: Index_constrs_records.31:
15
15
l_ext (File "index_constrs_records.ml", line 36, characters 21-26)
16
-
Resolved: Index_constrs_records.26 :
16
+
Resolved: Index_constrs_records.26:
17
17
l_ext (File "index_constrs_records.ml", line 36, characters 10-15)
18
-
Resolved: Index_constrs_records.27 :
18
+
Resolved: Index_constrs_records.27:
19
19
Ext (File "index_constrs_records.ml", line 36, characters 4-7)
20
-
Resolved: Index_constrs_records.30 :
20
+
Resolved: Index_constrs_records.30:
21
21
x (File "index_constrs_records.ml", line 35, characters 22-23)
22
-
Resolved: Index_constrs_records.25 :
22
+
Resolved: Index_constrs_records.25:
23
23
u (File "index_constrs_records.ml", line 35, characters 11-12)
24
-
Resolved: Index_constrs_records.25 :
24
+
Resolved: Index_constrs_records.25:
25
25
u (File "index_constrs_records.ml", line 33, characters 5-6)
26
-
Resolved: Index_constrs_records.24 :
26
+
Resolved: Index_constrs_records.24:
27
27
l (File "index_constrs_records.ml", line 30, characters 47-48)
28
-
Resolved: Index_constrs_records.1 :
28
+
Resolved: Index_constrs_records.1:
29
29
lbl (File "index_constrs_records.ml", line 30, characters 49-52)
30
-
Resolved: Index_constrs_records.23 :
30
+
Resolved: Index_constrs_records.23:
31
31
lbl (File "index_constrs_records.ml", line 30, characters 41-44)
32
-
Resolved: Index_constrs_records.22 :
32
+
Resolved: Index_constrs_records.22:
33
33
l_c (File "index_constrs_records.ml", line 30, characters 35-38)
34
-
Unresolved: CU Stdlib . "+"[value] :
34
+
Unresolved: CU Stdlib . "+"[value] :
35
35
(+) (File "index_constrs_records.ml", line 30, characters 39-40)
36
-
Unresolved: CU Stdlib . "+"[value] :
36
+
Unresolved: CU Stdlib . "+"[value] :
37
37
(+) (File "index_constrs_records.ml", line 30, characters 45-46)
38
-
Resolved: Index_constrs_records.1 :
38
+
Resolved: Index_constrs_records.1:
39
39
lbl (File "index_constrs_records.ml", line 30, characters 21-24)
40
-
Resolved: Index_constrs_records.3 :
40
+
Resolved: Index_constrs_records.3:
41
41
l_c (File "index_constrs_records.ml", line 30, characters 11-14)
42
-
Resolved: Index_constrs_records.4 :
42
+
Resolved: Index_constrs_records.4:
43
43
A (File "index_constrs_records.ml", line 30, characters 7-8)
44
-
Resolved: Index_constrs_records.3 :
44
+
Resolved: Index_constrs_records.3:
45
45
l_c (File "index_constrs_records.ml", line 29, characters 12-15)
46
-
Resolved: Index_constrs_records.4 :
46
+
Resolved: Index_constrs_records.4:
47
47
A (File "index_constrs_records.ml", line 29, characters 8-9)
48
-
Resolved: Index_constrs_records.19 :
48
+
Resolved: Index_constrs_records.19:
49
49
M (File "index_constrs_records.ml", line 27, characters 5-6)
50
-
Resolved: Index_constrs_records.3 :
50
+
Resolved: Index_constrs_records.3:
51
51
l_c (File "index_constrs_records.ml", line 25, characters 14-17)
52
-
Approximated: Index_constrs_records.19 :
52
+
Approximated: Index_constrs_records.19:
53
53
M (File "index_constrs_records.ml", line 25, characters 8-9)
54
-
Resolved: Index_constrs_records.4 :
54
+
Resolved: Index_constrs_records.4:
55
55
M.A (File "index_constrs_records.ml", line 25, characters 8-11)
56
-
Resolved: Index_constrs_records.3 :
56
+
Resolved: Index_constrs_records.3:
57
57
l_c (File "index_constrs_records.ml", line 22, characters 14-17)
58
-
Resolved: Index_constrs_records.4 :
58
+
Resolved: Index_constrs_records.4:
59
59
A (File "index_constrs_records.ml", line 22, characters 10-11)
60
60
61
61
Uid of decls:
+6
-6
testsuite/tests/shape-index/index_functor.reference
+6
-6
testsuite/tests/shape-index/index_functor.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_functor.3 :
2
+
Resolved: Index_functor.3:
3
3
N (File "index_functor.ml", line 22, characters 8-9)
4
-
Alias: Index_functor.4 -> Resolved: Index_functor.0 :
4
+
Alias: Index_functor.4 -> Resolved: Index_functor.0:
5
5
O (File "index_functor.ml", line 21, characters 8-9)
6
-
Resolved: Index_functor.3 :
6
+
Resolved: Index_functor.3:
7
7
N (File "index_functor.ml", line 20, characters 11-12)
8
-
Resolved: Index_functor.0 :
8
+
Resolved: Index_functor.0:
9
9
N.M (File "index_functor.ml", line 20, characters 11-14)
10
-
Resolved: Index_functor.2 :
10
+
Resolved: Index_functor.2:
11
11
F (File "index_functor.ml", line 19, characters 11-12)
12
-
Resolved: Index_functor.0 :
12
+
Resolved: Index_functor.0:
13
13
X (File "index_functor.ml", line 18, characters 43-44)
14
14
15
15
Uid of decls:
+8
-13
testsuite/tests/shape-index/index_labels.reference
+8
-13
testsuite/tests/shape-index/index_labels.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_labels.2 :
2
+
Resolved: Index_labels.2:
3
3
b (File "index_labels.ml", line 26, characters 14-15)
4
-
Resolved: Index_labels.1 :
5
-
a (File "index_labels.ml", line 26, characters 6-7)
6
-
Resolved: Index_labels.3 :
7
-
x (File "index_labels.ml", line 23, characters 2-3)
8
-
Resolved: Index_labels.1 :
9
-
a (File "index_labels.ml", line 23, characters 4-5)
10
-
Resolved: Index_labels.3 :
11
-
x (File "index_labels.ml", line 22, characters 2-3)
12
-
Resolved: Index_labels.1 :
13
-
a (File "index_labels.ml", line 22, characters 4-5)
14
-
Resolved: Index_labels.2 :
4
+
Resolved: Index_labels.1: a (File "index_labels.ml", line 26, characters 6-7)
5
+
Resolved: Index_labels.3: x (File "index_labels.ml", line 23, characters 2-3)
6
+
Resolved: Index_labels.1: a (File "index_labels.ml", line 23, characters 4-5)
7
+
Resolved: Index_labels.3: x (File "index_labels.ml", line 22, characters 2-3)
8
+
Resolved: Index_labels.1: a (File "index_labels.ml", line 22, characters 4-5)
9
+
Resolved: Index_labels.2:
15
10
b (File "index_labels.ml", line 20, characters 18-19)
16
-
Resolved: Index_labels.1 :
11
+
Resolved: Index_labels.1:
17
12
a (File "index_labels.ml", line 20, characters 10-11)
18
13
19
14
Uid of decls:
+6
-6
testsuite/tests/shape-index/index_modules.reference
+6
-6
testsuite/tests/shape-index/index_modules.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_modules.1 :
2
+
Resolved: Index_modules.1:
3
3
A (File "index_modules.ml", line 22, characters 17-18)
4
-
Resolved: Index_modules.0 :
4
+
Resolved: Index_modules.0:
5
5
A.x (File "index_modules.ml", line 22, characters 17-20)
6
-
Resolved: Index_modules.0 :
6
+
Resolved: Index_modules.0:
7
7
x (File "index_modules.ml", line 22, characters 13-14)
8
-
Unresolved: CU Stdlib . "+"[value] :
8
+
Unresolved: CU Stdlib . "+"[value] :
9
9
(+) (File "index_modules.ml", line 22, characters 15-16)
10
-
Unresolved: CU Stdlib . "print_int"[value] :
10
+
Unresolved: CU Stdlib . "print_int"[value] :
11
11
print_int (File "index_modules.ml", line 22, characters 2-11)
12
-
Resolved: Index_modules.1 :
12
+
Resolved: Index_modules.1:
13
13
A (File "index_modules.ml", line 21, characters 11-12)
14
14
15
15
Uid of decls:
+11
-11
testsuite/tests/shape-index/index_objects.reference
+11
-11
testsuite/tests/shape-index/index_objects.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_objects.21 :
2
+
Resolved: Index_objects.21:
3
3
ins (File "index_objects.ml", line 48, characters 21-24)
4
-
Resolved: Index_objects.28 :
4
+
Resolved: Index_objects.28:
5
5
self (File "index_objects.ml", line 47, characters 20-24)
6
-
Resolved: Index_objects.26 :
6
+
Resolved: Index_objects.26:
7
7
i (File "index_objects.ml", line 46, characters 28-29)
8
-
Resolved: Index_objects.21 :
8
+
Resolved: Index_objects.21:
9
9
ins (File "index_objects.ml", line 46, characters 21-24)
10
-
Resolved: Index_objects.21 :
10
+
Resolved: Index_objects.21:
11
11
ins (File "index_objects.ml", line 45, characters 22-25)
12
-
Resolved: Index_objects.13 :
12
+
Resolved: Index_objects.13:
13
13
ct (File "index_objects.ml", line 40, characters 28-30)
14
-
Resolved: Index_objects.5 :
14
+
Resolved: Index_objects.5:
15
15
c (File "index_objects.ml", line 32, characters 10-11)
16
-
Resolved: Index_objects.5 :
16
+
Resolved: Index_objects.5:
17
17
c (File "index_objects.ml", line 29, characters 8-9)
18
-
Resolved: Index_objects.5 :
18
+
Resolved: Index_objects.5:
19
19
c (File "index_objects.ml", line 29, characters 16-17)
20
-
Resolved: Index_objects.5 :
20
+
Resolved: Index_objects.5:
21
21
c (File "index_objects.ml", line 29, characters 8-9)
22
-
Resolved: Index_objects.0 :
22
+
Resolved: Index_objects.0:
23
23
o (File "index_objects.ml", line 23, characters 9-10)
24
24
25
25
Uid of decls:
+8
-10
testsuite/tests/shape-index/index_types.reference
+8
-10
testsuite/tests/shape-index/index_types.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_types.9 :
3
-
t (File "index_types.ml", line 41, characters 12-13)
4
-
Resolved: Index_types.10 :
5
-
N (File "index_types.ml", line 41, characters 9-10)
6
-
Resolved: Index_types.7 : t1 (File "index_types.ml", line 37, characters 5-7)
7
-
Resolved: Index_types.4 : t2 (File "index_types.ml", line 33, characters 7-9)
8
-
Resolved: Index_types.3 :
2
+
Resolved: Index_types.9: t (File "index_types.ml", line 41, characters 12-13)
3
+
Resolved: Index_types.10: N (File "index_types.ml", line 41, characters 9-10)
4
+
Resolved: Index_types.7: t1 (File "index_types.ml", line 37, characters 5-7)
5
+
Resolved: Index_types.4: t2 (File "index_types.ml", line 33, characters 7-9)
6
+
Resolved: Index_types.3:
9
7
poly (File "index_types.ml", line 29, characters 24-28)
10
-
Resolved: Index_types.0 : t (File "index_types.ml", line 25, characters 9-10)
11
-
Resolved: Index_types.0 : t (File "index_types.ml", line 20, characters 8-9)
12
-
Resolved: Index_types.0 : t (File "index_types.ml", line 20, characters 8-9)
8
+
Resolved: Index_types.0: t (File "index_types.ml", line 25, characters 9-10)
9
+
Resolved: Index_types.0: t (File "index_types.ml", line 20, characters 8-9)
10
+
Resolved: Index_types.0: t (File "index_types.ml", line 20, characters 8-9)
13
11
14
12
Uid of decls:
15
13
Index_types.0: t (File "index_types.ml", line 18, characters 5-6)
+11
-11
testsuite/tests/shape-index/index_vb.reference
+11
-11
testsuite/tests/shape-index/index_vb.reference
···
1
1
Indexed shapes:
2
-
Resolved: Index_vb.4 : c (File "index_vb.ml", line 22, characters 43-44)
3
-
Unresolved: CU Stdlib . "int_of_string"[value] :
2
+
Resolved: Index_vb.4: c (File "index_vb.ml", line 22, characters 43-44)
3
+
Unresolved: CU Stdlib . "int_of_string"[value] :
4
4
int_of_string (File "index_vb.ml", line 22, characters 29-42)
5
-
Resolved: Index_vb.5 : d (File "index_vb.ml", line 22, characters 24-25)
6
-
Unresolved: CU Stdlib . "*"[value] : ( *
5
+
Resolved: Index_vb.5: d (File "index_vb.ml", line 22, characters 24-25)
6
+
Unresolved: CU Stdlib . "*"[value] : ( *
7
7
) (File "index_vb.ml", line 22, characters 26-27)
8
-
Resolved: Index_vb.3 : a (File "index_vb.ml", line 22, characters 20-21)
9
-
Unresolved: CU Stdlib . "+"[value] :
8
+
Resolved: Index_vb.3: a (File "index_vb.ml", line 22, characters 20-21)
9
+
Unresolved: CU Stdlib . "+"[value] :
10
10
(+) (File "index_vb.ml", line 22, characters 22-23)
11
-
Unresolved: CU Stdlib . "print_int"[value] :
11
+
Unresolved: CU Stdlib . "print_int"[value] :
12
12
print_int (File "index_vb.ml", line 22, characters 9-18)
13
-
Resolved: Index_vb.2 : b (File "index_vb.ml", line 20, characters 34-35)
14
-
Resolved: Index_vb.1 : a (File "index_vb.ml", line 20, characters 26-27)
15
-
Resolved: Index_vb.2 : b (File "index_vb.ml", line 20, characters 9-10)
16
-
Resolved: Index_vb.1 : a (File "index_vb.ml", line 20, characters 6-7)
13
+
Resolved: Index_vb.2: b (File "index_vb.ml", line 20, characters 34-35)
14
+
Resolved: Index_vb.1: a (File "index_vb.ml", line 20, characters 26-27)
15
+
Resolved: Index_vb.2: b (File "index_vb.ml", line 20, characters 9-10)
16
+
Resolved: Index_vb.1: a (File "index_vb.ml", line 20, characters 6-7)
17
17
18
18
Uid of decls:
19
19
Index_vb.0: t (File "index_vb.ml", line 18, characters 5-6)
+6
-6
typing/shape_reduce.ml
+6
-6
typing/shape_reduce.ml
···
27
27
let rec print_result fmt result =
28
28
match result with
29
29
| Resolved uid ->
30
-
Format.fprintf fmt "@[Resolved: %a@]@;" Uid.print uid
30
+
Format.fprintf fmt "@[Resolved:@ %a@]" Uid.print uid
31
31
| Resolved_alias (uid, r) ->
32
-
Format.fprintf fmt "@[Alias: %a -> %a@]@;"
32
+
Format.fprintf fmt "@[Alias:@ %a@] ->@ %a"
33
33
Uid.print uid print_result r
34
34
| Unresolved shape ->
35
-
Format.fprintf fmt "@[Unresolved: %a@]@;" print shape
35
+
Format.fprintf fmt "@[Unresolved:@ %a@]" print shape
36
36
| Approximated (Some uid) ->
37
-
Format.fprintf fmt "@[Approximated: %a@]@;" Uid.print uid
37
+
Format.fprintf fmt "@[Approximated:@ %a@]" Uid.print uid
38
38
| Approximated None ->
39
-
Format.fprintf fmt "@[Approximated: No uid@]@;"
39
+
Format.fprintf fmt "Approximated: No uid"
40
40
| Internal_error_missing_uid ->
41
-
Format.fprintf fmt "@[Missing uid@]@;"
41
+
Format.fprintf fmt "Missing uid"
42
42
43
43
44
44
let find_shape env id =