Skip to content

Commit bbb0d67

Browse files
hhugohhugo
committed
accept
1 parent 45d10cb commit bbb0d67

File tree

7 files changed

+450
-520
lines changed

7 files changed

+450
-520
lines changed

‎compiler/tests-compiler/effects_continuations.ml‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,10 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
103103
{|
104104

105105
function exceptions(s, cont){
106-
<<<<<<< HEAD
107106
try{var _z_ = runtime.caml_int_of_string(s), n = _z_;}
108107
catch(_D_){
109108
var _u_ = caml_wrap_exception(_D_);
110-
if(_u_[1] !== Stdlib[7]){
111-
=======
112-
try{var _C_ = runtime.caml_int_of_string(s), n = _C_;}
113-
catch(_G_){
114-
var _v_ = caml_wrap_exception(_G_);
115-
if(! Object.is(_v_[1], Stdlib[7])){
116-
>>>>>>> c650ced771 (promote)
109+
if(! Object.is(_u_[1], Stdlib[7])){
117110
var raise$1 = caml_pop_trap();
118111
return raise$1(caml_maybe_attach_backtrace(_u_, 0));
119112
}
@@ -124,28 +117,17 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
124117
throw caml_maybe_attach_backtrace(Stdlib[8], 1);
125118
var _y_ = 7, m = _y_;
126119
}
127-
<<<<<<< HEAD
128120
catch(_C_){
129121
var _v_ = caml_wrap_exception(_C_);
130-
if(_v_ !== Stdlib[8]){
131-
=======
132-
catch(_F_){
133-
var _x_ = caml_wrap_exception(_F_);
134-
if(! Object.is(_x_, Stdlib[8])){
135-
>>>>>>> c650ced771 (promote)
122+
if(! Object.is(_v_, Stdlib[8])){
136123
var raise$0 = caml_pop_trap();
137124
return raise$0(caml_maybe_attach_backtrace(_v_, 0));
138125
}
139126
var m = 0;
140127
}
141128
runtime.caml_push_trap
142-
<<<<<<< HEAD
143129
(function(_B_){
144-
if(_B_ === Stdlib[8]) return cont(0);
145-
=======
146-
(function(_E_){
147-
if(Object.is(_E_, Stdlib[8])) return cont(0);
148-
>>>>>>> c650ced771 (promote)
130+
if(Object.is(_B_, Stdlib[8])) return cont(0);
149131
var raise = caml_pop_trap();
150132
return raise(caml_maybe_attach_backtrace(_B_, 0));
151133
});

‎compiler/tests-compiler/effects_exceptions.ml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,10 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
5757
{|
5858

5959
function exceptions(s, cont){
60-
<<<<<<< HEAD
6160
try{var _n_ = runtime.caml_int_of_string(s), n = _n_;}
6261
catch(_r_){
6362
var _i_ = caml_wrap_exception(_r_);
64-
if(_i_[1] !== Stdlib[7]){
65-
=======
66-
try{var _p_ = runtime.caml_int_of_string(s), n = _p_;}
67-
catch(_t_){
68-
var _i_ = caml_wrap_exception(_t_);
6963
if(! Object.is(_i_[1], Stdlib[7])){
70-
>>>>>>> c650ced771 (promote)
7164
var raise$1 = caml_pop_trap();
7265
return raise$1(caml_maybe_attach_backtrace(_i_, 0));
7366
}
@@ -78,28 +71,17 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
7871
throw caml_maybe_attach_backtrace(Stdlib[8], 1);
7972
var _m_ = 7, m = _m_;
8073
}
81-
<<<<<<< HEAD
8274
catch(_q_){
8375
var _j_ = caml_wrap_exception(_q_);
84-
if(_j_ !== Stdlib[8]){
85-
=======
86-
catch(_s_){
87-
var _k_ = caml_wrap_exception(_s_);
88-
if(! Object.is(_k_, Stdlib[8])){
89-
>>>>>>> c650ced771 (promote)
76+
if(! Object.is(_j_, Stdlib[8])){
9077
var raise$0 = caml_pop_trap();
9178
return raise$0(caml_maybe_attach_backtrace(_j_, 0));
9279
}
9380
var m = 0;
9481
}
9582
caml_push_trap
96-
<<<<<<< HEAD
9783
(function(_p_){
98-
if(_p_ === Stdlib[8]) return cont(0);
99-
=======
100-
(function(_r_){
101-
if(Object.is(_r_, Stdlib[8])) return cont(0);
102-
>>>>>>> c650ced771 (promote)
84+
if(Object.is(_p_, Stdlib[8])) return cont(0);
10385
var raise = caml_pop_trap();
10486
return raise(caml_maybe_attach_backtrace(_p_, 0));
10587
});

‎compiler/tests-compiler/gh747.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ end
353353
128: (Stdlib_Printf[1], outchan, _c_, str);
354354
129: }
355355
130: /*<<test.ml:69:6>>*/ /*<<test.ml:69:6>>*/ var _g_ = i + 1 | 0;
356-
131: if(_f_ === i) break;
356+
131: if(Object.is(_f_, i)) break;
357357
132: var i = _g_;
358358
133: }
359359
134: }

‎compiler/tests-compiler/global_deadcode.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ let%expect_test "Eliminates unused functions from functor" =
6969
if(! t) return [0, 0, x, 0, 1];
7070
var r = t[3], v = t[2], l = t[1], c = caml_call2(Ord[1], x, v);
7171
if(0 === c) return t;
72-
if(0 <= c){var rr = add(x, r); return r === rr ? t : bal(l, v, rr);}
72+
if(0 <= c){var rr = add(x, r); return Object.is(r, rr) ? t : bal(l, v, rr);}
7373
var ll = add(x, l);
74-
return l === ll ? t : bal(ll, v, r);
74+
return Object.is(l, ll) ? t : bal(ll, v, r);
7575
}
7676
function singleton(x){return [0, 0, x, 0, 1];}
7777
var empty = 0;

‎compiler/tests-compiler/loops.ml‎

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -259,27 +259,16 @@ let f t x =
259259
if(val$0 && ! val$0[2]){
260260
var x$1 = val$0[1], x$0 = x$1;
261261
for(;;){
262-
<<<<<<< HEAD
263262
a:
264263
{
265264
try{var val = caml_call2(Stdlib_Hashtbl[6], t, x$0);}
266265
catch(_e_){
267266
var _a_ = caml_wrap_exception(_e_);
268-
if(_a_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_a_, 0);
267+
if(! Object.is(_a_, Stdlib[3]))
268+
throw caml_maybe_attach_backtrace(_a_, 0);
269269
var _d_ = 0;
270270
break a;
271271
}
272-
=======
273-
var switch$0 = 0;
274-
try{var val = caml_call2(Stdlib_Hashtbl[6], t, x$0); switch$0 = 1;}
275-
catch(_e_){
276-
var _a_ = caml_wrap_exception(_e_);
277-
if(! Object.is(_a_, Stdlib[3])) throw caml_maybe_attach_backtrace(_a_, 0);
278-
var _d_ = 0;
279-
}
280-
if(switch$0){
281-
var switch$1 = 0;
282-
>>>>>>> c650ced771 (promote)
283272
if(val && ! val[2]){
284273
var y = val[1], _b_ = y === (x$0 + 1 | 0) ? 1 : 0;
285274
if(_b_){var _d_ = _b_; break a;}
@@ -507,9 +496,9 @@ let add_substitute =
507496
var lim = caml_ml_string_length(s), k = k$2, stop = new_start;
508497
for(;;){
509498
if(lim <= stop) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
510-
if(caml_string_get(s, stop) === opening)
499+
if(Object.is(caml_string_get(s, stop), opening))
511500
var i = stop + 1 | 0, k$0 = k + 1 | 0, k = k$0, stop = i;
512-
else if(caml_string_get(s, stop) === closing){
501+
else if(Object.is(caml_string_get(s, stop), closing)){
513502
if(0 === k) break;
514503
var i$0 = stop + 1 | 0, k$1 = k - 1 | 0, k = k$1, stop = i$0;
515504
}
@@ -537,79 +526,6 @@ let add_substitute =
537526
caml_call2(add_char, b, previous$0);
538527
var i$8 = i$4 + 1 | 0, previous = previous$0, i$4 = i$8;
539528
}
540-
<<<<<<< HEAD
541-
=======
542-
if(92 === previous){
543-
caml_call2(add_char, b, previous$0);
544-
var i$5 = i$4 + 1 | 0, previous = 32, i$4 = i$5;
545-
continue;
546-
}
547-
var start$0 = i$4 + 1 | 0;
548-
if(lim$1 <= start$0) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
549-
var opening = caml_string_get(s, start$0), switch$0 = 0;
550-
if(40 !== opening && 123 !== opening){
551-
var start = start$0 + 1 | 0, lim$0 = caml_ml_string_length(s), i$2 = start;
552-
for(;;){
553-
if(lim$0 <= i$2)
554-
var stop$0 = lim$0;
555-
else{
556-
var match = caml_string_get(s, i$2), switch$1 = 0;
557-
if(91 <= match){
558-
if(97 <= match){
559-
if(123 > match) switch$1 = 1;
560-
}
561-
else if(95 === match) switch$1 = 1;
562-
}
563-
else if(58 <= match){
564-
if(65 <= match) switch$1 = 1;
565-
}
566-
else if(48 <= match) switch$1 = 1;
567-
if(switch$1){var i$3 = i$2 + 1 | 0, i$2 = i$3; continue;}
568-
var stop$0 = i$2;
569-
}
570-
var
571-
match$0 =
572-
[0,
573-
caml_call3(Stdlib_String[15], s, start$0, stop$0 - start$0 | 0),
574-
stop$0];
575-
switch$0 = 1;
576-
break;
577-
}
578-
}
579-
if(! switch$0){
580-
var new_start = start$0 + 1 | 0, k$2 = 0;
581-
if(40 === opening)
582-
var closing = 41;
583-
else{
584-
if(123 !== opening)
585-
throw caml_maybe_attach_backtrace([0, Assert_failure, _a_], 1);
586-
var closing = 125;
587-
}
588-
var lim = caml_ml_string_length(s), k = k$2, stop = new_start;
589-
for(;;){
590-
if(lim <= stop) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
591-
if(Object.is(caml_string_get(s, stop), opening)){
592-
var i = stop + 1 | 0, k$0 = k + 1 | 0, k = k$0, stop = i;
593-
continue;
594-
}
595-
if(! Object.is(caml_string_get(s, stop), closing)){var i$1 = stop + 1 | 0, stop = i$1; continue;}
596-
if(0 !== k){
597-
var i$0 = stop + 1 | 0, k$1 = k - 1 | 0, k = k$1, stop = i$0;
598-
continue;
599-
}
600-
var
601-
match$0 =
602-
[0,
603-
caml_call3
604-
(Stdlib_String[15], s, new_start, (stop - start$0 | 0) - 1 | 0),
605-
stop + 1 | 0];
606-
break;
607-
}
608-
}
609-
var next_i = match$0[2], ident = match$0[1];
610-
caml_call2(add_string, b, caml_call1(f, ident));
611-
var previous = 32, i$4 = next_i;
612-
>>>>>>> c650ced771 (promote)
613529
}
614530
}
615531
//end |}]

‎compiler/tests-compiler/match_with_exn.ml‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,53 +73,34 @@ let fun2 () =
7373
[%expect
7474
{|
7575
function fun1(param){
76-
<<<<<<< HEAD
7776
a:
7877
{
7978
try{var i$1 = caml_call1(Stdlib_Random[5], 2);}
8079
catch(_e_){
8180
var _d_ = caml_wrap_exception(_e_);
82-
if(_d_[1] !== A) throw caml_maybe_attach_backtrace(_d_, 0);
81+
if(! Object.is(_d_[1], A)) throw caml_maybe_attach_backtrace(_d_, 0);
8382
var i = _d_[2];
8483
if(2 !== i) return i + 2 | 0;
8584
var i$0 = i;
8685
break a;
8786
}
8887
if(0 !== i$1) return i$1 + 1 | 0;
8988
var i$0 = i$1;
90-
=======
91-
var switch$0 = 0;
92-
try{var i$1 = caml_call1(Stdlib_Random[5], 2);}
93-
catch(_e_){
94-
var _d_ = caml_wrap_exception(_e_);
95-
if(! Object.is(_d_[1], A)) throw caml_maybe_attach_backtrace(_d_, 0);
96-
var i = _d_[2];
97-
if(2 !== i) return i + 2 | 0;
98-
var i$0 = i;
99-
switch$0 = 1;
100-
>>>>>>> c650ced771 (promote)
10189
}
10290
return i$0;
10391
}
10492
//end
10593
function fun2(param){
106-
<<<<<<< HEAD
10794
a:
10895
{
10996
try{var i$0 = caml_call1(Stdlib_Random[5], 2);}
11097
catch(_c_){
11198
var _a_ = caml_wrap_exception(_c_);
112-
if(_a_[1] === A){var _b_ = _a_[2]; if(2 === _b_){var i = _b_; break a;}}
99+
if(Object.is(_a_[1], A)){
100+
var _b_ = _a_[2];
101+
if(2 === _b_){var i = _b_; break a;}
102+
}
113103
throw caml_maybe_attach_backtrace(_a_, 0);
114-
=======
115-
var switch$0 = 0;
116-
try{var i$0 = caml_call1(Stdlib_Random[5], 2);}
117-
catch(_c_){
118-
var _a_ = caml_wrap_exception(_c_), switch$1 = 0;
119-
if(Object.is(_a_[1], A)){
120-
var _b_ = _a_[2];
121-
if(2 === _b_){var i = _b_; switch$0 = 1;} else switch$1 = 1;
122-
>>>>>>> c650ced771 (promote)
123104
}
124105
if(0 !== i$0) return i$0 + 1 | 0;
125106
var i = i$0;

0 commit comments

Comments
 (0)