Skip to content

Commit fb62b02

Browse files
ProgMinerProgMiner
committed
Implement variable ordering optimization
Since variables allocated linearly of allocation time, this optimization must increase [Var.subst] optimization hit rate and shorten [Subst.walk] recursion paths Signed-off-by: Eridan Domoratskiy <eridan200@mail.ru>
1 parent b27994a commit fb62b02

12 files changed

Lines changed: 97 additions & 96 deletions

File tree

‎regression/test001.t‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
fun q -> reverso q q, 3 answers {
7070
q=[];
7171
q=[_.11];
72-
q=[_.23; _.23];
72+
q=[_.11; _.11];
7373
}
7474
fun q -> reverso q q, 10 answers {
7575
q=[];
7676
q=[_.11];
77-
q=[_.23; _.23];
78-
q=[_.56; _.32; _.56];
79-
q=[_.110; _.89; _.89; _.110];
80-
q=[_.188; _.167; _.134; _.167; _.188];
81-
q=[_.293; _.266; _.236; _.236; _.266; _.293];
82-
q=[_.422; _.398; _.365; _.329; _.365; _.398; _.422];
83-
q=[_.578; _.554; _.524; _.488; _.488; _.524; _.554; _.578];
84-
q=[_.770; _.743; _.713; _.683; _.638; _.683; _.713; _.743; _.770];
77+
q=[_.11; _.11];
78+
q=[_.11; _.20; _.11];
79+
q=[_.11; _.20; _.20; _.11];
80+
q=[_.11; _.20; _.26; _.20; _.11];
81+
q=[_.11; _.20; _.26; _.26; _.20; _.11];
82+
q=[_.11; _.20; _.26; _.38; _.26; _.20; _.11];
83+
q=[_.11; _.20; _.26; _.38; _.38; _.26; _.20; _.11];
84+
q=[_.11; _.20; _.26; _.38; _.53; _.38; _.26; _.20; _.11];
8585
}
8686
fun q r -> two_vars q r, 1 answer {
87-
q=_.11; r=_.11;
87+
q=_.10; r=_.10;
8888
}

‎regression/test002.t‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
$ ./test002sort.exe
2-
[O; O; _.138]
3-
[O; O; _.136 [=/= O]]
4-
[O; O; _.153 [=/= O]]
5-
[O; S (O); S (_.497)]
6-
[O; S (O); S (_.516 [=/= O])]
2+
[O; O; _.12]
3+
[O; O; _.11 [=/= O]]
4+
[O; O; _.10 [=/= O]]
75
[O; S (O); S (_.110)]
6+
[O; S (O); S (_.110 [=/= O])]
87
[O; S (O); S (_.110)]
9-
[S (O); S (O); S (_.781)]
10-
[S (O); S (O); S (_.804 [=/= O])]
8+
[O; S (O); S (_.110)]
9+
[S (O); S (O); S (_.110)]
10+
[S (O); S (O); S (_.110 [=/= O])]
1111
[O; S (O); S (_.160 [=/= O])]
1212
[]
1313

‎regression/test005.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
q=[("x", V ("y")) | _.13];
2020
}
2121
fun q -> infero (abs varX (v varX)) q, 1 answer {
22-
q=Arr (_.18, _.18);
22+
q=Arr (_.17, _.17);
2323
}
2424
fun q -> infero (abs varF (abs varX (app (v varF) (v varX)))) q, 1 answer {
25-
q=Arr (Arr (_.30, _.26), Arr (_.30, _.26));
25+
q=Arr (Arr (_.25, _.26), Arr (_.25, _.26));
2626
}
2727
fun q -> infero (abs varX (abs varF (app (v varF) (v varX)))) q, 1 answer {
28-
q=Arr (_.30, Arr (Arr (_.30, _.26), _.26));
28+
q=Arr (_.17, Arr (Arr (_.17, _.26), _.26));
2929
}
3030
fun q -> infero q (arr (p varX) (p varX)), 1 answer {
31-
q=Abs (_.29, V (_.29));
31+
q=Abs (_.18, V (_.18));
3232
}

‎regression/test006.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
q=V ("x");
2525
}
2626
fun q -> evalo (app q (v varX)) (v varX), 1 answer {
27-
q=Abs (_.44, V (_.44));
27+
q=Abs (_.19, V (_.19));
2828
}
2929
fun q r -> evalo (app r q) (v varX), 1 answer {
30-
q=V ("x"); r=Abs (_.54, V (_.54));
30+
q=V ("x"); r=Abs (_.20, V (_.20));
3131
}
3232
fun q r s -> a_la_quine q r s, 2 answers {
33-
q=Abs (_.668, V (_.668)); r=Abs (_.668, V (_.668)); s=Abs (_.668, V (_.668));
34-
q=Abs (_.783, V (_.783)); r=Abs (_.783, Abs (_.783, V (_.783))); s=Abs (_.783, Abs (_.783, V (_.783)));
33+
q=Abs (_.21, V (_.21)); r=Abs (_.21, V (_.21)); s=Abs (_.21, V (_.21));
34+
q=Abs (_.21, V (_.21)); r=Abs (_.21, Abs (_.21, V (_.21))); s=Abs (_.21, Abs (_.21, V (_.21)));
3535
}

‎regression/test007.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
q=V ("x");
2525
}
2626
fun q -> evalo (app q (v varX)) (v varX), 1 answer {
27-
q=Abs (_.39, V (_.39));
27+
q=Abs (_.21, V (_.21));
2828
}
2929
fun q r -> evalo (app r q) (v varX), 1 answer {
30-
q=V ("x"); r=Abs (_.40, V (_.40));
30+
q=V ("x"); r=Abs (_.22, V (_.22));
3131
}

‎regression/test010.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
fun q -> (q === !3) &&& (!3 =/= q), all answers {
8787
}
8888
fun q r -> (q =/= !!(true)) &&& (q =/= r), all answers {
89-
q=_.10 [=/= _.11; =/= true]; r=_.11;
89+
q=_.10 [=/= true]; r=_.11 [=/= _.10 [=/= true]];
9090
}
9191
fun q -> q =/= Std.nil (), all answers {
9292
q=_.10 [=/= []];

‎regression/test011.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
fun q ->
163163
OCanren.Fresh.two
164164
(fun x y -> delay (fun () -> conj (!![x; y] === q) (x =/= y))), all answers {
165-
q=[_.11 [=/= _.12]; _.12];
165+
q=[_.11; _.12 [=/= _.11]];
166166
}
167167
fun q -> Fresh.two (fun a d -> ?&[!![a; d] === q; q =/= !![!5; !6]]), all answers {
168168
q=[_.11; _.12 [=/= 6]];
@@ -180,13 +180,13 @@
180180
OCanren.Fresh.two
181181
(fun x y ->
182182
delay (fun () -> conj (conj (!![x; y] === q) (x =/= y)) (y =/= x))), all answers {
183-
q=[_.11 [=/= _.12]; _.12];
183+
q=[_.11; _.12 [=/= _.11]];
184184
}
185185
fun q ->
186186
OCanren.Fresh.two
187187
(fun x y ->
188188
delay (fun () -> conj (conj (!![x; y] === q) (x =/= y)) (x =/= y))), all answers {
189-
q=[_.11 [=/= _.12]; _.12];
189+
q=[_.11; _.12 [=/= _.11]];
190190
}
191191
fun q -> (q =/= !5) &&& (!5 =/= q), all answers {
192192
q=_.10 [=/= 5];
@@ -250,7 +250,7 @@
250250
q=[_.12 [=/= _.11]; 2];
251251
}
252252
fun q -> distincto (!2 % (!3 %< q)), all answers {
253-
q=_.35 [=/= 2; =/= 3];
253+
q=_.10 [=/= 2; =/= 3];
254254
}
255255
fun q -> remembero !1 (!1 % (!2 % (!1 %< !3))) q, all answers {
256256
q=[2; 3];

‎regression/test014.t‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
$ ./test014.exe
22
fun q r s -> pluso q r s, 22 answers {
3-
q=_.12; r=[]; s=_.12;
3+
q=_.10; r=[]; s=_.10;
44
q=[]; r=[_.13 | _.14]; s=[_.13 | _.14];
55
q=[1]; r=[1]; s=[0; 1];
6-
q=[1]; r=[0; _.46 | _.47]; s=[1; _.46 | _.47];
6+
q=[1]; r=[0; _.27 | _.28]; s=[1; _.27 | _.28];
77
q=[1]; r=[1; 1]; s=[0; 0; 1];
8-
q=[0; _.109 | _.110]; r=[1]; s=[1; _.109 | _.110];
8+
q=[0; _.25 | _.26]; r=[1]; s=[1; _.25 | _.26];
99
q=[0; 1]; r=[0; 1]; s=[0; 0; 1];
10-
q=[1]; r=[1; 0; _.154 | _.155]; s=[0; 1; _.154 | _.155];
10+
q=[1]; r=[1; 0; _.90 | _.91]; s=[0; 1; _.90 | _.91];
1111
q=[1]; r=[1; 1; 1]; s=[0; 0; 0; 1];
1212
q=[1; 1]; r=[1]; s=[0; 0; 1];
1313
q=[1; 1]; r=[0; 1]; s=[1; 0; 1];
14-
q=[1]; r=[1; 1; 0; _.286 | _.287]; s=[0; 0; 1; _.286 | _.287];
14+
q=[1]; r=[1; 1; 0; _.207 | _.208]; s=[0; 0; 1; _.207 | _.208];
1515
q=[1]; r=[1; 1; 1; 1]; s=[0; 0; 0; 0; 1];
16-
q=[1; 0; _.345 | _.346]; r=[1]; s=[0; 1; _.345 | _.346];
17-
q=[1]; r=[1; 1; 1; 0; _.391 | _.392]; s=[0; 0; 0; 1; _.391 | _.392];
16+
q=[1; 0; _.210 | _.211]; r=[1]; s=[0; 1; _.210 | _.211];
17+
q=[1]; r=[1; 1; 1; 0; _.331 | _.332]; s=[0; 0; 0; 1; _.331 | _.332];
1818
q=[0; 1]; r=[1; 1]; s=[1; 0; 1];
1919
q=[1]; r=[1; 1; 1; 1; 1]; s=[0; 0; 0; 0; 0; 1];
2020
q=[1; 1; 1]; r=[1]; s=[0; 0; 0; 1];
2121
q=[1; 1]; r=[1; 1]; s=[0; 1; 1];
22-
q=[0; 1]; r=[0; 0; _.333 | _.334]; s=[0; 1; _.333 | _.334];
23-
q=[1]; r=[1; 1; 1; 1; 0; _.510 | _.511]; s=[0; 0; 0; 0; 1; _.510 | _.511];
22+
q=[0; 1]; r=[0; 0; _.161 | _.162]; s=[0; 1; _.161 | _.162];
23+
q=[1]; r=[1; 1; 1; 1; 0; _.452 | _.453]; s=[0; 0; 0; 0; 1; _.452 | _.453];
2424
q=[1]; r=[1; 1; 1; 1; 1; 1]; s=[0; 0; 0; 0; 0; 0; 1];
2525
}
2626
fun q r s -> multo q r s, 34 answers {
@@ -29,31 +29,31 @@
2929
q=[1]; r=[_.15 | _.16]; s=[_.15 | _.16];
3030
q=[_.17; _.18 | _.19]; r=[1]; s=[_.17; _.18 | _.19];
3131
q=[0; 1]; r=[_.28; _.33 | _.34]; s=[0; _.28; _.33 | _.34];
32-
q=[0; 0; 1]; r=[_.69; _.76 | _.77]; s=[0; 0; _.69; _.76 | _.77];
33-
q=[1; _.102 | _.103]; r=[0; 1]; s=[0; 1; _.102 | _.103];
34-
q=[0; 0; 0; 1]; r=[_.149; _.164 | _.165]; s=[0; 0; 0; _.149; _.164 | _.165];
35-
q=[1; _.192 | _.193]; r=[0; 0; 1]; s=[0; 0; 1; _.192 | _.193];
36-
q=[0; 1; _.218 | _.219]; r=[0; 1]; s=[0; 0; 1; _.218 | _.219];
37-
q=[0; 0; 0; 0; 1]; r=[_.314; _.343 | _.344]; s=[0; 0; 0; 0; _.314; _.343 | _.344];
38-
q=[1; _.375 | _.376]; r=[0; 0; 0; 1]; s=[0; 0; 0; 1; _.375 | _.376];
39-
q=[0; 1; _.401 | _.402]; r=[0; 0; 1]; s=[0; 0; 0; 1; _.401 | _.402];
40-
q=[0; 0; 1; _.459 | _.460]; r=[0; 1]; s=[0; 0; 0; 1; _.459 | _.460];
32+
q=[0; 0; 1]; r=[_.32; _.33 | _.34]; s=[0; 0; _.32; _.33 | _.34];
33+
q=[1; _.30 | _.31]; r=[0; 1]; s=[0; 1; _.30 | _.31];
34+
q=[0; 0; 0; 1]; r=[_.32; _.33 | _.34]; s=[0; 0; 0; _.32; _.33 | _.34];
35+
q=[1; _.30 | _.31]; r=[0; 0; 1]; s=[0; 0; 1; _.30 | _.31];
36+
q=[0; 1; _.71 | _.72]; r=[0; 1]; s=[0; 0; 1; _.71 | _.72];
37+
q=[0; 0; 0; 0; 1]; r=[_.32; _.33 | _.34]; s=[0; 0; 0; 0; _.32; _.33 | _.34];
38+
q=[1; _.30 | _.31]; r=[0; 0; 0; 1]; s=[0; 0; 0; 1; _.30 | _.31];
39+
q=[0; 1; _.71 | _.72]; r=[0; 0; 1]; s=[0; 0; 0; 1; _.71 | _.72];
40+
q=[0; 0; 1; _.155 | _.156]; r=[0; 1]; s=[0; 0; 0; 1; _.155 | _.156];
4141
q=[1; 1]; r=[1; 1]; s=[1; 0; 0; 1];
42-
q=[0; 0; 0; 0; 0; 1]; r=[_.656; _.713 | _.714]; s=[0; 0; 0; 0; 0; _.656; _.713 | _.714];
43-
q=[1; _.745 | _.746]; r=[0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 1; _.745 | _.746];
44-
q=[0; 1; _.778 | _.779]; r=[0; 0; 0; 1]; s=[0; 0; 0; 0; 1; _.778 | _.779];
45-
q=[0; 0; 1; _.834 | _.835]; r=[0; 0; 1]; s=[0; 0; 0; 0; 1; _.834 | _.835];
46-
q=[0; 0; 0; 1; _.946 | _.947]; r=[0; 1]; s=[0; 0; 0; 0; 1; _.946 | _.947];
42+
q=[0; 0; 0; 0; 0; 1]; r=[_.32; _.33 | _.34]; s=[0; 0; 0; 0; 0; _.32; _.33 | _.34];
43+
q=[1; _.30 | _.31]; r=[0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 1; _.30 | _.31];
44+
q=[0; 1; _.71 | _.72]; r=[0; 0; 0; 1]; s=[0; 0; 0; 0; 1; _.71 | _.72];
45+
q=[0; 0; 1; _.155 | _.156]; r=[0; 0; 1]; s=[0; 0; 0; 0; 1; _.155 | _.156];
46+
q=[0; 0; 0; 1; _.326 | _.327]; r=[0; 1]; s=[0; 0; 0; 0; 1; _.326 | _.327];
4747
q=[1; 1]; r=[1; 0; 1]; s=[1; 1; 1; 1];
4848
q=[0; 1; 1]; r=[1; 1]; s=[0; 1; 0; 0; 1];
4949
q=[1; 1]; r=[1; 1; 1]; s=[1; 0; 1; 0; 1];
5050
q=[1; 1]; r=[0; 1; 1]; s=[0; 1; 0; 0; 1];
51-
q=[0; 0; 0; 0; 0; 0; 1]; r=[_.1360; _.1493 | _.1494]; s=[0; 0; 0; 0; 0; 0; _.1360; _.1493 | _.1494];
52-
q=[1; _.1523 | _.1524]; r=[0; 0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.1523 | _.1524];
53-
q=[0; 1; _.1553 | _.1554]; r=[0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.1553 | _.1554];
54-
q=[0; 0; 1; _.1607 | _.1608]; r=[0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.1607 | _.1608];
55-
q=[0; 0; 0; 1; _.1716 | _.1717]; r=[0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.1716 | _.1717];
56-
q=[0; 0; 0; 0; 1; _.1946 | _.1947]; r=[0; 1]; s=[0; 0; 0; 0; 0; 1; _.1946 | _.1947];
51+
q=[0; 0; 0; 0; 0; 0; 1]; r=[_.32; _.33 | _.34]; s=[0; 0; 0; 0; 0; 0; _.32; _.33 | _.34];
52+
q=[1; _.30 | _.31]; r=[0; 0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.30 | _.31];
53+
q=[0; 1; _.71 | _.72]; r=[0; 0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.71 | _.72];
54+
q=[0; 0; 1; _.155 | _.156]; r=[0; 0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.155 | _.156];
55+
q=[0; 0; 0; 1; _.326 | _.327]; r=[0; 0; 1]; s=[0; 0; 0; 0; 0; 1; _.326 | _.327];
56+
q=[0; 0; 0; 0; 1; _.682 | _.683]; r=[0; 1]; s=[0; 0; 0; 0; 0; 1; _.682 | _.683];
5757
q=[1; 0; 1]; r=[1; 1]; s=[1; 1; 1; 1];
5858
q=[1; 1]; r=[1; 0; 0; 1]; s=[1; 1; 0; 1; 1];
5959
q=[0; 1; 1]; r=[1; 0; 1]; s=[0; 1; 1; 1; 1];
@@ -64,11 +64,11 @@
6464
q=[1]; r=[0; 1];
6565
q=[0; 1]; r=[0; 0; 1];
6666
q=[1; 1]; r=[0; 1; 1];
67-
q=[1; _.225; 1]; r=[0; 1; _.225; 1];
67+
q=[1; _.70; 1]; r=[0; 1; _.70; 1];
6868
q=[0; 0; 1]; r=[0; 0; 0; 1];
6969
q=[0; 1; 1]; r=[0; 0; 1; 1];
70-
q=[1; _.247; _.408; 1]; r=[0; 1; _.247; _.408; 1];
71-
q=[0; 1; _.408; 1]; r=[0; 0; 1; _.408; 1];
70+
q=[1; _.70; _.128; 1]; r=[0; 1; _.70; _.128; 1];
71+
q=[0; 1; _.128; 1]; r=[0; 0; 1; _.128; 1];
7272
q=[0; 0; 0; 1]; r=[0; 0; 0; 0; 1];
7373
}
7474
fun q r -> lelo q r, 15 answers {
@@ -77,19 +77,19 @@
7777
q=[]; r=[_.12 | _.13];
7878
q=[1]; r=[_.14; _.15 | _.16];
7979
q=[_.17; 1]; r=[_.19; 1];
80-
q=[_.23; 1]; r=[_.25; _.39; _.40 | _.41];
81-
q=[_.17; _.33; 1]; r=[_.19; _.35; 1];
82-
q=[_.17; _.33; _.50; 1]; r=[_.19; _.35; _.52; 1];
83-
q=[_.23; _.44; 1]; r=[_.25; _.46; _.60; _.61 | _.62];
84-
q=[_.17; _.33; _.50; _.67; 1]; r=[_.19; _.35; _.52; _.69; 1];
85-
q=[_.23; _.44; _.63; 1]; r=[_.25; _.46; _.65; _.79; _.80 | _.81];
86-
q=[_.17; _.33; _.50; _.67; _.86; 1]; r=[_.19; _.35; _.52; _.69; _.88; 1];
87-
q=[_.23; _.44; _.63; _.82; 1]; r=[_.25; _.46; _.65; _.84; _.98; _.99 | _.100];
88-
q=[_.17; _.33; _.50; _.67; _.86; _.101; 1]; r=[_.19; _.35; _.52; _.69; _.88; _.103; 1];
89-
q=[_.23; _.44; _.63; _.82; _.105; 1]; r=[_.25; _.46; _.65; _.84; _.107; _.121; _.122 | _.123];
80+
q=[_.23; 1]; r=[_.25; _.31; _.40 | _.41];
81+
q=[_.17; _.21; 1]; r=[_.19; _.27; 1];
82+
q=[_.17; _.21; _.37; 1]; r=[_.19; _.27; _.42; 1];
83+
q=[_.23; _.29; 1]; r=[_.25; _.31; _.54; _.61 | _.62];
84+
q=[_.17; _.21; _.37; _.56; 1]; r=[_.19; _.27; _.42; _.58; 1];
85+
q=[_.23; _.29; _.48; 1]; r=[_.25; _.31; _.54; _.75; _.80 | _.81];
86+
q=[_.17; _.21; _.37; _.56; _.73; 1]; r=[_.19; _.27; _.42; _.58; _.77; 1];
87+
q=[_.23; _.29; _.48; _.71; 1]; r=[_.25; _.31; _.54; _.75; _.96; _.99 | _.100];
88+
q=[_.17; _.21; _.37; _.56; _.73; _.90; 1]; r=[_.19; _.27; _.42; _.58; _.77; _.94; 1];
89+
q=[_.23; _.29; _.48; _.71; _.92; 1]; r=[_.25; _.31; _.54; _.75; _.96; _.115; _.122 | _.123];
9090
}
9191
fun q -> lto (build_num 5) q, all answers {
92-
q=[_.13; _.29; _.43; _.44 | _.45];
92+
q=[_.13; _.23; _.39; _.44 | _.45];
9393
q=[0; 1; 1];
9494
q=[1; 1; 1];
9595
}
@@ -102,14 +102,14 @@
102102
fun q r s t -> divo q r s t, 6 answers {
103103
q=[]; r=[_.14 | _.15]; s=[]; t=[];
104104
q=[1]; r=[_.19; _.20 | _.21]; s=[]; t=[1];
105-
q=[_.32; 1]; r=[_.34; _.63; _.64 | _.65]; s=[]; t=[_.32; 1];
106-
q=[_.32; _.78; 1]; r=[_.34; _.80; _.117; _.118 | _.119]; s=[]; t=[_.32; _.78; 1];
107-
q=[_.32; _.78; _.127; 1]; r=[_.34; _.80; _.129; _.174; _.175 | _.176]; s=[]; t=[_.32; _.78; _.127; 1];
108-
q=[_.32; _.78; _.127; _.181; 1]; r=[_.34; _.80; _.129; _.183; _.216; _.217 | _.218]; s=[]; t=[_.32; _.78; _.127; _.181; 1];
105+
q=[_.32; 1]; r=[_.34; _.50; _.64 | _.65]; s=[]; t=[_.32; 1];
106+
q=[_.32; _.46; 1]; r=[_.34; _.50; _.98; _.118 | _.119]; s=[]; t=[_.32; _.46; 1];
107+
q=[_.32; _.46; _.88; 1]; r=[_.34; _.50; _.98; _.157; _.175 | _.176]; s=[]; t=[_.32; _.46; _.88; 1];
108+
q=[_.32; _.46; _.88; _.151; 1]; r=[_.34; _.50; _.98; _.157; _.201; _.217 | _.218]; s=[]; t=[_.32; _.46; _.88; _.151; 1];
109109
}
110110
fun q r s -> test27 q r s, 5 answers {
111-
q=[]; r=[_.53; _.54 | _.55]; s=[0; 0; 1; 0; 0; 0; 1];
112-
q=[1]; r=[_.1151; _.1152 | _.1153]; s=[1; 1; 0; 0; 0; 0; 1];
111+
q=[]; r=[_.22; _.54 | _.55]; s=[0; 0; 1; 0; 0; 0; 1];
112+
q=[1]; r=[_.16; _.1152 | _.1153]; s=[1; 1; 0; 0; 0; 0; 1];
113113
q=[0; 1]; r=[0; 1; 1]; s=[0; 0; 1];
114114
q=[1; 1]; r=[1; 1]; s=[1; 0; 0; 1; 0; 1];
115115
q=[0; 0; 1]; r=[1; 1]; s=[0; 0; 1];

‎regression/test017.t‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,24 @@
6464
q=b;
6565
}
6666
fun q -> patho arco2 !!"a" q, 10 answers {
67-
q=_.11;
67+
q=_.10;
6868
q=a;
69-
q=_.14;
70-
q=_.15;
69+
q=_.10;
70+
q=_.10;
7171
q=a;
7272
q=a;
73-
q=_.20;
74-
q=_.21;
75-
q=_.22;
76-
q=_.23;
73+
q=_.10;
74+
q=_.10;
75+
q=_.10;
76+
q=_.10;
7777
}
7878
fun q -> patho_tabled !!"a" q, 10 answers {
79-
q=_.11;
79+
q=_.10;
8080
q=a;
8181
}
8282
fun q -> patho_tabled !!"a" q, 10 answers {
8383
q=a;
84-
q=_.11;
84+
q=_.10;
8585
}
8686
fun q -> patho arco3 !!"a" q, 10 answers {
8787
q=_.10 [=/= a; =/= b];
@@ -101,5 +101,5 @@
101101
}
102102
fun q -> patho_tabled !!"a" q, 10 answers {
103103
q=a;
104-
q=_.11 [=/= a; =/= b];
104+
q=_.10 [=/= a; =/= b];
105105
}

‎regression_ppx/test015.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
hd1 = _.12
44
hd2 = _.14
55
tl2 = _.15
6-
10: { 0: [| 10 =/= _.11 |] }
6+
11: { 0: [| 11 =/= _.10 |] }
77
8-
11: { 0: [| 11 =/= boxed 0 <_.12, _.13> |] }
8+
11: { 0: [| 11 =/= _.10 |] }
99
1010
15: { 0: [| 14 =/= _.12, 15 =/= _.13 |] }
1111

0 commit comments

Comments
 (0)