diff --git a/compiler/lib/generate.ml b/compiler/lib/generate.ml index 1e5ccc87dd..70a761afaf 100644 --- a/compiler/lib/generate.ml +++ b/compiler/lib/generate.ml @@ -2043,6 +2043,7 @@ let init () = ; "caml_floatarray_unsafe_set", "caml_array_unsafe_set" ; "caml_alloc_dummy_float", "caml_alloc_dummy" ; "caml_make_array", "%identity" + ; "caml_array_of_uniform_array", "%identity" ; "caml_ensure_stack_capacity", "%identity" ; "caml_js_from_float", "%identity" ; "caml_js_to_float", "%identity" diff --git a/compiler/tests-full/stdlib.cma.expected.js b/compiler/tests-full/stdlib.cma.expected.js index b9d5504993..b194008afb 100644 --- a/compiler/tests-full/stdlib.cma.expected.js +++ b/compiler/tests-full/stdlib.cma.expected.js @@ -7221,9 +7221,9 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_array_sub = runtime.caml_array_sub, caml_check_bound = runtime.caml_check_bound, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_wrap_exception = runtime.caml_wrap_exception; /*<>*/ function caml_call1(f, a0){ @@ -7267,7 +7267,7 @@ (Stdlib[1], cst_Array_init); /*<>*/ var /*<>*/ res = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (l, /*<>*/ caml_call1(f, 0)), /*<>*/ _aE_ = l - 1 | 0, /*<>*/ _aD_ = 1; @@ -7288,7 +7288,7 @@ /*<>*/ /*<>*/ caml_call1 (Stdlib[1], cst_Array_make_matrix); /*<>*/ /*<>*/ var - res = /*<>*/ caml_make_vect(sx, [0]); + res = /*<>*/ caml_array_make(sx, [0]); if(0 < sy){ /*<>*/ var _aB_ = sx - 1 | 0, @@ -7296,7 +7296,7 @@ if(_aB_ >= 0){ var x = _aA_; for(;;){ - res[1 + x] = /*<>*/ caml_make_vect(sy, init); + res[1 + x] = /*<>*/ caml_array_make(sy, init); /*<>*/ /*<>*/ var _aC_ = x + 1 | 0; if(_aB_ === x) break; x = _aC_; @@ -7310,7 +7310,7 @@ /*<>*/ /*<>*/ caml_call1 (Stdlib[1], cst_Array_init_matrix); /*<>*/ /*<>*/ var - res = /*<>*/ caml_make_vect(sx, [0]); + res = /*<>*/ caml_array_make(sx, [0]); if(0 < sy){ /*<>*/ var _av_ = sx - 1 | 0, @@ -7320,7 +7320,7 @@ for(;;){ /*<>*/ var /*<>*/ row = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (sy, /*<>*/ caml_call2(f, x, 0)), /*<>*/ _ax_ = sy - 1 | 0, /*<>*/ _aw_ = 1; @@ -7427,7 +7427,7 @@ /*<>*/ if(0 === l) /*<>*/ return [0]; /*<>*/ var /*<>*/ r = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (l, /*<>*/ caml_call1(f, a[1])), /*<>*/ _am_ = l - 1 | 0, /*<>*/ _al_ = 1; @@ -7485,7 +7485,7 @@ if(0 === la) /*<>*/ return [0]; /*<>*/ var /*<>*/ r = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (la, /*<>*/ caml_call2(f, a[1], b[1])), /*<>*/ _ad_ = la - 1 | 0, /*<>*/ _ac_ = 1; @@ -7522,7 +7522,7 @@ /*<>*/ if(0 === l) /*<>*/ return [0]; /*<>*/ var /*<>*/ r = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (l, /*<>*/ caml_call2(f, 0, a[1])), /*<>*/ _Z_ = l - 1 | 0, /*<>*/ _Y_ = 1; @@ -7566,7 +7566,7 @@ tl = l[2], hd = l[1], /*<>*/ a = - /*<>*/ caml_make_vect(list_length(0, l), hd), + /*<>*/ caml_array_make(list_length(0, l), hd), i = 1, param = tl; for(;;){ @@ -7604,7 +7604,7 @@ elt = match[2], acc$0 = match[1], /*<>*/ output_array = - /*<>*/ caml_make_vect(len, elt), + /*<>*/ caml_array_make(len, elt), /*<>*/ acc$1 = [0, acc$0], /*<>*/ _T_ = len - 1 | 0, /*<>*/ _S_ = 1; @@ -7766,9 +7766,9 @@ a0 = match[1], /*<>*/ n = x.length - 1, /*<>*/ a = - /*<>*/ caml_make_vect(n, a0), + /*<>*/ caml_array_make(n, a0), /*<>*/ b = - /*<>*/ caml_make_vect(n, b0), + /*<>*/ caml_array_make(n, b0), /*<>*/ _O_ = n - 1 | 0, /*<>*/ _N_ = 1; if(_O_ >= 1){ @@ -7794,7 +7794,7 @@ if(0 === na) /*<>*/ return [0]; /*<>*/ var /*<>*/ x = - /*<>*/ caml_make_vect(na, [0, a[1], b[1]]), + /*<>*/ caml_array_make(na, [0, a[1], b[1]]), /*<>*/ _L_ = na - 1 | 0, /*<>*/ _K_ = 1; if(_L_ >= 1){ @@ -8045,7 +8045,7 @@ l1 = l / 2 | 0, l2 = l - l1 | 0, /*<>*/ t = - /*<>*/ caml_make_vect(l2, caml_check_bound(a, 0)[1]); + /*<>*/ caml_array_make(l2, caml_check_bound(a, 0)[1]); /*<>*/ sortto(l1, t, 0, l2); /*<>*/ sortto(0, a, l2, l1); /*<>*/ return merge(l2, l1, t, 0, l2, a, 0); @@ -8114,7 +8114,7 @@ hd = l[1], /*<>*/ len = list_length(0, l), /*<>*/ a = - /*<>*/ caml_make_vect(len, hd), + /*<>*/ caml_array_make(len, hd), /*<>*/ i$1 = len - 2 | 0, i = i$1, param = tl; @@ -8187,12 +8187,12 @@ cst_Float_array_blit$1 = "Float.array.blit", cst_float_ml = "float.ml", caml_array_get = runtime.caml_array_get, + caml_array_make = runtime.caml_array_make, caml_array_set = runtime.caml_array_set, caml_float_compare = runtime.caml_float_compare, caml_floatarray_blit = runtime.caml_floatarray_blit, caml_floatarray_create = runtime.caml_floatarray_create, caml_hash = runtime.caml_hash, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_nextafter_float = runtime.caml_nextafter_float, caml_signbit_float = runtime.caml_signbit_float, @@ -8416,7 +8416,7 @@ (Stdlib[1], cst_Float_Array_make_matrix); /*<>*/ /*<>*/ var res = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (sx, /*<>*/ caml_floatarray_create(0)); if(0 < sy){ /*<>*/ var @@ -8440,7 +8440,7 @@ (Stdlib[1], cst_Float_Array_init_matrix); /*<>*/ /*<>*/ var res = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (sx, /*<>*/ caml_floatarray_create(0)); if(0 < sy){ /*<>*/ var @@ -9159,7 +9159,7 @@ /*<>*/ if(0 === l) /*<>*/ return [0]; /*<>*/ var /*<>*/ r = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make (l, /*<>*/ caml_call1(f, a[1])), /*<>*/ _i_ = l - 1 | 0, /*<>*/ _h_ = 1; @@ -10082,9 +10082,9 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, caml_fresh_oo_id = runtime.caml_fresh_oo_id, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_wrap_exception = runtime.caml_wrap_exception; /*<>*/ function caml_call1(f, a0){ @@ -10114,10 +10114,10 @@ [248, "Stdlib.Parsing.Parse_error", caml_fresh_oo_id(0)], /*<>*/ env = [0, - /*<>*/ caml_make_vect(100, 0), - /*<>*/ caml_make_vect(100, 0), - /*<>*/ caml_make_vect(100, Stdlib_Lexing[1]), - /*<>*/ caml_make_vect(100, Stdlib_Lexing[1]), + /*<>*/ caml_array_make(100, 0), + /*<>*/ caml_array_make(100, 0), + /*<>*/ caml_array_make(100, Stdlib_Lexing[1]), + /*<>*/ caml_array_make(100, Stdlib_Lexing[1]), 100, 0, 0, @@ -10135,13 +10135,13 @@ oldsize = env[5], newsize = oldsize * 2 | 0, /*<>*/ new_s = - /*<>*/ caml_make_vect(newsize, 0), + /*<>*/ caml_array_make(newsize, 0), /*<>*/ new_v = - /*<>*/ caml_make_vect(newsize, 0), + /*<>*/ caml_array_make(newsize, 0), /*<>*/ new_start = - /*<>*/ caml_make_vect(newsize, Stdlib_Lexing[1]), + /*<>*/ caml_array_make(newsize, Stdlib_Lexing[1]), /*<>*/ new_end = - /*<>*/ caml_make_vect(newsize, Stdlib_Lexing[1]); + /*<>*/ caml_array_make(newsize, Stdlib_Lexing[1]); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], env[1], 0, new_s, 0, oldsize); env[1] = new_s; @@ -13520,9 +13520,9 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, caml_domain_dls_get = runtime.caml_domain_dls_get, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_ml_domain_id = runtime.caml_ml_domain_id, caml_wrap_exception = runtime.caml_wrap_exception; @@ -13563,7 +13563,7 @@ /*<>*/ /*<>*/ var none = [0, 0]; function create_dls(param){ /*<>*/ /*<>*/ var - st = /*<>*/ caml_make_vect(8, none); + st = /*<>*/ caml_array_make(8, none); /*<>*/ /*<>*/ runtime.caml_domain_dls_set (st); /*<>*/ return; @@ -13611,7 +13611,7 @@ new_sz = s; } /*<>*/ /*<>*/ var - new_st = /*<>*/ caml_make_vect(new_sz, none); + new_st = /*<>*/ caml_array_make(new_sz, none); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], st, 0, new_st, 0, sz); /*<>*/ if @@ -13923,6 +13923,7 @@ cst$7 = "@", cst = ".*", Assert_failure = global_data.Assert_failure, + Match_failure = global_data.Match_failure, CamlinternalFormatBasics = global_data.CamlinternalFormatBasics, Stdlib = global_data.Stdlib, Stdlib_Buffer = global_data.Stdlib__Buffer, @@ -13954,13 +13955,14 @@ _h_ = [0, cst_camlinternalFormat_ml, 827, 22], _i_ = [0, cst_camlinternalFormat_ml, 832, 30], _j_ = [0, cst_camlinternalFormat_ml, 851, 23], - _k_ = [0, cst_camlinternalFormat_ml, 836, 26], - _l_ = [0, cst_camlinternalFormat_ml, 846, 28], - _m_ = [0, cst_camlinternalFormat_ml, 814, 21], - _n_ = [0, cst_camlinternalFormat_ml, 818, 21], - _o_ = [0, cst_camlinternalFormat_ml, 822, 19], - _p_ = [0, cst_camlinternalFormat_ml, 826, 22], - _q_ = [0, cst_camlinternalFormat_ml, 831, 30]; + _k_ = [0, cst_camlinternalFormat_ml, 803, 17], + _l_ = [0, cst_camlinternalFormat_ml, 836, 26], + _m_ = [0, cst_camlinternalFormat_ml, 846, 28], + _n_ = [0, cst_camlinternalFormat_ml, 814, 21], + _o_ = [0, cst_camlinternalFormat_ml, 818, 21], + _p_ = [0, cst_camlinternalFormat_ml, 822, 19], + _q_ = [0, cst_camlinternalFormat_ml, 826, 22], + _r_ = [0, cst_camlinternalFormat_ml, 831, 30]; function create_char_set(param){ /*<>*/ return /*<>*/ caml_call2 (Stdlib_Bytes[1], 32, 0); @@ -13969,14 +13971,14 @@ /*<>*/ var str_ind = c >>> 3 | 0, mask = 1 << (c & 7), - /*<>*/ _cU_ = + /*<>*/ _cV_ = /*<>*/ runtime.caml_bytes_get (char_set, str_ind) | mask; /*<>*/ return /*<>*/ caml_bytes_set (char_set, str_ind, - /*<>*/ caml_call1(Stdlib[29], _cU_)); + /*<>*/ caml_call1(Stdlib[29], _cV_)); /*<>*/ } function freeze_char_set(char_set){ /*<>*/ return /*<>*/ caml_call1 @@ -13988,19 +13990,19 @@ i = 0; for(;;){ /*<>*/ /*<>*/ var - _cS_ = + _cT_ = /*<>*/ caml_string_get(char_set, i) ^ 255; /*<>*/ /*<>*/ caml_bytes_set (char_set$0, i, - /*<>*/ caml_call1(Stdlib[29], _cS_)); + /*<>*/ caml_call1(Stdlib[29], _cT_)); /*<>*/ /*<>*/ var - _cT_ = i + 1 | 0; + _cU_ = i + 1 | 0; if(31 === i) /*<>*/ return /*<>*/ caml_call1 (Stdlib_Bytes[44], char_set$0); - i = _cT_; + i = _cU_; } /*<>*/ } function is_in_char_set(char_set, c){ @@ -14060,11 +14062,11 @@ case 6: var prec_opt = ign[2], pad_opt$5 = ign[1]; if(prec_opt) - var ndec = prec_opt[1], _cR_ = [0, ndec]; + var ndec = prec_opt[1], _cS_ = [0, ndec]; else - var _cR_ = 0; + var _cS_ = 0; /*<>*/ return [0, - [8, _a_, pad_of_pad_opt(pad_opt$5), _cR_, fmt]]; + [8, _a_, pad_of_pad_opt(pad_opt$5), _cS_, fmt]]; case 7: var pad_opt$6 = ign[1]; /*<>*/ return [0, @@ -14294,11 +14296,11 @@ default: /*<>*/ var c = formatting_lit[1], - /*<>*/ _cQ_ = + /*<>*/ _cR_ = /*<>*/ caml_call2 (Stdlib_String[1], 1, c); /*<>*/ return /*<>*/ caml_call2 - (Stdlib[28], cst$7, _cQ_); + (Stdlib[28], cst$7, _cR_); } /*<>*/ } function bprint_char_literal(buf, chr){ @@ -14308,17 +14310,17 @@ /*<>*/ } function bprint_string_literal(buf, str){ /*<>*/ var - _cO_ = caml_ml_string_length(str) - 1 | 0, - /*<>*/ _cN_ = 0; - if(_cO_ >= 0){ - var i = _cN_; + _cP_ = caml_ml_string_length(str) - 1 | 0, + /*<>*/ _cO_ = 0; + if(_cP_ >= 0){ + var i = _cO_; for(;;){ /*<>*/ bprint_char_literal (buf, /*<>*/ caml_string_get(str, i)); /*<>*/ /*<>*/ var - _cP_ = i + 1 | 0; - if(_cO_ === i) break; - i = _cP_; + _cQ_ = i + 1 | 0; + if(_cP_ === i) break; + i = _cQ_; } } return; @@ -14666,18 +14668,18 @@ /*<>*/ before = /*<>*/ caml_call1 (Stdlib_Char[1], c - 1 | 0), - /*<>*/ _cJ_ = + /*<>*/ _cK_ = is_in_char_set(set$0, c); - /*<>*/ if(_cJ_) + /*<>*/ if(_cK_) /*<>*/ var - /*<>*/ _cK_ = - is_in_char_set(set$0, before), /*<>*/ _cL_ = - _cK_ ? is_in_char_set(set$0, after) : _cK_, - _cM_ = 1 - _cL_; + is_in_char_set(set$0, before), + /*<>*/ _cM_ = + _cL_ ? is_in_char_set(set$0, after) : _cL_, + _cN_ = 1 - _cM_; else - var _cM_ = _cJ_; - /*<>*/ return _cM_; + var _cN_ = _cK_; + /*<>*/ return _cN_; /*<>*/ }; /*<>*/ if(is_alone(93)) /*<>*/ buffer_add_char(buf, 93); @@ -14818,12 +14820,12 @@ (buf, ign_flag$0); switch(counter){ case 0: - var _cF_ = 108; break; + var _cG_ = 108; break; case 1: - var _cF_ = 110; break; - default: var _cF_ = 78; + var _cG_ = 110; break; + default: var _cG_ = 78; } - /*<>*/ buffer_add_char(buf, _cF_); + /*<>*/ buffer_add_char(buf, _cG_); fmt$0 = rest$20; ign_flag$0 = 0; break; @@ -14849,20 +14851,20 @@ /*<>*/ var rest$23 = fmt$0[3], arity = fmt$0[1], - /*<>*/ _cH_ = + /*<>*/ _cI_ = int_of_custom_arity(arity), - _cG_ = 1; - if(_cH_ >= 1){ - var i$8 = _cG_; + _cH_ = 1; + if(_cI_ >= 1){ + var i$8 = _cH_; for(;;){ /*<>*/ buffer_add_char(buf, 37); /*<>*/ bprint_ignored_flag (buf, ign_flag$0); /*<>*/ buffer_add_char(buf, 63); /*<>*/ /*<>*/ var - _cI_ = i$8 + 1 | 0; - if(_cH_ === i$8) break; - i$8 = _cI_; + _cJ_ = i$8 + 1 | 0; + if(_cI_ === i$8) break; + i$8 = _cJ_; } } fmt$0 = rest$23; @@ -15277,10 +15279,12 @@ g: { if(typeof ty1 !== "number"){ - switch(ty1[0]){ - case 0: - var rest1 = ty1[1]; - if(typeof ty2 !== "number") + h: + { + switch(ty1[0]){ + case 0: + var rest1 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 0: var rest2 = ty2[1]; @@ -15301,10 +15305,10 @@ case 14: break e; } - break; - case 1: - var rest1$0 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 1: + var rest1$0 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 1: var rest2$0 = ty2[1]; @@ -15325,10 +15329,10 @@ case 14: break e; } - break; - case 2: - var rest1$1 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 2: + var rest1$1 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 2: var rest2$1 = ty2[1]; @@ -15349,10 +15353,10 @@ case 14: break e; } - break; - case 3: - var rest1$2 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 3: + var rest1$2 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 3: var rest2$2 = ty2[1]; @@ -15373,10 +15377,10 @@ case 14: break e; } - break; - case 4: - var rest1$3 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 4: + var rest1$3 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 4: var rest2$3 = ty2[1]; @@ -15397,10 +15401,10 @@ case 14: break e; } - break; - case 5: - var rest1$4 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 5: + var rest1$4 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 5: var rest2$4 = ty2[1]; @@ -15421,10 +15425,10 @@ case 14: break e; } - break; - case 6: - var rest1$5 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 6: + var rest1$5 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 6: var rest2$5 = ty2[1]; @@ -15445,10 +15449,10 @@ case 14: break e; } - break; - case 7: - var rest1$6 = ty1[1]; - if(typeof ty2 !== "number") + break; + case 7: + var rest1$6 = ty1[1]; + if(typeof ty2 === "number") break h; switch(ty2[0]){ case 7: var rest2$6 = ty2[1]; @@ -15469,142 +15473,145 @@ case 14: break e; } - break; - case 8: - var rest1$7 = ty1[2], ty1$0 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 8: - /*<>*/ var - rest2$7 = ty2[2], - ty2$0 = ty2[1], - /*<>*/ _cE_ = - trans(rest1$7, rest2$7); - /*<>*/ return [8, - trans(ty1$0, ty2$0), - _cE_]; - case 10: - break a; - case 11: - break b; - case 12: - break c; - case 13: - break d; - case 14: - break e; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _k_], 1); - case 9: - var rest1$8 = ty1[3], ty12 = ty1[2], ty11 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 8: - break f; - case 9: - /*<>*/ var - rest2$8 = ty2[3], - ty22 = ty2[2], - ty21 = ty2[1], - /*<>*/ ty = - trans(symm(ty12), ty21), - /*<>*/ match = - fmtty_rel_det(ty), - f4 = match[4], - f2 = match[2]; - /*<>*/ f2(0); - /*<>*/ f4(0); - /*<>*/ return [9, - ty11, - ty22, - trans(rest1$8, rest2$8)]; - case 10: - break a; - case 11: - break b; - case 12: - break c; - case 13: - break d; - case 14: - break e; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _l_], 1); - case 10: - var rest1$9 = ty1[1]; - if(typeof ty2 !== "number" && 10 === ty2[0]){ - var rest2$9 = ty2[1]; - /*<>*/ return [10, - trans(rest1$9, rest2$9)]; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _m_], 1); - case 11: - var rest1$10 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 10: - break a; - case 11: - var rest2$10 = ty2[1]; - /*<>*/ return [11, - trans(rest1$10, rest2$10)]; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _n_], 1); - case 12: - var rest1$11 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 10: - break a; - case 11: - break b; - case 12: - var rest2$11 = ty2[1]; - /*<>*/ return [12, - trans(rest1$11, rest2$11)]; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _o_], 1); - case 13: - var rest1$12 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 10: - break a; - case 11: - break b; - case 12: - break c; - case 13: - var rest2$12 = ty2[1]; - /*<>*/ return [13, - trans(rest1$12, rest2$12)]; - } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _p_], 1); - default: - var rest1$13 = ty1[1]; - if(typeof ty2 !== "number") - switch(ty2[0]){ - case 10: - break a; - case 11: - break b; - case 12: - break c; - case 13: - break d; - case 14: - var rest2$13 = ty2[1]; - /*<>*/ return [14, - trans(rest1$13, rest2$13)]; + break; + case 8: + var rest1$7 = ty1[2], ty1$0 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 8: + /*<>*/ var + rest2$7 = ty2[2], + ty2$0 = ty2[1], + /*<>*/ _cF_ = + trans(rest1$7, rest2$7); + /*<>*/ return [8, + trans(ty1$0, ty2$0), + _cF_]; + case 10: + break a; + case 11: + break b; + case 12: + break c; + case 13: + break d; + case 14: + break e; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _l_], 1); + case 9: + var rest1$8 = ty1[3], ty12 = ty1[2], ty11 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 8: + break f; + case 9: + /*<>*/ var + rest2$8 = ty2[3], + ty22 = ty2[2], + ty21 = ty2[1], + /*<>*/ ty = + trans(symm(ty12), ty21), + /*<>*/ match = + fmtty_rel_det(ty), + f4 = match[4], + f2 = match[2]; + /*<>*/ f2(0); + /*<>*/ f4(0); + /*<>*/ return [9, + ty11, + ty22, + trans(rest1$8, rest2$8)]; + case 10: + break a; + case 11: + break b; + case 12: + break c; + case 13: + break d; + case 14: + break e; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _m_], 1); + case 10: + var rest1$9 = ty1[1]; + if(typeof ty2 !== "number" && 10 === ty2[0]){ + var rest2$9 = ty2[1]; + /*<>*/ return [10, + trans(rest1$9, rest2$9)]; } - /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _q_], 1); + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _n_], 1); + case 11: + var rest1$10 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 10: + break a; + case 11: + var rest2$10 = ty2[1]; + /*<>*/ return [11, + trans(rest1$10, rest2$10)]; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _o_], 1); + case 12: + var rest1$11 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 10: + break a; + case 11: + break b; + case 12: + var rest2$11 = ty2[1]; + /*<>*/ return [12, + trans(rest1$11, rest2$11)]; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _p_], 1); + case 13: + var rest1$12 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 10: + break a; + case 11: + break b; + case 12: + break c; + case 13: + var rest2$12 = ty2[1]; + /*<>*/ return [13, + trans(rest1$12, rest2$12)]; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _q_], 1); + default: + var rest1$13 = ty1[1]; + if(typeof ty2 !== "number") + switch(ty2[0]){ + case 10: + break a; + case 11: + break b; + case 12: + break c; + case 13: + break d; + case 14: + var rest2$13 = ty2[1]; + /*<>*/ return [14, + trans(rest1$13, rest2$13)]; + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Assert_failure, _r_], 1); + } + /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace + ([0, Match_failure, _k_], 1); } /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace ([0, Assert_failure, _j_], 1); @@ -15760,13 +15767,13 @@ /*<>*/ var rest$13 = fmtty$0[2], formatting_gen = fmtty$0[1], - /*<>*/ _cB_ = fmtty_of_fmt(rest$13); + /*<>*/ _cC_ = fmtty_of_fmt(rest$13); if(0 === formatting_gen[0]) - var fmt = formatting_gen[1][1], _cC_ = fmtty_of_fmt(fmt); + var fmt = formatting_gen[1][1], _cD_ = fmtty_of_fmt(fmt); else - var fmt$0 = formatting_gen[1][1], _cC_ = fmtty_of_fmt(fmt$0); + var fmt$0 = formatting_gen[1][1], _cD_ = fmtty_of_fmt(fmt$0); /*<>*/ return /*<>*/ caml_call2 - (CamlinternalFormatBasics[1], _cC_, _cB_); + (CamlinternalFormatBasics[1], _cD_, _cC_); case 19: var rest$14 = fmtty$0[1]; /*<>*/ return [13, @@ -15819,10 +15826,10 @@ case 9: /*<>*/ var fmtty$6 = ign[2], - /*<>*/ _cD_ = + /*<>*/ _cE_ = fmtty_of_fmt(fmtty$5); /*<>*/ return /*<>*/ caml_call2 - (CamlinternalFormatBasics[1], fmtty$6, _cD_); + (CamlinternalFormatBasics[1], fmtty$6, _cE_); case 10: fmtty$0 = fmtty$5; break; default: fmtty$0 = fmtty$5; @@ -15907,23 +15914,23 @@ cst_no = "%no", cst_no$0 = "%#no", cst_nu = "%nu", - _r_ = [0, 103], + _s_ = [0, 103], cst_neg_infinity = "neg_infinity", cst_infinity = "infinity", cst_nan = "nan", - _s_ = [0, cst_camlinternalFormat_ml, 1558, 4], + _t_ = [0, cst_camlinternalFormat_ml, 1558, 4], cst_Printf_bad_conversion = "Printf: bad conversion %[", - _t_ = [0, cst_camlinternalFormat_ml, 1626, 39], - _u_ = [0, cst_camlinternalFormat_ml, 1649, 31], - _v_ = [0, cst_camlinternalFormat_ml, 1650, 31], + _u_ = [0, cst_camlinternalFormat_ml, 1626, 39], + _v_ = [0, cst_camlinternalFormat_ml, 1649, 31], + _w_ = [0, cst_camlinternalFormat_ml, 1650, 31], cst_Printf_bad_conversion$0 = "Printf: bad conversion %_", - _w_ = [0, cst_camlinternalFormat_ml, 1830, 8], - _x_ = [0, 0, 4], - _y_ = + _x_ = [0, cst_camlinternalFormat_ml, 1830, 8], + _y_ = [0, 0, 4], + _z_ = [0, [11, "invalid box description ", [3, 0, 0]], "invalid box description %S"], - _z_ = + _A_ = [0, [11, cst_invalid_format, @@ -15933,7 +15940,7 @@ "invalid format %S: at character number %d, %s"], cst_non_zero_widths_are_unsupp = "non-zero widths are unsupported for %c conversions", - _A_ = + _B_ = [0, [11, cst_invalid_format, @@ -15943,7 +15950,7 @@ cst_at_character_number, [4, 0, 0, 0, [11, ", '", [0, [11, "' without ", [2, 0, 0]]]]]]]], "invalid format %S: at character number %d, '%c' without %s"], - _B_ = + _C_ = [0, [11, cst_invalid_format, @@ -15953,7 +15960,7 @@ cst_at_character_number, [4, 0, 0, 0, [11, cst$44, [2, 0, [11, " expected, read ", [1, 0]]]]]]]], "invalid format %S: at character number %d, %s expected, read %C"], - _C_ = + _D_ = [0, [11, cst_invalid_format, @@ -15964,20 +15971,20 @@ [4, 0, 0, 0, [11, ", duplicate flag ", [1, 0]]]]]], "invalid format %S: at character number %d, duplicate flag %C"], cst_padding = "padding", - _D_ = [0, 1, 0], + _E_ = [0, 1, 0], cst_0 = cst_0$3, - _E_ = [0, 0], + _F_ = [0, 0], cst_precision = cst_precision$3, - _F_ = [1, 0], - _G_ = [1, 1], - cst_precision$0 = cst_precision$3, + _G_ = [1, 0], _H_ = [1, 1], + cst_precision$0 = cst_precision$3, + _I_ = [1, 1], cst_precision$1 = cst_precision$3, cst_0$0 = cst_0$3, - _I_ = [1, 1], + _J_ = [1, 1], cst_0$1 = cst_0$3, cst_0$2 = "'0'", - _J_ = + _K_ = [0, [11, cst_invalid_format, @@ -15991,11 +15998,11 @@ 0, [11, ', invalid conversion "', [12, 37, [0, [12, 34, 0]]]]]]]], 'invalid format %S: at character number %d, invalid conversion "%%%c"'], - _K_ = [0, 0], - cst_padding$0 = "`padding'", _L_ = [0, 0], + cst_padding$0 = "`padding'", + _M_ = [0, 0], cst_precision$2 = "`precision'", - _M_ = + _N_ = [0, [11, cst_invalid_format, @@ -16014,11 +16021,11 @@ " is only allowed after the '", [12, 37, [11, "', before padding and precision", 0]]]]]]]]], "invalid format %S: at character number %d, flag %C is only allowed after the '%%', before padding and precision"], - _N_ = [0, [12, 64, 0]], - _O_ = [0, "@ ", 1, 0], - _P_ = [0, "@,", 0, 0], - _Q_ = [2, 60], - _R_ = + _O_ = [0, [12, 64, 0]], + _P_ = [0, "@ ", 1, 0], + _Q_ = [0, "@,", 0, 0], + _R_ = [2, 60], + _S_ = [0, [11, cst_invalid_format, @@ -16036,7 +16043,7 @@ 37, [11, " instead at position ", [4, 0, 0, 0, [12, 46, 0]]]]]]]]]], "invalid format %S: '%%' alone is not accepted in character sets, use %%%% instead at position %d."], - _S_ = + _T_ = [0, [11, cst_invalid_format, @@ -16046,9 +16053,9 @@ ": integer ", [4, 0, 0, 0, [11, " is greater than the limit ", [4, 0, 0, 0, 0]]]]]], "invalid format %S: integer %d is greater than the limit %d"], - _T_ = [0, cst_camlinternalFormat_ml, 2837, 11], + _U_ = [0, cst_camlinternalFormat_ml, 2837, 11], cst_digit = "digit", - _U_ = + _V_ = [0, [11, cst_invalid_format, @@ -16060,10 +16067,10 @@ 'invalid format %S: unclosed sub-format, expected "%%%c" at character number %d'], cst_character = "character ')'", cst_character$0 = "character '}'", - _V_ = [0, cst_camlinternalFormat_ml, 2899, 34], - _W_ = [0, cst_camlinternalFormat_ml, 2935, 28], - _X_ = [0, cst_camlinternalFormat_ml, 2957, 11], - _Y_ = + _W_ = [0, cst_camlinternalFormat_ml, 2899, 34], + _X_ = [0, cst_camlinternalFormat_ml, 2935, 28], + _Y_ = [0, cst_camlinternalFormat_ml, 2957, 11], + _Z_ = [0, [11, cst_invalid_format, @@ -16083,11 +16090,11 @@ " is incompatible with '", [0, [11, "' in sub-format ", [3, 0, 0]]]]]]]]]], "invalid format %S: at character number %d, %s is incompatible with '%c' in sub-format %S"], - _Z_ = + ___ = [0, [11, cst_bad_input_format_type_mism, [3, 0, [11, cst_and, [3, 0, 0]]]], cst_bad_input_format_type_mism$0], - ___ = + _$_ = [0, [11, cst_bad_input_format_type_mism, [3, 0, [11, cst_and, [3, 0, 0]]]], cst_bad_input_format_type_mism$0]; @@ -16126,11 +16133,11 @@ /*<>*/ } function type_format(fmt, fmtty){ /*<>*/ /*<>*/ var - _cA_ = type_format_gen(fmt, fmtty); - if(typeof _cA_[2] !== "number") + _cB_ = type_format_gen(fmt, fmtty); + if(typeof _cB_[2] !== "number") /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Type_mismatch, 1); - var fmt$0 = _cA_[1]; + var fmt$0 = _cB_[1]; /*<>*/ return fmt$0; /*<>*/ } function type_format_gen(fmt, fmtty0){ @@ -16405,7 +16412,7 @@ fmt_rest$13 = fmt[3], sub_fmtty$1 = fmt[2], pad_opt$0 = fmt[1], - /*<>*/ _cy_ = + /*<>*/ _cz_ = [0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub_fmtty1)]; @@ -16414,7 +16421,7 @@ ([0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub_fmtty$1)], - _cy_)) + _cz_)) /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Type_mismatch, 1); /*<>*/ var @@ -16584,12 +16591,12 @@ /*<>*/ var sub_fmtty$3 = ign[2], pad_opt$2 = ign[1], - /*<>*/ _cz_ = + /*<>*/ _cA_ = type_ignored_format_substituti(sub_fmtty$3, rest, fmtty0), - match$43 = _cz_[2], + match$43 = _cA_[2], fmtty$21 = match$43[2], fmt$22 = match$43[1], - sub_fmtty$4 = _cz_[1]; + sub_fmtty$4 = _cA_[1]; /*<>*/ return [0, [23, [9, pad_opt$2, sub_fmtty$4], fmt$22], fmtty$21]; @@ -16791,7 +16798,7 @@ sub_fmtty_rest$17 = sub_fmtty[3], sub2_fmtty$2 = sub_fmtty[2], sub1_fmtty$0 = sub_fmtty[1], - /*<>*/ _cw_ = + /*<>*/ _cx_ = [0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub1_fmtty)]; @@ -16800,11 +16807,11 @@ ([0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub1_fmtty$0)], - _cw_)) + _cx_)) /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Type_mismatch, 1); /*<>*/ /*<>*/ var - _cx_ = + _cy_ = [0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub2_fmtty$1)]; @@ -16813,7 +16820,7 @@ ([0, /*<>*/ caml_call1 (CamlinternalFormatBasics[2], sub2_fmtty$2)], - _cx_)) + _cy_)) /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Type_mismatch, 1); /*<>*/ var @@ -16905,11 +16912,11 @@ /*<>*/ } function recast(fmt, fmtty){ /*<>*/ /*<>*/ var - _cv_ = symm(fmtty); + _cw_ = symm(fmtty); /*<>*/ return type_format (fmt, /*<>*/ caml_call1 - (CamlinternalFormatBasics[2], _cv_)); + (CamlinternalFormatBasics[2], _cw_)); /*<>*/ } function fix_padding(padty, width, str){ /*<>*/ var @@ -16919,10 +16926,10 @@ /*<>*/ caml_call1(Stdlib[18], width); if(width$0 <= len) /*<>*/ return str; /*<>*/ var - _cu_ = 2 === padty$0 ? 48 : 32, + _cv_ = 2 === padty$0 ? 48 : 32, /*<>*/ res = /*<>*/ caml_call2 - (Stdlib_Bytes[1], width$0, _cu_); + (Stdlib_Bytes[1], width$0, _cv_); /*<>*/ switch(padty$0){ case 0: /*<>*/ /*<>*/ caml_call5 @@ -17097,7 +17104,7 @@ /*<>*/ var /*<>*/ prec$0 = /*<>*/ caml_call1(Stdlib[18], prec), - /*<>*/ symb = char_of_fconv(_r_, fconv), + /*<>*/ symb = char_of_fconv(_s_, fconv), /*<>*/ buf = buffer_create(16); /*<>*/ buffer_add_char(buf, 37); /*<>*/ bprint_fconv_flag(buf, fconv); @@ -17114,16 +17121,16 @@ /*<>*/ return s; /*<>*/ var /*<>*/ n = [0, 0], - _cp_ = caml_ml_string_length(s) - 1 | 0, - /*<>*/ _co_ = 0; - if(_cp_ >= 0){ - var i$0 = _co_; + _cq_ = caml_ml_string_length(s) - 1 | 0, + /*<>*/ _cp_ = 0; + if(_cq_ >= 0){ + var i$0 = _cp_; for(;;){ if(9 >= caml_string_unsafe_get(s, i$0) - 48 >>> 0) n[1]++; /*<>*/ /*<>*/ var - _ct_ = i$0 + 1 | 0; - if(_cp_ === i$0) break; - i$0 = _ct_; + _cu_ = i$0 + 1 | 0; + if(_cq_ === i$0) break; + i$0 = _cu_; } } /*<>*/ var @@ -17141,10 +17148,10 @@ /*<>*/ var /*<>*/ left = [0, ((digits - 1 | 0) % 3 | 0) + 1 | 0], - _cr_ = caml_ml_string_length(s) - 1 | 0, - /*<>*/ _cq_ = 0; - if(_cr_ >= 0){ - var i = _cq_; + _cs_ = caml_ml_string_length(s) - 1 | 0, + /*<>*/ _cr_ = 0; + if(_cs_ >= 0){ + var i = _cr_; for(;;){ var c = caml_string_unsafe_get(s, i); if(9 < c - 48 >>> 0) @@ -17158,9 +17165,9 @@ /*<>*/ put(c); } /*<>*/ /*<>*/ var - _cs_ = i + 1 | 0; - if(_cr_ === i) break; - i = _cs_; + _ct_ = i + 1 | 0; + if(_cs_ === i) break; + i = _ct_; } } /*<>*/ return /*<>*/ caml_call1 @@ -17169,139 +17176,139 @@ function convert_int(iconv, n){ /*<>*/ switch(iconv){ case 1: - var _cn_ = cst_d$0; break; + var _co_ = cst_d$0; break; case 2: - var _cn_ = cst_d$1; break; + var _co_ = cst_d$1; break; case 4: - var _cn_ = cst_i$1; break; + var _co_ = cst_i$1; break; case 5: - var _cn_ = cst_i$2; break; + var _co_ = cst_i$2; break; case 6: - var _cn_ = cst_x; break; + var _co_ = cst_x; break; case 7: - var _cn_ = cst_x$0; break; + var _co_ = cst_x$0; break; case 8: - var _cn_ = cst_X; break; + var _co_ = cst_X; break; case 9: - var _cn_ = cst_X$0; break; + var _co_ = cst_X$0; break; case 10: - var _cn_ = cst_o; break; + var _co_ = cst_o; break; case 11: - var _cn_ = cst_o$0; break; + var _co_ = cst_o$0; break; case 0: case 13: - var _cn_ = cst_d; break; + var _co_ = cst_d; break; case 3: case 14: - var _cn_ = cst_i$0; break; - default: var _cn_ = cst_u; + var _co_ = cst_i$0; break; + default: var _co_ = cst_u; } /*<>*/ return transform_int_alt (iconv, - /*<>*/ caml_format_int(_cn_, n)); + /*<>*/ caml_format_int(_co_, n)); /*<>*/ } function convert_int32(iconv, n){ /*<>*/ switch(iconv){ case 1: - var _cm_ = cst_ld$0; break; + var _cn_ = cst_ld$0; break; case 2: - var _cm_ = cst_ld$1; break; + var _cn_ = cst_ld$1; break; case 4: - var _cm_ = cst_li$1; break; + var _cn_ = cst_li$1; break; case 5: - var _cm_ = cst_li$2; break; + var _cn_ = cst_li$2; break; case 6: - var _cm_ = cst_lx; break; + var _cn_ = cst_lx; break; case 7: - var _cm_ = cst_lx$0; break; + var _cn_ = cst_lx$0; break; case 8: - var _cm_ = cst_lX; break; + var _cn_ = cst_lX; break; case 9: - var _cm_ = cst_lX$0; break; + var _cn_ = cst_lX$0; break; case 10: - var _cm_ = cst_lo; break; + var _cn_ = cst_lo; break; case 11: - var _cm_ = cst_lo$0; break; + var _cn_ = cst_lo$0; break; case 0: case 13: - var _cm_ = cst_ld; break; + var _cn_ = cst_ld; break; case 3: case 14: - var _cm_ = cst_li$0; break; - default: var _cm_ = cst_lu; + var _cn_ = cst_li$0; break; + default: var _cn_ = cst_lu; } /*<>*/ return transform_int_alt (iconv, - /*<>*/ caml_format_int(_cm_, n)); + /*<>*/ caml_format_int(_cn_, n)); /*<>*/ } function convert_nativeint(iconv, n){ /*<>*/ switch(iconv){ case 1: - var _cl_ = cst_nd$0; break; + var _cm_ = cst_nd$0; break; case 2: - var _cl_ = cst_nd$1; break; + var _cm_ = cst_nd$1; break; case 4: - var _cl_ = cst_ni$1; break; + var _cm_ = cst_ni$1; break; case 5: - var _cl_ = cst_ni$2; break; + var _cm_ = cst_ni$2; break; case 6: - var _cl_ = cst_nx; break; + var _cm_ = cst_nx; break; case 7: - var _cl_ = cst_nx$0; break; + var _cm_ = cst_nx$0; break; case 8: - var _cl_ = cst_nX; break; + var _cm_ = cst_nX; break; case 9: - var _cl_ = cst_nX$0; break; + var _cm_ = cst_nX$0; break; case 10: - var _cl_ = cst_no; break; + var _cm_ = cst_no; break; case 11: - var _cl_ = cst_no$0; break; + var _cm_ = cst_no$0; break; case 0: case 13: - var _cl_ = cst_nd; break; + var _cm_ = cst_nd; break; case 3: case 14: - var _cl_ = cst_ni$0; break; - default: var _cl_ = cst_nu; + var _cm_ = cst_ni$0; break; + default: var _cm_ = cst_nu; } /*<>*/ return transform_int_alt (iconv, - /*<>*/ caml_format_int(_cl_, n)); + /*<>*/ caml_format_int(_cm_, n)); /*<>*/ } function convert_int64(iconv, n){ /*<>*/ switch(iconv){ case 1: - var _ck_ = cst_Ld$0; break; + var _cl_ = cst_Ld$0; break; case 2: - var _ck_ = cst_Ld$1; break; + var _cl_ = cst_Ld$1; break; case 4: - var _ck_ = cst_Li$1; break; + var _cl_ = cst_Li$1; break; case 5: - var _ck_ = cst_Li$2; break; + var _cl_ = cst_Li$2; break; case 6: - var _ck_ = cst_Lx; break; + var _cl_ = cst_Lx; break; case 7: - var _ck_ = cst_Lx$0; break; + var _cl_ = cst_Lx$0; break; case 8: - var _ck_ = cst_LX; break; + var _cl_ = cst_LX; break; case 9: - var _ck_ = cst_LX$0; break; + var _cl_ = cst_LX$0; break; case 10: - var _ck_ = cst_Lo; break; + var _cl_ = cst_Lo; break; case 11: - var _ck_ = cst_Lo$0; break; + var _cl_ = cst_Lo$0; break; case 0: case 13: - var _ck_ = cst_Ld; break; + var _cl_ = cst_Ld; break; case 3: case 14: - var _ck_ = cst_Li$0; break; - default: var _ck_ = cst_Lu; + var _cl_ = cst_Li$0; break; + default: var _cl_ = cst_Lu; } /*<>*/ return transform_int_alt (iconv, /*<>*/ runtime.caml_int64_format - (_ck_, n)); + (_cl_, n)); /*<>*/ } function convert_float(fconv, prec, x){ function hex(param){ @@ -17333,41 +17340,41 @@ i = 0; /*<>*/ for(;;){ if(i === len) - var _ch_ = 0; + var _ci_ = 0; else{ /*<>*/ /*<>*/ var - _cg_ = + _ch_ = /*<>*/ caml_string_get(str, i) - 46 | 0; a: { - if(23 < _cg_ >>> 0){ - if(55 === _cg_) break a; + if(23 < _ch_ >>> 0){ + if(55 === _ch_) break a; } - else if(21 < _cg_ - 1 >>> 0) break a; + else if(21 < _ch_ - 1 >>> 0) break a; /*<>*/ /*<>*/ var i$0 = i + 1 | 0; i = i$0; continue; } - var _ch_ = 1; + var _ci_ = 1; } /*<>*/ /*<>*/ var - _ci_ = - _ch_ + _cj_ = + _ci_ ? str : /*<>*/ caml_call2 (Stdlib[28], str, cst$17); - /*<>*/ return caml_special_val(_ci_); + /*<>*/ return caml_special_val(_cj_); } case 6: /*<>*/ return hex(0); case 7: /*<>*/ /*<>*/ var - _cj_ = hex(0); + _ck_ = hex(0); /*<>*/ return /*<>*/ caml_call1 - (Stdlib_String[26], _cj_); + (Stdlib_String[26], _ck_); case 8: /*<>*/ return caml_special_val(hex(0)); default: @@ -17598,12 +17605,12 @@ /*<>*/ return function(param){ /*<>*/ var fmt = param[1], - /*<>*/ _cf_ = recast(fmt, fmtty); + /*<>*/ _cg_ = recast(fmt, fmtty); /*<>*/ return make_printf (k$0, acc$0, /*<>*/ caml_call2 - (CamlinternalFormatBasics[3], _cf_, rest$13)); /*<>*/ }; + (CamlinternalFormatBasics[3], _cg_, rest$13)); /*<>*/ }; case 15: var rest$14 = fmt$0[1]; /*<>*/ return function(f, x){ @@ -17630,9 +17637,9 @@ fmt$0 = rest$16; break; case 18: - var _cd_ = fmt$0[1]; - if(0 === _cd_[0]){ - var rest$17 = fmt$0[2], fmt$1 = _cd_[1][1]; + var _ce_ = fmt$0[1]; + if(0 === _ce_[0]){ + var rest$17 = fmt$0[2], fmt$1 = _ce_[1][1]; let acc = acc$0, k = k$0, rest = rest$17; var k$1 = @@ -17645,7 +17652,7 @@ fmt$0 = fmt$1; } else{ - var rest$18 = fmt$0[2], fmt$2 = _cd_[1][1]; + var rest$18 = fmt$0[2], fmt$2 = _ce_[1][1]; let acc = acc$0, k = k$0, rest = rest$18; var k$2 = @@ -17660,7 +17667,7 @@ break; case 19: /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _s_], 1); + ([0, Assert_failure, _t_], 1); case 20: /*<>*/ var rest$19 = fmt$0[3], @@ -17700,14 +17707,14 @@ rest$23 = fmt$0[3], f = fmt$0[2], arity = fmt$0[1], - /*<>*/ _ce_ = + /*<>*/ _cf_ = /*<>*/ caml_call1(f, 0); /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (make_custom$0, [0, k$0, acc$0, rest$23, arity, _ce_]); + (make_custom$0, [0, k$0, acc$0, rest$23, arity, _cf_]); var counter$0 = counter + 1 | 0; /*<>*/ return make_custom$0 - (counter$0, k$0, acc$0, rest$23, arity, _ce_); + (counter$0, k$0, acc$0, rest$23, arity, _cf_); } } /*<>*/ } @@ -17733,7 +17740,7 @@ (counter$1, k, acc, fmt); case 2: /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _t_], 1); + ([0, Assert_failure, _u_], 1); default: /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return @@ -17897,7 +17904,7 @@ fmt); /*<>*/ }; case 10: var rest$9 = fmtty[1]; - /*<>*/ return function(_cc_, param){ + /*<>*/ return function(_cd_, param){ /*<>*/ return make_from_fmtty (k, acc, rest$9, fmt); /*<>*/ }; case 11: @@ -17912,10 +17919,10 @@ (k, acc, rest$11, fmt); /*<>*/ }; case 13: /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _u_], 1); + ([0, Assert_failure, _v_], 1); default: /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _v_], 1); + ([0, Assert_failure, _w_], 1); } /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return @@ -17930,13 +17937,13 @@ } function make_invalid_arg(counter, k, acc, fmt){ /*<>*/ /*<>*/ var - _cb_ = [8, acc, cst_Printf_bad_conversion$0]; + _cc_ = [8, acc, cst_Printf_bad_conversion$0]; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (make_printf$0, [0, k, _cb_, fmt]); + (make_printf$0, [0, k, _cc_, fmt]); var counter$0 = counter + 1 | 0; /*<>*/ return make_printf$0 - (counter$0, k, _cb_, fmt); + (counter$0, k, _cc_, fmt); /*<>*/ } function make_padding(k, acc, fmt, pad, trans){ /*<>*/ if(typeof pad === "number") @@ -18104,13 +18111,13 @@ /*<>*/ caml_call1(f, x)); /*<>*/ }; } /*<>*/ /*<>*/ var - _ca_ = [4, acc, f]; + _cb_ = [4, acc, f]; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (make_printf$0, [0, k, _ca_, rest]); + (make_printf$0, [0, k, _cb_, rest]); var counter$0 = counter + 1 | 0; /*<>*/ return make_printf$0 - (counter$0, k, _ca_, rest); + (counter$0, k, _cb_, rest); /*<>*/ } function make_custom(k, acc, rest, arity, f){ /*<>*/ return caml_trampoline @@ -18127,31 +18134,31 @@ /*<>*/ var rest = fmt$0[1], /*<>*/ x = make_iprintf(k$0, o, rest); - /*<>*/ return function(_b$_){ + /*<>*/ return function(_ca_){ /*<>*/ return x;}; case 1: /*<>*/ var rest$0 = fmt$0[1], /*<>*/ x$0 = make_iprintf(k$0, o, rest$0); - /*<>*/ return function(_b__){ + /*<>*/ return function(_b$_){ /*<>*/ return x$0;}; case 2: - var _bM_ = fmt$0[1]; - if(typeof _bM_ === "number"){ + var _bN_ = fmt$0[1]; + if(typeof _bN_ === "number"){ /*<>*/ var rest$1 = fmt$0[2], /*<>*/ x$1 = make_iprintf(k$0, o, rest$1); - /*<>*/ return function(_b9_){ + /*<>*/ return function(_b__){ /*<>*/ return x$1;}; } - if(0 === _bM_[0]){ + if(0 === _bN_[0]){ /*<>*/ var rest$2 = fmt$0[2], /*<>*/ x$2 = make_iprintf(k$0, o, rest$2); - /*<>*/ return function(_b8_){ + /*<>*/ return function(_b9_){ /*<>*/ return x$2;}; } /*<>*/ var @@ -18159,25 +18166,25 @@ /*<>*/ x$3 = make_iprintf(k$0, o, rest$3), /*<>*/ x$4 = - function(_b7_){ /*<>*/ return x$3;}; - /*<>*/ return function(_b6_){ + function(_b8_){ /*<>*/ return x$3;}; + /*<>*/ return function(_b7_){ /*<>*/ return x$4;}; case 3: - var _bN_ = fmt$0[1]; - if(typeof _bN_ === "number"){ + var _bO_ = fmt$0[1]; + if(typeof _bO_ === "number"){ /*<>*/ var rest$4 = fmt$0[2], /*<>*/ x$5 = make_iprintf(k$0, o, rest$4); - /*<>*/ return function(_b5_){ + /*<>*/ return function(_b6_){ /*<>*/ return x$5;}; } - if(0 === _bN_[0]){ + if(0 === _bO_[0]){ /*<>*/ var rest$5 = fmt$0[2], /*<>*/ x$6 = make_iprintf(k$0, o, rest$5); - /*<>*/ return function(_b4_){ + /*<>*/ return function(_b5_){ /*<>*/ return x$6;}; } /*<>*/ var @@ -18185,8 +18192,8 @@ /*<>*/ x$7 = make_iprintf(k$0, o, rest$6), /*<>*/ x$8 = - function(_b3_){ /*<>*/ return x$7;}; - /*<>*/ return function(_b2_){ + function(_b4_){ /*<>*/ return x$7;}; + /*<>*/ return function(_b3_){ /*<>*/ return x$8;}; case 4: var rest$7 = fmt$0[4], prec = fmt$0[3], pad = fmt$0[2]; @@ -18209,21 +18216,21 @@ /*<>*/ return fn_of_padding_precision (k$0, o, rest$11, pad$3, prec$3); case 9: - var _bO_ = fmt$0[1]; - if(typeof _bO_ === "number"){ + var _bP_ = fmt$0[1]; + if(typeof _bP_ === "number"){ /*<>*/ var rest$12 = fmt$0[2], /*<>*/ x$9 = make_iprintf(k$0, o, rest$12); - /*<>*/ return function(_b1_){ + /*<>*/ return function(_b2_){ /*<>*/ return x$9;}; } - if(0 === _bO_[0]){ + if(0 === _bP_[0]){ /*<>*/ var rest$13 = fmt$0[2], /*<>*/ x$10 = make_iprintf(k$0, o, rest$13); - /*<>*/ return function(_b0_){ + /*<>*/ return function(_b1_){ /*<>*/ return x$10;}; } /*<>*/ var @@ -18231,8 +18238,8 @@ /*<>*/ x$11 = make_iprintf(k$0, o, rest$14), /*<>*/ x$12 = - function(_bZ_){ /*<>*/ return x$11;}; - /*<>*/ return function(_bY_){ + function(_b0_){ /*<>*/ return x$11;}; + /*<>*/ return function(_bZ_){ /*<>*/ return x$12;}; case 10: var rest$15 = fmt$0[1]; fmt$0 = rest$15; break; @@ -18245,41 +18252,41 @@ rest$18 = fmt$0[3], /*<>*/ x$13 = make_iprintf(k$0, o, rest$18); - /*<>*/ return function(_bX_){ + /*<>*/ return function(_bY_){ /*<>*/ return x$13;}; case 14: var rest$19 = fmt$0[3], fmtty = fmt$0[2]; /*<>*/ return function(param){ /*<>*/ var fmt = param[1], - /*<>*/ _bW_ = recast(fmt, fmtty); + /*<>*/ _bX_ = recast(fmt, fmtty); /*<>*/ return make_iprintf (k$0, o, /*<>*/ caml_call2 - (CamlinternalFormatBasics[3], _bW_, rest$19)); /*<>*/ }; + (CamlinternalFormatBasics[3], _bX_, rest$19)); /*<>*/ }; case 15: /*<>*/ var rest$20 = fmt$0[1], /*<>*/ x$14 = make_iprintf(k$0, o, rest$20), /*<>*/ x$15 = - function(_bV_){ /*<>*/ return x$14;}; - /*<>*/ return function(_bU_){ + function(_bW_){ /*<>*/ return x$14;}; + /*<>*/ return function(_bV_){ /*<>*/ return x$15;}; case 16: /*<>*/ var rest$21 = fmt$0[1], /*<>*/ x$16 = make_iprintf(k$0, o, rest$21); - /*<>*/ return function(_bT_){ + /*<>*/ return function(_bU_){ /*<>*/ return x$16;}; case 17: var rest$22 = fmt$0[2]; fmt$0 = rest$22; break; case 18: - var _bP_ = fmt$0[1]; - if(0 === _bP_[0]){ - var rest$23 = fmt$0[2], fmt$1 = _bP_[1][1]; + var _bQ_ = fmt$0[1]; + if(0 === _bQ_[0]){ + var rest$23 = fmt$0[2], fmt$1 = _bQ_[1][1]; let k = k$0, rest = rest$23; var k$1 = @@ -18291,7 +18298,7 @@ fmt$0 = fmt$1; } else{ - var rest$24 = fmt$0[2], fmt$2 = _bP_[1][1]; + var rest$24 = fmt$0[2], fmt$2 = _bQ_[1][1]; let k = k$0, rest = rest$24; var k$2 = @@ -18305,27 +18312,27 @@ break; case 19: /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _w_], 1); + ([0, Assert_failure, _x_], 1); case 20: /*<>*/ var rest$25 = fmt$0[3], /*<>*/ x$17 = make_iprintf(k$0, o, rest$25); - /*<>*/ return function(_bS_){ + /*<>*/ return function(_bT_){ /*<>*/ return x$17;}; case 21: /*<>*/ var rest$26 = fmt$0[2], /*<>*/ x$18 = make_iprintf(k$0, o, rest$26); - /*<>*/ return function(_bR_){ + /*<>*/ return function(_bS_){ /*<>*/ return x$18;}; case 22: /*<>*/ var rest$27 = fmt$0[1], /*<>*/ x$19 = make_iprintf(k$0, o, rest$27); - /*<>*/ return function(_bQ_){ + /*<>*/ return function(_bR_){ /*<>*/ return x$19;}; case 23: var rest$28 = fmt$0[2], ign = fmt$0[1]; @@ -18356,66 +18363,66 @@ if(typeof prec !== "number"){ /*<>*/ /*<>*/ var x$2 = make_iprintf(k, o, fmt); - /*<>*/ return function(_bL_){ + /*<>*/ return function(_bM_){ /*<>*/ return x$2;}; } if(prec){ /*<>*/ var /*<>*/ x = make_iprintf(k, o, fmt), /*<>*/ x$0 = - function(_bK_){ /*<>*/ return x;}; - /*<>*/ return function(_bJ_){ + function(_bL_){ /*<>*/ return x;}; + /*<>*/ return function(_bK_){ /*<>*/ return x$0;}; } /*<>*/ /*<>*/ var x$1 = make_iprintf(k, o, fmt); - /*<>*/ return function(_bI_){ + /*<>*/ return function(_bJ_){ /*<>*/ return x$1;}; } if(0 === pad[0]){ if(typeof prec !== "number"){ /*<>*/ /*<>*/ var x$6 = make_iprintf(k, o, fmt); - /*<>*/ return function(_bH_){ + /*<>*/ return function(_bI_){ /*<>*/ return x$6;}; } if(prec){ /*<>*/ var /*<>*/ x$3 = make_iprintf(k, o, fmt), /*<>*/ x$4 = - function(_bG_){ /*<>*/ return x$3;}; - /*<>*/ return function(_bF_){ + function(_bH_){ /*<>*/ return x$3;}; + /*<>*/ return function(_bG_){ /*<>*/ return x$4;}; } /*<>*/ /*<>*/ var x$5 = make_iprintf(k, o, fmt); - /*<>*/ return function(_bE_){ + /*<>*/ return function(_bF_){ /*<>*/ return x$5;}; } if(typeof prec !== "number"){ /*<>*/ var /*<>*/ x$12 = make_iprintf(k, o, fmt), /*<>*/ x$13 = - function(_bD_){ /*<>*/ return x$12;}; - /*<>*/ return function(_bC_){ + function(_bE_){ /*<>*/ return x$12;}; + /*<>*/ return function(_bD_){ /*<>*/ return x$13;}; } if(prec){ /*<>*/ var /*<>*/ x$7 = make_iprintf(k, o, fmt), /*<>*/ x$8 = - function(_bB_){ /*<>*/ return x$7;}, + function(_bC_){ /*<>*/ return x$7;}, /*<>*/ x$9 = - function(_bA_){ /*<>*/ return x$8;}; - /*<>*/ return function(_bz_){ + function(_bB_){ /*<>*/ return x$8;}; + /*<>*/ return function(_bA_){ /*<>*/ return x$9;}; } /*<>*/ /*<>*/ var x$10 = make_iprintf(k, o, fmt); - /*<>*/ function x$11(_by_){ + /*<>*/ function x$11(_bz_){ /*<>*/ return x$10; } - /*<>*/ return function(_bx_){ + /*<>*/ return function(_by_){ /*<>*/ return x$11;}; /*<>*/ } function fn_of_custom_arity$0(counter, k, o, fmt, param){ @@ -18424,7 +18431,7 @@ arity = param[1], /*<>*/ x = fn_of_custom_arity(k, o, fmt, arity); - /*<>*/ return function(_bw_){ + /*<>*/ return function(_bx_){ /*<>*/ return x;}; } /*<>*/ if(counter >= 50) @@ -18593,9 +18600,9 @@ var f = acc$0[2], p$3 = acc$0[1]; /*<>*/ strput_acc(b, p$3); /*<>*/ /*<>*/ var - _bv_ = /*<>*/ caml_call1(f, 0); + _bw_ = /*<>*/ caml_call1(f, 0); /*<>*/ return /*<>*/ caml_call2 - (Stdlib_Buffer[16], b, _bv_); + (Stdlib_Buffer[16], b, _bw_); case 7: var acc$3 = acc$0[1]; acc$0 = acc$3; break; case 8: @@ -18626,21 +18633,21 @@ function k(acc){ /*<>*/ strput_acc(buf, acc); /*<>*/ /*<>*/ var - _bu_ = + _bv_ = /*<>*/ caml_call1 (Stdlib_Buffer[2], buf); /*<>*/ return /*<>*/ caml_call1 - (Stdlib[2], _bu_); + (Stdlib[2], _bv_); /*<>*/ } /*<>*/ return make_printf(k, 0, fmt); } function open_box_of_string(str){ /*<>*/ if(str == cst$43) - /*<>*/ return _x_; + /*<>*/ return _y_; var len = caml_ml_string_length(str); function invalid_box(param){ /*<>*/ return /*<>*/ caml_call1 - (failwith_message(_y_), str); + (failwith_message(_z_), str); /*<>*/ } function parse_spaces(i){ /*<>*/ var i$0 = i; @@ -18703,15 +18710,15 @@ else /*<>*/ try{ /*<>*/ var - /*<>*/ _bs_ = + /*<>*/ _bt_ = /*<>*/ runtime.caml_int_of_string ( /*<>*/ caml_call3 (Stdlib_String[16], str, nstart, nend - nstart | 0)), - indent = _bs_; + indent = _bt_; } - catch(_bt_){ - var _br_ = caml_wrap_exception(_bt_); - if(_br_[1] !== Stdlib[7]) throw caml_maybe_attach_backtrace(_br_, 0); + catch(_bu_){ + var _bs_ = caml_wrap_exception(_bu_); + if(_bs_[1] !== Stdlib[7]) throw caml_maybe_attach_backtrace(_bs_, 0); var indent = invalid_box(0); } /*<>*/ /*<>*/ var @@ -18763,15 +18770,15 @@ var legacy_behavior$0 = 1; function invalid_format_message(str_ind, msg){ /*<>*/ return /*<>*/ caml_call3 - (failwith_message(_z_), str, str_ind, msg); + (failwith_message(_A_), str, str_ind, msg); /*<>*/ } function invalid_format_without(str_ind, c, s){ /*<>*/ return /*<>*/ caml_call4 - (failwith_message(_A_), str, str_ind, c, s); + (failwith_message(_B_), str, str_ind, c, s); /*<>*/ } function expected_character(str_ind, expected, read){ /*<>*/ return /*<>*/ caml_call4 - (failwith_message(_B_), str, str_ind, expected, read); + (failwith_message(_C_), str, str_ind, expected, read); /*<>*/ } function parse(lit_start, end_ind){ /*<>*/ a: @@ -18808,7 +18815,7 @@ var str_ind$0 = str_ind + 1 | 0; a: if(str_ind$0 === end_ind) - var match$0 = _N_; + var match$0 = _O_; else{ /*<>*/ /*<>*/ var c = @@ -18854,7 +18861,7 @@ case 0: var fmt_rest$5 = parse(str_ind$0 + 1 | 0, end_ind)[1], - match$0 = [0, [17, _O_, fmt_rest$5]]; + match$0 = [0, [17, _P_, fmt_rest$5]]; break a; case 5: /*<>*/ if @@ -18876,7 +18883,7 @@ case 12: var fmt_rest$8 = parse(str_ind$0 + 1 | 0, end_ind)[1], - match$0 = [0, [17, _P_, fmt_rest$8]]; + match$0 = [0, [17, _Q_, fmt_rest$8]]; break a; case 14: var @@ -18888,9 +18895,9 @@ b: try{ var - _bg_ = str_ind$3 === end_ind ? 1 : 0, - _bh_ = - _bg_ + _bh_ = str_ind$3 === end_ind ? 1 : 0, + _bi_ = + _bh_ || (60 !== @@ -18898,7 +18905,7 @@ (str, str_ind$3) ? 1 : 0); - if(_bh_) + if(_bi_) /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Stdlib[8], 1); /*<>*/ var @@ -18937,10 +18944,10 @@ str, str_ind$3 - 2 | 0, (str_ind_3 - str_ind$3 | 0) + 3 | 0), - /*<>*/ _bi_ = [0, s, width, 0], - /*<>*/ _bj_ = str_ind_3 + 1 | 0, - formatting_lit$0 = _bi_, - next_ind = _bj_; + /*<>*/ _bj_ = [0, s, width, 0], + /*<>*/ _bk_ = str_ind_3 + 1 | 0, + formatting_lit$0 = _bj_, + next_ind = _bk_; break b; } } @@ -18966,20 +18973,20 @@ str, str_ind$3 - 2 | 0, (str_ind_5 - str_ind$3 | 0) + 3 | 0), - /*<>*/ _bk_ = + /*<>*/ _bl_ = [0, s$0, width, offset], - /*<>*/ _bl_ = str_ind_5 + 1 | 0, - formatting_lit$0 = _bk_, - next_ind = _bl_; + /*<>*/ _bm_ = str_ind_5 + 1 | 0, + formatting_lit$0 = _bl_, + next_ind = _bm_; break b; } /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace (Stdlib[8], 1); } - catch(_bq_){ - var _bf_ = caml_wrap_exception(_bq_); - if(_bf_ !== Stdlib[8] && _bf_[1] !== Stdlib[7]) - throw caml_maybe_attach_backtrace(_bf_, 0); + catch(_br_){ + var _bg_ = caml_wrap_exception(_br_); + if(_bg_ !== Stdlib[8] && _bg_[1] !== Stdlib[7]) + throw caml_maybe_attach_backtrace(_bg_, 0); var formatting_lit$0 = formatting_lit, next_ind = str_ind$3; } var @@ -19003,7 +19010,7 @@ if(58 > match$6) break c; } else if(45 === match$6) break c; - var _bo_ = 0; + var _bp_ = 0; break b; } /*<>*/ var @@ -19027,28 +19034,28 @@ str, str_ind$4 - 2 | 0, (str_ind_3$0 - str_ind$4 | 0) + 3 | 0), - _bo_ = [0, [0, str_ind_3$0 + 1 | 0, [1, s$1, size]]]; + _bp_ = [0, [0, str_ind_3$0 + 1 | 0, [1, s$1, size]]]; } - var _bn_ = _bo_; + var _bo_ = _bp_; } - catch(_bp_){ - var _bm_ = caml_wrap_exception(_bp_); - if(_bm_ !== Stdlib[8] && _bm_[1] !== Stdlib[7]) - throw caml_maybe_attach_backtrace(_bm_, 0); - var _bn_ = 0; + catch(_bq_){ + var _bn_ = caml_wrap_exception(_bq_); + if(_bn_ !== Stdlib[8] && _bn_[1] !== Stdlib[7]) + throw caml_maybe_attach_backtrace(_bn_, 0); + var _bo_ = 0; } - if(_bn_) + if(_bo_) var - match$5 = _bn_[1], + match$5 = _bo_[1], formatting_lit$1 = match$5[2], next_ind$0 = match$5[1], fmt_rest$13 = parse(next_ind$0, end_ind)[1], - _be_ = [0, [17, formatting_lit$1, fmt_rest$13]]; + _bf_ = [0, [17, formatting_lit$1, fmt_rest$13]]; else var fmt_rest$14 = parse(str_ind$4, end_ind)[1], - _be_ = [0, [17, _Q_, fmt_rest$14]]; - var match$0 = _be_; + _bf_ = [0, [17, _R_, fmt_rest$14]]; + var match$0 = _bf_; break a; case 31: var @@ -19079,14 +19086,14 @@ /*<>*/ hash = [0, 0]; function set_flag(str_ind, flag){ /*<>*/ var - _bb_ = flag[1], - _bc_ = _bb_ ? 1 - legacy_behavior$0 : _bb_; - if(_bc_){ + _bc_ = flag[1], + _bd_ = _bc_ ? 1 - legacy_behavior$0 : _bc_; + if(_bd_){ /*<>*/ /*<>*/ var - _bd_ = + _be_ = /*<>*/ caml_string_get(str, str_ind); /*<>*/ /*<>*/ caml_call3 - (failwith_message(_C_), str, str_ind, _bd_); + (failwith_message(_D_), str, str_ind, _be_); } flag[1] = 1; return; @@ -19229,7 +19236,7 @@ hash$0, space$0, ign, - _D_); + _E_); } /*<>*/ } function parse_after_padding @@ -19301,10 +19308,10 @@ case 3: if(legacy_behavior$0){ /*<>*/ var - /*<>*/ _ba_ = str_ind$0 + 1 | 0, + /*<>*/ _bb_ = str_ind$0 + 1 | 0, minus$0 = minus || (45 === symb$0 ? 1 : 0); /*<>*/ return parse_literal - (minus$0, _ba_); + (minus$0, _bb_); } break; } @@ -19319,7 +19326,7 @@ space, ign, pad, - _E_) + _F_) : invalid_format_without(str_ind$0 - 1 | 0, 46, cst_precision); /*<>*/ } function parse_after_precision @@ -19348,12 +19355,12 @@ /*<>*/ return parse_conv(0); if(minus){ if(typeof prec === "number") - /*<>*/ return parse_conv(_F_); + /*<>*/ return parse_conv(_G_); var n = prec[1]; /*<>*/ return parse_conv([0, 0, n]); } if(typeof prec === "number") - /*<>*/ return parse_conv(_G_); + /*<>*/ return parse_conv(_H_); var n$0 = prec[1]; /*<>*/ return parse_conv([0, 1, n$0]); /*<>*/ } @@ -19416,7 +19423,7 @@ if(0 !== pad[0]) return 2 <= pad[1] ? legacy_behavior$0 - ? _H_ + ? _I_ : incompatible_flag(pct_ind, str_ind, 48, cst_precision$1) : pad; if(2 > pad[1]) /*<>*/ return pad; @@ -19431,7 +19438,7 @@ if(0 !== pad[0]) return 2 <= pad[1] ? legacy_behavior$0 - ? _I_ + ? _J_ : incompatible_flag(pct_ind, str_ind, symb, cst_0$1) : pad; if(2 > pad[1]) /*<>*/ return pad; @@ -19490,29 +19497,29 @@ /*<>*/ var /*<>*/ ignored$2 = [9, get_pad_opt(95), sub_fmtty], - _aJ_ = [0, [23, ignored$2, fmt_rest$7]]; + _aK_ = [0, [23, ignored$2, fmt_rest$7]]; else - var _aJ_ = [0, [14, get_pad_opt(40), sub_fmtty, fmt_rest$7]]; - var fmt_result = _aJ_; + var _aK_ = [0, [14, get_pad_opt(40), sub_fmtty, fmt_rest$7]]; + var fmt_result = _aK_; break a; case 44: var fmt_result = parse(str_ind, end_ind); break a; case 67: /*<>*/ var fmt_rest$10 = parse(str_ind, end_ind)[1], - /*<>*/ _aL_ = + /*<>*/ _aM_ = get_ign(0) ? [0, [23, 1, fmt_rest$10]] : [0, [1, fmt_rest$10]], - fmt_result = _aL_; + fmt_result = _aM_; break a; case 78: var fmt_rest$14 = parse(str_ind, end_ind)[1], counter$0 = 2; /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored$6 = [11, counter$0], - _aR_ = [0, [23, ignored$6, fmt_rest$14]]; + _aS_ = [0, [23, ignored$6, fmt_rest$14]]; else - var _aR_ = [0, [21, counter$0, fmt_rest$14]]; - var fmt_result = _aR_; + var _aS_ = [0, [21, counter$0, fmt_rest$14]]; + var fmt_result = _aS_; break a; case 83: /*<>*/ var @@ -19523,15 +19530,15 @@ /*<>*/ var /*<>*/ ignored$7 = [1, get_padprec_opt(95)], - _aS_ = [0, [23, ignored$7, fmt_rest$15]]; + _aT_ = [0, [23, ignored$7, fmt_rest$15]]; else /*<>*/ var /*<>*/ match$5 = make_padding_fmt_ebb(pad$6, fmt_rest$15), fmt_rest$16 = match$5[2], pad$7 = match$5[1], - _aS_ = [0, [3, pad$7, fmt_rest$16]]; - var fmt_result = _aS_; + _aT_ = [0, [3, pad$7, fmt_rest$16]]; + var fmt_result = _aT_; break a; case 91: if(str_ind === end_ind) @@ -19550,9 +19557,9 @@ /*<>*/ caml_call1 (Stdlib[29], i)); /*<>*/ /*<>*/ var - _a$_ = i + 1 | 0; + _ba_ = i + 1 | 0; if(c === i) break; - i = _a$_; + i = _ba_; } } return; @@ -19560,7 +19567,7 @@ fail_single_percent = function(str_ind){ /*<>*/ return /*<>*/ caml_call2 - (failwith_message(_R_), str, str_ind); + (failwith_message(_S_), str, str_ind); /*<>*/ }, parse_char_set_content = function(counter, str_ind, end_ind){ @@ -19577,13 +19584,13 @@ if(93 === c) /*<>*/ return str_ind$0 + 1 | 0; - var _a__ = str_ind$0 + 1 | 0; + var _a$_ = str_ind$0 + 1 | 0; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (parse_char_set_after_char$0, [0, _a__, end_ind, c]); + (parse_char_set_after_char$0, [0, _a$_, end_ind, c]); var counter$0 = counter + 1 | 0; /*<>*/ return parse_char_set_after_char$0 - (counter$0, _a__, end_ind, c); + (counter$0, _a$_, end_ind, c); } /*<>*/ add_in_char_set (char_set, 45); @@ -19637,13 +19644,13 @@ /*<>*/ return fail_single_percent (str_ind$2); /*<>*/ add_range(c$0, c$3); - var _a8_ = str_ind$2 + 2 | 0; + var _a9_ = str_ind$2 + 2 | 0; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (parse_char_set_content, [0, _a8_, end_ind]); + (parse_char_set_content, [0, _a9_, end_ind]); var counter$1 = counter + 1 | 0; /*<>*/ return parse_char_set_content - (counter$1, _a8_, end_ind); + (counter$1, _a9_, end_ind); } if(93 === c$2){ /*<>*/ add_in_char_set @@ -19654,24 +19661,24 @@ | 0; } /*<>*/ add_range(c$0, c$2); - var _a9_ = str_ind$2 + 1 | 0; + var _a__ = str_ind$2 + 1 | 0; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (parse_char_set_content, [0, _a9_, end_ind]); + (parse_char_set_content, [0, _a__, end_ind]); var counter$0 = counter + 1 | 0; /*<>*/ return parse_char_set_content - (counter$0, _a9_, end_ind); + (counter$0, _a__, end_ind); } if(37 === c$0){ /*<>*/ add_in_char_set (char_set, c$1); - var _a7_ = str_ind$0 + 1 | 0; + var _a8_ = str_ind$0 + 1 | 0; /*<>*/ if(counter >= 50) /*<>*/ return /*<>*/ caml_trampoline_return - (parse_char_set_content, [0, _a7_, end_ind]); + (parse_char_set_content, [0, _a8_, end_ind]); var counter$2 = counter + 1 | 0; /*<>*/ return parse_char_set_content - (counter$2, _a7_, end_ind); + (counter$2, _a8_, end_ind); } } if(37 === c$0) @@ -19721,10 +19728,10 @@ /*<>*/ var /*<>*/ ignored$9 = [10, get_pad_opt(95), char_set$1], - _aX_ = [0, [23, ignored$9, fmt_rest$19]]; + _aY_ = [0, [23, ignored$9, fmt_rest$19]]; else - var _aX_ = [0, [20, get_pad_opt(91), char_set$1, fmt_rest$19]]; - var fmt_result = _aX_; + var _aY_ = [0, [20, get_pad_opt(91), char_set$1, fmt_rest$19]]; + var fmt_result = _aY_; break a; case 97: var @@ -19744,28 +19751,28 @@ if(match$7){ if(0 === match$7[1]) /*<>*/ var - /*<>*/ _aY_ = + /*<>*/ _aZ_ = get_ign(0) ? [0, [23, 3, fmt_rest$21]] : [0, [22, fmt_rest$21]], - _aZ_ = _aY_; + _a0_ = _aZ_; else var - _aZ_ = + _a0_ = legacy_behavior$0 ? char_format(fmt_rest$21) : invalid_format_message (str_ind, cst_non_zero_widths_are_unsupp); - var _a0_ = _aZ_; + var _a1_ = _a0_; } else - var _a0_ = char_format(fmt_rest$21); - var fmt_result = _a0_; + var _a1_ = char_format(fmt_rest$21); + var fmt_result = _a1_; break a; case 114: /*<>*/ var fmt_rest$22 = parse(str_ind, end_ind)[1], - /*<>*/ _a1_ = + /*<>*/ _a2_ = get_ign(0) ? [0, [23, 2, fmt_rest$22]] : [0, [19, fmt_rest$22]], - fmt_result = _a1_; + fmt_result = _a2_; break a; case 115: /*<>*/ var @@ -19776,15 +19783,15 @@ /*<>*/ var /*<>*/ ignored$10 = [0, get_padprec_opt(95)], - _a2_ = [0, [23, ignored$10, fmt_rest$23]]; + _a3_ = [0, [23, ignored$10, fmt_rest$23]]; else /*<>*/ var /*<>*/ match$8 = make_padding_fmt_ebb(pad$9, fmt_rest$23), fmt_rest$24 = match$8[2], pad$10 = match$8[1], - _a2_ = [0, [2, pad$10, fmt_rest$24]]; - var fmt_result = _a2_; + _a3_ = [0, [2, pad$10, fmt_rest$24]]; + var fmt_result = _a3_; break a; case 116: var @@ -19803,10 +19810,10 @@ /*<>*/ var /*<>*/ ignored$11 = [8, get_pad_opt(95), sub_fmtty$0], - _a3_ = [0, [23, ignored$11, fmt_rest$26]]; + _a4_ = [0, [23, ignored$11, fmt_rest$26]]; else - var _a3_ = [0, [13, get_pad_opt(123), sub_fmtty$0, fmt_rest$26]]; - var fmt_result = _a3_; + var _a4_ = [0, [13, get_pad_opt(123), sub_fmtty$0, fmt_rest$26]]; + var fmt_result = _a4_; break a; case 66: case 98: @@ -19818,15 +19825,15 @@ /*<>*/ var /*<>*/ ignored$3 = [7, get_padprec_opt(95)], - _aK_ = [0, [23, ignored$3, fmt_rest$8]]; + _aL_ = [0, [23, ignored$3, fmt_rest$8]]; else /*<>*/ var /*<>*/ match$3 = make_padding_fmt_ebb(pad$3, fmt_rest$8), fmt_rest$9 = match$3[2], pad$4 = match$3[1], - _aK_ = [0, [9, pad$4, fmt_rest$9]]; - var fmt_result = _aK_; + _aL_ = [0, [9, pad$4, fmt_rest$9]]; + var fmt_result = _aL_; break a; case 37: case 64: @@ -19842,22 +19849,22 @@ /*<>*/ symb$0 = /*<>*/ caml_string_get (str, str_ind), - /*<>*/ _a4_ = symb$0 - 88 | 0; + /*<>*/ _a5_ = symb$0 - 88 | 0; b: { - if(32 >= _a4_ >>> 0) - switch(_a4_){ + if(32 >= _a5_ >>> 0) + switch(_a5_){ case 0: case 12: case 17: case 23: case 29: case 32: - var _aQ_ = 1; break b; + var _aR_ = 1; break b; } - var _aQ_ = 0; + var _aR_ = 0; } - /*<>*/ if(_aQ_) break; + /*<>*/ if(_aR_) break; } var fmt_rest$13 = parse(str_ind, end_ind)[1]; b: @@ -19873,15 +19880,15 @@ } else if(76 === symb){var counter = 2; break b;} /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _V_], 1); + ([0, Assert_failure, _W_], 1); } /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored$5 = [11, counter], - _aP_ = [0, [23, ignored$5, fmt_rest$13]]; + _aQ_ = [0, [23, ignored$5, fmt_rest$13]]; else - var _aP_ = [0, [21, counter, fmt_rest$13]]; - var fmt_result = _aP_; + var _aQ_ = [0, [21, counter, fmt_rest$13]]; + var fmt_result = _aQ_; break a; case 32: case 35: @@ -19891,7 +19898,7 @@ var fmt_result = /*<>*/ caml_call3 - (failwith_message(_M_), str, pct_ind, symb); + (failwith_message(_N_), str, pct_ind, symb); break a; case 88: case 100: @@ -19900,26 +19907,26 @@ case 117: case 120: /*<>*/ var - /*<>*/ _aT_ = get_space(0), - /*<>*/ _aU_ = get_hash(0), + /*<>*/ _aU_ = get_space(0), + /*<>*/ _aV_ = get_hash(0), /*<>*/ iconv$2 = - compute_int_conv(pct_ind, str_ind, get_plus(0), _aU_, _aT_, symb), + compute_int_conv(pct_ind, str_ind, get_plus(0), _aV_, _aU_, symb), fmt_rest$17 = parse(str_ind, end_ind)[1]; /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored$8 = [2, iconv$2, get_pad_opt(95)], - _aV_ = [0, [23, ignored$8, fmt_rest$17]]; + _aW_ = [0, [23, ignored$8, fmt_rest$17]]; else /*<>*/ var - /*<>*/ _aW_ = get_prec(0), + /*<>*/ _aX_ = get_prec(0), /*<>*/ match$6 = - make_padprec_fmt_ebb(get_int_pad(0), _aW_, fmt_rest$17), + make_padprec_fmt_ebb(get_int_pad(0), _aX_, fmt_rest$17), fmt_rest$18 = match$6[3], prec$4 = match$6[2], pad$8 = match$6[1], - _aV_ = [0, [4, iconv$2, pad$8, prec$4, fmt_rest$18]]; - var fmt_result = _aV_; + _aW_ = [0, [4, iconv$2, pad$8, prec$4, fmt_rest$18]]; + var fmt_result = _aW_; break a; case 69: case 70: @@ -19949,28 +19956,28 @@ if(3 >= switcher >>> 0){ switch(switcher){ case 0: - var _a5_ = 1; break; + var _a6_ = 1; break; case 1: - var _a5_ = 0; break; + var _a6_ = 0; break; case 2: - var _a5_ = 3; break; - default: var _a5_ = 6; + var _a6_ = 3; break; + default: var _a6_ = 6; } - var kind = _a5_; + var kind = _a6_; break b; } } else if(69 <= symb){ switch(symb - 69 | 0){ case 0: - var _a6_ = 2; break; + var _a7_ = 2; break; case 1: break c; case 2: - var _a6_ = 4; break; - default: var _a6_ = 7; + var _a7_ = 4; break; + default: var _a7_ = 7; } - var kind = _a6_; + var kind = _a7_; break b; } if(hash$1){ @@ -19978,7 +19985,7 @@ } else if(70 === symb){var kind = 5; break b;} /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _X_], 1); + ([0, Assert_failure, _Y_], 1); } /*<>*/ var /*<>*/ fconv = [0, flag, kind], @@ -19988,25 +19995,25 @@ match = get_prec(0); if(typeof match === "number") var - _aM_ = + _aN_ = match ? incompatible_flag(pct_ind, str_ind, 95, cst$26) : 0; else - var ndec = match[1], _aM_ = [0, ndec]; + var ndec = match[1], _aN_ = [0, ndec]; /*<>*/ var /*<>*/ ignored$4 = - [6, get_pad_opt(95), _aM_], - _aN_ = [0, [23, ignored$4, fmt_rest$11]]; + [6, get_pad_opt(95), _aN_], + _aO_ = [0, [23, ignored$4, fmt_rest$11]]; } else /*<>*/ var - /*<>*/ _aO_ = get_prec(0), + /*<>*/ _aP_ = get_prec(0), /*<>*/ match$4 = - make_padprec_fmt_ebb(get_pad(0), _aO_, fmt_rest$11), + make_padprec_fmt_ebb(get_pad(0), _aP_, fmt_rest$11), fmt_rest$12 = match$4[3], prec$3 = match$4[2], pad$5 = match$4[1], - _aN_ = [0, [8, fconv, pad$5, prec$3, fmt_rest$12]]; - var fmt_result = _aN_; + _aO_ = [0, [8, fconv, pad$5, prec$3, fmt_rest$12]]; + var fmt_result = _aO_; break a; } b: @@ -20015,137 +20022,137 @@ switch(symb - 108 | 0){ case 0: /*<>*/ var - /*<>*/ _at_ = + /*<>*/ _au_ = /*<>*/ caml_string_get (str, str_ind), - /*<>*/ _au_ = get_space(0), - /*<>*/ _av_ = get_hash(0), + /*<>*/ _av_ = get_space(0), + /*<>*/ _aw_ = get_hash(0), /*<>*/ iconv = compute_int_conv - (pct_ind, str_ind + 1 | 0, get_plus(0), _av_, _au_, _at_), + (pct_ind, str_ind + 1 | 0, get_plus(0), _aw_, _av_, _au_), fmt_rest = parse(str_ind + 1 | 0, end_ind)[1]; /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored = [3, iconv, get_pad_opt(95)], - _aw_ = [0, [23, ignored, fmt_rest]]; + _ax_ = [0, [23, ignored, fmt_rest]]; else /*<>*/ var - /*<>*/ _ay_ = get_prec(0), + /*<>*/ _az_ = get_prec(0), /*<>*/ match$0 = - make_padprec_fmt_ebb(get_int_pad(0), _ay_, fmt_rest), + make_padprec_fmt_ebb(get_int_pad(0), _az_, fmt_rest), fmt_rest$0 = match$0[3], prec$0 = match$0[2], pad$0 = match$0[1], - _aw_ = [0, [5, iconv, pad$0, prec$0, fmt_rest$0]]; - var _ax_ = _aw_; + _ax_ = [0, [5, iconv, pad$0, prec$0, fmt_rest$0]]; + var _ay_ = _ax_; break; case 1: break b; default: /*<>*/ var - /*<>*/ _az_ = + /*<>*/ _aA_ = /*<>*/ caml_string_get (str, str_ind), - /*<>*/ _aA_ = get_space(0), - /*<>*/ _aB_ = get_hash(0), + /*<>*/ _aB_ = get_space(0), + /*<>*/ _aC_ = get_hash(0), /*<>*/ iconv$0 = compute_int_conv - (pct_ind, str_ind + 1 | 0, get_plus(0), _aB_, _aA_, _az_), + (pct_ind, str_ind + 1 | 0, get_plus(0), _aC_, _aB_, _aA_), fmt_rest$1 = parse(str_ind + 1 | 0, end_ind)[1]; /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored$0 = [4, iconv$0, get_pad_opt(95)], - _aC_ = [0, [23, ignored$0, fmt_rest$1]]; + _aD_ = [0, [23, ignored$0, fmt_rest$1]]; else /*<>*/ var - /*<>*/ _aD_ = get_prec(0), + /*<>*/ _aE_ = get_prec(0), /*<>*/ match$1 = - make_padprec_fmt_ebb(get_int_pad(0), _aD_, fmt_rest$1), + make_padprec_fmt_ebb(get_int_pad(0), _aE_, fmt_rest$1), fmt_rest$2 = match$1[3], prec$1 = match$1[2], pad$1 = match$1[1], - _aC_ = [0, [6, iconv$0, pad$1, prec$1, fmt_rest$2]]; - var _ax_ = _aC_; + _aD_ = [0, [6, iconv$0, pad$1, prec$1, fmt_rest$2]]; + var _ay_ = _aD_; } - var fmt_result = _ax_; + var fmt_result = _ay_; break a; } } else if(76 === symb){ /*<>*/ var - /*<>*/ _aE_ = + /*<>*/ _aF_ = /*<>*/ caml_string_get(str, str_ind), - /*<>*/ _aF_ = get_space(0), - /*<>*/ _aG_ = get_hash(0), + /*<>*/ _aG_ = get_space(0), + /*<>*/ _aH_ = get_hash(0), /*<>*/ iconv$1 = compute_int_conv - (pct_ind, str_ind + 1 | 0, get_plus(0), _aG_, _aF_, _aE_), + (pct_ind, str_ind + 1 | 0, get_plus(0), _aH_, _aG_, _aF_), fmt_rest$3 = parse(str_ind + 1 | 0, end_ind)[1]; /*<>*/ if(get_ign(0)) /*<>*/ var /*<>*/ ignored$1 = [5, iconv$1, get_pad_opt(95)], - _aH_ = [0, [23, ignored$1, fmt_rest$3]]; + _aI_ = [0, [23, ignored$1, fmt_rest$3]]; else /*<>*/ var - /*<>*/ _aI_ = get_prec(0), + /*<>*/ _aJ_ = get_prec(0), /*<>*/ match$2 = - make_padprec_fmt_ebb(get_int_pad(0), _aI_, fmt_rest$3), + make_padprec_fmt_ebb(get_int_pad(0), _aJ_, fmt_rest$3), fmt_rest$4 = match$2[3], prec$2 = match$2[2], pad$2 = match$2[1], - _aH_ = [0, [7, iconv$1, pad$2, prec$2, fmt_rest$4]]; - var fmt_result = _aH_; + _aI_ = [0, [7, iconv$1, pad$2, prec$2, fmt_rest$4]]; + var fmt_result = _aI_; break a; } var fmt_result = /*<>*/ caml_call3 - (failwith_message(_J_), str, str_ind - 1 | 0, symb); + (failwith_message(_K_), str, str_ind - 1 | 0, symb); } if(1 - legacy_behavior$0){ - var _ak_ = 1 - plus_used[1], plus$0 = _ak_ ? plus : _ak_; + var _al_ = 1 - plus_used[1], plus$0 = _al_ ? plus : _al_; if(plus$0) /*<>*/ incompatible_flag (pct_ind, str_ind, symb, cst$27); - var _al_ = 1 - hash_used[1], hash$0 = _al_ ? hash : _al_; + var _am_ = 1 - hash_used[1], hash$0 = _am_ ? hash : _am_; if(hash$0) /*<>*/ incompatible_flag (pct_ind, str_ind, symb, cst$28); - var _am_ = 1 - space_used[1], space$0 = _am_ ? space : _am_; + var _an_ = 1 - space_used[1], space$0 = _an_ ? space : _an_; if(space$0) /*<>*/ incompatible_flag (pct_ind, str_ind, symb, cst$29); var - _an_ = 1 - pad_used[1], - _ao_ = - _an_ + _ao_ = 1 - pad_used[1], + _ap_ = + _ao_ ? /*<>*/ caml_notequal - ([0, pad], _K_) - : _an_; - /*<>*/ if(_ao_) + ([0, pad], _L_) + : _ao_; + /*<>*/ if(_ap_) /*<>*/ incompatible_flag (pct_ind, str_ind, symb, cst_padding$0); var - _ap_ = 1 - prec_used[1], - _aq_ = - _ap_ + _aq_ = 1 - prec_used[1], + _ar_ = + _aq_ ? /*<>*/ caml_notequal - ([0, prec], _L_) - : _ap_; - /*<>*/ if(_aq_){ - var _ar_ = ign ? 95 : symb; + ([0, prec], _M_) + : _aq_; + /*<>*/ if(_ar_){ + var _as_ = ign ? 95 : symb; /*<>*/ incompatible_flag - (pct_ind, str_ind, _ar_, cst_precision$2); + (pct_ind, str_ind, _as_, cst_precision$2); } var plus$1 = ign ? plus : ign; if(plus$1) /*<>*/ incompatible_flag (pct_ind, str_ind, 95, cst$30); } - var _as_ = 1 - ign_used[1], ign$0 = _as_ ? ign : _as_; + var _at_ = 1 - ign_used[1], ign$0 = _at_ ? ign : _at_; a: if(ign$0){ b: @@ -20189,13 +20196,13 @@ [0, sub_fmt, sub_str], /*<>*/ formatting$0 = is_open_tag ? [0, sub_format$0] : [1, sub_format$0], - /*<>*/ _ai_ = + /*<>*/ _aj_ = [0, [18, formatting$0, fmt_rest$0]]; - /*<>*/ return _ai_; + /*<>*/ return _aj_; } - catch(_aj_){ - var _ah_ = caml_wrap_exception(_aj_); - if(_ah_ !== Stdlib[8]) throw caml_maybe_attach_backtrace(_ah_, 0); + catch(_ak_){ + var _ai_ = caml_wrap_exception(_ak_); + if(_ai_ !== Stdlib[8]) throw caml_maybe_attach_backtrace(_ai_, 0); /*<>*/ var fmt_rest = parse(str_ind, end_ind)[1], /*<>*/ formatting = @@ -20236,9 +20243,9 @@ var new_acc = (acc$0 * 10 | 0) + (c - 48 | 0) | 0; if(Stdlib_Sys[12] < new_acc){ /*<>*/ /*<>*/ var - _ag_ = Stdlib_Sys[12]; + _ah_ = Stdlib_Sys[12]; /*<>*/ return /*<>*/ caml_call3 - (failwith_message(_S_), str, new_acc, _ag_); + (failwith_message(_T_), str, new_acc, _ah_); } var str_ind$1 = str_ind$0 + 1 | 0; str_ind$0 = str_ind$1; @@ -20276,7 +20283,7 @@ /*<>*/ return [0, next_ind, - n | 0]; } /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _T_], 1); + ([0, Assert_failure, _U_], 1); /*<>*/ } function add_literal(lit_start, str_ind, fmt){ /*<>*/ var @@ -20301,7 +20308,7 @@ /*<>*/ for(;;){ if(str_ind$0 === end_ind) /*<>*/ /*<>*/ caml_call3 - (failwith_message(_U_), str, c, end_ind); + (failwith_message(_V_), str, c, end_ind); if (37 === @@ -20488,7 +20495,7 @@ else{ if(! space$0) /*<>*/ throw /*<>*/ caml_maybe_attach_backtrace - ([0, Assert_failure, _W_], 1); + ([0, Assert_failure, _X_], 1); if(! legacy_behavior$0) /*<>*/ return incompatible_flag (pct_ind, str_ind, symb, cst$34); @@ -20502,7 +20509,7 @@ /*<>*/ caml_call3 (Stdlib_String[16], str, pct_ind, str_ind - pct_ind | 0); /*<>*/ return /*<>*/ caml_call5 - (failwith_message(_Y_), str, pct_ind, option, symb, subfmt); + (failwith_message(_Z_), str, pct_ind, option, symb, subfmt); /*<>*/ } return parse(0, caml_ml_string_length(str)); } @@ -20511,16 +20518,16 @@ fmt = fmt_ebb_of_string(0, str)[1]; /*<>*/ try{ /*<>*/ /*<>*/ var - _ae_ = [0, type_format(fmt, fmtty), str]; - /*<>*/ return _ae_; + _af_ = [0, type_format(fmt, fmtty), str]; + /*<>*/ return _af_; } - catch(_af_){ - var _ac_ = caml_wrap_exception(_af_); - if(_ac_ !== Type_mismatch) throw caml_maybe_attach_backtrace(_ac_, 0); + catch(_ag_){ + var _ad_ = caml_wrap_exception(_ag_); + if(_ad_ !== Type_mismatch) throw caml_maybe_attach_backtrace(_ad_, 0); /*<>*/ /*<>*/ var - _ad_ = string_of_fmtty(fmtty); + _ae_ = string_of_fmtty(fmtty); /*<>*/ return /*<>*/ caml_call2 - (failwith_message(_Z_), str, _ad_); + (failwith_message(___), str, _ae_); } /*<>*/ } function format_of_string_format(str, param){ @@ -20530,15 +20537,15 @@ fmt$0 = fmt_ebb_of_string(0, str)[1]; /*<>*/ try{ /*<>*/ /*<>*/ var - _aa_ = [0, type_format(fmt$0, fmtty_of_fmt(fmt)), str]; - /*<>*/ return _aa_; + _ab_ = [0, type_format(fmt$0, fmtty_of_fmt(fmt)), str]; + /*<>*/ return _ab_; } - catch(_ab_){ - var _$_ = caml_wrap_exception(_ab_); - if(_$_ === Type_mismatch) + catch(_ac_){ + var _aa_ = caml_wrap_exception(_ac_); + if(_aa_ === Type_mismatch) /*<>*/ return /*<>*/ caml_call2 - (failwith_message(___), str, str$0); - throw caml_maybe_attach_backtrace(_$_, 0); + (failwith_message(_$_), str, str$0); + throw caml_maybe_attach_backtrace(_aa_, 0); } } var @@ -20567,7 +20574,7 @@ symm, trans, recast]; - runtime.caml_register_global(197, CamlinternalFormat, "CamlinternalFormat"); + runtime.caml_register_global(199, CamlinternalFormat, "CamlinternalFormat"); return; /*<>*/ } (globalThis)); @@ -20703,8 +20710,8 @@ cst_append$1 = "append", cst_dynarray_ml = "dynarray.ml", cst_ensure_capacity$0 = "ensure_capacity", + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_wrap_exception = runtime.caml_wrap_exception; /*<>*/ function caml_call1(f, a0){ @@ -21064,7 +21071,7 @@ /*<>*/ caml_call2 (Stdlib[17], _Q_, capacity_request), /*<>*/ new_arr = - /*<>*/ caml_make_vect(new_capacity, 0); + /*<>*/ caml_array_make(new_capacity, 0); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], arr, 0, new_arr, 0, a[1]); a[2] = new_arr; @@ -21105,7 +21112,7 @@ var _L_ = cur_capacity < n ? 1 : 0; if(_L_){ /*<>*/ /*<>*/ var - new_arr = /*<>*/ caml_make_vect(n, 0); + new_arr = /*<>*/ caml_array_make(n, 0); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], arr, 0, new_arr, 0, a[1]); a[2] = new_arr; @@ -24254,6 +24261,7 @@ runtime = globalThis.jsoo_runtime, cst_Bigarray_Array3_of_array_n$1 = "Bigarray.Array3.of_array: non-cubic data", + caml_array_make = runtime.caml_array_make, caml_ba_change_layout = runtime.caml_ba_change_layout, caml_ba_create = runtime.caml_ba_create, caml_ba_dim_1 = runtime.caml_ba_dim_1, @@ -24267,7 +24275,6 @@ caml_ba_set_generic = runtime.caml_ba_set_generic, caml_ba_slice = runtime.caml_ba_slice, caml_check_bound = runtime.caml_check_bound, - caml_make_vect = runtime.caml_make_vect, caml_mul = runtime.caml_mul; /*<>*/ function caml_call1(f, a0){ return (f.l >= 0 ? f.l : f.l = f.length) == 1 @@ -24383,14 +24390,14 @@ /*<>*/ return layout ? (floop (arr, - /*<>*/ caml_make_vect(dlen, 1), + /*<>*/ caml_array_make(dlen, 1), f, dlen - 1 | 0, dims), arr) : (cloop (arr, - /*<>*/ caml_make_vect(dlen, 0), + /*<>*/ caml_array_make(dlen, 0), f, 0, dims), @@ -24401,7 +24408,7 @@ /*<>*/ n = /*<>*/ caml_ba_num_dims(a), /*<>*/ d = - /*<>*/ caml_make_vect(n, 0), + /*<>*/ caml_array_make(n, 0), /*<>*/ _af_ = n - 1 | 0, /*<>*/ _ae_ = 0; if(_af_ >= 0){ @@ -25552,10 +25559,10 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, caml_compare = runtime.caml_compare, caml_hash = runtime.caml_hash, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_sys_getenv = runtime.caml_sys_getenv, caml_wrap_exception = runtime.caml_wrap_exception; @@ -25669,7 +25676,7 @@ var seed = 0; /*<>*/ return [0, 0, - /*<>*/ caml_make_vect(s, 0), + /*<>*/ caml_array_make(s, 0), seed, s]; } @@ -25690,7 +25697,7 @@ && len !== /*<>*/ caml_call1(Stdlib[18], h[4])){ h[1] = 0; h[2] = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make ( /*<>*/ caml_call1(Stdlib[18], h[4]), 0); return 0; } @@ -25733,7 +25740,7 @@ /*<>*/ var nsize = ndata.length - 1, /*<>*/ ndata_tail = - /*<>*/ caml_make_vect(nsize, 0), + /*<>*/ caml_array_make(nsize, 0), _aa_ = odata.length - 2 | 0, /*<>*/ _$_ = 0; if(_aa_ >= 0){ @@ -25799,7 +25806,7 @@ if(! ___) return ___; /*<>*/ var /*<>*/ ndata = - /*<>*/ caml_make_vect(nsize, 0), + /*<>*/ caml_array_make(nsize, 0), /*<>*/ inplace = 1 - ongoing_traversal(h); h[2] = ndata; /*<>*/ return insert_all_buckets @@ -25973,7 +25980,7 @@ 0, h[2]), /*<>*/ histo = - /*<>*/ caml_make_vect(mbl + 1 | 0, 0); + /*<>*/ caml_array_make(mbl + 1 | 0, 0); /*<>*/ /*<>*/ caml_call2 (Stdlib_Array[12], function(b){ @@ -26550,7 +26557,7 @@ /*<>*/ var _h_ = 4 <= h.length - 1 ? h[4] : s, /*<>*/ h$0 = - [0, h[1], /*<>*/ caml_make_vect(s, 0), seed, _h_]; + [0, h[1], /*<>*/ caml_array_make(s, 0), seed, _h_]; /*<>*/ insert_all_buckets (function(_i_){ /*<>*/ return key_index(h$0, _i_);}, 0, h[2], h$0[2]); /*<>*/ return h$0; @@ -26601,8 +26608,8 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_mod = runtime.caml_mod; /*<>*/ function caml_call1(f, a0){ @@ -26737,8 +26744,8 @@ sz$0 = 7 <= sz ? sz : 7, sz$1 = Stdlib_Sys[13] < sz$0 ? Stdlib_Sys[13] : sz$0; /*<>*/ return [0, - /*<>*/ caml_make_vect(sz$1, emptybucket), - /*<>*/ caml_make_vect(sz$1, [0]), + /*<>*/ caml_array_make(sz$1, emptybucket), + /*<>*/ caml_array_make(sz$1, [0]), limit, 0, 0]; @@ -26861,7 +26868,7 @@ /*<>*/ var /*<>*/ newbucket$0 = create(newsz), /*<>*/ newhashes = - /*<>*/ caml_make_vect(newsz, 0); + /*<>*/ caml_array_make(newsz, 0); /*<>*/ blit(bucket$0, 0, newbucket$0, 0, sz); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], hashes, 0, newhashes, 0, sz); @@ -31593,10 +31600,10 @@ var runtime = globalThis.jsoo_runtime, cst_camlinternalOO_ml = "camlinternalOO.ml", + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, caml_div = runtime.caml_div, caml_get_public_method = runtime.caml_get_public_method, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_obj_block = runtime.caml_obj_block, caml_set_oo_id = runtime.caml_set_oo_id, @@ -31683,7 +31690,7 @@ /*<>*/ var len = pub_labels.length - 1, /*<>*/ methods = - /*<>*/ caml_make_vect + /*<>*/ caml_array_make ((len * 2 | 0) + 2 | 0, dummy_met); /*<>*/ caml_check_bound(methods, 0)[1] = len; var @@ -31732,7 +31739,7 @@ if(_ab_){ /*<>*/ /*<>*/ var new_buck = - /*<>*/ caml_make_vect(new_size, dummy_met); + /*<>*/ caml_array_make(new_size, dummy_met); /*<>*/ /*<>*/ caml_call5 (Stdlib_Array[9], array[2], 0, new_buck, 0, old_size); array[2] = new_buck; @@ -31976,7 +31983,8 @@ /*<>*/ nmeths = meths$0.length - 1, nvals = vals.length - 1, /*<>*/ res = - /*<>*/ caml_make_vect(nmeths + nvals | 0, 0), + /*<>*/ caml_array_make + (nmeths + nvals | 0, 0), /*<>*/ _D_ = nmeths - 1 | 0, /*<>*/ _C_ = 0; if(_D_ >= 0){ @@ -32861,8 +32869,8 @@ "use strict"; var runtime = globalThis.jsoo_runtime, + caml_array_make = runtime.caml_array_make, caml_check_bound = runtime.caml_check_bound, - caml_make_vect = runtime.caml_make_vect, caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace, caml_wrap_exception = runtime.caml_wrap_exception; /*<>*/ function caml_call1(f, a0){ @@ -32936,7 +32944,7 @@ var seed = 0; /*<>*/ return [0, 0, - /*<>*/ caml_make_vect(x, 0), + /*<>*/ caml_array_make(x, 0), seed, x]; } @@ -32965,7 +32973,7 @@ : (h [1] = 0, - h[2] = /*<>*/ caml_make_vect(h[4], 0), + h[2] = /*<>*/ caml_array_make(h[4], 0), 0); /*<>*/ } function copy(h){ @@ -33019,7 +33027,7 @@ _ad_ = _ac_ ? (osize >>> 1 | 0) <= h[1] ? 1 : 0 : _ac_; if(_ad_){ /*<>*/ /*<>*/ var - ndata = /*<>*/ caml_make_vect(nsize, 0); + ndata = /*<>*/ caml_array_make(nsize, 0); h[2] = ndata; /*<>*/ var insert_bucket = @@ -33259,7 +33267,7 @@ 0, h[2]), /*<>*/ histo = - /*<>*/ caml_make_vect(mbl + 1 | 0, 0); + /*<>*/ caml_array_make(mbl + 1 | 0, 0); /*<>*/ /*<>*/ caml_call2 (Stdlib_Array[12], function(b){ @@ -33301,7 +33309,7 @@ 0, h[2]), /*<>*/ histo = - /*<>*/ caml_make_vect(mbl + 1 | 0, 0); + /*<>*/ caml_array_make(mbl + 1 | 0, 0); /*<>*/ /*<>*/ caml_call2 (Stdlib_Array[12], function(b){ diff --git a/runtime/array.js b/runtime/array.js index 1fee30b736..c8b66c0e2f 100644 --- a/runtime/array.js +++ b/runtime/array.js @@ -100,9 +100,9 @@ function caml_check_bound (array, index) { return array; } -//Provides: caml_make_vect const (const, mutable) +//Provides: caml_array_make const (const, mutable) //Requires: caml_array_bound_error -function caml_make_vect (len, init) { +function caml_array_make (len, init) { if (len < 0) caml_array_bound_error(); var len = len + 1 | 0; var b = new Array(len); @@ -111,9 +111,16 @@ function caml_make_vect (len, init) { return b; } -//Provides: caml_make_float_vect const (const) +//Provides: caml_make_vect +//Requires: caml_array_make +function caml_make_vect(len, init) { + return caml_array_make(len, init); +} + +//Provides: caml_array_create_float const (const) //Requires: caml_array_bound_error -function caml_make_float_vect(len){ +//Alias: caml_make_float_vect +function caml_array_create_float(len){ if (len < 0) caml_array_bound_error(); var len = len + 1 | 0; var b = new Array(len); diff --git a/runtime/stdlib.js b/runtime/stdlib.js index 01285c96ec..6dc8541273 100644 --- a/runtime/stdlib.js +++ b/runtime/stdlib.js @@ -190,3 +190,8 @@ function caml_is_printable(c) { return +(c > 31 && c < 127); } //Provides: caml_maybe_print_stats function caml_maybe_print_stats(unit) { return 0 } + +//Provides: caml_process_pending_actions_with_root +function caml_process_pending_actions_with_root(extra_root) { + return 0 +}