From ce279ca59f3d38c3e0f4a18e6adf1f49492a5400 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 19 Jan 2016 14:26:24 +0000 Subject: [PATCH] fix some minor issues of {!S.if} in JS flatten pass --- jscomp/js_pass_flatten.ml | 18 +- jscomp/js_pass_flatten.mli | 11 +- jscomp/runtime/caml_string.js | 14 +- jscomp/runtime/curry.js | 35 +- jscomp/stdlib/arg.js | 98 +-- jscomp/stdlib/array.js | 35 +- jscomp/stdlib/buffer.js | 35 +- jscomp/stdlib/bytes.js | 105 +++- jscomp/stdlib/camlinternalFormat.js | 794 ++++++++++++++++-------- jscomp/stdlib/camlinternalLazy.js | 28 +- jscomp/stdlib/camlinternalMod.js | 34 +- jscomp/stdlib/camlinternalOO.js | 234 +++++-- jscomp/stdlib/char.js | 21 +- jscomp/stdlib/complex.js | 9 +- jscomp/stdlib/digest.js | 7 +- jscomp/stdlib/filename.js | 35 +- jscomp/stdlib/format.js | 208 ++++++- jscomp/stdlib/genlex.js | 132 +++- jscomp/stdlib/hashtbl.js | 153 ++++- jscomp/stdlib/int32.js | 7 +- jscomp/stdlib/int64.js | 7 +- jscomp/stdlib/lazy.js | 7 +- jscomp/stdlib/lexing.js | 9 +- jscomp/stdlib/list.js | 861 +++++++++++++++++--------- jscomp/stdlib/map.js | 177 +++++- jscomp/stdlib/marshal.js | 21 +- jscomp/stdlib/nativeint.js | 7 +- jscomp/stdlib/parsing.js | 7 +- jscomp/stdlib/pervasives.js | 72 ++- jscomp/stdlib/printexc.js | 146 +++-- jscomp/stdlib/queue.js | 7 +- jscomp/stdlib/random.js | 21 +- jscomp/stdlib/scanf.js | 307 +++++++-- jscomp/stdlib/set.js | 243 ++++++-- jscomp/stdlib/sort.js | 18 +- jscomp/stdlib/stream.js | 70 ++- jscomp/stdlib/string.js | 42 +- jscomp/stdlib/sys.js | 9 +- jscomp/stdlib/weak.js | 7 +- jscomp/test/a_list_test.js | 9 +- jscomp/test/bdd.js | 105 +++- jscomp/test/complex_while_loop.js | 7 +- jscomp/test/demo_page.js | 16 +- jscomp/test/ext_bytes.js | 21 +- jscomp/test/ext_filename.js | 7 +- jscomp/test/ext_list.js | 51 +- jscomp/test/ext_string.js | 23 +- jscomp/test/fib.js | 7 +- jscomp/test/int_map.js | 177 +++++- jscomp/test/lazy_test.js | 7 +- jscomp/test/map_test.js | 112 +++- jscomp/test/qcc.js | 204 ++++-- jscomp/test/rec_value_test.js | 56 +- jscomp/test/test_array_primitive.js | 15 +- jscomp/test/test_bool_equal.js | 21 +- jscomp/test/test_bug.js | 42 +- jscomp/test/test_char.js | 21 +- jscomp/test/test_demo.js | 16 +- jscomp/test/test_fastdt.js | 87 ++- jscomp/test/test_fib.js | 30 +- jscomp/test/test_for_map.js | 177 +++++- jscomp/test/test_functor_dead_code.js | 7 +- jscomp/test/test_incomplete.js | 7 +- jscomp/test/test_inline_map.js | 49 +- jscomp/test/test_inline_map2.js | 98 ++- jscomp/test/test_int_map_find.js | 49 +- jscomp/test/test_internalOO.js | 618 ++++++++++++++---- jscomp/test/test_list.js | 861 +++++++++++++++++--------- jscomp/test/test_map_find.js | 98 ++- jscomp/test/test_per.js | 72 ++- jscomp/test/test_primitive.js | 22 +- jscomp/test/test_set.js | 243 ++++++-- jscomp/test/test_simple_tailcall.js | 7 +- jscomp/test/test_string_map.js | 49 +- jscomp/test/test_switch.js | 14 +- jscomp/test/test_while_side_effect.js | 7 +- jscomp/test/ticker.js | 249 ++++++-- 77 files changed, 5811 insertions(+), 1901 deletions(-) diff --git a/jscomp/js_pass_flatten.ml b/jscomp/js_pass_flatten.ml index 775e2b8654..508f8768e3 100644 --- a/jscomp/js_pass_flatten.ml +++ b/jscomp/js_pass_flatten.ml @@ -30,9 +30,10 @@ let flatten_map = match x.statement_desc with | Exp ({expression_desc = Seq _; _} as v) -> (S.block ( List.rev_map (self#statement) (Js_analyzer.rev_flatten_seq v ))) - | Exp ({expression_desc = Cond(a,b,c); _} ) -> - (S.if_ a ([ self#statement (S.exp b) ]) - ~else_:([self#statement (S.exp c)])) + | Exp ({expression_desc = Cond(a,b,c); comment} ) -> + (* Note that we need apply [self#statement] recursively *) + { statement_desc = If (a, [ self#statement (S.exp b)], + Some [ self#statement (S.exp c)]); comment} (* CHECK? Trick semantics difference *) (* super#statement (S.if_ a ([ (\* self#statement *\) (S.exp b) ]) *) (* ~else_:([self#statement (S.exp c)]) *) @@ -46,19 +47,24 @@ let flatten_map = -> S.block (Ext_list.rev_map_append (self#statement) rest_rev [self#statement @@ S.exp (E.assign a last_one)]) + (* TODO: here we introduce a block, should avoid it *) (* super#statement *) (* (S.block (List.rev_append rest_rev [S.exp (E.assign a last_one)])) *) | _ -> assert false end - | Return ( {return_value = {expression_desc = Cond (a,b,c); _}; }) + | Return ( {return_value = {expression_desc = Cond (a,b,c); comment}}) -> - S.if_ a [S.return b] ~else_:[S.return c] + { statement_desc = If (a, [self#statement (S.return b)], + Some [ self#statement (S.return c)]); comment} + | Return ({return_value = {expression_desc = Seq _; _} as v}) -> let block = Js_analyzer.rev_flatten_seq v in begin match block with | {statement_desc = Exp last_one ; _} :: rest_rev - -> super#statement (S.block (List.rev_append rest_rev [S.return last_one])) + -> + super#statement + (S.block (Ext_list.rev_map_append (self#statement) rest_rev [S.return last_one])) | _ -> assert false end | Block [x] diff --git a/jscomp/js_pass_flatten.mli b/jscomp/js_pass_flatten.mli index 94febb8929..bb833e269b 100644 --- a/jscomp/js_pass_flatten.mli +++ b/jscomp/js_pass_flatten.mli @@ -20,6 +20,15 @@ -(** A pass converting nested js statement into a flatten visual appearance *) +(** A pass converting nested js statement into a flatten visual appearance + + Note this module is used to convert some nested expressions to flat statements, + in general, it's more human readable, and since it generate flat statements, we can spot + some inline opportunities for the produced statemetns, + (inline) expressions inside a nested expression would generate ugly code. + + Since we are aiming to flatten expressions, we should avoid some smart constructors in {!J_helper}, + it tries to spit out expression istead of statements if it can +*) val program : J.program -> J.program diff --git a/jscomp/runtime/caml_string.js b/jscomp/runtime/caml_string.js index 5a44166bb4..69a4e23cdd 100644 --- a/jscomp/runtime/caml_string.js +++ b/jscomp/runtime/caml_string.js @@ -37,9 +37,17 @@ function caml_create_string(len) { } function caml_string_compare(s1, s2) { - return s1 === s2 ? 0 : ( - s1 < s2 ? -1 : 1 - ); + if (s1 === s2) { + return 0; + } + else { + if (s1 < s2) { + return -1; + } + else { + return 1; + } + } } function caml_fill_string(s, i, l, c) { diff --git a/jscomp/runtime/curry.js b/jscomp/runtime/curry.js index d19d4e471b..cb6e3d9c81 100644 --- a/jscomp/runtime/curry.js +++ b/jscomp/runtime/curry.js @@ -73,45 +73,70 @@ function curry1(o, x, arity) { function app1(o, x) { var len = o.length; - return len === 1 || len === 0 ? o(x) : curry1(o, x, len); + if (len === 1 || len === 0) { + return o(x); + } + else { + return curry1(o, x, len); + } } function app2(o, x, y) { var len = o.length; - return len === 2 ? o(x, y) : curry(o, /* array */[ + if (len === 2) { + return o(x, y); + } + else { + return curry(o, /* array */[ x, y ]); + } } function app3(o, a0, a1, a2) { var len = o.length; - return len === 3 ? o(a0, a1, a2) : curry(o, /* array */[ + if (len === 3) { + return o(a0, a1, a2); + } + else { + return curry(o, /* array */[ a0, a1, a2 ]); + } } function app4(o, a0, a1, a2, a3) { var len = o.length; - return len === 4 ? o(a0, a1, a2)(a3) : curry(o, /* array */[ + if (len === 4) { + return o(a0, a1, a2)(a3); + } + else { + return curry(o, /* array */[ a0, a1, a2, a3 ]); + } } function app5(o, a0, a1, a2, a3, a4) { var len = o.length; - return len === 4 ? o(a0, a1, a2)(a3, a4) : curry(o, /* array */[ + if (len === 4) { + return o(a0, a1, a2)(a3, a4); + } + else { + return curry(o, /* array */[ a0, a1, a2, a3, a4 ]); + } } exports.curry = curry; diff --git a/jscomp/stdlib/arg.js b/jscomp/stdlib/arg.js index 78c90c8fc0..c65fdf5d1d 100644 --- a/jscomp/stdlib/arg.js +++ b/jscomp/stdlib/arg.js @@ -47,70 +47,83 @@ function assoc3(x, _l) { } function make_symlist(prefix, sep, suffix, l) { - return l ? List.fold_left(function (x, y) { + if (l) { + return List.fold_left(function (x, y) { return x + (sep + y); - }, prefix + l[1], l[2]) + suffix : ""; + }, prefix + l[1], l[2]) + suffix; + } + else { + return ""; + } } function print_spec(buf, param) { var doc = param[3]; var spec = param[2]; var key = param[1]; - return doc.length ? ( - spec[0] === 11 ? Printf.bprintf(buf, [ - /* Format */0, + if (doc.length) { + if (spec[0] === 11) { + return Printf.bprintf(buf, [ + /* Format */0, + [ + /* String_literal */11, + " ", [ - /* String_literal */11, - " ", + /* String */2, + /* No_padding */0, [ - /* String */2, - /* No_padding */0, + /* Char_literal */12, + /* " " */32, [ - /* Char_literal */12, - /* " " */32, + /* String */2, + /* No_padding */0, [ /* String */2, /* No_padding */0, [ - /* String */2, - /* No_padding */0, - [ - /* Char_literal */12, - /* "\n" */10, - /* End_of_format */0 - ] + /* Char_literal */12, + /* "\n" */10, + /* End_of_format */0 ] ] ] ] - ], - " %s %s%s\n" - ])(key, make_symlist("{", "|", "}", spec[1]), doc) : Printf.bprintf(buf, [ - /* Format */0, + ] + ], + " %s %s%s\n" + ])(key, make_symlist("{", "|", "}", spec[1]), doc); + } + else { + return Printf.bprintf(buf, [ + /* Format */0, + [ + /* String_literal */11, + " ", [ - /* String_literal */11, - " ", + /* String */2, + /* No_padding */0, [ - /* String */2, - /* No_padding */0, + /* Char_literal */12, + /* " " */32, [ - /* Char_literal */12, - /* " " */32, + /* String */2, + /* No_padding */0, [ - /* String */2, - /* No_padding */0, - [ - /* Char_literal */12, - /* "\n" */10, - /* End_of_format */0 - ] + /* Char_literal */12, + /* "\n" */10, + /* End_of_format */0 ] ] ] - ], - " %s %s\n" - ])(key, doc) - ) : 0; + ] + ], + " %s %s\n" + ])(key, doc); + } + } + else { + return 0; + } } function help_action() { @@ -795,7 +808,12 @@ function second_word(s) { function max_arg_len(cur, param) { var kwd = param[1]; - return param[2][0] === 11 ? Pervasives.max(cur, kwd.length) : Pervasives.max(cur, kwd.length + second_word(param[3])); + if (param[2][0] === 11) { + return Pervasives.max(cur, kwd.length); + } + else { + return Pervasives.max(cur, kwd.length + second_word(param[3])); + } } function add_padding(len, ksd) { diff --git a/jscomp/stdlib/array.js b/jscomp/stdlib/array.js index e4c27b7b52..68fde13ad8 100644 --- a/jscomp/stdlib/array.js +++ b/jscomp/stdlib/array.js @@ -32,18 +32,36 @@ function make_matrix(sx, sy, init) { function copy(a) { var l = a.length; - return l ? Caml_array.caml_array_sub(a, 0, l) : /* array */[]; + if (l) { + return Caml_array.caml_array_sub(a, 0, l); + } + else { + return /* array */[]; + } } function append(a1, a2) { var l1 = a1.length; - return l1 ? ( - a2.length ? a1.concat(a2) : Caml_array.caml_array_sub(a1, 0, l1) - ) : copy(a2); + if (l1) { + if (a2.length) { + return a1.concat(a2); + } + else { + return Caml_array.caml_array_sub(a1, 0, l1); + } + } + else { + return copy(a2); + } } function sub(a, ofs, len) { - return len < 0 || ofs > a.length - len ? Pervasives.invalid_arg("Array.sub") : Caml_array.caml_array_sub(a, ofs, len); + if (len < 0 || ofs > a.length - len) { + return Pervasives.invalid_arg("Array.sub"); + } + else { + return Caml_array.caml_array_sub(a, ofs, len); + } } function fill(a, ofs, len, v) { @@ -59,7 +77,12 @@ function fill(a, ofs, len, v) { } function blit(a1, ofs1, a2, ofs2, len) { - return len < 0 || ofs1 < 0 || ofs1 > a1.length - len || ofs2 < 0 || ofs2 > a2.length - len ? Pervasives.invalid_arg("Array.blit") : Caml_array.caml_array_blit(a1, ofs1, a2, ofs2, len); + if (len < 0 || ofs1 < 0 || ofs1 > a1.length - len || ofs2 < 0 || ofs2 > a2.length - len) { + return Pervasives.invalid_arg("Array.blit"); + } + else { + return Caml_array.caml_array_blit(a1, ofs1, a2, ofs2, len); + } } function iter(f, a) { diff --git a/jscomp/stdlib/buffer.js b/jscomp/stdlib/buffer.js index 3eff91f350..a0638c146f 100644 --- a/jscomp/stdlib/buffer.js +++ b/jscomp/stdlib/buffer.js @@ -29,15 +29,30 @@ function to_bytes(b) { } function sub(b, ofs, len) { - return ofs < 0 || len < 0 || ofs > b[2] - len ? Pervasives.invalid_arg("Buffer.sub") : Bytes.sub_string(b[1], ofs, len); + if (ofs < 0 || len < 0 || ofs > b[2] - len) { + return Pervasives.invalid_arg("Buffer.sub"); + } + else { + return Bytes.sub_string(b[1], ofs, len); + } } function blit(src, srcoff, dst, dstoff, len) { - return len < 0 || srcoff < 0 || srcoff > src[2] - len || dstoff < 0 || dstoff > dst.length - len ? Pervasives.invalid_arg("Buffer.blit") : Bytes.blit(src[1], srcoff, dst, dstoff, len); + if (len < 0 || srcoff < 0 || srcoff > src[2] - len || dstoff < 0 || dstoff > dst.length - len) { + return Pervasives.invalid_arg("Buffer.blit"); + } + else { + return Bytes.blit(src[1], srcoff, dst, dstoff, len); + } } function nth(b, ofs) { - return ofs < 0 || ofs >= b[2] ? Pervasives.invalid_arg("Buffer.nth") : b[1][ofs]; + if (ofs < 0 || ofs >= b[2]) { + return Pervasives.invalid_arg("Buffer.nth"); + } + else { + return b[1][ofs]; + } } function length(b) { @@ -63,7 +78,12 @@ function resize(b, more) { new_len = 2 * new_len; }; if (new_len > Sys.max_string_length) { - b[2] + more <= Sys.max_string_length ? (new_len = Sys.max_string_length) : Pervasives.failwith("Buffer.add: cannot grow buffer"); + if (b[2] + more <= Sys.max_string_length) { + new_len = Sys.max_string_length; + } + else { + Pervasives.failwith("Buffer.add: cannot grow buffer"); + } } var new_buffer = Caml_string.caml_create_string(new_len); Bytes.blit(b[1], 0, new_buffer, 0, b[2]); @@ -325,7 +345,12 @@ function add_substitute(b, f, s) { } } else { - return previous === /* "\\" */92 ? add_char(b, previous) : 0; + if (previous === /* "\\" */92) { + return add_char(b, previous); + } + else { + return 0; + } } }; }; diff --git a/jscomp/stdlib/bytes.js b/jscomp/stdlib/bytes.js index 923f03d8f1..05d3979ce5 100644 --- a/jscomp/stdlib/bytes.js +++ b/jscomp/stdlib/bytes.js @@ -75,15 +75,30 @@ function extend(s, left, right) { } function fill(s, ofs, len, c) { - return ofs < 0 || len < 0 || ofs > s.length - len ? Pervasives.invalid_arg("String.fill / Bytes.fill") : Caml_string.caml_fill_string(s, ofs, len, c); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return Pervasives.invalid_arg("String.fill / Bytes.fill"); + } + else { + return Caml_string.caml_fill_string(s, ofs, len, c); + } } function blit(s1, ofs1, s2, ofs2, len) { - return len < 0 || ofs1 < 0 || ofs1 > s1.length - len || ofs2 < 0 || ofs2 > s2.length - len ? Pervasives.invalid_arg("Bytes.blit") : Caml_string.caml_blit_bytes(s1, ofs1, s2, ofs2, len); + if (len < 0 || ofs1 < 0 || ofs1 > s1.length - len || ofs2 < 0 || ofs2 > s2.length - len) { + return Pervasives.invalid_arg("Bytes.blit"); + } + else { + return Caml_string.caml_blit_bytes(s1, ofs1, s2, ofs2, len); + } } function blit_string(s1, ofs1, s2, ofs2, len) { - return len < 0 || ofs1 < 0 || ofs1 > s1.length - len || ofs2 < 0 || ofs2 > s2.length - len ? Pervasives.invalid_arg("String.blit / Bytes.blit_string") : Caml_string.caml_blit_string(s1, ofs1, s2, ofs2, len); + if (len < 0 || ofs1 < 0 || ofs1 > s1.length - len || ofs2 < 0 || ofs2 > s2.length - len) { + return Pervasives.invalid_arg("String.blit / Bytes.blit_string"); + } + else { + return Caml_string.caml_blit_string(s1, ofs1, s2, ofs2, len); + } } function iter(f, a) { @@ -140,11 +155,22 @@ var cat = Caml_string.bytes_cat; function is_space(param) { var switcher = -9 + param; - return 4 < (switcher >>> 0) ? ( - switcher !== 23 ? /* false */0 : /* true */1 - ) : ( - switcher !== 2 ? /* true */1 : /* false */0 - ); + if (4 < (switcher >>> 0)) { + if (switcher !== 23) { + return /* false */0; + } + else { + return /* true */1; + } + } + else { + if (switcher !== 2) { + return /* true */1; + } + else { + return /* false */0; + } + } } function trim(s) { @@ -157,7 +183,12 @@ function trim(s) { while(j >= i && is_space(s[j])) { -- j; }; - return j >= i ? sub(s, i, j - i + 1) : empty; + if (j >= i) { + return sub(s, i, j - i + 1); + } + else { + return empty; + } } function escaped(s) { @@ -166,17 +197,37 @@ function escaped(s) { var c = s[i]; var $js; var exit = 0; - c >= 14 ? ( - c !== 34 ? ( - c !== 92 ? (exit = 1) : ($js = 2) - ) : ($js = 2) - ) : ( - c >= 11 ? ( - c >= 13 ? ($js = 2) : (exit = 1) - ) : ( - c >= 8 ? ($js = 2) : (exit = 1) - ) - ); + if (c >= 14) { + if (c !== 34) { + if (c !== 92) { + exit = 1; + } + else { + $js = 2; + } + } + else { + $js = 2; + } + } + else { + if (c >= 11) { + if (c >= 13) { + $js = 2; + } + else { + exit = 1; + } + } + else { + if (c >= 8) { + $js = 2; + } + else { + exit = 1; + } + } + } if (exit === 1) { $js = Caml_string.caml_is_printable(c) ? 1 : 4; } @@ -342,7 +393,12 @@ function index(s, c) { function index_from(s, i, c) { var l = s.length; - return i < 0 || i > l ? Pervasives.invalid_arg("String.index_from / Bytes.index_from") : index_rec(s, l, i, c); + if (i < 0 || i > l) { + return Pervasives.invalid_arg("String.index_from / Bytes.index_from"); + } + else { + return index_rec(s, l, i, c); + } } function rindex_rec(s, _i, c) { @@ -367,7 +423,12 @@ function rindex(s, c) { } function rindex_from(s, i, c) { - return i < -1 || i >= s.length ? Pervasives.invalid_arg("String.rindex_from / Bytes.rindex_from") : rindex_rec(s, i, c); + if (i < -1 || i >= s.length) { + return Pervasives.invalid_arg("String.rindex_from / Bytes.rindex_from"); + } + else { + return rindex_rec(s, i, c); + } } function contains_from(s, i, c) { diff --git a/jscomp/stdlib/camlinternalFormat.js b/jscomp/stdlib/camlinternalFormat.js index 4d1b194370..1241b71001 100644 --- a/jscomp/stdlib/camlinternalFormat.js +++ b/jscomp/stdlib/camlinternalFormat.js @@ -43,18 +43,28 @@ function is_in_char_set(char_set, c) { } function pad_of_pad_opt(pad_opt) { - return pad_opt ? [ + if (pad_opt) { + return [ /* Lit_padding */0, /* Right */1, pad_opt[1] - ] : /* No_padding */0; + ]; + } + else { + return /* No_padding */0; + } } function prec_of_prec_opt(prec_opt) { - return prec_opt ? [ + if (prec_opt) { + return [ /* Lit_precision */0, prec_opt[1] - ] : /* No_precision */0; + ]; + } + else { + return /* No_precision */0; + } } function param_format_of_ignored_format(ign, fmt) { @@ -342,7 +352,12 @@ function bprint_char_set(buf, char_set) { buffer_add_char(buf, /* "]" */93); } print_out(set, 1); - return is_alone(/* "-" */45) ? buffer_add_char(buf, /* "-" */45) : 0; + if (is_alone(/* "-" */45)) { + return buffer_add_char(buf, /* "-" */45); + } + else { + return 0; + } }; var print_out = function (set, _i) { while(/* true */1) { @@ -414,7 +429,14 @@ function bprint_char_set(buf, char_set) { } } if (exit === 1) { - return !is_in_char_set(set, Pervasives.char_of_int(i + 1)) ? (print_char(buf, i - 1), print_char(buf, i), print_out(set, i + 2)) : print_in(set, i - 1, i + 2); + if (!is_in_char_set(set, Pervasives.char_of_int(i + 1))) { + print_char(buf, i - 1); + print_char(buf, i); + return print_out(set, i + 2); + } + else { + return print_in(set, i - 1, i + 2); + } } } @@ -430,7 +452,12 @@ function bprint_char_set(buf, char_set) { print_char(buf, i); print_char(buf, /* "-" */45); print_char(buf, j - 1); - return j < 256 ? print_out(set, j + 1) : 0; + if (j < 256) { + return print_out(set, j + 1); + } + else { + return 0; + } } else { _j = j + 1; @@ -439,9 +466,19 @@ function bprint_char_set(buf, char_set) { }; var print_char = function (buf, i) { var c = Pervasives.char_of_int(i); - return c !== 37 ? ( - c !== 64 ? buffer_add_char(buf, c) : (buffer_add_char(buf, /* "%" */37), buffer_add_char(buf, /* "@" */64)) - ) : (buffer_add_char(buf, /* "%" */37), buffer_add_char(buf, /* "%" */37)); + if (c !== 37) { + if (c !== 64) { + return buffer_add_char(buf, c); + } + else { + buffer_add_char(buf, /* "%" */37); + return buffer_add_char(buf, /* "@" */64); + } + } + else { + buffer_add_char(buf, /* "%" */37); + return buffer_add_char(buf, /* "%" */37); + } }; buffer_add_char(buf, /* "[" */91); print_start(is_in_char_set(char_set, /* "\000" */0) ? (buffer_add_char(buf, /* "^" */94), rev_char_set(char_set)) : char_set); @@ -461,11 +498,21 @@ function bprint_padty(buf, padty) { } function bprint_ignored_flag(buf, ign_flag) { - return ign_flag ? buffer_add_char(buf, /* "_" */95) : 0; + if (ign_flag) { + return buffer_add_char(buf, /* "_" */95); + } + else { + return 0; + } } function bprint_pad_opt(buf, pad_opt) { - return pad_opt ? buffer_add_string(buf, Pervasives.string_of_int(pad_opt[1])) : /* () */0; + if (pad_opt) { + return buffer_add_string(buf, Pervasives.string_of_int(pad_opt[1])); + } + else { + return /* () */0; + } } function bprint_padding(buf, pad) { @@ -474,14 +521,28 @@ function bprint_padding(buf, pad) { } else { bprint_padty(buf, pad[1]); - return pad[0] ? buffer_add_char(buf, /* "*" */42) : buffer_add_string(buf, Pervasives.string_of_int(pad[2])); + if (pad[0]) { + return buffer_add_char(buf, /* "*" */42); + } + else { + return buffer_add_string(buf, Pervasives.string_of_int(pad[2])); + } } } function bprint_precision(buf, prec) { - return typeof prec === "number" ? ( - prec !== 0 ? buffer_add_string(buf, ".*") : /* () */0 - ) : (buffer_add_char(buf, /* "." */46), buffer_add_string(buf, Pervasives.string_of_int(prec[1]))); + if (typeof prec === "number") { + if (prec !== 0) { + return buffer_add_string(buf, ".*"); + } + else { + return /* () */0; + } + } + else { + buffer_add_char(buf, /* "." */46); + return buffer_add_string(buf, Pervasives.string_of_int(prec[1])); + } } function bprint_iconv_flag(buf, iconv) { @@ -613,7 +674,12 @@ function string_of_formatting_gen(formatting_gen) { } function bprint_char_literal(buf, chr) { - return chr !== 37 ? buffer_add_char(buf, chr) : buffer_add_string(buf, "%%"); + if (chr !== 37) { + return buffer_add_char(buf, chr); + } + else { + return buffer_add_string(buf, "%%"); + } } function bprint_string_literal(buf, str) { @@ -702,7 +768,12 @@ function bprint_fmtty(buf, _fmtty) { } function int_of_custom_arity(param) { - return param ? 1 + int_of_custom_arity(param[1]) : 0; + if (param) { + return 1 + int_of_custom_arity(param[1]); + } + else { + return 0; + } } function bprint_fmt(buf, fmt) { @@ -2170,10 +2241,15 @@ function fmtty_of_fmt(_fmtty) { } function fmtty_of_custom(arity, fmtty) { - return arity ? [ + if (arity) { + return [ /* Any_ty */12, fmtty_of_custom(arity[1], fmtty) - ] : fmtty; + ]; + } + else { + return fmtty; + } } function fmtty_of_ignored_format(ign, fmt) { @@ -2213,21 +2289,37 @@ function fmtty_of_ignored_format(ign, fmt) { } function fmtty_of_padding_fmtty(pad, fmtty) { - return typeof pad === "number" ? fmtty : ( - pad[0] ? [ - /* Int_ty */2, - fmtty - ] : fmtty - ); + if (typeof pad === "number") { + return fmtty; + } + else { + if (pad[0]) { + return [ + /* Int_ty */2, + fmtty + ]; + } + else { + return fmtty; + } + } } function fmtty_of_precision_fmtty(prec, fmtty) { - return typeof prec === "number" ? ( - prec !== 0 ? [ - /* Int_ty */2, - fmtty - ] : fmtty - ) : fmtty; + if (typeof prec === "number") { + if (prec !== 0) { + return [ + /* Int_ty */2, + fmtty + ]; + } + else { + return fmtty; + } + } + else { + return fmtty; + } } var Type_mismatch = [ @@ -3705,13 +3797,27 @@ function convert_float(fconv, prec, x) { }; }; var match = Caml_float.caml_classify_float(x); - return match !== 3 ? ( - match >= 4 ? "nan" : ( - is_valid(0) ? str : str + "." - ) - ) : ( - x < 0.0 ? "neg_infinity" : "infinity" - ); + if (match !== 3) { + if (match >= 4) { + return "nan"; + } + else { + if (is_valid(0)) { + return str; + } + else { + return str + "."; + } + } + } + else { + if (x < 0.0) { + return "neg_infinity"; + } + else { + return "infinity"; + } + } } } @@ -4160,21 +4266,26 @@ function make_string_padding(k, o, acc, fmt, pad, trans) { function make_int_padding_precision(k, o, acc, fmt, pad, prec, trans, iconv) { if (typeof pad === "number") { if (typeof prec === "number") { - return prec !== 0 ? function (p, x) { - var str = fix_int_precision(p, trans(iconv, x)); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (x) { - var str = trans(iconv, x); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - }; + if (prec !== 0) { + return function (p, x) { + var str = fix_int_precision(p, trans(iconv, x)); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (x) { + var str = trans(iconv, x); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } } else { var p = prec[1]; @@ -4192,21 +4303,26 @@ function make_int_padding_precision(k, o, acc, fmt, pad, prec, trans, iconv) { if (pad[0]) { var padty = pad[1]; if (typeof prec === "number") { - return prec !== 0 ? function (w, p, x) { - var str = fix_padding(padty, w, fix_int_precision(p, trans(iconv, x))); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (w, x) { - var str = fix_padding(padty, w, trans(iconv, x)); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - }; + if (prec !== 0) { + return function (w, p, x) { + var str = fix_padding(padty, w, fix_int_precision(p, trans(iconv, x))); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (w, x) { + var str = fix_padding(padty, w, trans(iconv, x)); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } } else { var p$1 = prec[1]; @@ -4224,21 +4340,26 @@ function make_int_padding_precision(k, o, acc, fmt, pad, prec, trans, iconv) { var w = pad[2]; var padty$1 = pad[1]; if (typeof prec === "number") { - return prec !== 0 ? function (p, x) { - var str = fix_padding(padty$1, w, fix_int_precision(p, trans(iconv, x))); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (x) { - var str = fix_padding(padty$1, w, trans(iconv, x)); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - }; + if (prec !== 0) { + return function (p, x) { + var str = fix_padding(padty$1, w, fix_int_precision(p, trans(iconv, x))); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (x) { + var str = fix_padding(padty$1, w, trans(iconv, x)); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } } else { var p$2 = prec[1]; @@ -4258,21 +4379,26 @@ function make_int_padding_precision(k, o, acc, fmt, pad, prec, trans, iconv) { function make_float_padding_precision(k, o, acc, fmt, pad, prec, fconv) { if (typeof pad === "number") { if (typeof prec === "number") { - return prec !== 0 ? function (p, x) { - var str = convert_float(fconv, p, x); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (x) { - var str = convert_float(fconv, default_float_precision, x); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - }; + if (prec !== 0) { + return function (p, x) { + var str = convert_float(fconv, p, x); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (x) { + var str = convert_float(fconv, default_float_precision, x); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } } else { var p = prec[1]; @@ -4290,22 +4416,27 @@ function make_float_padding_precision(k, o, acc, fmt, pad, prec, fconv) { if (pad[0]) { var padty = pad[1]; if (typeof prec === "number") { - return prec !== 0 ? function (w, p, x) { - var str = fix_padding(padty, w, convert_float(fconv, p, x)); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (w, x) { - var str = convert_float(fconv, default_float_precision, x); - var str$prime = fix_padding(padty, w, str); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str$prime - ], fmt); - }; + if (prec !== 0) { + return function (w, p, x) { + var str = fix_padding(padty, w, convert_float(fconv, p, x)); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (w, x) { + var str = convert_float(fconv, default_float_precision, x); + var str$prime = fix_padding(padty, w, str); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str$prime + ], fmt); + }; + } } else { var p$1 = prec[1]; @@ -4323,22 +4454,27 @@ function make_float_padding_precision(k, o, acc, fmt, pad, prec, fconv) { var w = pad[2]; var padty$1 = pad[1]; if (typeof prec === "number") { - return prec !== 0 ? function (p, x) { - var str = fix_padding(padty$1, w, convert_float(fconv, p, x)); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str - ], fmt); - } : function (x) { - var str = convert_float(fconv, default_float_precision, x); - var str$prime = fix_padding(padty$1, w, str); - return make_printf(k, o, [ - /* Acc_data_string */4, - acc, - str$prime - ], fmt); - }; + if (prec !== 0) { + return function (p, x) { + var str = fix_padding(padty$1, w, convert_float(fconv, p, x)); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str + ], fmt); + }; + } + else { + return function (x) { + var str = convert_float(fconv, default_float_precision, x); + var str$prime = fix_padding(padty$1, w, str); + return make_printf(k, o, [ + /* Acc_data_string */4, + acc, + str$prime + ], fmt); + }; + } } else { var p$2 = prec[1]; @@ -4706,42 +4842,57 @@ function open_box_of_string(str) { } function make_padding_fmt_ebb(pad, fmt) { - return typeof pad === "number" ? [ + if (typeof pad === "number") { + return [ /* Padding_fmt_EBB */0, /* No_padding */0, fmt - ] : ( - pad[0] ? [ - /* Padding_fmt_EBB */0, - [ - /* Arg_padding */1, - pad[1] - ], - fmt - ] : [ - /* Padding_fmt_EBB */0, - [ - /* Lit_padding */0, - pad[1], - pad[2] - ], - fmt - ] - ); + ]; + } + else { + if (pad[0]) { + return [ + /* Padding_fmt_EBB */0, + [ + /* Arg_padding */1, + pad[1] + ], + fmt + ]; + } + else { + return [ + /* Padding_fmt_EBB */0, + [ + /* Lit_padding */0, + pad[1], + pad[2] + ], + fmt + ]; + } + } } function make_precision_fmt_ebb(prec, fmt) { - return typeof prec === "number" ? ( - prec !== 0 ? [ - /* Precision_fmt_EBB */0, - /* Arg_precision */1, - fmt - ] : [ - /* Precision_fmt_EBB */0, - /* No_precision */0, - fmt - ] - ) : [ + if (typeof prec === "number") { + if (prec !== 0) { + return [ + /* Precision_fmt_EBB */0, + /* Arg_precision */1, + fmt + ]; + } + else { + return [ + /* Precision_fmt_EBB */0, + /* No_precision */0, + fmt + ]; + } + } + else { + return [ /* Precision_fmt_EBB */0, [ /* Lit_precision */0, @@ -4749,37 +4900,46 @@ function make_precision_fmt_ebb(prec, fmt) { ], fmt ]; + } } function make_padprec_fmt_ebb(pad, prec, fmt) { var match = make_precision_fmt_ebb(prec, fmt); var fmt$prime = match[2]; var prec$1 = match[1]; - return typeof pad === "number" ? [ + if (typeof pad === "number") { + return [ /* Padprec_fmt_EBB */0, /* No_padding */0, prec$1, fmt$prime - ] : ( - pad[0] ? [ - /* Padprec_fmt_EBB */0, - [ - /* Arg_padding */1, - pad[1] - ], - prec$1, - fmt$prime - ] : [ - /* Padprec_fmt_EBB */0, - [ - /* Lit_padding */0, - pad[1], - pad[2] - ], - prec$1, - fmt$prime - ] - ); + ]; + } + else { + if (pad[0]) { + return [ + /* Padprec_fmt_EBB */0, + [ + /* Arg_padding */1, + pad[1] + ], + prec$1, + fmt$prime + ]; + } + else { + return [ + /* Padprec_fmt_EBB */0, + [ + /* Lit_padding */0, + pad[1], + pad[2] + ], + prec$1, + fmt$prime + ]; + } + } } function fmt_ebb_of_string(legacy_behavior, str) { @@ -4938,7 +5098,12 @@ function fmt_ebb_of_string(legacy_behavior, str) { unexpected_end_of_format(end_ind); } var match = str.charCodeAt(str_ind); - return match !== 95 ? parse_flags(pct_ind, str_ind, end_ind, /* false */0) : parse_flags(pct_ind, str_ind + 1, end_ind, /* true */1); + if (match !== 95) { + return parse_flags(pct_ind, str_ind, end_ind, /* false */0); + } + else { + return parse_flags(pct_ind, str_ind + 1, end_ind, /* true */1); + } }; var parse_flags = function (pct_ind, str_ind, end_ind, ign) { var zero = [ @@ -5118,7 +5283,12 @@ function fmt_ebb_of_string(legacy_behavior, str) { unexpected_end_of_format(end_ind); } var symb = str.charCodeAt(str_ind); - return symb !== 46 ? parse_conversion(pct_ind, str_ind + 1, end_ind, plus, sharp, space, ign, pad, /* No_precision */0, pad, symb) : parse_precision(pct_ind, str_ind + 1, end_ind, minus, plus, sharp, space, ign, pad); + if (symb !== 46) { + return parse_conversion(pct_ind, str_ind + 1, end_ind, plus, sharp, space, ign, pad, /* No_precision */0, pad, symb); + } + else { + return parse_precision(pct_ind, str_ind + 1, end_ind, minus, plus, sharp, space, ign, pad); + } }; var parse_precision = function (pct_ind, str_ind, end_ind, minus, plus, sharp, space, ign, pad) { if (str_ind === end_ind) { @@ -5172,10 +5342,15 @@ function fmt_ebb_of_string(legacy_behavior, str) { } break; case 2 : - return legacy_behavior$1 ? parse_after_precision(pct_ind, str_ind, end_ind, minus, plus, sharp, space, ign, pad, [ + if (legacy_behavior$1) { + return parse_after_precision(pct_ind, str_ind, end_ind, minus, plus, sharp, space, ign, pad, [ /* Lit_precision */0, 0 - ]) : invalid_format_without(str_ind - 1, /* "." */46, "precision"); + ]); + } + else { + return invalid_format_without(str_ind - 1, /* "." */46, "precision"); + } } }; @@ -5200,25 +5375,36 @@ function fmt_ebb_of_string(legacy_behavior, str) { exit = 1; } if (exit === 1) { - return minus !== 0 ? ( - typeof prec === "number" ? parse_conv([ - /* Arg_padding */1, - /* Left */0 - ]) : parse_conv([ - /* Lit_padding */0, - /* Left */0, - prec[1] - ]) - ) : ( - typeof prec === "number" ? parse_conv([ - /* Arg_padding */1, - /* Right */1 - ]) : parse_conv([ - /* Lit_padding */0, - /* Right */1, - prec[1] - ]) - ); + if (minus !== 0) { + if (typeof prec === "number") { + return parse_conv([ + /* Arg_padding */1, + /* Left */0 + ]); + } + else { + return parse_conv([ + /* Lit_padding */0, + /* Left */0, + prec[1] + ]); + } + } + else { + if (typeof prec === "number") { + return parse_conv([ + /* Arg_padding */1, + /* Right */1 + ]); + } + else { + return parse_conv([ + /* Lit_padding */0, + /* Right */1, + prec[1] + ]); + } + } } } @@ -5280,24 +5466,44 @@ function fmt_ebb_of_string(legacy_behavior, str) { return padprec; }; var check_no_0 = function (symb, pad) { - return typeof pad === "number" ? pad : ( - pad[0] ? ( - pad[1] >= 2 ? ( - legacy_behavior$1 ? [ - /* Arg_padding */1, - /* Right */1 - ] : incompatible_flag(pct_ind, str_ind, symb, "0") - ) : pad - ) : ( - pad[1] >= 2 ? ( - legacy_behavior$1 ? [ - /* Lit_padding */0, - /* Right */1, - pad[2] - ] : incompatible_flag(pct_ind, str_ind, symb, "0") - ) : pad - ) - ); + if (typeof pad === "number") { + return pad; + } + else { + if (pad[0]) { + if (pad[1] >= 2) { + if (legacy_behavior$1) { + return [ + /* Arg_padding */1, + /* Right */1 + ]; + } + else { + return incompatible_flag(pct_ind, str_ind, symb, "0"); + } + } + else { + return pad; + } + } + else { + if (pad[1] >= 2) { + if (legacy_behavior$1) { + return [ + /* Lit_padding */0, + /* Right */1, + pad[2] + ]; + } + else { + return incompatible_flag(pct_ind, str_ind, symb, "0"); + } + } + else { + return pad; + } + } + } }; var opt_of_pad = function (c, pad) { if (typeof pad === "number") { @@ -5310,20 +5516,30 @@ function fmt_ebb_of_string(legacy_behavior, str) { else { switch (pad[1]) { case 0 : - return legacy_behavior$1 ? [ + if (legacy_behavior$1) { + return [ /* Some */0, pad[2] - ] : incompatible_flag(pct_ind, str_ind, c, "'-'"); + ]; + } + else { + return incompatible_flag(pct_ind, str_ind, c, "'-'"); + } case 1 : return [ /* Some */0, pad[2] ]; case 2 : - return legacy_behavior$1 ? [ + if (legacy_behavior$1) { + return [ /* Some */0, pad[2] - ] : incompatible_flag(pct_ind, str_ind, c, "'0'"); + ]; + } + else { + return incompatible_flag(pct_ind, str_ind, c, "'0'"); + } } } @@ -5337,12 +5553,20 @@ function fmt_ebb_of_string(legacy_behavior, str) { }; var get_prec_opt = function () { var match = get_prec(/* () */0); - return typeof match === "number" ? ( - match !== 0 ? incompatible_flag(pct_ind, str_ind, /* "_" */95, "'*'") : /* None */0 - ) : [ + if (typeof match === "number") { + if (match !== 0) { + return incompatible_flag(pct_ind, str_ind, /* "_" */95, "'*'"); + } + else { + return /* None */0; + } + } + else { + return [ /* Some */0, match[1] ]; + } }; var fmt_result; var exit = 0; @@ -5536,36 +5760,46 @@ function fmt_ebb_of_string(legacy_behavior, str) { break; case 99 : var char_format = function (fmt_rest) { - return get_ign(/* () */0) ? [ + if (get_ign(/* () */0)) { + return [ /* Fmt_EBB */0, [ /* Ignored_param */23, /* Ignored_char */0, fmt_rest ] - ] : [ + ]; + } + else { + return [ /* Fmt_EBB */0, [ /* Char */0, fmt_rest ] ]; + } }; var scan_format = function (fmt_rest) { - return get_ign(/* () */0) ? [ + if (get_ign(/* () */0)) { + return [ /* Fmt_EBB */0, [ /* Ignored_param */23, /* Ignored_scan_next_char */4, fmt_rest ] - ] : [ + ]; + } + else { + return [ /* Fmt_EBB */0, [ /* Scan_next_char */22, fmt_rest ] ]; + } }; var match$10 = parse(str_ind, end_ind); var fmt_rest$5 = match$10[1]; @@ -5808,9 +6042,17 @@ function fmt_ebb_of_string(legacy_behavior, str) { var match$20 = get_prec(/* () */0); var pad$3; var exit$1 = 0; - typeof match$20 === "number" ? ( - match$20 !== 0 ? (exit$1 = 9) : (pad$3 = match$19) - ) : (exit$1 = 9); + if (typeof match$20 === "number") { + if (match$20 !== 0) { + exit$1 = 9; + } + else { + pad$3 = match$19; + } + } + else { + exit$1 = 9; + } if (exit$1 === 9) { pad$3 = typeof match$19 === "number" ? /* No_padding */0 : ( match$19[0] ? ( @@ -6649,11 +6891,22 @@ function fmt_ebb_of_string(legacy_behavior, str) { var str_ind_1 = parse_spaces(str_ind, end_ind); var match$1 = str.charCodeAt(str_ind_1); var exit = 0; - match$1 >= 48 ? ( - match$1 >= 58 ? (match = /* None */0) : (exit = 1) - ) : ( - match$1 !== 45 ? (match = /* None */0) : (exit = 1) - ); + if (match$1 >= 48) { + if (match$1 >= 58) { + match = /* None */0; + } + else { + exit = 1; + } + } + else { + if (match$1 !== 45) { + match = /* None */0; + } + else { + exit = 1; + } + } if (exit === 1) { var match$2 = parse_integer(str_ind_1, end_ind); var str_ind_3 = parse_spaces(match$2[1], end_ind); @@ -6794,7 +7047,12 @@ function fmt_ebb_of_string(legacy_behavior, str) { } var c = str.charCodeAt(str_ind); if (c !== 45) { - return c !== 93 ? parse_char_set_after_char(str_ind + 1, end_ind, c) : str_ind + 1; + if (c !== 93) { + return parse_char_set_after_char(str_ind + 1, end_ind, c); + } + else { + return str_ind + 1; + } } else { add_char(/* "-" */45); @@ -6866,7 +7124,15 @@ function fmt_ebb_of_string(legacy_behavior, str) { } var c$prime = str.charCodeAt(str_ind); if (c$prime !== 37) { - return c$prime !== 93 ? (add_range(c, c$prime), parse_char_set_content(str_ind + 1, end_ind)) : (add_char(c), add_char(/* "-" */45), str_ind + 1); + if (c$prime !== 93) { + add_range(c, c$prime); + return parse_char_set_content(str_ind + 1, end_ind); + } + else { + add_char(c); + add_char(/* "-" */45); + return str_ind + 1; + } } else { if (str_ind + 1 === end_ind) { @@ -7042,26 +7308,34 @@ function fmt_ebb_of_string(legacy_behavior, str) { }; var add_literal = function (lit_start, str_ind, fmt) { var size = str_ind - lit_start; - return size !== 0 ? ( - size !== 1 ? [ - /* Fmt_EBB */0, - [ - /* String_literal */11, - $$String.sub(str, lit_start, size), - fmt - ] - ] : [ - /* Fmt_EBB */0, - [ - /* Char_literal */12, - str.charCodeAt(lit_start), - fmt - ] + if (size !== 0) { + if (size !== 1) { + return [ + /* Fmt_EBB */0, + [ + /* String_literal */11, + $$String.sub(str, lit_start, size), + fmt ] - ) : [ + ]; + } + else { + return [ + /* Fmt_EBB */0, + [ + /* Char_literal */12, + str.charCodeAt(lit_start), + fmt + ] + ]; + } + } + else { + return [ /* Fmt_EBB */0, fmt ]; + } }; var search_subformat_end = function (_str_ind, end_ind, c) { while(/* true */1) { diff --git a/jscomp/stdlib/camlinternalLazy.js b/jscomp/stdlib/camlinternalLazy.js index b3a6487448..4523eda13e 100644 --- a/jscomp/stdlib/camlinternalLazy.js +++ b/jscomp/stdlib/camlinternalLazy.js @@ -42,16 +42,32 @@ function force_val_lazy_block(blk) { function force(lzv) { var t = Caml_obj_runtime.caml_obj_tag(lzv); - return t === Obj.forward_tag ? lzv[0] : ( - t !== Obj.lazy_tag ? lzv : force_lazy_block(lzv) - ); + if (t === Obj.forward_tag) { + return lzv[0]; + } + else { + if (t !== Obj.lazy_tag) { + return lzv; + } + else { + return force_lazy_block(lzv); + } + } } function force_val(lzv) { var t = Caml_obj_runtime.caml_obj_tag(lzv); - return t === Obj.forward_tag ? lzv[0] : ( - t !== Obj.lazy_tag ? lzv : force_val_lazy_block(lzv) - ); + if (t === Obj.forward_tag) { + return lzv[0]; + } + else { + if (t !== Obj.lazy_tag) { + return lzv; + } + else { + return force_val_lazy_block(lzv); + } + } } exports.Undefined = Undefined; diff --git a/jscomp/stdlib/camlinternalMod.js b/jscomp/stdlib/camlinternalMod.js index f323cc8877..35a733d0cf 100644 --- a/jscomp/stdlib/camlinternalMod.js +++ b/jscomp/stdlib/camlinternalMod.js @@ -34,9 +34,14 @@ function init_mod(loc, shape) { } } else { - return shape[0] ? shape[1] : $$Array.map(function (param) { + if (shape[0]) { + return shape[1]; + } + else { + return $$Array.map(function (param) { return init_mod(loc, param); }, shape[1]); + } } } @@ -63,13 +68,32 @@ function update_mod(shape, o, n) { if (typeof shape === "number") { switch (shape) { case 0 : - return Caml_obj_runtime.caml_obj_tag(n) === Obj.closure_tag && n.length <= o.length ? (overwrite(o, n), Caml_obj_runtime.caml_obj_truncate(o, n.length)) : overwrite(o, function (x) { + if (Caml_obj_runtime.caml_obj_tag(n) === Obj.closure_tag && n.length <= o.length) { + overwrite(o, n); + return Caml_obj_runtime.caml_obj_truncate(o, n.length); + } + else { + return overwrite(o, function (x) { return n(x); }); + } case 1 : - return Caml_obj_runtime.caml_obj_tag(n) === Obj.lazy_tag ? (o[0] = n[0], /* () */0) : ( - Caml_obj_runtime.caml_obj_tag(n) === Obj.forward_tag ? (Caml_obj_runtime.caml_obj_set_tag(o, Obj.forward_tag), o[0] = n[0], /* () */0) : (Caml_obj_runtime.caml_obj_set_tag(o, Obj.forward_tag), o[0] = n, /* () */0) - ); + if (Caml_obj_runtime.caml_obj_tag(n) === Obj.lazy_tag) { + o[0] = n[0]; + return /* () */0; + } + else { + if (Caml_obj_runtime.caml_obj_tag(n) === Obj.forward_tag) { + Caml_obj_runtime.caml_obj_set_tag(o, Obj.forward_tag); + o[0] = n[0]; + return /* () */0; + } + else { + Caml_obj_runtime.caml_obj_set_tag(o, Obj.forward_tag); + o[0] = n; + return /* () */0; + } + } case 2 : if (!(Caml_obj_runtime.caml_obj_tag(n) === 0 && n.length === 4)) { throw [ diff --git a/jscomp/stdlib/camlinternalOO.js b/jscomp/stdlib/camlinternalOO.js index eb5ebac87f..8980a193ab 100644 --- a/jscomp/stdlib/camlinternalOO.js +++ b/jscomp/stdlib/camlinternalOO.js @@ -31,7 +31,12 @@ function public_method_label(s) { accu = 223 * accu + s.charCodeAt(i); } accu = accu & (1 << 31) - 1; - return accu > 1073741823 ? accu - (1 << 31) : accu; + if (accu > 1073741823) { + return accu - (1 << 31); + } + else { + return accu; + } } function compare(x, y) { @@ -39,7 +44,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -64,9 +74,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -79,9 +97,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -107,9 +133,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -117,6 +150,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -167,7 +201,12 @@ function compare$1(x, y) { } function height$1(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$1(l, x, d, r) { @@ -192,9 +231,17 @@ function bal$1(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$1(ll) >= height$1(lr) ? create$1(ll, lv, ld, create$1(lr, x, d, r)) : ( - lr ? create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(ll) >= height$1(lr)) { + return create$1(ll, lv, ld, create$1(lr, x, d, r)); + } + else { + if (lr) { + return create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -207,9 +254,17 @@ function bal$1(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$1(rr) >= height$1(rl) ? create$1(create$1(l, x, d, rl), rv, rd, rr) : ( - rl ? create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(rr) >= height$1(rl)) { + return create$1(create$1(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -235,9 +290,16 @@ function add$1(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$1(x, v); - return c ? ( - c < 0 ? bal$1(add$1(x, data, l), v, d, r) : bal$1(l, v, d, add$1(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$1(add$1(x, data, l), v, d, r); + } + else { + return bal$1(l, v, d, add$1(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -245,6 +307,7 @@ function add$1(x, data, param) { r, param[5] ]; + } } else { return [ @@ -281,7 +344,12 @@ function compare$2(x, y) { } function height$2(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$2(l, x, d, r) { @@ -306,9 +374,17 @@ function bal$2(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$2(ll) >= height$2(lr) ? create$2(ll, lv, ld, create$2(lr, x, d, r)) : ( - lr ? create$2(create$2(ll, lv, ld, lr[1]), lr[2], lr[3], create$2(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$2(ll) >= height$2(lr)) { + return create$2(ll, lv, ld, create$2(lr, x, d, r)); + } + else { + if (lr) { + return create$2(create$2(ll, lv, ld, lr[1]), lr[2], lr[3], create$2(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -321,9 +397,17 @@ function bal$2(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$2(rr) >= height$2(rl) ? create$2(create$2(l, x, d, rl), rv, rd, rr) : ( - rl ? create$2(create$2(l, x, d, rl[1]), rl[2], rl[3], create$2(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$2(rr) >= height$2(rl)) { + return create$2(create$2(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$2(create$2(l, x, d, rl[1]), rl[2], rl[3], create$2(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -349,9 +433,16 @@ function add$2(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$2(x, v); - return c ? ( - c < 0 ? bal$2(add$2(x, data, l), v, d, r) : bal$2(l, v, d, add$2(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$2(add$2(x, data, l), v, d, r); + } + else { + return bal$2(l, v, d, add$2(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -359,6 +450,7 @@ function add$2(x, data, param) { r, param[5] ]; + } } else { return [ @@ -410,7 +502,12 @@ var table_count = [ var dummy_met = [0]; function fit_size(n) { - return n <= 2 ? n : fit_size((n + 1) / 2 | 0) * 2; + if (n <= 2) { + return n; + } + else { + return fit_size((n + 1) / 2 | 0) * 2; + } } function new_table(pub_labels) { @@ -495,15 +592,21 @@ function get_method_labels(table, names) { function set_method(table, label, element) { ++ method_count[1]; - return find$2(label, table[4]) ? put(table, label, element) : (table[6] = [ - /* :: */0, - [ - /* tuple */0, - label, - element - ], - table[6] - ], /* () */0); + if (find$2(label, table[4])) { + return put(table, label, element); + } + else { + table[6] = [ + /* :: */0, + [ + /* tuple */0, + label, + element + ], + table[6] + ]; + return /* () */0; + } } function get_method(table, label) { @@ -521,7 +624,12 @@ function get_method(table, label) { } function to_list(arr) { - return arr ? $$Array.to_list(arr) : /* [] */0; + if (arr) { + return $$Array.to_list(arr); + } + else { + return /* [] */0; + } } function narrow(table, vars, virt_meths, concr_meths) { @@ -548,7 +656,12 @@ function narrow(table, vars, virt_meths, concr_meths) { table[5] ]; table[7] = fold(function (lab, info, tvars) { - return List.mem(lab, vars$1) ? add(lab, info, tvars) : tvars; + if (List.mem(lab, vars$1)) { + return add(lab, info, tvars); + } + else { + return tvars; + } }, table[7], /* Empty */0); var by_name = [ 0, @@ -583,11 +696,16 @@ function narrow(table, vars, virt_meths, concr_meths) { table[3] = by_name[1]; table[4] = by_label[1]; table[6] = List.fold_right(function (met, hm) { - return List.mem(met[1], virt_meth_labs) ? hm : [ + if (List.mem(met[1], virt_meth_labs)) { + return hm; + } + else { + return [ /* :: */0, met, hm ]; + } }, table[6], /* [] */0); return /* () */0; } @@ -602,11 +720,16 @@ function widen(table) { table[3] = match[1]; table[4] = match[2]; table[6] = List.fold_right(function (met, hm) { - return List.mem(met[1], virt_meths) ? hm : [ + if (List.mem(met[1], virt_meths)) { + return hm; + } + else { + return [ /* :: */0, met, hm ]; + } }, table[6], match[3]); return /* () */0; } @@ -636,7 +759,12 @@ function new_variable(table, name) { } function to_array(arr) { - return Caml_primitive.caml_equal(arr, 0) ? /* array */[] : arr; + if (Caml_primitive.caml_equal(arr, 0)) { + return /* array */[]; + } + else { + return arr; + } } function new_methods_variables(table, meths, vals) { @@ -809,7 +937,12 @@ function iter_f(obj, _param) { function run_initializers(obj, table) { var inits = table[8]; - return inits !== /* [] */0 ? iter_f(obj, inits) : 0; + if (inits !== /* [] */0) { + return iter_f(obj, inits); + } + else { + return 0; + } } function run_initializers_opt(obj_0, obj, table) { @@ -890,7 +1023,12 @@ function lookup_keys(i, keys, tables) { } function lookup_tables(root, keys) { - return root[2] !== /* Empty */0 ? lookup_keys(keys.length - 1, keys, root[2]) : build_path(keys.length - 1, keys, root); + if (root[2] !== /* Empty */0) { + return lookup_keys(keys.length - 1, keys, root[2]); + } + else { + return build_path(keys.length - 1, keys, root); + } } function get_const(x) { diff --git a/jscomp/stdlib/char.js b/jscomp/stdlib/char.js index 37fa5f045b..3e01033d5c 100644 --- a/jscomp/stdlib/char.js +++ b/jscomp/stdlib/char.js @@ -4,7 +4,12 @@ var Pervasives = require("./pervasives"); var Caml_string = require("../runtime/caml_string"); function chr(n) { - return n < 0 || n > 255 ? Pervasives.invalid_arg("Char.chr") : n; + if (n < 0 || n > 255) { + return Pervasives.invalid_arg("Char.chr"); + } + else { + return n; + } } function escaped(c) { @@ -65,11 +70,21 @@ function escaped(c) { } function lowercase(c) { - return c >= /* "A" */65 && c <= /* "Z" */90 || c >= /* "\192" */192 && c <= /* "\214" */214 || c >= /* "\216" */216 && c <= /* "\222" */222 ? c + 32 : c; + if (c >= /* "A" */65 && c <= /* "Z" */90 || c >= /* "\192" */192 && c <= /* "\214" */214 || c >= /* "\216" */216 && c <= /* "\222" */222) { + return c + 32; + } + else { + return c; + } } function uppercase(c) { - return c >= /* "a" */97 && c <= /* "z" */122 || c >= /* "\224" */224 && c <= /* "\246" */246 || c >= /* "\248" */248 && c <= /* "\254" */254 ? c - 32 : c; + if (c >= /* "a" */97 && c <= /* "z" */122 || c >= /* "\224" */224 && c <= /* "\246" */246 || c >= /* "\248" */248 && c <= /* "\254" */254) { + return c - 32; + } + else { + return c; + } } function compare(c1, c2) { diff --git a/jscomp/stdlib/complex.js b/jscomp/stdlib/complex.js index 79d4bd3eec..0ad12503ef 100644 --- a/jscomp/stdlib/complex.js +++ b/jscomp/stdlib/complex.js @@ -121,13 +121,18 @@ function sqrt(x) { var q$1 = r / i; w = Math.sqrt(i) * Math.sqrt(0.5 * (q$1 + Math.sqrt(1.0 + q$1 * q$1))); } - return x[0] >= 0.0 ? /* array */[ + if (x[0] >= 0.0) { + return /* array */[ w, 0.5 * x[1] / w - ] : /* array */[ + ]; + } + else { + return /* array */[ 0.5 * i / w, x[1] >= 0.0 ? w : -w ]; + } } } diff --git a/jscomp/stdlib/digest.js b/jscomp/stdlib/digest.js index f2abba3ead..002bc833ba 100644 --- a/jscomp/stdlib/digest.js +++ b/jscomp/stdlib/digest.js @@ -16,7 +16,12 @@ function bytes(b) { } function substring(str, ofs, len) { - return ofs < 0 || len < 0 || ofs > str.length - len ? Pervasives.invalid_arg("Digest.substring") : Caml_primitive.caml_md5_string(str, ofs, len); + if (ofs < 0 || len < 0 || ofs > str.length - len) { + return Pervasives.invalid_arg("Digest.substring"); + } + else { + return Caml_primitive.caml_md5_string(str, ofs, len); + } } function subbytes(b, ofs, len) { diff --git a/jscomp/stdlib/filename.js b/jscomp/stdlib/filename.js index ea091e0420..ce578db475 100644 --- a/jscomp/stdlib/filename.js +++ b/jscomp/stdlib/filename.js @@ -16,7 +16,12 @@ function generic_quote(quotequote, s) { var b = Buffer.create(l + 20); Buffer.add_char(b, /* "'" */39); for(var i = 0 ,i_finish = l - 1; i<= i_finish; ++i){ - s[i] === "'" ? Buffer.add_string(b, quotequote) : Buffer.add_char(b, s.charCodeAt(i)); + if (s[i] === "'") { + Buffer.add_string(b, quotequote); + } + else { + Buffer.add_char(b, s.charCodeAt(i)); + } } Buffer.add_char(b, /* "'" */39); return Buffer.contents(b); @@ -55,7 +60,12 @@ function generic_basename(is_dir_sep, current_dir_name, name) { } }; }; - return name === "" ? current_dir_name : find_end(name.length - 1); + if (name === "") { + return current_dir_name; + } + else { + return find_end(name.length - 1); + } } function generic_dirname(is_dir_sep, current_dir_name, name) { @@ -107,7 +117,12 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { } }; }; - return name === "" ? current_dir_name : trailing_sep(name.length - 1); + if (name === "") { + return current_dir_name; + } + else { + return trailing_sep(name.length - 1); + } } var current_dir_name = "."; @@ -176,12 +191,22 @@ var dir_sep = "/"; function concat(dirname, filename) { var l = dirname.length; - return l === 0 || is_dir_sep$1(dirname, l - 1) ? dirname + filename : dirname + (dir_sep + filename); + if (l === 0 || is_dir_sep$1(dirname, l - 1)) { + return dirname + filename; + } + else { + return dirname + (dir_sep + filename); + } } function chop_suffix(name, suff) { var n = name.length - suff.length; - return n < 0 ? Pervasives.invalid_arg("Filename.chop_suffix") : $$String.sub(name, 0, n); + if (n < 0) { + return Pervasives.invalid_arg("Filename.chop_suffix"); + } + else { + return $$String.sub(name, 0, n); + } } function chop_extension(name) { diff --git a/jscomp/stdlib/format.js b/jscomp/stdlib/format.js index 715eabc5e0..664a57d164 100644 --- a/jscomp/stdlib/format.js +++ b/jscomp/stdlib/format.js @@ -32,7 +32,16 @@ function add_queue(x, q) { c_001 ]; var match = q[1]; - return match ? (q[1] = c, match[1][2] = c, /* () */0) : (q[1] = c, q[2] = c, /* () */0); + if (match) { + q[1] = c; + match[1][2] = c; + return /* () */0; + } + else { + q[1] = c; + q[2] = c; + return /* () */0; + } } var Empty_queue = [ @@ -118,11 +127,22 @@ function pp_force_break_line(state) { var match$1 = match[1]; var width = match$1[2]; var bl_ty = match$1[1]; - return width > state[9] ? ( - bl_ty !== 0 ? ( - bl_ty >= 5 ? /* () */0 : break_line(state, width) - ) : /* () */0 - ) : 0; + if (width > state[9]) { + if (bl_ty !== 0) { + if (bl_ty >= 5) { + return /* () */0; + } + else { + return break_line(state, width); + } + } + else { + return /* () */0; + } + } + else { + return 0; + } } else { return pp_output_newline(state); @@ -147,15 +167,20 @@ function format_pp_token(state, size, param) { var add_tab = function (n, ls) { if (ls) { var x = ls[1]; - return Caml_primitive.caml_lessthan(n, x) ? [ + if (Caml_primitive.caml_lessthan(n, x)) { + return [ /* :: */0, n, ls - ] : [ + ]; + } + else { + return [ /* :: */0, x, add_tab(n, ls[2]) ]; + } } else { return [ @@ -174,15 +199,37 @@ function format_pp_token(state, size, param) { break; case 1 : var match$1 = state[2]; - return match$1 ? (state[2] = match$1[2], /* () */0) : /* () */0; + if (match$1) { + state[2] = match$1[2]; + return /* () */0; + } + else { + return /* () */0; + } case 2 : var match$2 = state[3]; - return match$2 ? (state[3] = match$2[2], /* () */0) : /* () */0; + if (match$2) { + state[3] = match$2[2]; + return /* () */0; + } + else { + return /* () */0; + } case 3 : var match$3 = state[2]; - return match$3 ? break_line(state, match$3[1][2]) : pp_output_newline(state); + if (match$3) { + return break_line(state, match$3[1][2]); + } + else { + return pp_output_newline(state); + } case 4 : - return state[10] !== state[6] - state[9] ? pp_skip_token(state) : 0; + if (state[10] !== state[6] - state[9]) { + return pp_skip_token(state); + } + else { + return 0; + } case 5 : var match$4 = state[5]; if (match$4) { @@ -217,13 +264,29 @@ function format_pp_token(state, size, param) { case 2 : return break_new_line(state, off, width); case 3 : - return size > state[9] ? break_new_line(state, off, width) : break_same_line(state, n); + if (size > state[9]) { + return break_new_line(state, off, width); + } + else { + return break_same_line(state, n); + } case 4 : - return state[11] ? break_same_line(state, n) : ( - size > state[9] ? break_new_line(state, off, width) : ( - state[10] > state[6] - width + off ? break_new_line(state, off, width) : break_same_line(state, n) - ) - ); + if (state[11]) { + return break_same_line(state, n); + } + else { + if (size > state[9]) { + return break_new_line(state, off, width); + } + else { + if (state[10] > state[6] - width + off) { + return break_new_line(state, off, width); + } + else { + return break_same_line(state, n); + } + } + } case 0 : case 5 : return break_same_line(state, n); @@ -275,7 +338,12 @@ function format_pp_token(state, size, param) { tab = insertion_point; } var offset = tab - insertion_point; - return offset >= 0 ? break_same_line(state, offset + param[1]) : break_new_line(state, tab + param[2], state[6]); + if (offset >= 0) { + return break_same_line(state, offset + param[1]); + } + else { + return break_new_line(state, tab + param[2], state[6]); + } } else { return /* () */0; @@ -327,7 +395,14 @@ function advance_loop(state) { while(/* true */1) { var match = peek_queue(state[27]); var size = match[1]; - return !(size < 0 && state[13] - state[12] < state[9]) ? (take_queue(state[27]), format_pp_token(state, size < 0 ? pp_infinity : size, match[2]), state[12] = match[3] + state[12]) : 0; + if (!(size < 0 && state[13] - state[12] < state[9])) { + take_queue(state[27]); + format_pp_token(state, size < 0 ? pp_infinity : size, match[2]); + return state[12] = match[3] + state[12]; + } + else { + return 0; + } }; } @@ -416,13 +491,27 @@ function set_size(state, ty) { exit = 1; break; case 3 : - return !ty ? (queue_elem[1] = state[13] + size, state[1] = t, /* () */0) : 0; + if (!ty) { + queue_elem[1] = state[13] + size; + state[1] = t; + return /* () */0; + } + else { + return 0; + } default: return /* () */0; } } if (exit === 1) { - return ty ? (queue_elem[1] = state[13] + size, state[1] = t, /* () */0) : 0; + if (ty) { + queue_elem[1] = state[13] + size; + state[1] = t; + return /* () */0; + } + else { + return 0; + } } } @@ -460,7 +549,12 @@ function pp_open_box_gen(state, indent, br_ty) { return scan_push(state, /* false */0, elem); } else { - return state[14] === state[15] ? enqueue_string(state, state[16]) : 0; + if (state[14] === state[15]) { + return enqueue_string(state, state[16]); + } + else { + return 0; + } } } @@ -497,7 +591,8 @@ function pp_open_tag(state, tag_name) { ]; state[25](tag_name); } - return state[22] ? pp_enqueue(state, [ + if (state[22]) { + return pp_enqueue(state, [ /* record */0, 0, [ @@ -505,7 +600,11 @@ function pp_open_tag(state, tag_name) { tag_name ], 0 - ]) : 0; + ]); + } + else { + return 0; + } } function pp_close_tag(state, _) { @@ -519,7 +618,14 @@ function pp_close_tag(state, _) { } if (state[21]) { var match = state[4]; - return match ? (state[26](match[1]), state[4] = match[2], /* () */0) : /* () */0; + if (match) { + state[26](match[1]); + state[4] = match[2]; + return /* () */0; + } + else { + return /* () */0; + } } else { return 0; @@ -593,7 +699,12 @@ function pp_flush_queue(state, b) { } function pp_print_as_size(state, size, s) { - return state[14] < state[15] ? enqueue_string_as(state, size, s) : 0; + if (state[14] < state[15]) { + return enqueue_string_as(state, size, s); + } + else { + return 0; + } } function pp_print_as(state, isize, s) { @@ -651,11 +762,21 @@ function pp_print_flush(state, _) { } function pp_force_newline(state, _) { - return state[14] < state[15] ? enqueue_advance(state, make_queue_elem(0, /* Pp_newline */3, 0)) : 0; + if (state[14] < state[15]) { + return enqueue_advance(state, make_queue_elem(0, /* Pp_newline */3, 0)); + } + else { + return 0; + } } function pp_print_if_newline(state, _) { - return state[14] < state[15] ? enqueue_advance(state, make_queue_elem(0, /* Pp_if_newline */4, 0)) : 0; + if (state[14] < state[15]) { + return enqueue_advance(state, make_queue_elem(0, /* Pp_if_newline */4, 0)); + } + else { + return 0; + } } function pp_print_break(state, width, offset) { @@ -804,11 +925,22 @@ function pp_print_text(ppf, s) { pp_force_newline(ppf, /* () */0); } }; - return left[1] !== len ? flush(/* () */0) : 0; + if (left[1] !== len) { + return flush(/* () */0); + } + else { + return 0; + } } function pp_set_max_boxes(state, n) { - return n > 1 ? (state[15] = n, /* () */0) : 0; + if (n > 1) { + state[15] = n; + return /* () */0; + } + else { + return 0; + } } function pp_get_max_boxes(state, _) { @@ -829,7 +961,12 @@ function pp_get_ellipsis_text(state, _) { } function pp_limit(n) { - return n < pp_infinity ? n : -1 + pp_infinity; + if (n < pp_infinity) { + return n; + } + else { + return -1 + pp_infinity; + } } function pp_set_min_space_left(state, n) { @@ -1278,7 +1415,12 @@ function compute_tag(output, tag_acc) { output(ppf, tag_acc); pp_print_flush(ppf, /* () */0); var len = Buffer.length(buf); - return len < 2 ? Buffer.contents(buf) : Buffer.sub(buf, 1, len - 2); + if (len < 2) { + return Buffer.contents(buf); + } + else { + return Buffer.sub(buf, 1, len - 2); + } } function output_formatting_lit(ppf, fmting_lit) { diff --git a/jscomp/stdlib/genlex.js b/jscomp/stdlib/genlex.js index 8c7e549e86..1d8c9edac4 100644 --- a/jscomp/stdlib/genlex.js +++ b/jscomp/stdlib/genlex.js @@ -308,18 +308,40 @@ function make_lexer(keywords) { var exit$1 = 0; if (c >= 91) { var switcher = -95 + c; - 27 < (switcher >>> 0) ? ( - switcher >= 97 ? (exit$1 = 2) : (exit = 1) - ) : ( - switcher !== 1 ? (exit$1 = 2) : (exit = 1) - ); + if (27 < (switcher >>> 0)) { + if (switcher >= 97) { + exit$1 = 2; + } + else { + exit = 1; + } + } + else { + if (switcher !== 1) { + exit$1 = 2; + } + else { + exit = 1; + } + } } else { - c >= 48 ? ( - 6 < (-58 + c >>> 0) ? (exit$1 = 2) : (exit = 1) - ) : ( - c !== 39 ? (exit = 1) : (exit$1 = 2) - ); + if (c >= 48) { + if (6 < (-58 + c >>> 0)) { + exit$1 = 2; + } + else { + exit = 1; + } + } + else { + if (c !== 39) { + exit = 1; + } + else { + exit$1 = 2; + } + } } if (exit$1 === 2) { Stream.junk(strm__); @@ -348,15 +370,31 @@ function make_lexer(keywords) { var exit$1 = 0; if (c >= 94) { var switcher = -95 + c; - 30 < (switcher >>> 0) ? ( - switcher >= 32 ? (exit = 1) : (exit$1 = 2) - ) : ( - switcher !== 29 ? (exit = 1) : (exit$1 = 2) - ); + if (30 < (switcher >>> 0)) { + if (switcher >= 32) { + exit = 1; + } + else { + exit$1 = 2; + } + } + else { + if (switcher !== 29) { + exit = 1; + } + else { + exit$1 = 2; + } + } } else { if (c >= 65) { - c !== 92 ? (exit = 1) : (exit$1 = 2); + if (c !== 92) { + exit = 1; + } + else { + exit$1 = 2; + } } else { if (c >= 33) { @@ -457,9 +495,17 @@ function make_lexer(keywords) { var c = match[1]; var exit$1 = 0; if (c >= 58) { - c !== 69 ? ( - c !== 101 ? (exit = 1) : (exit$1 = 2) - ) : (exit$1 = 2); + if (c !== 69) { + if (c !== 101) { + exit = 1; + } + else { + exit$1 = 2; + } + } + else { + exit$1 = 2; + } } else { if (c !== 46) { @@ -765,15 +811,25 @@ function make_lexer(keywords) { }; var maybe_comment = function (strm__) { var match = Stream.peek(strm__); - return match ? ( - match[1] !== 42 ? [ - /* Some */0, - keyword_or_error(/* "(" */40) - ] : (Stream.junk(strm__), comment(strm__), next_token(strm__)) - ) : [ + if (match) { + if (match[1] !== 42) { + return [ + /* Some */0, + keyword_or_error(/* "(" */40) + ]; + } + else { + Stream.junk(strm__); + comment(strm__); + return next_token(strm__); + } + } + else { + return [ /* Some */0, keyword_or_error(/* "(" */40) ]; + } }; var comment = function (strm__) { while(/* true */1) { @@ -811,7 +867,15 @@ function make_lexer(keywords) { var maybe_nested_comment = function (strm__) { var match = Stream.peek(strm__); if (match) { - return match[1] !== 42 ? (Stream.junk(strm__), comment(strm__)) : (Stream.junk(strm__), comment(strm__), comment(strm__)); + if (match[1] !== 42) { + Stream.junk(strm__); + return comment(strm__); + } + else { + Stream.junk(strm__); + comment(strm__); + return comment(strm__); + } } else { throw Stream.Failure; @@ -822,9 +886,19 @@ function make_lexer(keywords) { var match = Stream.peek(strm__); if (match) { var c = match[1]; - return c !== 41 ? ( - c !== 42 ? (Stream.junk(strm__), comment(strm__)) : Stream.junk(strm__) - ) : (Stream.junk(strm__), /* () */0); + if (c !== 41) { + if (c !== 42) { + Stream.junk(strm__); + return comment(strm__); + } + else { + return Stream.junk(strm__); + } + } + else { + Stream.junk(strm__); + return /* () */0; + } } else { throw Stream.Failure; diff --git a/jscomp/stdlib/hashtbl.js b/jscomp/stdlib/hashtbl.js index e1dbac39e2..15155a13fe 100644 --- a/jscomp/stdlib/hashtbl.js +++ b/jscomp/stdlib/hashtbl.js @@ -117,7 +117,14 @@ function clear(h) { function reset(h) { var len = h[2].length; - return h.length < 4 || len === h[4] ? clear(h) : (h[1] = 0, h[2] = Caml_array.caml_make_vect(h[4], /* Empty */0), /* () */0); + if (h.length < 4 || len === h[4]) { + return clear(h); + } + else { + h[1] = 0; + h[2] = Caml_array.caml_make_vect(h[4], /* Empty */0); + return /* () */0; + } } function copy(h) { @@ -169,7 +176,12 @@ function resize(indexfun, h) { } function key_index(h, key) { - return h.length >= 3 ? Caml_primitive.caml_hash(10, 100, h[3], key) & h[2].length - 1 : Caml_primitive.caml_hash_univ_param(10, 100, key) % h[2].length; + if (h.length >= 3) { + return Caml_primitive.caml_hash(10, 100, h[3], key) & h[2].length - 1; + } + else { + return Caml_primitive.caml_hash_univ_param(10, 100, key) % h[2].length; + } } function add(h, key, info) { @@ -183,7 +195,12 @@ function add(h, key, info) { ]; h[2][i] = bucket; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } } function remove(h, key) { @@ -191,12 +208,18 @@ function remove(h, key) { if (param) { var next = param[3]; var k = param[1]; - return Caml_primitive.caml_compare(k, key) ? [ + if (Caml_primitive.caml_compare(k, key)) { + return [ /* Cons */0, k, param[2], remove_bucket(next) - ] : (-- h[1], next); + ]; + } + else { + -- h[1]; + return next; + } } else { return /* Empty */0; @@ -233,7 +256,12 @@ function find(h, key) { var rest2 = rest1[3]; if (Caml_primitive.caml_compare(key, rest1[1])) { if (rest2) { - return Caml_primitive.caml_compare(key, rest2[1]) ? find_rec(key, rest2[3]) : rest2[2]; + if (Caml_primitive.caml_compare(key, rest2[1])) { + return find_rec(key, rest2[3]); + } + else { + return rest2[2]; + } } else { throw Caml_exceptions.Not_found; @@ -286,17 +314,22 @@ function replace(h, key, info) { if (param) { var next = param[3]; var k = param[1]; - return Caml_primitive.caml_compare(k, key) ? [ + if (Caml_primitive.caml_compare(k, key)) { + return [ /* Cons */0, k, param[2], replace_bucket(next) - ] : [ + ]; + } + else { + return [ /* Cons */0, key, info, next ]; + } } else { throw Caml_exceptions.Not_found; @@ -317,7 +350,12 @@ function replace(h, key, info) { l ]; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } } else { throw exn; @@ -327,7 +365,12 @@ function replace(h, key, info) { function mem(h, key) { var mem_in_bucket = function (param) { - return param ? +(Caml_primitive.caml_compare(param[1], key) === 0 || mem_in_bucket(param[3])) : /* false */0; + if (param) { + return +(Caml_primitive.caml_compare(param[1], key) === 0 || mem_in_bucket(param[3])); + } + else { + return /* false */0; + } }; return mem_in_bucket(h[2][key_index(h, key)]); } @@ -422,19 +465,30 @@ function MakeSeeded(H) { ]; h[2][i] = bucket; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } }; var remove = function (h, key) { var remove_bucket = function (param) { if (param) { var next = param[3]; var k = param[1]; - return H[1](k, key) ? (-- h[1], next) : [ + if (H[1](k, key)) { + -- h[1]; + return next; + } + else { + return [ /* Cons */0, k, param[2], remove_bucket(next) ]; + } } else { return /* Empty */0; @@ -475,7 +529,12 @@ function MakeSeeded(H) { } else { if (rest2) { - return H[1](key, rest2[1]) ? rest2[2] : find_rec(key, rest2[3]); + if (H[1](key, rest2[1])) { + return rest2[2]; + } + else { + return find_rec(key, rest2[3]); + } } else { throw Caml_exceptions.Not_found; @@ -520,17 +579,22 @@ function MakeSeeded(H) { if (param) { var next = param[3]; var k = param[1]; - return H[1](k, key) ? [ + if (H[1](k, key)) { + return [ /* Cons */0, key, info, next - ] : [ + ]; + } + else { + return [ /* Cons */0, k, param[2], replace_bucket(next) ]; + } } else { throw Caml_exceptions.Not_found; @@ -551,7 +615,12 @@ function MakeSeeded(H) { l ]; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } } else { throw exn; @@ -560,7 +629,12 @@ function MakeSeeded(H) { }; var mem = function (h, key) { var mem_in_bucket = function (param) { - return param ? +(H[1](param[1], key) || mem_in_bucket(param[3])) : /* false */0; + if (param) { + return +(H[1](param[1], key) || mem_in_bucket(param[3])); + } + else { + return /* false */0; + } }; return mem_in_bucket(h[2][key_index(h, key)]); }; @@ -602,19 +676,30 @@ function Make(H) { ]; h[2][i] = bucket; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } }; var remove = function (h, key) { var remove_bucket = function (param) { if (param) { var next = param[3]; var k = param[1]; - return equal(k, key) ? (-- h[1], next) : [ + if (equal(k, key)) { + -- h[1]; + return next; + } + else { + return [ /* Cons */0, k, param[2], remove_bucket(next) ]; + } } else { return /* Empty */0; @@ -655,7 +740,12 @@ function Make(H) { } else { if (rest2) { - return equal(key, rest2[1]) ? rest2[2] : find_rec(key, rest2[3]); + if (equal(key, rest2[1])) { + return rest2[2]; + } + else { + return find_rec(key, rest2[3]); + } } else { throw Caml_exceptions.Not_found; @@ -700,17 +790,22 @@ function Make(H) { if (param) { var next = param[3]; var k = param[1]; - return equal(k, key) ? [ + if (equal(k, key)) { + return [ /* Cons */0, key, info, next - ] : [ + ]; + } + else { + return [ /* Cons */0, k, param[2], replace_bucket(next) ]; + } } else { throw Caml_exceptions.Not_found; @@ -731,7 +826,12 @@ function Make(H) { l ]; ++ h[1]; - return h[1] > (h[2].length << 1) ? resize(key_index, h) : 0; + if (h[1] > (h[2].length << 1)) { + return resize(key_index, h); + } + else { + return 0; + } } else { throw exn; @@ -740,7 +840,12 @@ function Make(H) { }; var mem = function (h, key) { var mem_in_bucket = function (param) { - return param ? +(equal(param[1], key) || mem_in_bucket(param[3])) : /* false */0; + if (param) { + return +(equal(param[1], key) || mem_in_bucket(param[3])); + } + else { + return /* false */0; + } }; return mem_in_bucket(h[2][key_index(h, key)]); }; diff --git a/jscomp/stdlib/int32.js b/jscomp/stdlib/int32.js index 620624c246..ae62d01c24 100644 --- a/jscomp/stdlib/int32.js +++ b/jscomp/stdlib/int32.js @@ -12,7 +12,12 @@ function pred(n) { } function abs(n) { - return n >= 0 ? n : -n; + if (n >= 0) { + return n; + } + else { + return -n; + } } function lognot(n) { diff --git a/jscomp/stdlib/int64.js b/jscomp/stdlib/int64.js index 028ecf8834..6357d838f7 100644 --- a/jscomp/stdlib/int64.js +++ b/jscomp/stdlib/int64.js @@ -11,7 +11,12 @@ function pred(n) { } function abs(n) { - return n >= 0 ? n : -n; + if (n >= 0) { + return n; + } + else { + return -n; + } } function lognot(n) { diff --git a/jscomp/stdlib/lazy.js b/jscomp/stdlib/lazy.js index 6bf5813bbc..f9795d36b9 100644 --- a/jscomp/stdlib/lazy.js +++ b/jscomp/stdlib/lazy.js @@ -12,7 +12,12 @@ function from_fun(f) { function from_val(v) { var t = Caml_obj_runtime.caml_obj_tag(v); - return t === Obj.forward_tag || t === Obj.lazy_tag || t === Obj.double_tag ? Caml_obj_runtime.caml_lazy_make_forward(v) : v; + if (t === Obj.forward_tag || t === Obj.lazy_tag || t === Obj.double_tag) { + return Caml_obj_runtime.caml_lazy_make_forward(v); + } + else { + return v; + } } function is_val(l) { diff --git a/jscomp/stdlib/lexing.js b/jscomp/stdlib/lexing.js index f256010d5c..fd22ce39a9 100644 --- a/jscomp/stdlib/lexing.js +++ b/jscomp/stdlib/lexing.js @@ -157,10 +157,15 @@ function sub_lexeme_char(lexbuf, i) { } function sub_lexeme_char_opt(lexbuf, i) { - return i >= 0 ? [ + if (i >= 0) { + return [ /* Some */0, lexbuf[2][i] - ] : /* None */0; + ]; + } + else { + return /* None */0; + } } function lexeme_char(lexbuf, i) { diff --git a/jscomp/stdlib/list.js b/jscomp/stdlib/list.js index 2ce71dbf32..f2d260d450 100644 --- a/jscomp/stdlib/list.js +++ b/jscomp/stdlib/list.js @@ -23,11 +23,21 @@ function length(l) { } function hd(param) { - return param ? param[1] : Pervasives.failwith("hd"); + if (param) { + return param[1]; + } + else { + return Pervasives.failwith("hd"); + } } function tl(param) { - return param ? param[2] : Pervasives.failwith("tl"); + if (param) { + return param[2]; + } + else { + return Pervasives.failwith("tl"); + } } function nth(l, n) { @@ -80,7 +90,12 @@ function rev(l) { } function flatten(param) { - return param ? Pervasives.$at(param[1], flatten(param[2])) : /* [] */0; + if (param) { + return Pervasives.$at(param[1], flatten(param[2])); + } + else { + return /* [] */0; + } } function map(f, param) { @@ -183,7 +198,12 @@ function fold_left(f, _accu, _l) { } function fold_right(f, l, accu) { - return l ? f(l[1], fold_right(f, l[2], accu)) : accu; + if (l) { + return f(l[1], fold_right(f, l[2], accu)); + } + else { + return accu; + } } function map2(f, l1, l2) { @@ -201,7 +221,12 @@ function map2(f, l1, l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.map2") : /* [] */0; + if (l2) { + return Pervasives.invalid_arg("List.map2"); + } + else { + return /* [] */0; + } } } @@ -226,7 +251,12 @@ function rev_map2(f, l1, l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.rev_map2") : accu; + if (l2) { + return Pervasives.invalid_arg("List.rev_map2"); + } + else { + return accu; + } } }; }; @@ -248,7 +278,12 @@ function iter2(f, _l1, _l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.iter2") : /* () */0; + if (l2) { + return Pervasives.invalid_arg("List.iter2"); + } + else { + return /* () */0; + } } }; } @@ -269,49 +304,107 @@ function fold_left2(f, _accu, _l1, _l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.fold_left2") : accu; + if (l2) { + return Pervasives.invalid_arg("List.fold_left2"); + } + else { + return accu; + } } }; } function fold_right2(f, l1, l2, accu) { - return l1 ? ( - l2 ? f(l1[1], l2[1], fold_right2(f, l1[2], l2[2], accu)) : Pervasives.invalid_arg("List.fold_right2") - ) : ( - l2 ? Pervasives.invalid_arg("List.fold_right2") : accu - ); + if (l1) { + if (l2) { + return f(l1[1], l2[1], fold_right2(f, l1[2], l2[2], accu)); + } + else { + return Pervasives.invalid_arg("List.fold_right2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.fold_right2"); + } + else { + return accu; + } + } } function for_all(p, param) { - return param ? +(p(param[1]) && for_all(p, param[2])) : /* true */1; + if (param) { + return +(p(param[1]) && for_all(p, param[2])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[1]) || exists(p, param[2])) : /* false */0; + if (param) { + return +(p(param[1]) || exists(p, param[2])); + } + else { + return /* false */0; + } } function for_all2(p, l1, l2) { - return l1 ? ( - l2 ? +(p(l1[1], l2[1]) && for_all2(p, l1[2], l2[2])) : Pervasives.invalid_arg("List.for_all2") - ) : ( - l2 ? Pervasives.invalid_arg("List.for_all2") : /* true */1 - ); + if (l1) { + if (l2) { + return +(p(l1[1], l2[1]) && for_all2(p, l1[2], l2[2])); + } + else { + return Pervasives.invalid_arg("List.for_all2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.for_all2"); + } + else { + return /* true */1; + } + } } function exists2(p, l1, l2) { - return l1 ? ( - l2 ? +(p(l1[1], l2[1]) || exists2(p, l1[2], l2[2])) : Pervasives.invalid_arg("List.exists2") - ) : ( - l2 ? Pervasives.invalid_arg("List.exists2") : /* false */0 - ); + if (l1) { + if (l2) { + return +(p(l1[1], l2[1]) || exists2(p, l1[2], l2[2])); + } + else { + return Pervasives.invalid_arg("List.exists2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.exists2"); + } + else { + return /* false */0; + } + } } function mem(x, param) { - return param ? +(Caml_primitive.caml_compare(param[1], x) === 0 || mem(x, param[2])) : /* false */0; + if (param) { + return +(Caml_primitive.caml_compare(param[1], x) === 0 || mem(x, param[2])); + } + else { + return /* false */0; + } } function memq(x, param) { - return param ? +(param[1] === x || memq(x, param[2])) : /* false */0; + if (param) { + return +(param[1] === x || memq(x, param[2])); + } + else { + return /* false */0; + } } function assoc(x, _param) { @@ -351,22 +444,37 @@ function assq(x, _param) { } function mem_assoc(x, param) { - return param ? +(Caml_primitive.caml_compare(param[1][1], x) === 0 || mem_assoc(x, param[2])) : /* false */0; + if (param) { + return +(Caml_primitive.caml_compare(param[1][1], x) === 0 || mem_assoc(x, param[2])); + } + else { + return /* false */0; + } } function mem_assq(x, param) { - return param ? +(param[1][1] === x || mem_assq(x, param[2])) : /* false */0; + if (param) { + return +(param[1][1] === x || mem_assq(x, param[2])); + } + else { + return /* false */0; + } } function remove_assoc(x, param) { if (param) { var l = param[2]; var pair = param[1]; - return Caml_primitive.caml_compare(pair[1], x) ? [ + if (Caml_primitive.caml_compare(pair[1], x)) { + return [ /* :: */0, pair, remove_assoc(x, l) - ] : l; + ]; + } + else { + return l; + } } else { return /* [] */0; @@ -377,11 +485,16 @@ function remove_assq(x, param) { if (param) { var l = param[2]; var pair = param[1]; - return pair[1] === x ? l : [ + if (pair[1] === x) { + return l; + } + else { + return [ /* :: */0, pair, remove_assq(x, l) ]; + } } else { return /* [] */0; @@ -502,19 +615,30 @@ function split(param) { } function combine(l1, l2) { - return l1 ? ( - l2 ? [ - /* :: */0, - [ - /* tuple */0, - l1[1], - l2[1] - ], - combine(l1[2], l2[2]) - ] : Pervasives.invalid_arg("List.combine") - ) : ( - l2 ? Pervasives.invalid_arg("List.combine") : /* [] */0 - ); + if (l1) { + if (l2) { + return [ + /* :: */0, + [ + /* tuple */0, + l1[1], + l2[1] + ], + combine(l1[2], l2[2]) + ]; + } + else { + return Pervasives.invalid_arg("List.combine"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.combine"); + } + else { + return /* [] */0; + } + } } function merge(cmp, l1, l2) { @@ -522,15 +646,20 @@ function merge(cmp, l1, l2) { if (l2) { var h2 = l2[1]; var h1 = l1[1]; - return cmp(h1, h2) <= 0 ? [ + if (cmp(h1, h2) <= 0) { + return [ /* :: */0, h1, merge(cmp, l1[2], l2) - ] : [ + ]; + } + else { + return [ /* :: */0, h2, merge(cmp, l1, l2[2]) ]; + } } else { return l1; @@ -655,87 +784,104 @@ function stable_sort(cmp, l) { var x3 = match$1[1]; var x2 = match[1]; var x1 = l[1]; - return cmp(x1, x2) <= 0 ? ( - cmp(x2, x3) <= 0 ? [ + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { + return [ + /* :: */0, + x1, + [ + /* :: */0, + x2, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x1, x3) <= 0) { + return [ /* :: */0, x1, [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, + x2, /* [] */0 ] ] - ] : ( - cmp(x1, x3) <= 0 ? [ - /* :: */0, - x1, - [ - /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x1, + [ /* :: */0, - x3, - [ - /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] + x2, + /* [] */0 ] - ) - ) : ( - cmp(x1, x3) <= 0 ? [ + ] + ]; + } + } + } + else { + if (cmp(x1, x3) <= 0) { + return [ + /* :: */0, + x2, + [ + /* :: */0, + x1, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x2, x3) <= 0) { + return [ /* :: */0, x2, [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, + x1, /* [] */0 ] ] - ] : ( - cmp(x2, x3) <= 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + [ /* :: */0, - x3, - [ - /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] + x1, + /* [] */0 ] - ) - ); + ] + ]; + } + } + } } else { exit = 1; @@ -756,7 +902,8 @@ function stable_sort(cmp, l) { if (match$2) { var x2$1 = match$2[1]; var x1$1 = l[1]; - return cmp(x1$1, x2$1) <= 0 ? [ + if (cmp(x1$1, x2$1) <= 0) { + return [ /* :: */0, x1$1, [ @@ -764,7 +911,10 @@ function stable_sort(cmp, l) { x2$1, /* [] */0 ] - ] : [ + ]; + } + else { + return [ /* :: */0, x2$1, [ @@ -773,6 +923,7 @@ function stable_sort(cmp, l) { /* [] */0 ] ]; + } } else { exit = 1; @@ -807,87 +958,104 @@ function stable_sort(cmp, l) { var x3 = match$1[1]; var x2 = match[1]; var x1 = l[1]; - return cmp(x1, x2) > 0 ? ( - cmp(x2, x3) > 0 ? [ + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { + return [ + /* :: */0, + x1, + [ + /* :: */0, + x2, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x1, x3) > 0) { + return [ /* :: */0, x1, [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, + x2, /* [] */0 ] ] - ] : ( - cmp(x1, x3) > 0 ? [ - /* :: */0, - x1, - [ - /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x1, + [ /* :: */0, - x3, - [ - /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] + x2, + /* [] */0 ] - ) - ) : ( - cmp(x1, x3) > 0 ? [ + ] + ]; + } + } + } + else { + if (cmp(x1, x3) > 0) { + return [ + /* :: */0, + x2, + [ + /* :: */0, + x1, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x2, x3) > 0) { + return [ /* :: */0, x2, [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, + x1, /* [] */0 ] ] - ] : ( - cmp(x2, x3) > 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + [ /* :: */0, - x3, - [ - /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] + x1, + /* [] */0 ] - ) - ); + ] + ]; + } + } + } } else { exit = 1; @@ -908,7 +1076,8 @@ function stable_sort(cmp, l) { if (match$2) { var x2$1 = match$2[1]; var x1$1 = l[1]; - return cmp(x1$1, x2$1) > 0 ? [ + if (cmp(x1$1, x2$1) > 0) { + return [ /* :: */0, x1$1, [ @@ -916,7 +1085,10 @@ function stable_sort(cmp, l) { x2$1, /* [] */0 ] - ] : [ + ]; + } + else { + return [ /* :: */0, x2$1, [ @@ -925,6 +1097,7 @@ function stable_sort(cmp, l) { /* [] */0 ] ]; + } } else { exit = 1; @@ -945,7 +1118,12 @@ function stable_sort(cmp, l) { }; var len = length(l); - return len < 2 ? l : sort(len, l); + if (len < 2) { + return l; + } + else { + return sort(len, l); + } } function sort_uniq(cmp, l) { @@ -1084,33 +1262,40 @@ function sort_uniq(cmp, l) { } else { var c$2 = cmp(x1, x3); - return c$2 ? ( - c$2 < 0 ? [ + if (c$2) { + if (c$2 < 0) { + return [ + /* :: */0, + x1, + [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x1, [ /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1, [ @@ -1119,6 +1304,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1153,33 +1339,40 @@ function sort_uniq(cmp, l) { } else { var c$4 = cmp(x2, x3); - return c$4 ? ( - c$4 < 0 ? [ + if (c$4) { + if (c$4 < 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x2, [ /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, [ @@ -1188,6 +1381,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1205,29 +1399,37 @@ function sort_uniq(cmp, l) { } else { var c$5 = cmp(x2, x3); - return c$5 ? ( - c$5 < 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - /* [] */0 - ] - ] : [ + if (c$5) { + if (c$5 < 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, /* [] */0 ]; + } } } else { @@ -1250,29 +1452,37 @@ function sort_uniq(cmp, l) { var x2$1 = match$2[1]; var x1$1 = l[1]; var c$6 = cmp(x1$1, x2$1); - return c$6 ? ( - c$6 < 0 ? [ - /* :: */0, - x1$1, - [ - /* :: */0, - x2$1, - /* [] */0 - ] - ] : [ + if (c$6) { + if (c$6 < 0) { + return [ + /* :: */0, + x1$1, + [ /* :: */0, x2$1, - [ - /* :: */0, - x1$1, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x2$1, + [ + /* :: */0, + x1$1, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1$1, /* [] */0 ]; + } } else { exit = 1; @@ -1329,33 +1539,40 @@ function sort_uniq(cmp, l) { } else { var c$2 = cmp(x1, x3); - return c$2 ? ( - c$2 > 0 ? [ + if (c$2) { + if (c$2 > 0) { + return [ + /* :: */0, + x1, + [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x1, [ /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1, [ @@ -1364,6 +1581,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1398,33 +1616,40 @@ function sort_uniq(cmp, l) { } else { var c$4 = cmp(x2, x3); - return c$4 ? ( - c$4 > 0 ? [ + if (c$4) { + if (c$4 > 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x2, [ /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, [ @@ -1433,6 +1658,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1450,29 +1676,37 @@ function sort_uniq(cmp, l) { } else { var c$5 = cmp(x2, x3); - return c$5 ? ( - c$5 > 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - /* [] */0 - ] - ] : [ + if (c$5) { + if (c$5 > 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, /* [] */0 ]; + } } } else { @@ -1495,29 +1729,37 @@ function sort_uniq(cmp, l) { var x2$1 = match$2[1]; var x1$1 = l[1]; var c$6 = cmp(x1$1, x2$1); - return c$6 ? ( - c$6 > 0 ? [ - /* :: */0, - x1$1, - [ - /* :: */0, - x2$1, - /* [] */0 - ] - ] : [ + if (c$6) { + if (c$6 > 0) { + return [ + /* :: */0, + x1$1, + [ /* :: */0, x2$1, - [ - /* :: */0, - x1$1, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x2$1, + [ + /* :: */0, + x1$1, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1$1, /* [] */0 ]; + } } else { exit = 1; @@ -1538,7 +1780,12 @@ function sort_uniq(cmp, l) { }; var len = length(l); - return len < 2 ? l : sort(len, l); + if (len < 2) { + return l; + } + else { + return sort(len, l); + } } var append = Pervasives.$at; diff --git a/jscomp/stdlib/map.js b/jscomp/stdlib/map.js index a2f150c3bd..dcbc98fcd5 100644 --- a/jscomp/stdlib/map.js +++ b/jscomp/stdlib/map.js @@ -5,7 +5,12 @@ var Caml_exceptions = require("../runtime/caml_exceptions"); function Make(funarg) { var height = function (param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } }; var create = function (l, x, d, r) { var hl = height(l); @@ -38,9 +43,17 @@ function Make(funarg) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -53,9 +66,17 @@ function Make(funarg) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -74,7 +95,12 @@ function Make(funarg) { } }; var is_empty = function (param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } }; var add = function (x, data, param) { if (param) { @@ -83,9 +109,16 @@ function Make(funarg) { var v = param[2]; var l = param[1]; var c = funarg[1](x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -93,6 +126,7 @@ function Make(funarg) { r, param[5] ]; + } } else { return [ @@ -176,7 +210,12 @@ function Make(funarg) { var remove_min_binding = function (param) { if (param) { var l = param[1]; - return l ? bal(remove_min_binding(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal(remove_min_binding(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -203,9 +242,17 @@ function Make(funarg) { var v = param[2]; var l = param[1]; var c = funarg[1](x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, d, r) : bal(l, v, d, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, d, r); + } + else { + return bal(l, v, d, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -275,25 +322,53 @@ function Make(funarg) { }; }; var for_all = function (p, param) { - return param ? +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])); + } + else { + return /* true */1; + } }; var exists = function (p, param) { - return param ? +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])); + } + else { + return /* false */0; + } }; var add_min_binding = function (k, v, param) { - return param ? bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]) : singleton(k, v); + if (param) { + return bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton(k, v); + } }; var add_max_binding = function (k, v, param) { - return param ? bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])) : singleton(k, v); + if (param) { + return bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])); + } + else { + return singleton(k, v); + } }; var join = function (l, v, d, r) { if (l) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal(l[1], l[2], l[3], join(l[4], v, d, r)) : ( - rh > lh + 2 ? bal(join(l, v, d, r[1]), r[2], r[3], r[4]) : create(l, v, d, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], l[3], join(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create(l, v, d, r); + } + } } else { return add_max_binding(v, d, l); @@ -318,7 +393,12 @@ function Make(funarg) { } }; var concat_or_join = function (t1, v, d, t2) { - return d ? join(t1, v, d[1], t2) : concat(t1, t2); + if (d) { + return join(t1, v, d[1], t2); + } + else { + return concat(t1, t2); + } }; var split = function (x, param) { if (param) { @@ -422,7 +502,12 @@ function Make(funarg) { var l$prime = filter(p, param[1]); var pvd = p(v, d); var r$prime = filter(p, param[4]); - return pvd ? join(l$prime, v, d, r$prime) : concat(l$prime, r$prime); + if (pvd) { + return join(l$prime, v, d, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -439,15 +524,20 @@ function Make(funarg) { var match$1 = partition(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join(lt, v, d, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, d, rf) ]; + } } else { return [ @@ -503,7 +593,12 @@ function Make(funarg) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -511,16 +606,32 @@ function Make(funarg) { }; var equal = function (cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(funarg[1](e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(funarg[1](e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum(m1, /* End */0), cons_enum(m2, /* End */0)); }; var cardinal = function (param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } }; var bindings_aux = function (_accu, _param) { while(/* true */1) { diff --git a/jscomp/stdlib/marshal.js b/jscomp/stdlib/marshal.js index ff51a70237..bcfcde1f91 100644 --- a/jscomp/stdlib/marshal.js +++ b/jscomp/stdlib/marshal.js @@ -5,13 +5,23 @@ var Pervasives = require("./pervasives"); var Caml_primitive = require("../runtime/caml_primitive"); function to_buffer(buff, ofs, len, v, flags) { - return ofs < 0 || len < 0 || ofs > buff.length - len ? Pervasives.invalid_arg("Marshal.to_buffer: substring out of bounds") : Caml_primitive.caml_output_value_to_buffer(buff, ofs, len, v, flags); + if (ofs < 0 || len < 0 || ofs > buff.length - len) { + return Pervasives.invalid_arg("Marshal.to_buffer: substring out of bounds"); + } + else { + return Caml_primitive.caml_output_value_to_buffer(buff, ofs, len, v, flags); + } } var header_size = 20; function data_size(buff, ofs) { - return ofs < 0 || ofs > buff.length - header_size ? Pervasives.invalid_arg("Marshal.data_size") : Caml_primitive.caml_marshal_data_size(buff, ofs); + if (ofs < 0 || ofs > buff.length - header_size) { + return Pervasives.invalid_arg("Marshal.data_size"); + } + else { + return Caml_primitive.caml_marshal_data_size(buff, ofs); + } } function total_size(buff, ofs) { @@ -24,7 +34,12 @@ function from_bytes(buff, ofs) { } else { var len = Caml_primitive.caml_marshal_data_size(buff, ofs); - return ofs > buff.length - (header_size + len) ? Pervasives.invalid_arg("Marshal.from_bytes") : Caml_primitive.caml_input_value_from_string(buff, ofs); + if (ofs > buff.length - (header_size + len)) { + return Pervasives.invalid_arg("Marshal.from_bytes"); + } + else { + return Caml_primitive.caml_input_value_from_string(buff, ofs); + } } } diff --git a/jscomp/stdlib/nativeint.js b/jscomp/stdlib/nativeint.js index c687f26348..63e8690e33 100644 --- a/jscomp/stdlib/nativeint.js +++ b/jscomp/stdlib/nativeint.js @@ -13,7 +13,12 @@ function pred(n) { } function abs(n) { - return n >= 0 ? n : -n; + if (n >= 0) { + return n; + } + else { + return -n; + } } var size = Sys.word_size; diff --git a/jscomp/stdlib/parsing.js b/jscomp/stdlib/parsing.js index ad6241d012..40dae31bcb 100644 --- a/jscomp/stdlib/parsing.js +++ b/jscomp/stdlib/parsing.js @@ -158,7 +158,12 @@ function yyparse(tables, start, lexer, lexbuf) { } else { current_lookahead_fun[1] = function (tok) { - return Caml_obj_runtime.caml_obj_is_block(tok) ? +(tables[3][Caml_obj_runtime.caml_obj_tag(tok)] === curr_char) : +(tables[2][tok] === curr_char); + if (Caml_obj_runtime.caml_obj_is_block(tok)) { + return +(tables[3][Caml_obj_runtime.caml_obj_tag(tok)] === curr_char); + } + else { + return +(tables[2][tok] === curr_char); + } }; throw exn; } diff --git a/jscomp/stdlib/pervasives.js b/jscomp/stdlib/pervasives.js index 5a363891a6..f5ede34b2c 100644 --- a/jscomp/stdlib/pervasives.js +++ b/jscomp/stdlib/pervasives.js @@ -30,15 +30,30 @@ var Exit = [ ]; function min(x, y) { - return Caml_primitive.caml_lessequal(x, y) ? x : y; + if (Caml_primitive.caml_lessequal(x, y)) { + return x; + } + else { + return y; + } } function max(x, y) { - return Caml_primitive.caml_greaterequal(x, y) ? x : y; + if (Caml_primitive.caml_greaterequal(x, y)) { + return x; + } + else { + return y; + } } function abs(x) { - return x >= 0 ? x : -x; + if (x >= 0) { + return x; + } + else { + return -x; + } } function lnot(x) { @@ -64,11 +79,21 @@ var epsilon_float = Number.EPSILON; var $caret = Caml_string.add; function char_of_int(n) { - return n < 0 || n > 255 ? invalid_arg("char_of_int") : n; + if (n < 0 || n > 255) { + return invalid_arg("char_of_int"); + } + else { + return n; + } } function string_of_bool(b) { - return b ? "true" : "false"; + if (b) { + return "true"; + } + else { + return "false"; + } } function bool_of_string(param) { @@ -121,11 +146,16 @@ function string_of_float(f) { } function $at(l1, l2) { - return l1 ? [ + if (l1) { + return [ /* :: */0, l1[1], $at(l1[2], l2) - ] : l2; + ]; + } + else { + return l2; + } } var stdin = Caml_io.stdin; @@ -208,11 +238,21 @@ function output_string(oc, s) { } function output(oc, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("output") : Caml_io.caml_ml_output(oc, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("output"); + } + else { + return Caml_io.caml_ml_output(oc, s, ofs, len); + } } function output_substring(oc, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("output_substring") : Caml_io.caml_ml_output(oc, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("output_substring"); + } + else { + return Caml_io.caml_ml_output(oc, s, ofs, len); + } } function output_value(chan, v) { @@ -268,7 +308,12 @@ function open_in_bin(name) { } function input(ic, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("input") : Caml_primitive.caml_ml_input(ic, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("input"); + } + else { + return Caml_primitive.caml_ml_input(ic, s, ofs, len); + } } function unsafe_really_input(ic, s, _ofs, _len) { @@ -292,7 +337,12 @@ function unsafe_really_input(ic, s, _ofs, _len) { } function really_input(ic, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("really_input") : unsafe_really_input(ic, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("really_input"); + } + else { + return unsafe_really_input(ic, s, ofs, len); + } } function really_input_string(ic, len) { diff --git a/jscomp/stdlib/printexc.js b/jscomp/stdlib/printexc.js index 43c892f7a4..ee966e934d 100644 --- a/jscomp/stdlib/printexc.js +++ b/jscomp/stdlib/printexc.js @@ -68,7 +68,8 @@ var locfmt = [ function field(x, i) { var f = x[i]; - return !Caml_obj_runtime.caml_obj_is_block(f) ? Printf.sprintf([ + if (!Caml_obj_runtime.caml_obj_is_block(f)) { + return Printf.sprintf([ /* Format */0, [ /* Int */4, @@ -78,23 +79,37 @@ function field(x, i) { /* End_of_format */0 ], "%d" - ])(f) : ( - Caml_obj_runtime.caml_obj_tag(f) === Obj.string_tag ? Printf.sprintf([ - /* Format */0, - [ - /* Caml_string */3, - /* No_padding */0, - /* End_of_format */0 - ], - "%S" - ])(f) : ( - Caml_obj_runtime.caml_obj_tag(f) === Obj.double_tag ? Pervasives.string_of_float(f) : "_" - ) - ); + ])(f); + } + else { + if (Caml_obj_runtime.caml_obj_tag(f) === Obj.string_tag) { + return Printf.sprintf([ + /* Format */0, + [ + /* Caml_string */3, + /* No_padding */0, + /* End_of_format */0 + ], + "%S" + ])(f); + } + else { + if (Caml_obj_runtime.caml_obj_tag(f) === Obj.double_tag) { + return Pervasives.string_of_float(f); + } + else { + return "_"; + } + } + } } function other_fields(x, i) { - return i >= x.length ? "" : Printf.sprintf([ + if (i >= x.length) { + return ""; + } + else { + return Printf.sprintf([ /* Format */0, [ /* String_literal */11, @@ -111,6 +126,7 @@ function other_fields(x, i) { ], ", %s%s" ])(field(x, i), other_fields(x, i + 1)); + } } function fields(x) { @@ -305,30 +321,48 @@ function convert_raw_backtrace(rbckt) { function format_backtrace_slot(pos, slot) { var info = function (is_raise) { - return is_raise ? ( - pos ? "Re-raised at" : "Raised at" - ) : ( - pos ? "Called from" : "Raised by primitive operation at" - ); + if (is_raise) { + if (pos) { + return "Re-raised at"; + } + else { + return "Raised at"; + } + } + else { + if (pos) { + return "Called from"; + } + else { + return "Raised by primitive operation at"; + } + } }; - return slot[0] ? ( - slot[1] !== 0 ? /* None */0 : [ - /* Some */0, - Printf.sprintf([ - /* Format */0, + if (slot[0]) { + if (slot[1] !== 0) { + return /* None */0; + } + else { + return [ + /* Some */0, + Printf.sprintf([ + /* Format */0, + [ + /* String */2, + /* No_padding */0, [ - /* String */2, - /* No_padding */0, - [ - /* String_literal */11, - " unknown location", - /* End_of_format */0 - ] - ], - "%s unknown location" - ])(info(/* false */0)) - ] - ) : [ + /* String_literal */11, + " unknown location", + /* End_of_format */0 + ] + ], + "%s unknown location" + ])(info(/* false */0)) + ]; + } + } + else { + return [ /* Some */0, Printf.sprintf([ /* Format */0, @@ -378,6 +412,7 @@ function format_backtrace_slot(pos, slot) { '%s file "%s", line %d, characters %d-%d' ])(info(slot[1]), slot[2], slot[3], slot[4], slot[5]) ]; + } } function print_exception_backtrace(outchan, backtrace) { @@ -464,7 +499,11 @@ function backtrace_slot_is_raise(param) { } function backtrace_slot_location(param) { - return param[0] ? /* None */0 : [ + if (param[0]) { + return /* None */0; + } + else { + return [ /* Some */0, [ /* record */0, @@ -474,6 +513,7 @@ function backtrace_slot_location(param) { param[5] ] ]; + } } function backtrace_slots(raw_backtrace) { @@ -481,15 +521,30 @@ function backtrace_slots(raw_backtrace) { if (match) { var backtrace = match[1]; var usable_slot = function (param) { - return param[0] ? /* false */0 : /* true */1; + if (param[0]) { + return /* false */0; + } + else { + return /* true */1; + } }; var exists_usable = function (i) { - return i !== -1 ? +(usable_slot(backtrace[i]) || exists_usable(i - 1)) : /* false */0; + if (i !== -1) { + return +(usable_slot(backtrace[i]) || exists_usable(i - 1)); + } + else { + return /* false */0; + } }; - return exists_usable(backtrace.length - 1) ? [ + if (exists_usable(backtrace.length - 1)) { + return [ /* Some */0, backtrace - ] : /* None */0; + ]; + } + else { + return /* None */0; + } } else { return /* None */0; @@ -518,7 +573,12 @@ function register_printer(fn) { } function exn_slot(x) { - return Caml_obj_runtime.caml_obj_tag(x) ? x : x[0]; + if (Caml_obj_runtime.caml_obj_tag(x)) { + return x; + } + else { + return x[0]; + } } function exn_slot_id(x) { diff --git a/jscomp/stdlib/queue.js b/jscomp/stdlib/queue.js index 976ad153ff..271a90077b 100644 --- a/jscomp/stdlib/queue.js +++ b/jscomp/stdlib/queue.js @@ -66,7 +66,12 @@ function take(q) { -- q[1]; var tail = q[2]; var head = tail[2]; - head === tail ? (q[2] = /* None */0) : (tail[2] = head[2]); + if (head === tail) { + q[2] = /* None */0; + } + else { + tail[2] = head[2]; + } return head[1]; } diff --git a/jscomp/stdlib/random.js b/jscomp/stdlib/random.js index 6beee43b1c..59d724c9f5 100644 --- a/jscomp/stdlib/random.js +++ b/jscomp/stdlib/random.js @@ -83,7 +83,12 @@ function intaux(s, n) { } function $$int(s, bound) { - return bound > 1073741823 || bound <= 0 ? Pervasives.invalid_arg("Random.int") : intaux(s, bound); + if (bound > 1073741823 || bound <= 0) { + return Pervasives.invalid_arg("Random.int"); + } + else { + return intaux(s, bound); + } } function int32aux(s, n) { @@ -100,7 +105,12 @@ function int32aux(s, n) { } function int32(s, bound) { - return bound <= 0 ? Pervasives.invalid_arg("Random.int32") : int32aux(s, bound); + if (bound <= 0) { + return Pervasives.invalid_arg("Random.int32"); + } + else { + return int32aux(s, bound); + } } function int64aux(s, n) { @@ -118,7 +128,12 @@ function int64aux(s, n) { } function int64(s, bound) { - return bound <= 0 ? Pervasives.invalid_arg("Random.int64") : int64aux(s, bound); + if (bound <= 0) { + return Pervasives.invalid_arg("Random.int64"); + } + else { + return int64aux(s, bound); + } } var nativeint = Nativeint.size === 32 ? function (s, bound) { diff --git a/jscomp/stdlib/scanf.js b/jscomp/stdlib/scanf.js index 9a7ea9241d..4ce8982204 100644 --- a/jscomp/stdlib/scanf.js +++ b/jscomp/stdlib/scanf.js @@ -39,7 +39,12 @@ function next_char(ib) { } function peek_char(ib) { - return ib[3] ? ib[2] : next_char(ib); + if (ib[3]) { + return ib[2]; + } + else { + return next_char(ib); + } } function checked_peek_char(ib) { @@ -65,15 +70,31 @@ function beginning_of_input(ib) { function name_of_input(ib) { var match = ib[9]; - return typeof match === "number" ? ( - match ? "unnamed function" : "unnamed character string" - ) : ( - match[0] ? "unnamed pervasives input channel" : match[1] - ); + if (typeof match === "number") { + if (match) { + return "unnamed function"; + } + else { + return "unnamed character string"; + } + } + else { + if (match[0]) { + return "unnamed pervasives input channel"; + } + else { + return match[1]; + } + } } function char_count(ib) { - return ib[3] ? ib[4] - 1 : ib[4]; + if (ib[3]) { + return ib[4] - 1; + } + else { + return ib[4]; + } } function line_count(ib) { @@ -194,7 +215,14 @@ function from_ic(scan_close_ic, iname, ic) { } else { lim[1] = Pervasives.input(ic, buf, 0, len); - return lim[1] ? (i[1] = 1, buf[0]) : (eof[1] = /* true */1, scan_close_ic(ic)); + if (lim[1]) { + i[1] = 1; + return buf[0]; + } + else { + eof[1] = /* true */1; + return scan_close_ic(ic); + } } } }; @@ -277,9 +305,17 @@ function from_channel(param) { function close_in(ib) { var match = ib[9]; - return typeof match === "number" ? /* () */0 : ( - match[0] ? Pervasives.close_in(match[1]) : Pervasives.close_in(match[2]) - ); + if (typeof match === "number") { + return /* () */0; + } + else { + if (match[0]) { + return Pervasives.close_in(match[1]); + } + else { + return Pervasives.close_in(match[2]); + } + } } var Scan_failure = [ @@ -386,11 +422,22 @@ function skip_whites(ib) { var c = peek_char(ib); if (!eof(ib)) { var switcher = -9 + c; - return !(4 < (switcher >>> 0)) ? ( - 1 < (-2 + switcher >>> 0) ? invalidate_current_char(ib) : /* () */0 - ) : ( - switcher !== 23 ? /* () */0 : invalidate_current_char(ib) - ); + if (!(4 < (switcher >>> 0))) { + if (1 < (-2 + switcher >>> 0)) { + return invalidate_current_char(ib); + } + else { + return /* () */0; + } + } + else { + if (switcher !== 23) { + return /* () */0; + } + else { + return invalidate_current_char(ib); + } + } } else { return 0; @@ -531,7 +578,12 @@ function token_int_literal(conv, ib) { } var l = tok.length; - return l === 0 || tok.charCodeAt(0) !== /* "+" */43 ? tok : $$String.sub(tok, 1, l - 1); + if (l === 0 || tok.charCodeAt(0) !== /* "+" */43) { + return tok; + } + else { + return $$String.sub(tok, 1, l - 1); + } } function token_int(conv, ib) { @@ -650,7 +702,11 @@ function scan_digits_plus(basis, digitp, width, ib) { }; if (width) { var c = checked_peek_char(ib); - return digitp(c) ? scan_digits(store_char(width, ib, c)) : bad_input(Printf.sprintf([ + if (digitp(c)) { + return scan_digits(store_char(width, ib, c)); + } + else { + return bad_input(Printf.sprintf([ /* Format */0, [ /* String_literal */11, @@ -674,6 +730,7 @@ function scan_digits_plus(basis, digitp, width, ib) { ], "character %C is not a valid %s digit" ])(c, basis)); + } } else { return bad_token_length("digits"); @@ -681,7 +738,12 @@ function scan_digits_plus(basis, digitp, width, ib) { } function is_binary_digit(param) { - return 1 < (-48 + param >>> 0) ? /* false */0 : /* true */1; + if (1 < (-48 + param >>> 0)) { + return /* false */0; + } + else { + return /* true */1; + } } function scan_binary_int(param, param$1) { @@ -689,7 +751,12 @@ function scan_binary_int(param, param$1) { } function is_octal_digit(param) { - return 7 < (-48 + param >>> 0) ? /* false */0 : /* true */1; + if (7 < (-48 + param >>> 0)) { + return /* false */0; + } + else { + return /* true */1; + } } function scan_octal_int(param, param$1) { @@ -698,11 +765,22 @@ function scan_octal_int(param, param$1) { function is_hexa_digit(param) { var switcher = -48 + param; - return 22 < (switcher >>> 0) ? ( - 5 < (-49 + switcher >>> 0) ? /* false */0 : /* true */1 - ) : ( - 6 < (-10 + switcher >>> 0) ? /* true */1 : /* false */0 - ); + if (22 < (switcher >>> 0)) { + if (5 < (-49 + switcher >>> 0)) { + return /* false */0; + } + else { + return /* true */1; + } + } + else { + if (6 < (-10 + switcher >>> 0)) { + return /* true */1; + } + else { + return /* false */0; + } + } } function scan_hexadecimal_int(param, param$1) { @@ -761,7 +839,12 @@ function scan_unsigned_int(width, ib) { } else { if (c$1 !== 88) { - return c$1 >= 98 ? scan_binary_int(store_char(width$1, ib, c$1), ib) : scan_decimal_digits(width$1, ib); + if (c$1 >= 98) { + return scan_binary_int(store_char(width$1, ib, c$1), ib); + } + else { + return scan_decimal_digits(width$1, ib); + } } else { exit = 1; @@ -854,9 +937,17 @@ function scan_int_conv(conv, width, ib) { function scan_frac_part(width, ib) { if (width) { var c = peek_char(ib); - return eof(ib) ? width : ( - 9 < (-48 + c >>> 0) ? width : scan_decimal_digits(store_char(width, ib, c), ib) - ); + if (eof(ib)) { + return width; + } + else { + if (9 < (-48 + c >>> 0)) { + return width; + } + else { + return scan_decimal_digits(store_char(width, ib, c), ib); + } + } } else { return width; @@ -948,7 +1039,12 @@ function scan_caml_float(width, precision, ib) { else { var switcher = -69 + c; if (!(32 < (switcher >>> 0))) { - return 30 < (-1 + switcher >>> 0) ? scan_exp_part(width$1, ib) : bad_float(/* () */0); + if (30 < (-1 + switcher >>> 0)) { + return scan_exp_part(width$1, ib); + } + else { + return bad_float(/* () */0); + } } else { if (switcher !== -23) { @@ -1047,7 +1143,12 @@ function char_for_backslash(c) { } } else { - return c !== 98 ? c : /* "\b" */8; + if (c !== 98) { + return c; + } + else { + return /* "\b" */8; + } } } @@ -1057,7 +1158,8 @@ function decimal_value_of_char(c) { function char_for_decimal_code(c0, c1, c2) { var c = 100 * decimal_value_of_char(c0) + 10 * decimal_value_of_char(c1) + decimal_value_of_char(c2); - return c < 0 || c > 255 ? bad_input(Printf.sprintf([ + if (c < 0 || c > 255) { + return bad_input(Printf.sprintf([ /* Format */0, [ /* String_literal */11, @@ -1074,18 +1176,31 @@ function char_for_decimal_code(c0, c1, c2) { ] ], "bad character decimal encoding \\%c%c%c" - ])(c0, c1, c2)) : Pervasives.char_of_int(c); + ])(c0, c1, c2)); + } + else { + return Pervasives.char_of_int(c); + } } function hexadecimal_value_of_char(c) { - return c >= /* "a" */97 ? c - 87 : ( - c >= /* "A" */65 ? c - 55 : c - /* "0" */48 - ); + if (c >= /* "a" */97) { + return c - 87; + } + else { + if (c >= /* "A" */65) { + return c - 55; + } + else { + return c - /* "0" */48; + } + } } function char_for_hexadecimal_code(c1, c2) { var c = 16 * hexadecimal_value_of_char(c1) + hexadecimal_value_of_char(c2); - return c < 0 || c > 255 ? bad_input(Printf.sprintf([ + if (c < 0 || c > 255) { + return bad_input(Printf.sprintf([ /* Format */0, [ /* String_literal */11, @@ -1099,13 +1214,22 @@ function char_for_hexadecimal_code(c1, c2) { ] ], "bad character hexadecimal encoding \\%c%c" - ])(c1, c2)) : Pervasives.char_of_int(c); + ])(c1, c2)); + } + else { + return Pervasives.char_of_int(c); + } } function check_next_char(message, width, ib) { if (width) { var c = peek_char(ib); - return eof(ib) ? bad_end_of_input(message) : c; + if (eof(ib)) { + return bad_end_of_input(message); + } + else { + return c; + } } else { return bad_token_length(message); @@ -1167,11 +1291,22 @@ function scan_backslash_char(width, ib) { var get_digit = function () { var c = next_char(ib); var switcher = -48 + c; - return 22 < (switcher >>> 0) ? ( - 5 < (-49 + switcher >>> 0) ? bad_input_escape(c) : c - ) : ( - 6 < (-10 + switcher >>> 0) ? c : bad_input_escape(c) - ); + if (22 < (switcher >>> 0)) { + if (5 < (-49 + switcher >>> 0)) { + return bad_input_escape(c); + } + else { + return c; + } + } + else { + if (6 < (-10 + switcher >>> 0)) { + return c; + } + else { + return bad_input_escape(c); + } + } }; var c1 = get_digit(/* () */0); var c2 = get_digit(/* () */0); @@ -1184,7 +1319,12 @@ function scan_backslash_char(width, ib) { if (c >= 48) { var get_digit$1 = function () { var c = next_char(ib); - return 9 < (-48 + c >>> 0) ? bad_input_escape(c) : c; + if (9 < (-48 + c >>> 0)) { + return bad_input_escape(c); + } + else { + return c; + } }; var c1$1 = get_digit$1(/* () */0); var c2$1 = get_digit$1(/* () */0); @@ -1212,15 +1352,30 @@ function scan_backslash_char(width, ib) { function scan_caml_char(width, ib) { var find_start = function (width) { var c = checked_peek_char(ib); - return c !== 39 ? character_mismatch(/* "'" */39, c) : find_char(ignore_char(width, ib)); + if (c !== 39) { + return character_mismatch(/* "'" */39, c); + } + else { + return find_char(ignore_char(width, ib)); + } }; var find_char = function (width) { var c = check_next_char_for_char(width, ib); - return c !== 92 ? find_stop(store_char(width, ib, c)) : find_stop(scan_backslash_char(ignore_char(width, ib), ib)); + if (c !== 92) { + return find_stop(store_char(width, ib, c)); + } + else { + return find_stop(scan_backslash_char(ignore_char(width, ib), ib)); + } }; var find_stop = function (width) { var c = check_next_char_for_char(width, ib); - return c !== 39 ? character_mismatch(/* "'" */39, c) : ignore_char(width, ib); + if (c !== 39) { + return character_mismatch(/* "'" */39, c); + } + else { + return ignore_char(width, ib); + } }; return find_start(width); } @@ -1228,7 +1383,12 @@ function scan_caml_char(width, ib) { function scan_caml_string(width, ib) { var find_start = function (width) { var c = checked_peek_char(ib); - return c !== 34 ? character_mismatch(/* "\"" */34, c) : find_stop(ignore_char(width, ib)); + if (c !== 34) { + return character_mismatch(/* "\"" */34, c); + } + else { + return find_stop(ignore_char(width, ib)); + } }; var find_stop = function (_width) { while(/* true */1) { @@ -1249,13 +1409,26 @@ function scan_caml_string(width, ib) { }; var scan_backslash = function (width) { var match = check_next_char_for_string(width, ib); - return match !== 10 ? ( - match !== 13 ? find_stop(scan_backslash_char(width, ib)) : skip_newline(ignore_char(width, ib)) - ) : skip_spaces(ignore_char(width, ib)); + if (match !== 10) { + if (match !== 13) { + return find_stop(scan_backslash_char(width, ib)); + } + else { + return skip_newline(ignore_char(width, ib)); + } + } + else { + return skip_spaces(ignore_char(width, ib)); + } }; var skip_newline = function (width) { var match = check_next_char_for_string(width, ib); - return match !== 10 ? find_stop(store_char(width, ib, /* "\r" */13)) : skip_spaces(ignore_char(width, ib)); + if (match !== 10) { + return find_stop(store_char(width, ib, /* "\r" */13)); + } + else { + return skip_spaces(ignore_char(width, ib)); + } }; var skip_spaces = function (_width) { while(/* true */1) { @@ -1314,7 +1487,12 @@ function scan_chars_in_char_set(char_set, scan_indic, width, ib) { scan_chars(width, c); if (!eof(ib)) { var ci = peek_char(ib); - return c === ci ? invalidate_current_char(ib) : character_mismatch(c, ci); + if (c === ci) { + return invalidate_current_char(ib); + } + else { + return character_mismatch(c, ci); + } } else { return 0; @@ -1383,7 +1561,12 @@ function get_counter(ib, counter) { } function width_of_pad_opt(pad_opt) { - return pad_opt ? pad_opt[1] : Pervasives.max_int; + if (pad_opt) { + return pad_opt[1]; + } + else { + return Pervasives.max_int; + } } function stopper_of_formatting_lit(fmting) { @@ -1713,7 +1896,12 @@ function make_scanf(ib, _fmt, readers) { } }(c$5))); case 8 : - return fmt[1] >= 15 ? pad_prec_scanf(ib, fmt[4], readers, fmt[2], fmt[3], scan_caml_float, token_float) : pad_prec_scanf(ib, fmt[4], readers, fmt[2], fmt[3], scan_float, token_float); + if (fmt[1] >= 15) { + return pad_prec_scanf(ib, fmt[4], readers, fmt[2], fmt[3], scan_caml_float, token_float); + } + else { + return pad_prec_scanf(ib, fmt[4], readers, fmt[2], fmt[3], scan_float, token_float); + } case 9 : scan_bool(ib); var b = token_bool(ib); @@ -2026,7 +2214,12 @@ function kscanf(ib, ef, param) { } } - return match[0] ? ef(ib, match[1]) : apply(f, match[1]); + if (match[0]) { + return ef(ib, match[1]); + } + else { + return apply(f, match[1]); + } }; return take_format_readers(k, fmt); } diff --git a/jscomp/stdlib/set.js b/jscomp/stdlib/set.js index 1dde99a18c..11b67c7450 100644 --- a/jscomp/stdlib/set.js +++ b/jscomp/stdlib/set.js @@ -6,7 +6,12 @@ var List = require("./list"); function Make(funarg) { var height = function (param) { - return param ? param[4] : 0; + if (param) { + return param[4]; + } + else { + return 0; + } }; var create = function (l, v, r) { var hl = l ? l[4] : 0; @@ -27,9 +32,17 @@ function Make(funarg) { var lr = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, create(lr, v, r)) : ( - lr ? create(create(ll, lv, lr[1]), lr[2], create(lr[3], v, r)) : Pervasives.invalid_arg("Set.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, create(lr, v, r)); + } + else { + if (lr) { + return create(create(ll, lv, lr[1]), lr[2], create(lr[3], v, r)); + } + else { + return Pervasives.invalid_arg("Set.bal"); + } + } } else { return Pervasives.invalid_arg("Set.bal"); @@ -41,9 +54,17 @@ function Make(funarg) { var rr = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, v, rl), rv, rr) : ( - rl ? create(create(l, v, rl[1]), rl[2], create(rl[3], rv, rr)) : Pervasives.invalid_arg("Set.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, v, rl), rv, rr); + } + else { + if (rl) { + return create(create(l, v, rl[1]), rl[2], create(rl[3], rv, rr)); + } + else { + return Pervasives.invalid_arg("Set.bal"); + } + } } else { return Pervasives.invalid_arg("Set.bal"); @@ -66,9 +87,17 @@ function Make(funarg) { var v = t[2]; var l = t[1]; var c = funarg[1](x, v); - return c ? ( - c < 0 ? bal(add(x, l), v, r) : bal(l, v, add(x, r)) - ) : t; + if (c) { + if (c < 0) { + return bal(add(x, l), v, r); + } + else { + return bal(l, v, add(x, r)); + } + } + else { + return t; + } } else { return [ @@ -90,19 +119,37 @@ function Make(funarg) { ]; }; var add_min_element = function (v, param) { - return param ? bal(add_min_element(v, param[1]), param[2], param[3]) : singleton(v); + if (param) { + return bal(add_min_element(v, param[1]), param[2], param[3]); + } + else { + return singleton(v); + } }; var add_max_element = function (v, param) { - return param ? bal(param[1], param[2], add_max_element(v, param[3])) : singleton(v); + if (param) { + return bal(param[1], param[2], add_max_element(v, param[3])); + } + else { + return singleton(v); + } }; var join = function (l, v, r) { if (l) { if (r) { var rh = r[4]; var lh = l[4]; - return lh > rh + 2 ? bal(l[1], l[2], join(l[3], v, r)) : ( - rh > lh + 2 ? bal(join(l, v, r[1]), r[2], r[3]) : create(l, v, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], join(l[3], v, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, r[1]), r[2], r[3]); + } + else { + return create(l, v, r); + } + } } else { return add_max_element(v, l); @@ -149,21 +196,42 @@ function Make(funarg) { var remove_min_elt = function (param) { if (param) { var l = param[1]; - return l ? bal(remove_min_elt(l), param[2], param[3]) : param[3]; + if (l) { + return bal(remove_min_elt(l), param[2], param[3]); + } + else { + return param[3]; + } } else { return Pervasives.invalid_arg("Set.remove_min_elt"); } }; var merge = function (t1, t2) { - return t1 ? ( - t2 ? bal(t1, min_elt(t2), remove_min_elt(t2)) : t1 - ) : t2; + if (t1) { + if (t2) { + return bal(t1, min_elt(t2), remove_min_elt(t2)); + } + else { + return t1; + } + } + else { + return t2; + } }; var concat = function (t1, t2) { - return t1 ? ( - t2 ? join(t1, min_elt(t2), remove_min_elt(t2)) : t1 - ) : t2; + if (t1) { + if (t2) { + return join(t1, min_elt(t2), remove_min_elt(t2)); + } + else { + return t1; + } + } + else { + return t2; + } }; var split = function (x, param) { if (param) { @@ -211,7 +279,12 @@ function Make(funarg) { }; var empty = /* Empty */0; var is_empty = function (param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } }; var mem = function (x, param) { if (param) { @@ -228,9 +301,17 @@ function Make(funarg) { var v = param[2]; var l = param[1]; var c = funarg[1](x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, r) : bal(l, v, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, r); + } + else { + return bal(l, v, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -278,7 +359,12 @@ function Make(funarg) { var l1 = s1[1]; var match = split(v1, s2); var l2 = match[1]; - return match[2] !== 0 ? join(inter(l1, l2), v1, inter(r1, match[3])) : concat(inter(l1, l2), inter(r1, match[3])); + if (match[2] !== 0) { + return join(inter(l1, l2), v1, inter(r1, match[3])); + } + else { + return concat(inter(l1, l2), inter(r1, match[3])); + } } else { return /* Empty */0; @@ -296,7 +382,12 @@ function Make(funarg) { var l1 = s1[1]; var match = split(v1, s2); var l2 = match[1]; - return match[2] !== 0 ? concat(diff(l1, l2), diff(r1, match[3])) : join(diff(l1, l2), v1, diff(r1, match[3])); + if (match[2] !== 0) { + return concat(diff(l1, l2), diff(r1, match[3])); + } + else { + return join(diff(l1, l2), v1, diff(r1, match[3])); + } } else { return s1; @@ -344,7 +435,12 @@ function Make(funarg) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -363,21 +459,29 @@ function Make(funarg) { var v1 = s1[2]; var l1 = s1[1]; var c = funarg[1](v1, s2[2]); - return c ? ( - c < 0 ? +(subset([ - /* Node */0, - l1, - v1, - /* Empty */0, - 0 - ], l2) && subset(r1, s2)) : +(subset([ - /* Node */0, - /* Empty */0, - v1, - r1, - 0 - ], r2) && subset(l1, s2)) - ) : +(subset(l1, l2) && subset(r1, r2)); + if (c) { + if (c < 0) { + return +(subset([ + /* Node */0, + l1, + v1, + /* Empty */0, + 0 + ], l2) && subset(r1, s2)); + } + else { + return +(subset([ + /* Node */0, + /* Empty */0, + v1, + r1, + 0 + ], r2) && subset(l1, s2)); + } + } + else { + return +(subset(l1, l2) && subset(r1, r2)); + } } else { return /* false */0; @@ -414,10 +518,20 @@ function Make(funarg) { }; }; var for_all = function (p, param) { - return param ? +(p(param[2]) && for_all(p, param[1]) && for_all(p, param[3])) : /* true */1; + if (param) { + return +(p(param[2]) && for_all(p, param[1]) && for_all(p, param[3])); + } + else { + return /* true */1; + } }; var exists = function (p, param) { - return param ? +(p(param[2]) || exists(p, param[1]) || exists(p, param[3])) : /* false */0; + if (param) { + return +(p(param[2]) || exists(p, param[1]) || exists(p, param[3])); + } + else { + return /* false */0; + } }; var filter = function (p, param) { if (param) { @@ -425,7 +539,12 @@ function Make(funarg) { var l$prime = filter(p, param[1]); var pv = p(v); var r$prime = filter(p, param[3]); - return pv ? join(l$prime, v, r$prime) : concat(l$prime, r$prime); + if (pv) { + return join(l$prime, v, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -441,15 +560,20 @@ function Make(funarg) { var match$1 = partition(p, param[3]); var rf = match$1[2]; var rt = match$1[1]; - return pv ? [ + if (pv) { + return [ /* tuple */0, join(lt, v, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, rf) ]; + } } else { return [ @@ -460,7 +584,12 @@ function Make(funarg) { } }; var cardinal = function (param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[3]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[3]); + } + else { + return 0; + } }; var elements_aux = function (_accu, _param) { while(/* true */1) { @@ -649,9 +778,17 @@ function Make(funarg) { if (match$2) { var match$3 = match$2[2]; var x3 = match$2[1]; - return match$3 ? ( - match$3[2] ? of_sorted_list(List.sort_uniq(funarg[1], l)) : add(match$3[1], add(x3, add(x2, add(x1, singleton(x0))))) - ) : add(x3, add(x2, add(x1, singleton(x0)))); + if (match$3) { + if (match$3[2]) { + return of_sorted_list(List.sort_uniq(funarg[1], l)); + } + else { + return add(match$3[1], add(x3, add(x2, add(x1, singleton(x0))))); + } + } + else { + return add(x3, add(x2, add(x1, singleton(x0)))); + } } else { return add(x2, add(x1, singleton(x0))); diff --git a/jscomp/stdlib/sort.js b/jscomp/stdlib/sort.js index 64dfffd4bf..8a1172a4a1 100644 --- a/jscomp/stdlib/sort.js +++ b/jscomp/stdlib/sort.js @@ -7,15 +7,20 @@ function merge(order, l1, l2) { var h1 = l1[1]; if (l2) { var h2 = l2[1]; - return order(h1, h2) ? [ + if (order(h1, h2)) { + return [ /* :: */0, h1, merge(order, l1[2], l2) - ] : [ + ]; + } + else { + return [ /* :: */0, h2, merge(order, l1, l2[2]) ]; + } } else { return l1; @@ -74,11 +79,16 @@ function list(order, l) { var merge2 = function (x) { if (x) { var match = x[2]; - return match ? [ + if (match) { + return [ /* :: */0, merge(order, x[1], match[1]), merge2(match[2]) - ] : x; + ]; + } + else { + return x; + } } else { return x; diff --git a/jscomp/stdlib/stream.js b/jscomp/stdlib/stream.js index 2f9f213a9b..9c54c53331 100644 --- a/jscomp/stdlib/stream.js +++ b/jscomp/stdlib/stream.js @@ -97,22 +97,34 @@ function get_data(count, _d) { var match$1 = g[1]; if (match$1) { var match$2 = match$1[1]; - return match$2 ? (g[1] = /* None */0, [ - /* Scons */0, - match$2[1], - d - ]) : /* Sempty */0; + if (match$2) { + g[1] = /* None */0; + return [ + /* Scons */0, + match$2[1], + d + ]; + } + else { + return /* Sempty */0; + } } else { var match$3 = g[2](count); - return match$3 ? [ + if (match$3) { + return [ /* Scons */0, match$3[1], d - ] : (g[1] = [ - /* Some */0, - /* None */0 - ], /* Sempty */0); + ]; + } + else { + g[1] = [ + /* Some */0, + /* None */0 + ]; + return /* Sempty */0; + } } break; case 4 : @@ -220,10 +232,16 @@ function peek(s) { if (b[4] >= b[3]) { fill_buff(b); } - return b[3] ? [ + if (b[3]) { + return [ /* Some */0, b[2][b[4]] - ] : (set_data(s, /* Sempty */0), /* None */0); + ]; + } + else { + set_data(s, /* Sempty */0); + return /* None */0; + } } } @@ -396,10 +414,16 @@ function of_string(s) { ]; return from(function () { var c = count[1]; - return c < s.length ? (++ count[1], [ - /* Some */0, - s.charCodeAt(c) - ]) : /* None */0; + if (c < s.length) { + ++ count[1]; + return [ + /* Some */0, + s.charCodeAt(c) + ]; + } + else { + return /* None */0; + } }); } @@ -410,10 +434,16 @@ function of_bytes(s) { ]; return from(function () { var c = count[1]; - return c < s.length ? (++ count[1], [ - /* Some */0, - s[c] - ]) : /* None */0; + if (c < s.length) { + ++ count[1]; + return [ + /* Some */0, + s[c] + ]; + } + else { + return /* None */0; + } }); } diff --git a/jscomp/stdlib/string.js b/jscomp/stdlib/string.js index b2d3a81388..796f33e9b9 100644 --- a/jscomp/stdlib/string.js +++ b/jscomp/stdlib/string.js @@ -78,17 +78,36 @@ function mapi(f, s) { function is_space(param) { var switcher = -9 + param; - return 4 < (switcher >>> 0) ? ( - switcher !== 23 ? /* false */0 : /* true */1 - ) : ( - switcher !== 2 ? /* true */1 : /* false */0 - ); + if (4 < (switcher >>> 0)) { + if (switcher !== 23) { + return /* false */0; + } + else { + return /* true */1; + } + } + else { + if (switcher !== 2) { + return /* true */1; + } + else { + return /* false */0; + } + } } function trim(s) { - return s === "" ? s : ( - is_space(s.charCodeAt(0)) || is_space(s.charCodeAt(s.length - 1)) ? bts(Bytes.trim(bos(s))) : s - ); + if (s === "") { + return s; + } + else { + if (is_space(s.charCodeAt(0)) || is_space(s.charCodeAt(s.length - 1))) { + return bts(Bytes.trim(bos(s))); + } + else { + return s; + } + } } function escaped(s) { @@ -144,7 +163,12 @@ function escaped(s) { } }; }; - return needs_escape(0) ? bts(Bytes.escaped(bos(s))) : s; + if (needs_escape(0)) { + return bts(Bytes.escaped(bos(s))); + } + else { + return s; + } } function index(s, c) { diff --git a/jscomp/stdlib/sys.js b/jscomp/stdlib/sys.js index 48cc7014c9..a3f130921d 100644 --- a/jscomp/stdlib/sys.js +++ b/jscomp/stdlib/sys.js @@ -39,12 +39,17 @@ var Break = [ ]; function catch_break(on) { - return on ? set_signal(sigint, [ + if (on) { + return set_signal(sigint, [ /* Signal_handle */0, function () { throw Break; } - ]) : set_signal(sigint, /* Signal_default */0); + ]); + } + else { + return set_signal(sigint, /* Signal_default */0); + } } var argv = match_002; diff --git a/jscomp/stdlib/weak.js b/jscomp/stdlib/weak.js index 0cffd336d9..57a0ad9cd8 100644 --- a/jscomp/stdlib/weak.js +++ b/jscomp/stdlib/weak.js @@ -256,7 +256,12 @@ function Make(H) { test_shrink_bucket(t); } } - return t[4] > (t[1].length / over_limit | 0) ? resize(t) : 0; + if (t[4] > (t[1].length / over_limit | 0)) { + return resize(t); + } + else { + return 0; + } } else { if (Caml_primitive.caml_weak_check(bucket, i)) { diff --git a/jscomp/test/a_list_test.js b/jscomp/test/a_list_test.js index ee2bd10bb6..cad6d3a35d 100644 --- a/jscomp/test/a_list_test.js +++ b/jscomp/test/a_list_test.js @@ -86,7 +86,8 @@ var suites_002 = [ ] ], Ext_list.flat_map(function (x) { - return x % 2 ? [ + if (x % 2) { + return [ /* :: */0, 1, [ @@ -94,11 +95,15 @@ var suites_002 = [ 1, /* [] */0 ] - ] : [ + ]; + } + else { + return [ /* :: */0, 0, /* [] */0 ]; + } }, [ /* :: */0, 0, diff --git a/jscomp/test/bdd.js b/jscomp/test/bdd.js index c93f7e57dc..857f30a6c2 100644 --- a/jscomp/test/bdd.js +++ b/jscomp/test/bdd.js @@ -7,7 +7,12 @@ function $$eval(_bdd, vars) { while(/* true */1) { var bdd = _bdd; if (typeof bdd === "number") { - return bdd !== 0 ? /* false */0 : /* true */1; + if (bdd !== 0) { + return /* false */0; + } + else { + return /* true */1; + } } else { _bdd = vars[bdd[2]] ? bdd[4] : bdd[1]; @@ -16,9 +21,17 @@ function $$eval(_bdd, vars) { } function getId(bdd) { - return typeof bdd === "number" ? ( - bdd !== 0 ? 0 : 1 - ) : bdd[3]; + if (typeof bdd === "number") { + if (bdd !== 0) { + return 0; + } + else { + return 1; + } + } + else { + return bdd[3]; + } } var initSize_1 = 8 * 1024 - 1; @@ -174,9 +187,17 @@ function mkNode(low, v, high) { } function cmpVar(x, y) { - return x < y ? /* LESS */0 : ( - x > y ? /* GREATER */2 : /* EQUAL */1 - ); + if (x < y) { + return /* LESS */0; + } + else { + if (x > y) { + return /* GREATER */2; + } + else { + return /* EQUAL */1; + } + } } var zero = /* Zero */1; @@ -211,7 +232,12 @@ function hash(x, y) { function not(n) { if (typeof n === "number") { - return n !== 0 ? /* One */0 : /* Zero */1; + if (n !== 0) { + return /* One */0; + } + else { + return /* Zero */1; + } } else { var id = n[3]; @@ -230,7 +256,12 @@ function not(n) { function and2(n1, n2) { if (typeof n1 === "number") { - return n1 !== 0 ? /* Zero */1 : n2; + if (n1 !== 0) { + return /* Zero */1; + } + else { + return n2; + } } else { var r1 = n1[4]; @@ -238,7 +269,12 @@ function and2(n1, n2) { var v1 = n1[2]; var l1 = n1[1]; if (typeof n2 === "number") { - return n2 !== 0 ? /* Zero */1 : n1; + if (n2 !== 0) { + return /* Zero */1; + } + else { + return n1; + } } else { var r2 = n2[4]; @@ -275,7 +311,12 @@ function and2(n1, n2) { function xor(n1, n2) { if (typeof n1 === "number") { - return n1 !== 0 ? n2 : not(n2); + if (n1 !== 0) { + return n2; + } + else { + return not(n2); + } } else { var r1 = n1[4]; @@ -283,7 +324,12 @@ function xor(n1, n2) { var v1 = n1[2]; var l1 = n1[1]; if (typeof n2 === "number") { - return n2 !== 0 ? n1 : not(n1); + if (n2 !== 0) { + return n1; + } + else { + return not(n1); + } } else { var r2 = n2[4]; @@ -320,10 +366,20 @@ function xor(n1, n2) { function hwb(n) { var h = function (i, j) { - return i === j ? mkVar(i) : xor(and2(not(mkVar(j)), h(i, j - 1)), and2(mkVar(j), g(i, j - 1))); + if (i === j) { + return mkVar(i); + } + else { + return xor(and2(not(mkVar(j)), h(i, j - 1)), and2(mkVar(j), g(i, j - 1))); + } }; var g = function (i, j) { - return i === j ? mkVar(i) : xor(and2(not(mkVar(i)), h(i + 1, j)), and2(mkVar(i), g(i + 1, j))); + if (i === j) { + return mkVar(i); + } + else { + return xor(and2(not(mkVar(i)), h(i + 1, j)), and2(mkVar(i), g(i + 1, j))); + } }; return h(0, n - 1); } @@ -347,11 +403,22 @@ function random_vars(n) { } function bool_equal(a, b) { - return a !== 0 ? ( - b !== 0 ? /* true */1 : /* false */0 - ) : ( - b !== 0 ? /* false */0 : /* true */1 - ); + if (a !== 0) { + if (b !== 0) { + return /* true */1; + } + else { + return /* false */0; + } + } + else { + if (b !== 0) { + return /* false */0; + } + else { + return /* true */1; + } + } } function test_hwb(bdd, vars) { diff --git a/jscomp/test/complex_while_loop.js b/jscomp/test/complex_while_loop.js index 92c7af2125..cd833e33c4 100644 --- a/jscomp/test/complex_while_loop.js +++ b/jscomp/test/complex_while_loop.js @@ -6,7 +6,12 @@ function f() { var n = 0; while(function () { var fib = function (n) { - return 1 < (n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } }; return +(fib(n) > 10); }()) { diff --git a/jscomp/test/demo_page.js b/jscomp/test/demo_page.js index 3a4baba17a..50e12dcf27 100644 --- a/jscomp/test/demo_page.js +++ b/jscomp/test/demo_page.js @@ -4,7 +4,12 @@ var React = require("react"); var ReactDom = require("react-dom"); function fib(n) { - return 1 < (-1 + n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (-1 + n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } } function sum(n) { @@ -16,11 +21,16 @@ function sum(n) { } function map(f, param) { - return param ? [ + if (param) { + return [ /* Cons */0, f(param[1]), map(f, param[2]) - ] : /* Nil */0; + ]; + } + else { + return /* Nil */0; + } } function test_curry(x, y) { diff --git a/jscomp/test/ext_bytes.js b/jscomp/test/ext_bytes.js index c70df87949..3262e19072 100644 --- a/jscomp/test/ext_bytes.js +++ b/jscomp/test/ext_bytes.js @@ -35,13 +35,26 @@ function escaped(s) { var c = s[i$1]; var exit = 0; if (c >= 35) { - c !== 92 ? ( - c >= 127 ? (exit = 1) : (s$prime[n] = c) - ) : (exit = 2); + if (c !== 92) { + if (c >= 127) { + exit = 1; + } + else { + s$prime[n] = c; + } + } + else { + exit = 2; + } } else { if (c >= 32) { - c >= 34 ? (exit = 2) : (s$prime[n] = c); + if (c >= 34) { + exit = 2; + } + else { + s$prime[n] = c; + } } else { if (c >= 14) { diff --git a/jscomp/test/ext_filename.js b/jscomp/test/ext_filename.js index 7cdf13c11d..1a3a7f93ba 100644 --- a/jscomp/test/ext_filename.js +++ b/jscomp/test/ext_filename.js @@ -28,7 +28,12 @@ function absolute_path(s) { _s = dir; } else { - return base === Filename.parent_dir_name ? Filename.dirname(aux(dir)) : Filename.concat(aux(dir), base); + if (base === Filename.parent_dir_name) { + return Filename.dirname(aux(dir)); + } + else { + return Filename.concat(aux(dir), base); + } } } }; diff --git a/jscomp/test/ext_list.js b/jscomp/test/ext_list.js index 7aa37044b1..2b0003fb11 100644 --- a/jscomp/test/ext_list.js +++ b/jscomp/test/ext_list.js @@ -41,7 +41,12 @@ function same_length(_xs, _ys) { } } else { - return ys ? /* false */0 : /* true */1; + if (ys) { + return /* false */0; + } + else { + return /* true */1; + } } }; } @@ -100,7 +105,12 @@ function filter_map2(f, _xs, _ys) { } } else { - return ys ? Pervasives.invalid_arg("Ext_list.filter_map2") : /* [] */0; + if (ys) { + return Pervasives.invalid_arg("Ext_list.filter_map2"); + } + else { + return /* [] */0; + } } }; } @@ -134,7 +144,12 @@ function filter_map2i(f, xs, ys) { } } else { - return ys ? Pervasives.invalid_arg("Ext_list.filter_map2i") : /* [] */0; + if (ys) { + return Pervasives.invalid_arg("Ext_list.filter_map2i"); + } + else { + return /* [] */0; + } } }; }; @@ -176,7 +191,12 @@ function flat_map2(f, lx, ly) { } } else { - return ly ? Pervasives.invalid_arg("Ext_list.flat_map2") : List.rev(acc); + if (ly) { + return Pervasives.invalid_arg("Ext_list.flat_map2"); + } + else { + return List.rev(acc); + } } }; }; @@ -291,11 +311,16 @@ function init(n, f) { function take(n, l) { var arr = $$Array.of_list(l); var arr_length = arr.length; - return arr_length < n ? Pervasives.invalid_arg("Ext_list.take") : [ + if (arr_length < n) { + return Pervasives.invalid_arg("Ext_list.take"); + } + else { + return [ /* tuple */0, $$Array.to_list($$Array.sub(arr, 0, n)), $$Array.to_list($$Array.sub(arr, n, arr_length - n)) ]; + } } function exclude_tail(x) { @@ -326,14 +351,20 @@ function exclude_tail(x) { } function group(cmp, lst) { - return lst ? aux(cmp, lst[1], group(cmp, lst[2])) : /* [] */0; + if (lst) { + return aux(cmp, lst[1], group(cmp, lst[2])); + } + else { + return /* [] */0; + } } function aux(cmp, x, xss) { if (xss) { var ys = xss[2]; var y = xss[1]; - return cmp(x, List.hd(y)) ? [ + if (cmp(x, List.hd(y))) { + return [ /* :: */0, [ /* :: */0, @@ -341,11 +372,15 @@ function aux(cmp, x, xss) { y ], ys - ] : [ + ]; + } + else { + return [ /* :: */0, y, aux(cmp, x, ys) ]; + } } else { return [ diff --git a/jscomp/test/ext_string.js b/jscomp/test/ext_string.js index 8211a08ce4..c29eac546d 100644 --- a/jscomp/test/ext_string.js +++ b/jscomp/test/ext_string.js @@ -120,18 +120,35 @@ function escaped(s) { } } else { - return match >= 11 ? (match !== 13, /* true */1) : (match >= 8, /* true */1); + if (match >= 11) { + match !== 13; + return /* true */1; + } + else { + match >= 8; + return /* true */1; + } } } }; }; - return needs_escape(0) ? Bytes.unsafe_to_string(Ext_bytes.escaped(Bytes.unsafe_of_string(s))) : s; + if (needs_escape(0)) { + return Bytes.unsafe_to_string(Ext_bytes.escaped(Bytes.unsafe_of_string(s))); + } + else { + return s; + } } function for_all(p, s) { var len = s.length; var aux = function (i) { - return i >= len ? /* true */1 : +(p(s.charCodeAt(i)) && aux(i + 1)); + if (i >= len) { + return /* true */1; + } + else { + return +(p(s.charCodeAt(i)) && aux(i + 1)); + } }; return aux(0); } diff --git a/jscomp/test/fib.js b/jscomp/test/fib.js index 3d08c05d27..40a0d46921 100644 --- a/jscomp/test/fib.js +++ b/jscomp/test/fib.js @@ -2,7 +2,12 @@ "use strict"; function fib(n) { - return 1 < (n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } } exports.fib = fib; diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js index 30c5479e97..46a0696180 100644 --- a/jscomp/test/int_map.js +++ b/jscomp/test/int_map.js @@ -9,7 +9,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -45,9 +50,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -60,9 +73,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -82,7 +103,12 @@ function bal(l, x, d, r) { } function is_empty(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add(x, data, param) { @@ -92,9 +118,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -102,6 +135,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -190,7 +224,12 @@ function max_binding(_param) { function remove_min_binding(param) { if (param) { var l = param[1]; - return l ? bal(remove_min_binding(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal(remove_min_binding(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -219,9 +258,17 @@ function remove(x, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, d, r) : bal(l, v, d, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, d, r); + } + else { + return bal(l, v, d, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -296,19 +343,39 @@ function fold(f, _m, _accu) { } function for_all(p, param) { - return param ? +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding(k, v, param) { - return param ? bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]) : singleton(k, v); + if (param) { + return bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton(k, v); + } } function add_max_binding(k, v, param) { - return param ? bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])) : singleton(k, v); + if (param) { + return bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])); + } + else { + return singleton(k, v); + } } function join(l, v, d, r) { @@ -316,9 +383,17 @@ function join(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal(l[1], l[2], l[3], join(l[4], v, d, r)) : ( - rh > lh + 2 ? bal(join(l, v, d, r[1]), r[2], r[3], r[4]) : create(l, v, d, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], l[3], join(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create(l, v, d, r); + } + } } else { return add_max_binding(v, d, l); @@ -345,7 +420,12 @@ function concat(t1, t2) { } function concat_or_join(t1, v, d, t2) { - return d ? join(t1, v, d[1], t2) : concat(t1, t2); + if (d) { + return join(t1, v, d[1], t2); + } + else { + return concat(t1, t2); + } } function split(x, param) { @@ -452,7 +532,12 @@ function filter(p, param) { var l$prime = filter(p, param[1]); var pvd = p(v, d); var r$prime = filter(p, param[4]); - return pvd ? join(l$prime, v, d, r$prime) : concat(l$prime, r$prime); + if (pvd) { + return join(l$prime, v, d, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -470,15 +555,20 @@ function partition(p, param) { var match$1 = partition(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join(lt, v, d, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, d, rf) ]; + } } else { return [ @@ -536,7 +626,12 @@ function compare$1(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -545,17 +640,33 @@ function compare$1(cmp, m1, m2) { function equal(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum(m1, /* End */0), cons_enum(m2, /* End */0)); } function cardinal(param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } } function bindings_aux(_accu, _param) { diff --git a/jscomp/test/lazy_test.js b/jscomp/test/lazy_test.js index 81a0ae87c6..e6ae6060b1 100644 --- a/jscomp/test/lazy_test.js +++ b/jscomp/test/lazy_test.js @@ -20,7 +20,12 @@ function lazy_test() { var h = u[1]; var tag = Caml_obj_runtime.caml_obj_tag(v); if (tag !== 250) { - tag === 246 ? CamlinternalLazy.force_lazy_block(v) : v; + if (tag === 246) { + CamlinternalLazy.force_lazy_block(v); + } + else { + ; + } } var g = u[1]; return [ diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js index 3367b6a90d..5fb9d2aa92 100644 --- a/jscomp/test/map_test.js +++ b/jscomp/test/map_test.js @@ -15,7 +15,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -40,9 +45,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -55,9 +68,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -83,9 +104,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -93,6 +121,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -153,7 +182,12 @@ function compare$1(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -161,11 +195,21 @@ function compare$1(cmp, m1, m2) { } function cardinal(param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } } function height$1(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$1(l, x, d, r) { @@ -190,9 +234,17 @@ function bal$1(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$1(ll) >= height$1(lr) ? create$1(ll, lv, ld, create$1(lr, x, d, r)) : ( - lr ? create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(ll) >= height$1(lr)) { + return create$1(ll, lv, ld, create$1(lr, x, d, r)); + } + else { + if (lr) { + return create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -205,9 +257,17 @@ function bal$1(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$1(rr) >= height$1(rl) ? create$1(create$1(l, x, d, rl), rv, rd, rr) : ( - rl ? create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(rr) >= height$1(rl)) { + return create$1(create$1(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -233,9 +293,16 @@ function add$1(x, data, param) { var v = param[2]; var l = param[1]; var c = $$String.compare(x, v); - return c ? ( - c < 0 ? bal$1(add$1(x, data, l), v, d, r) : bal$1(l, v, d, add$1(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$1(add$1(x, data, l), v, d, r); + } + else { + return bal$1(l, v, d, add$1(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -243,6 +310,7 @@ function add$1(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/qcc.js b/jscomp/test/qcc.js index ac96ed9b7b..182eec474f 100644 --- a/jscomp/test/qcc.js +++ b/jscomp/test/qcc.js @@ -30,7 +30,13 @@ function bufferize(f) { /* tuple */0, function () { var match = buf[1]; - return match ? (buf[1] = /* None */0, match[1]) : f(/* () */0); + if (match) { + buf[1] = /* None */0; + return match[1]; + } + else { + return f(/* () */0); + } }, function (x) { if (buf[1] !== /* None */0) { @@ -143,18 +149,38 @@ var s = new Array(100); function getq() { var c = getch(/* () */0); - return c !== 92 ? c : ( - peekch(/* () */0) === /* "n" */110 ? (getch(/* () */0), /* "\n" */10) : c - ); + if (c !== 92) { + return c; + } + else { + if (peekch(/* () */0) === /* "n" */110) { + getch(/* () */0); + return /* "\n" */10; + } + else { + return c; + } + } } function isid(param) { var switcher = -91 + param; - return 5 < (switcher >>> 0) ? ( - 57 < (26 + switcher >>> 0) ? /* false */0 : /* true */1 - ) : ( - switcher !== 4 ? /* false */0 : /* true */1 - ); + if (5 < (switcher >>> 0)) { + if (57 < (26 + switcher >>> 0)) { + return /* false */0; + } + else { + return /* true */1; + } + } + else { + if (switcher !== 4) { + return /* false */0; + } + else { + return /* true */1; + } + } } function id(_n, _ch) { @@ -239,10 +265,15 @@ function op(ch, _param) { function cconst() { var ch = getq(/* () */0); var qt = getch(/* () */0); - return qt !== /* "'" */39 ? Pervasives.failwith("syntax error") : [ + if (qt !== /* "'" */39) { + return Pervasives.failwith("syntax error"); + } + else { + return [ /* ILit */1, ch ]; + } } function skip(_param) { @@ -251,9 +282,17 @@ function skip(_param) { var exit = 0; if (ch >= 14) { if (ch !== 32) { - return ch !== 47 ? ch : ( - peekch(/* () */0) === /* "*" */42 ? com(getch(/* () */0)) : ch - ); + if (ch !== 47) { + return ch; + } + else { + if (peekch(/* () */0) === /* "*" */42) { + return com(getch(/* () */0)); + } + else { + return ch; + } + } } else { exit = 1; @@ -342,7 +381,11 @@ function next() { return slit(gpos[1], gpos[1]); } if (exit === 1) { - return isid(c) ? id(0, c) : op(c, [ + if (isid(c)) { + return id(0, c); + } + else { + return op(c, [ /* :: */0, "++", [ @@ -383,6 +426,7 @@ function next() { ] ] ]); + } } } @@ -414,7 +458,14 @@ var opos = [ ]; function out(x) { - return x !== 0 ? (out(x / 256 | 0), obuf[opos[1]] = Char.chr(x & 255), ++ opos[1]) : 0; + if (x !== 0) { + out(x / 256 | 0); + obuf[opos[1]] = Char.chr(x & 255); + return ++ opos[1]; + } + else { + return 0; + } } function le(n, x) { @@ -524,12 +575,22 @@ var align = [ function push(r) { ++ align[1]; - return r < 8 ? out(80 + r) : out(16720 + r - 8); + if (r < 8) { + return out(80 + r); + } + else { + return out(16720 + r - 8); + } } function pop(r) { -- align[1]; - return r < 8 ? out(88 + r) : out(16728 + r - 8); + if (r < 8) { + return out(88 + r); + } + else { + return out(16728 + r - 8); + } } var lval = [ @@ -546,25 +607,43 @@ var lval = [ function patchlval() { var match = lval[1][1]; - return match[0] ? (opos[1] -= match[1], /* () */0) : (obuf[opos[1] - match[1]] = /* "\141" */141, /* () */0); + if (match[0]) { + opos[1] -= match[1]; + return /* () */0; + } + else { + obuf[opos[1] - match[1]] = /* "\141" */141; + return /* () */0; + } } function read(param) { - return param !== 0 ? (out(4722614), le(8, 0), lval[1] = [ - /* tuple */0, - [ - /* Del */1, - 4 - ], - /* Chr */1 - ], /* () */0) : (out(18571), le(8, 0), lval[1] = [ - /* tuple */0, - [ - /* Del */1, - 3 - ], - /* Int */0 - ], /* () */0); + if (param !== 0) { + out(4722614); + le(8, 0); + lval[1] = [ + /* tuple */0, + [ + /* Del */1, + 4 + ], + /* Chr */1 + ]; + return /* () */0; + } + else { + out(18571); + le(8, 0); + lval[1] = [ + /* tuple */0, + [ + /* Del */1, + 3 + ], + /* Int */0 + ]; + return /* () */0; + } } var globs = Caml_array.caml_make_vect(100, [ @@ -1031,7 +1110,12 @@ function binary(stk, lvl) { } else { var lvlof = function (o) { - return !List.mem_assoc(o, lvls) ? -1 : List.assoc(o, lvls); + if (!List.mem_assoc(o, lvls)) { + return -1; + } + else { + return List.assoc(o, lvls); + } }; var fold = function (_param) { while(/* true */1) { @@ -1185,7 +1269,12 @@ function unary(stk) { ])(o)); } out(List.assoc(o, unops)); - return o === "!" ? cmp(2) : 0; + if (o === "!") { + return cmp(2); + } + else { + return 0; + } } break; case 1 : @@ -1308,7 +1397,12 @@ function postfix(stk) { out(1216605192); } out(65488); - return align[1] % 2 !== 0 ? out(1216594952) : 0; + if (align[1] % 2 !== 0) { + return out(1216594952); + } + else { + return 0; + } case "++" : case "--" : exit = 1; @@ -1392,7 +1486,12 @@ function expr(stk) { push(0); expr(stk); pop(1); - ty ? out(34817) : out(4753665); + if (ty) { + out(34817); + } + else { + out(4753665); + } _param = /* () */0; } else { @@ -1719,7 +1818,15 @@ function block(brk, stk) { stmt(brk, stk$prime); }; next$1(/* () */0); - return n !== 0 ? (out(4752324), out(n * 8), align[1] -= n, /* () */0) : 0; + if (n !== 0) { + out(4752324); + out(n * 8); + align[1] -= n; + return /* () */0; + } + else { + return 0; + } } function top(_param) { @@ -1968,7 +2075,12 @@ function elfgen(outf) { var itr = function (f) { return symitr(function (i, s) { var g = globs[i]; - return g[2] < 0 && g[1] !== 0 ? f(s, s.length, g[1]) : 0; + if (g[2] < 0 && g[1] !== 0) { + return f(s, s.length, g[1]); + } + else { + return 0; + } }); }; var va = function (x) { @@ -1976,9 +2088,17 @@ function elfgen(outf) { }; var patchloc = function (i, _) { var g = globs[i]; - return g[2] >= 0 && g[2] < base ? patch(/* false */0, g[1], va(g[2])) : ( - g[2] >= 0 ? patch(/* false */0, g[1], g[2]) : 0 - ); + if (g[2] >= 0 && g[2] < base) { + return patch(/* false */0, g[1], va(g[2])); + } + else { + if (g[2] >= 0) { + return patch(/* false */0, g[1], g[2]); + } + else { + return 0; + } + } }; symitr(patchloc); var strtab = opos[1]; diff --git a/jscomp/test/rec_value_test.js b/jscomp/test/rec_value_test.js index a99f61eabf..a14bf7bb1c 100644 --- a/jscomp/test/rec_value_test.js +++ b/jscomp/test/rec_value_test.js @@ -48,7 +48,12 @@ Caml_primitive.caml_update_dummy(xx, [ ]); function naive(n) { - return 1 < (n >>> 0) ? n + naive(n - 1) + naive(n - 2) : 1; + if (1 < (n >>> 0)) { + return n + naive(n - 1) + naive(n - 2); + } + else { + return 1; + } } var one = 1; @@ -164,19 +169,39 @@ Caml_primitive.caml_update_dummy(xs$1, [ var two = 2; function fib2(n) { - return 1 < (n >>> 0) ? fib2(n - 1) + fib2(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib2(n - 1) + fib2(n - 2); + } + else { + return 1; + } } function fib3(n) { - return 1 < (n >>> 0) ? fib3(n - 1) + fib3(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib3(n - 1) + fib3(n - 2); + } + else { + return 1; + } } function odd(n) { - return n === 1 ? /* true */1 : even(n - 1); + if (n === 1) { + return /* true */1; + } + else { + return even(n - 1); + } } function even(n) { - return n ? odd(n - 1) : /* true */1; + if (n) { + return odd(n - 1); + } + else { + return /* true */1; + } } function even2(_n) { @@ -193,9 +218,17 @@ function even2(_n) { function lazy_v() { var tag = Caml_obj_runtime.caml_obj_tag(lazy_v); - return tag === 250 ? lazy_v[1] : ( - tag === 246 ? CamlinternalLazy.force_lazy_block(lazy_v) : lazy_v - ); + if (tag === 250) { + return lazy_v[1]; + } + else { + if (tag === 246) { + return CamlinternalLazy.force_lazy_block(lazy_v); + } + else { + return lazy_v; + } + } } function sum(_acc, _n) { @@ -291,7 +324,12 @@ var suites_002 = [ var match$1 = match[2]; if (match$1) { var match$2 = match$1[2]; - match$2 ? ($js = match$2[1]) : (exit = 1); + if (match$2) { + $js = match$2[1]; + } + else { + exit = 1; + } } else { exit = 1; diff --git a/jscomp/test/test_array_primitive.js b/jscomp/test/test_array_primitive.js index cd1a52d6e6..4630081661 100644 --- a/jscomp/test/test_array_primitive.js +++ b/jscomp/test/test_array_primitive.js @@ -11,11 +11,22 @@ function caml_array_sub(x, offset, len) { } function caml_array_set(xs, index, newval) { - return index < 0 || index >= xs.length ? Pervasives.invalid_arg("index out of bounds") : (xs[index] = newval, /* () */0); + if (index < 0 || index >= xs.length) { + return Pervasives.invalid_arg("index out of bounds"); + } + else { + xs[index] = newval; + return /* () */0; + } } function caml_array_get(xs, index) { - return index < 0 || index >= xs.length ? Pervasives.invalid_arg("index out of bounds") : xs[index]; + if (index < 0 || index >= xs.length) { + return Pervasives.invalid_arg("index out of bounds"); + } + else { + return xs[index]; + } } function caml_make_vect(len, init) { diff --git a/jscomp/test/test_bool_equal.js b/jscomp/test/test_bool_equal.js index d530aaec7a..4292edb612 100644 --- a/jscomp/test/test_bool_equal.js +++ b/jscomp/test/test_bool_equal.js @@ -3,11 +3,22 @@ var Caml_exceptions = require("../runtime/caml_exceptions"); function bool_equal(x, y) { - return x !== 0 ? ( - y !== 0 ? /* true */1 : /* false */0 - ) : ( - y !== 0 ? /* false */0 : /* true */1 - ); + if (x !== 0) { + if (y !== 0) { + return /* true */1; + } + else { + return /* false */0; + } + } + else { + if (y !== 0) { + return /* false */0; + } + else { + return /* true */1; + } + } } function assertions() { diff --git a/jscomp/test/test_bug.js b/jscomp/test/test_bug.js index 1af0fdbc1b..1e8e82af08 100644 --- a/jscomp/test/test_bug.js +++ b/jscomp/test/test_bug.js @@ -9,17 +9,37 @@ function escaped(s) { var c = s[i]; var $js; var exit = 0; - c >= 14 ? ( - c !== 34 ? ( - c !== 92 ? (exit = 1) : ($js = 2) - ) : ($js = 2) - ) : ( - c >= 11 ? ( - c >= 13 ? ($js = 2) : (exit = 1) - ) : ( - c >= 8 ? ($js = 2) : (exit = 1) - ) - ); + if (c >= 14) { + if (c !== 34) { + if (c !== 92) { + exit = 1; + } + else { + $js = 2; + } + } + else { + $js = 2; + } + } + else { + if (c >= 11) { + if (c >= 13) { + $js = 2; + } + else { + exit = 1; + } + } + else { + if (c >= 8) { + $js = 2; + } + else { + exit = 1; + } + } + } if (exit === 1) { $js = Caml_string.caml_is_printable(c) ? 1 : 4; } diff --git a/jscomp/test/test_char.js b/jscomp/test/test_char.js index a4b20a0cfc..78caaeec92 100644 --- a/jscomp/test/test_char.js +++ b/jscomp/test/test_char.js @@ -8,7 +8,12 @@ function f(x) { } function chr(n) { - return n < 0 || n > 255 ? Pervasives.invalid_arg("Char.chr") : n; + if (n < 0 || n > 255) { + return Pervasives.invalid_arg("Char.chr"); + } + else { + return n; + } } function escaped(c) { @@ -70,11 +75,21 @@ function escaped(c) { } function lowercase(c) { - return c >= /* "A" */65 && c <= /* "Z" */90 || c >= /* "\192" */192 && c <= /* "\214" */214 || c >= /* "\216" */216 && c <= /* "\222" */222 ? c + 32 : c; + if (c >= /* "A" */65 && c <= /* "Z" */90 || c >= /* "\192" */192 && c <= /* "\214" */214 || c >= /* "\216" */216 && c <= /* "\222" */222) { + return c + 32; + } + else { + return c; + } } function uppercase(c) { - return c >= /* "a" */97 && c <= /* "z" */122 || c >= /* "\224" */224 && c <= /* "\246" */246 || c >= /* "\248" */248 && c <= /* "\254" */254 ? c - 32 : c; + if (c >= /* "a" */97 && c <= /* "z" */122 || c >= /* "\224" */224 && c <= /* "\246" */246 || c >= /* "\248" */248 && c <= /* "\254" */254) { + return c - 32; + } + else { + return c; + } } function compare(c1, c2) { diff --git a/jscomp/test/test_demo.js b/jscomp/test/test_demo.js index 7ac949b054..7076486c8b 100644 --- a/jscomp/test/test_demo.js +++ b/jscomp/test/test_demo.js @@ -3,7 +3,12 @@ var List = require("../stdlib/list"); function fib(n) { - return 1 < (-1 + n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (-1 + n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } } function cons(x, y) { @@ -15,11 +20,16 @@ function cons(x, y) { } function map(f, param) { - return param ? [ + if (param) { + return [ /* Cons */0, f(param[1]), map(f, param[2]) - ] : /* Nil */0; + ]; + } + else { + return /* Nil */0; + } } function sum(n) { diff --git a/jscomp/test/test_fastdt.js b/jscomp/test/test_fastdt.js index a1654672a9..cf4c299923 100644 --- a/jscomp/test/test_fastdt.js +++ b/jscomp/test/test_fastdt.js @@ -63,13 +63,23 @@ function array_elem(a, i) { return /* true */1; } else { - v < i ? (_lo = mi) : (_hi = mi); + if (v < i) { + _lo = mi; + } + else { + _hi = mi; + } } } } }; }; - return _N ? bin_search(0, _N - 1) : /* false */0; + if (_N) { + return bin_search(0, _N - 1); + } + else { + return /* false */0; + } } var split_white_re = Str.regexp("[ \t]+"); @@ -107,7 +117,13 @@ function clean_up_dict(fcounts, minfc) { 0 ]; Hashtbl.iter(function (str, f) { - return Caml_primitive.caml_greaterthan(Hashtbl.find(fcounts, f), minfc) ? (Hashtbl.replace(okay_f, str, id[1]), ++ id[1]) : 0; + if (Caml_primitive.caml_greaterthan(Hashtbl.find(fcounts, f), minfc)) { + Hashtbl.replace(okay_f, str, id[1]); + return ++ id[1]; + } + else { + return 0; + } }, dict); dictN[1] = id[1]; Hashtbl.clear(dict); @@ -137,7 +153,12 @@ function map_filter(f, param) { } function $slash$dot$dot(a, b) { - return b ? a / b : 0.5; + if (b) { + return a / b; + } + else { + return 0.5; + } } function predict(dt, x) { @@ -188,7 +209,12 @@ function predict_committee(dts, x) { function is_real_value(f) { var match = Caml_float.caml_classify_float(f); - return match >= 3 ? /* false */0 : /* true */1; + if (match >= 3) { + return /* false */0; + } + else { + return /* true */1; + } } function find_split_feature(c_t, c_f, _F, _Y, _W, used, validEx) { @@ -196,13 +222,27 @@ function find_split_feature(c_t, c_f, _F, _Y, _W, used, validEx) { return x * x; }; var plp2 = function (x) { - return x <= 0 || x >= 1 ? 0 : ( - x < 0.2 ? 0.468995593589281168 + 3.16992500144231215 * (x - 0.10) - 8.01497244938313 * sqr(x - 0.10) : ( - x < 0.5 ? 0.934068055375491091 + 0.893084796083488341 * (x - 0.35) - 3.17075833162409548 * sqr(x - 0.35) : ( - x < 0.8 ? 0.934068055375491091 - 0.893084796083488341 * (x - 0.65) - 3.17075833162409548 * sqr(x - 0.65) : 0.934068055375491091 - 0.893084796083488341 * (x - 0.90) - 3.17075833162409548 * sqr(x - 0.90) - ) - ) - ); + if (x <= 0 || x >= 1) { + return 0; + } + else { + if (x < 0.2) { + return 0.468995593589281168 + 3.16992500144231215 * (x - 0.10) - 8.01497244938313 * sqr(x - 0.10); + } + else { + if (x < 0.5) { + return 0.934068055375491091 + 0.893084796083488341 * (x - 0.35) - 3.17075833162409548 * sqr(x - 0.35); + } + else { + if (x < 0.8) { + return 0.934068055375491091 - 0.893084796083488341 * (x - 0.65) - 3.17075833162409548 * sqr(x - 0.65); + } + else { + return 0.934068055375491091 - 0.893084796083488341 * (x - 0.90) - 3.17075833162409548 * sqr(x - 0.90); + } + } + } + } }; var best = /* None */0; for(var f = 0 ,f_finish = _F.length - 1; f<= f_finish; ++f){ @@ -212,7 +252,12 @@ function find_split_feature(c_t, c_f, _F, _Y, _W, used, validEx) { for(var i = 0 ,i_finish = /* unknown */"Bigarray.dim_1" - 1; i<= i_finish; ++i){ var n = /* unknown */"Bigarray.get[generic,unknown]"; if (validEx[n] > 0) { - _Y[n] ? c_1t += _W[n] : c_1f += _W[n]; + if (_Y[n]) { + c_1t += _W[n]; + } + else { + c_1f += _W[n]; + } } } @@ -322,10 +367,14 @@ function trim_tree_same(dt) { var p2 = f[1]; var tp = p1[0] / (p1[0] + p1[1]); var fp = p2[0] / (p2[0] + p2[1]); - return Math.abs(tp - fp) < 1e-6 ? [ + if (Math.abs(tp - fp) < 1e-6) { + return [ /* Leaf */1, mkfp(p1[0] + p2[0], p1[1] + p2[1]) - ] : [ + ]; + } + else { + return [ /* Node */0, [ /* record */0, @@ -334,6 +383,7 @@ function trim_tree_same(dt) { f ] ]; + } } else { exit = 1; @@ -432,7 +482,12 @@ function build_dt(max_depth, leaf_acc, smooth, validExO, _F, _Y, _W) { var c_f = 0; for(var n = 0 ,n_finish = _N - 1; n<= n_finish; ++n){ if (validEx[n] > 0) { - _Y[n] ? c_t += _W[n] : c_f += _W[n]; + if (_Y[n]) { + c_t += _W[n]; + } + else { + c_f += _W[n]; + } } } diff --git a/jscomp/test/test_fib.js b/jscomp/test/test_fib.js index 28f405ea15..426b75dd1a 100644 --- a/jscomp/test/test_fib.js +++ b/jscomp/test/test_fib.js @@ -2,11 +2,21 @@ "use strict"; function fib(n) { - return 1 < (n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } } function fib2(n) { - return 1 < (-1 + n >>> 0) ? fib2(n - 1) + fib2(n - 2) : 1; + if (1 < (-1 + n >>> 0)) { + return fib2(n - 1) + fib2(n - 2); + } + else { + return 1; + } } var v = 0; @@ -34,15 +44,25 @@ function cons(x, y) { } function length(x) { - return x ? 1 + length(x[2]) : 0; + if (x) { + return 1 + length(x[2]); + } + else { + return 0; + } } function map(f, x) { - return x ? [ + if (x) { + return [ /* Cons */0, f(x[1]), map(f, x[2]) - ] : /* Nil */0; + ]; + } + else { + return /* Nil */0; + } } function f(x) { diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js index 1e9d08e5bb..3772ccc5bb 100644 --- a/jscomp/test/test_for_map.js +++ b/jscomp/test/test_for_map.js @@ -9,7 +9,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -45,9 +50,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -60,9 +73,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -82,7 +103,12 @@ function bal(l, x, d, r) { } function is_empty(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add(x, data, param) { @@ -92,9 +118,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -102,6 +135,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -190,7 +224,12 @@ function max_binding(_param) { function remove_min_binding(param) { if (param) { var l = param[1]; - return l ? bal(remove_min_binding(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal(remove_min_binding(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -219,9 +258,17 @@ function remove(x, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, d, r) : bal(l, v, d, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, d, r); + } + else { + return bal(l, v, d, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -296,19 +343,39 @@ function fold(f, _m, _accu) { } function for_all(p, param) { - return param ? +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding(k, v, param) { - return param ? bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]) : singleton(k, v); + if (param) { + return bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton(k, v); + } } function add_max_binding(k, v, param) { - return param ? bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])) : singleton(k, v); + if (param) { + return bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])); + } + else { + return singleton(k, v); + } } function join(l, v, d, r) { @@ -316,9 +383,17 @@ function join(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal(l[1], l[2], l[3], join(l[4], v, d, r)) : ( - rh > lh + 2 ? bal(join(l, v, d, r[1]), r[2], r[3], r[4]) : create(l, v, d, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], l[3], join(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create(l, v, d, r); + } + } } else { return add_max_binding(v, d, l); @@ -345,7 +420,12 @@ function concat(t1, t2) { } function concat_or_join(t1, v, d, t2) { - return d ? join(t1, v, d[1], t2) : concat(t1, t2); + if (d) { + return join(t1, v, d[1], t2); + } + else { + return concat(t1, t2); + } } function split(x, param) { @@ -452,7 +532,12 @@ function filter(p, param) { var l$prime = filter(p, param[1]); var pvd = p(v, d); var r$prime = filter(p, param[4]); - return pvd ? join(l$prime, v, d, r$prime) : concat(l$prime, r$prime); + if (pvd) { + return join(l$prime, v, d, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -470,15 +555,20 @@ function partition(p, param) { var match$1 = partition(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join(lt, v, d, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, d, rf) ]; + } } else { return [ @@ -536,7 +626,12 @@ function compare$1(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -545,17 +640,33 @@ function compare$1(cmp, m1, m2) { function equal(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum(m1, /* End */0), cons_enum(m2, /* End */0)); } function cardinal(param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } } function bindings_aux(_accu, _param) { diff --git a/jscomp/test/test_functor_dead_code.js b/jscomp/test/test_functor_dead_code.js index 5ef46fcbdf..9fe9d27d88 100644 --- a/jscomp/test/test_functor_dead_code.js +++ b/jscomp/test/test_functor_dead_code.js @@ -2,7 +2,12 @@ "use strict"; function is_empty(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } var v = is_empty(/* Empty */0); diff --git a/jscomp/test/test_incomplete.js b/jscomp/test/test_incomplete.js index 313666b885..9d225d5071 100644 --- a/jscomp/test/test_incomplete.js +++ b/jscomp/test/test_incomplete.js @@ -21,7 +21,12 @@ function f(x) { } function f2(x) { - return x ? 0 : 1; + if (x) { + return 0; + } + else { + return 1; + } } function f3(x) { diff --git a/jscomp/test/test_inline_map.js b/jscomp/test/test_inline_map.js index 204ab71bba..7ce2650cab 100644 --- a/jscomp/test/test_inline_map.js +++ b/jscomp/test/test_inline_map.js @@ -11,7 +11,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -36,9 +41,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -51,9 +64,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -79,9 +100,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -89,6 +117,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/test_inline_map2.js b/jscomp/test/test_inline_map2.js index 9d601014f4..c1dbdcc5ad 100644 --- a/jscomp/test/test_inline_map2.js +++ b/jscomp/test/test_inline_map2.js @@ -12,7 +12,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -37,9 +42,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -52,9 +65,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -80,9 +101,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -90,6 +118,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -162,7 +191,12 @@ function compare$1(x, y) { } function height$1(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$1(l, x, d, r) { @@ -187,9 +221,17 @@ function bal$1(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$1(ll) >= height$1(lr) ? create$1(ll, lv, ld, create$1(lr, x, d, r)) : ( - lr ? create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(ll) >= height$1(lr)) { + return create$1(ll, lv, ld, create$1(lr, x, d, r)); + } + else { + if (lr) { + return create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -202,9 +244,17 @@ function bal$1(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$1(rr) >= height$1(rl) ? create$1(create$1(l, x, d, rl), rv, rd, rr) : ( - rl ? create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(rr) >= height$1(rl)) { + return create$1(create$1(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -230,9 +280,16 @@ function add$1(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$1(x, v); - return c ? ( - c < 0 ? bal$1(add$1(x, data, l), v, d, r) : bal$1(l, v, d, add$1(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$1(add$1(x, data, l), v, d, r); + } + else { + return bal$1(l, v, d, add$1(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -240,6 +297,7 @@ function add$1(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/test_int_map_find.js b/jscomp/test/test_int_map_find.js index e782d5a855..3ded75a642 100644 --- a/jscomp/test/test_int_map_find.js +++ b/jscomp/test/test_int_map_find.js @@ -9,7 +9,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -34,9 +39,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -49,9 +62,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -77,9 +98,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -87,6 +115,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/test_internalOO.js b/jscomp/test/test_internalOO.js index f26465509c..e553f814ef 100644 --- a/jscomp/test/test_internalOO.js +++ b/jscomp/test/test_internalOO.js @@ -37,7 +37,12 @@ function public_method_label(s) { accu = 223 * accu + s.charCodeAt(i); } accu = accu & (1 << 31) - 1; - return accu > 1073741823 ? accu - (1 << 31) : accu; + if (accu > 1073741823) { + return accu - (1 << 31); + } + else { + return accu; + } } function compare(x, y) { @@ -45,7 +50,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -81,9 +91,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -96,9 +114,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -118,7 +144,12 @@ function bal(l, x, d, r) { } function is_empty(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add(x, data, param) { @@ -128,9 +159,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -138,6 +176,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -226,7 +265,12 @@ function max_binding(_param) { function remove_min_binding(param) { if (param) { var l = param[1]; - return l ? bal(remove_min_binding(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal(remove_min_binding(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -255,9 +299,17 @@ function remove(x, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, d, r) : bal(l, v, d, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, d, r); + } + else { + return bal(l, v, d, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -332,19 +384,39 @@ function fold(f, _m, _accu) { } function for_all(p, param) { - return param ? +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding(k, v, param) { - return param ? bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]) : singleton(k, v); + if (param) { + return bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton(k, v); + } } function add_max_binding(k, v, param) { - return param ? bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])) : singleton(k, v); + if (param) { + return bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])); + } + else { + return singleton(k, v); + } } function join(l, v, d, r) { @@ -352,9 +424,17 @@ function join(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal(l[1], l[2], l[3], join(l[4], v, d, r)) : ( - rh > lh + 2 ? bal(join(l, v, d, r[1]), r[2], r[3], r[4]) : create(l, v, d, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], l[3], join(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create(l, v, d, r); + } + } } else { return add_max_binding(v, d, l); @@ -381,7 +461,12 @@ function concat(t1, t2) { } function concat_or_join(t1, v, d, t2) { - return d ? join(t1, v, d[1], t2) : concat(t1, t2); + if (d) { + return join(t1, v, d[1], t2); + } + else { + return concat(t1, t2); + } } function split(x, param) { @@ -488,7 +573,12 @@ function filter(p, param) { var l$prime = filter(p, param[1]); var pvd = p(v, d); var r$prime = filter(p, param[4]); - return pvd ? join(l$prime, v, d, r$prime) : concat(l$prime, r$prime); + if (pvd) { + return join(l$prime, v, d, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -506,15 +596,20 @@ function partition(p, param) { var match$1 = partition(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join(lt, v, d, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, d, rf) ]; + } } else { return [ @@ -572,7 +667,12 @@ function compare$1(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -581,17 +681,33 @@ function compare$1(cmp, m1, m2) { function equal(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum(m1, /* End */0), cons_enum(m2, /* End */0)); } function cardinal(param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } } function bindings_aux(_accu, _param) { @@ -653,7 +769,12 @@ function compare$2(x, y) { } function height$1(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$1(l, x, d, r) { @@ -689,9 +810,17 @@ function bal$1(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$1(ll) >= height$1(lr) ? create$1(ll, lv, ld, create$1(lr, x, d, r)) : ( - lr ? create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(ll) >= height$1(lr)) { + return create$1(ll, lv, ld, create$1(lr, x, d, r)); + } + else { + if (lr) { + return create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -704,9 +833,17 @@ function bal$1(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$1(rr) >= height$1(rl) ? create$1(create$1(l, x, d, rl), rv, rd, rr) : ( - rl ? create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(rr) >= height$1(rl)) { + return create$1(create$1(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -726,7 +863,12 @@ function bal$1(l, x, d, r) { } function is_empty$1(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add$1(x, data, param) { @@ -736,9 +878,16 @@ function add$1(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$2(x, v); - return c ? ( - c < 0 ? bal$1(add$1(x, data, l), v, d, r) : bal$1(l, v, d, add$1(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$1(add$1(x, data, l), v, d, r); + } + else { + return bal$1(l, v, d, add$1(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -746,6 +895,7 @@ function add$1(x, data, param) { r, param[5] ]; + } } else { return [ @@ -834,7 +984,12 @@ function max_binding$1(_param) { function remove_min_binding$1(param) { if (param) { var l = param[1]; - return l ? bal$1(remove_min_binding$1(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal$1(remove_min_binding$1(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -863,9 +1018,17 @@ function remove$1(x, param) { var v = param[2]; var l = param[1]; var c = compare$2(x, v); - return c ? ( - c < 0 ? bal$1(remove$1(x, l), v, d, r) : bal$1(l, v, d, remove$1(x, r)) - ) : merge$2(l, r); + if (c) { + if (c < 0) { + return bal$1(remove$1(x, l), v, d, r); + } + else { + return bal$1(l, v, d, remove$1(x, r)); + } + } + else { + return merge$2(l, r); + } } else { return /* Empty */0; @@ -940,19 +1103,39 @@ function fold$1(f, _m, _accu) { } function for_all$1(p, param) { - return param ? +(p(param[2], param[3]) && for_all$1(p, param[1]) && for_all$1(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all$1(p, param[1]) && for_all$1(p, param[4])); + } + else { + return /* true */1; + } } function exists$1(p, param) { - return param ? +(p(param[2], param[3]) || exists$1(p, param[1]) || exists$1(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists$1(p, param[1]) || exists$1(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding$1(k, v, param) { - return param ? bal$1(add_min_binding$1(k, v, param[1]), param[2], param[3], param[4]) : singleton$1(k, v); + if (param) { + return bal$1(add_min_binding$1(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton$1(k, v); + } } function add_max_binding$1(k, v, param) { - return param ? bal$1(param[1], param[2], param[3], add_max_binding$1(k, v, param[4])) : singleton$1(k, v); + if (param) { + return bal$1(param[1], param[2], param[3], add_max_binding$1(k, v, param[4])); + } + else { + return singleton$1(k, v); + } } function join$1(l, v, d, r) { @@ -960,9 +1143,17 @@ function join$1(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal$1(l[1], l[2], l[3], join$1(l[4], v, d, r)) : ( - rh > lh + 2 ? bal$1(join$1(l, v, d, r[1]), r[2], r[3], r[4]) : create$1(l, v, d, r) - ); + if (lh > rh + 2) { + return bal$1(l[1], l[2], l[3], join$1(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal$1(join$1(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create$1(l, v, d, r); + } + } } else { return add_max_binding$1(v, d, l); @@ -989,7 +1180,12 @@ function concat$1(t1, t2) { } function concat_or_join$1(t1, v, d, t2) { - return d ? join$1(t1, v, d[1], t2) : concat$1(t1, t2); + if (d) { + return join$1(t1, v, d[1], t2); + } + else { + return concat$1(t1, t2); + } } function split$1(x, param) { @@ -1096,7 +1292,12 @@ function filter$1(p, param) { var l$prime = filter$1(p, param[1]); var pvd = p(v, d); var r$prime = filter$1(p, param[4]); - return pvd ? join$1(l$prime, v, d, r$prime) : concat$1(l$prime, r$prime); + if (pvd) { + return join$1(l$prime, v, d, r$prime); + } + else { + return concat$1(l$prime, r$prime); + } } else { return /* Empty */0; @@ -1114,15 +1315,20 @@ function partition$1(p, param) { var match$1 = partition$1(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join$1(lt, v, d, rt), concat$1(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat$1(lt, rt), join$1(lf, v, d, rf) ]; + } } else { return [ @@ -1180,7 +1386,12 @@ function compare$3(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -1189,17 +1400,33 @@ function compare$3(cmp, m1, m2) { function equal$1(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare$2(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum$1(e1[3], e1[4]), cons_enum$1(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare$2(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum$1(e1[3], e1[4]), cons_enum$1(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum$1(m1, /* End */0), cons_enum$1(m2, /* End */0)); } function cardinal$1(param) { - return param ? cardinal$1(param[1]) + 1 + cardinal$1(param[4]) : 0; + if (param) { + return cardinal$1(param[1]) + 1 + cardinal$1(param[4]); + } + else { + return 0; + } } function bindings_aux$1(_accu, _param) { @@ -1261,7 +1488,12 @@ function compare$4(x, y) { } function height$2(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$2(l, x, d, r) { @@ -1297,9 +1529,17 @@ function bal$2(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$2(ll) >= height$2(lr) ? create$2(ll, lv, ld, create$2(lr, x, d, r)) : ( - lr ? create$2(create$2(ll, lv, ld, lr[1]), lr[2], lr[3], create$2(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$2(ll) >= height$2(lr)) { + return create$2(ll, lv, ld, create$2(lr, x, d, r)); + } + else { + if (lr) { + return create$2(create$2(ll, lv, ld, lr[1]), lr[2], lr[3], create$2(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -1312,9 +1552,17 @@ function bal$2(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$2(rr) >= height$2(rl) ? create$2(create$2(l, x, d, rl), rv, rd, rr) : ( - rl ? create$2(create$2(l, x, d, rl[1]), rl[2], rl[3], create$2(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$2(rr) >= height$2(rl)) { + return create$2(create$2(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$2(create$2(l, x, d, rl[1]), rl[2], rl[3], create$2(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -1334,7 +1582,12 @@ function bal$2(l, x, d, r) { } function is_empty$2(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add$2(x, data, param) { @@ -1344,9 +1597,16 @@ function add$2(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$4(x, v); - return c ? ( - c < 0 ? bal$2(add$2(x, data, l), v, d, r) : bal$2(l, v, d, add$2(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$2(add$2(x, data, l), v, d, r); + } + else { + return bal$2(l, v, d, add$2(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -1354,6 +1614,7 @@ function add$2(x, data, param) { r, param[5] ]; + } } else { return [ @@ -1442,7 +1703,12 @@ function max_binding$2(_param) { function remove_min_binding$2(param) { if (param) { var l = param[1]; - return l ? bal$2(remove_min_binding$2(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal$2(remove_min_binding$2(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -1471,9 +1737,17 @@ function remove$2(x, param) { var v = param[2]; var l = param[1]; var c = compare$4(x, v); - return c ? ( - c < 0 ? bal$2(remove$2(x, l), v, d, r) : bal$2(l, v, d, remove$2(x, r)) - ) : merge$4(l, r); + if (c) { + if (c < 0) { + return bal$2(remove$2(x, l), v, d, r); + } + else { + return bal$2(l, v, d, remove$2(x, r)); + } + } + else { + return merge$4(l, r); + } } else { return /* Empty */0; @@ -1548,19 +1822,39 @@ function fold$2(f, _m, _accu) { } function for_all$2(p, param) { - return param ? +(p(param[2], param[3]) && for_all$2(p, param[1]) && for_all$2(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all$2(p, param[1]) && for_all$2(p, param[4])); + } + else { + return /* true */1; + } } function exists$2(p, param) { - return param ? +(p(param[2], param[3]) || exists$2(p, param[1]) || exists$2(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists$2(p, param[1]) || exists$2(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding$2(k, v, param) { - return param ? bal$2(add_min_binding$2(k, v, param[1]), param[2], param[3], param[4]) : singleton$2(k, v); + if (param) { + return bal$2(add_min_binding$2(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton$2(k, v); + } } function add_max_binding$2(k, v, param) { - return param ? bal$2(param[1], param[2], param[3], add_max_binding$2(k, v, param[4])) : singleton$2(k, v); + if (param) { + return bal$2(param[1], param[2], param[3], add_max_binding$2(k, v, param[4])); + } + else { + return singleton$2(k, v); + } } function join$2(l, v, d, r) { @@ -1568,9 +1862,17 @@ function join$2(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal$2(l[1], l[2], l[3], join$2(l[4], v, d, r)) : ( - rh > lh + 2 ? bal$2(join$2(l, v, d, r[1]), r[2], r[3], r[4]) : create$2(l, v, d, r) - ); + if (lh > rh + 2) { + return bal$2(l[1], l[2], l[3], join$2(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal$2(join$2(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create$2(l, v, d, r); + } + } } else { return add_max_binding$2(v, d, l); @@ -1597,7 +1899,12 @@ function concat$2(t1, t2) { } function concat_or_join$2(t1, v, d, t2) { - return d ? join$2(t1, v, d[1], t2) : concat$2(t1, t2); + if (d) { + return join$2(t1, v, d[1], t2); + } + else { + return concat$2(t1, t2); + } } function split$2(x, param) { @@ -1704,7 +2011,12 @@ function filter$2(p, param) { var l$prime = filter$2(p, param[1]); var pvd = p(v, d); var r$prime = filter$2(p, param[4]); - return pvd ? join$2(l$prime, v, d, r$prime) : concat$2(l$prime, r$prime); + if (pvd) { + return join$2(l$prime, v, d, r$prime); + } + else { + return concat$2(l$prime, r$prime); + } } else { return /* Empty */0; @@ -1722,15 +2034,20 @@ function partition$2(p, param) { var match$1 = partition$2(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join$2(lt, v, d, rt), concat$2(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat$2(lt, rt), join$2(lf, v, d, rf) ]; + } } else { return [ @@ -1788,7 +2105,12 @@ function compare$5(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -1797,17 +2119,33 @@ function compare$5(cmp, m1, m2) { function equal$2(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare$4(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum$2(e1[3], e1[4]), cons_enum$2(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare$4(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum$2(e1[3], e1[4]), cons_enum$2(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum$2(m1, /* End */0), cons_enum$2(m2, /* End */0)); } function cardinal$2(param) { - return param ? cardinal$2(param[1]) + 1 + cardinal$2(param[4]) : 0; + if (param) { + return cardinal$2(param[1]) + 1 + cardinal$2(param[4]); + } + else { + return 0; + } } function bindings_aux$2(_accu, _param) { @@ -1884,7 +2222,12 @@ var table_count = [ var dummy_met = [0]; function fit_size(n) { - return n <= 2 ? n : fit_size((n + 1) / 2 | 0) * 2; + if (n <= 2) { + return n; + } + else { + return fit_size((n + 1) / 2 | 0) * 2; + } } function new_table(pub_labels) { @@ -1969,15 +2312,21 @@ function get_method_labels(table, names) { function set_method(table, label, element) { ++ method_count[1]; - return find$2(label, table[4]) ? put(table, label, element) : (table[6] = [ - /* :: */0, - [ - /* tuple */0, - label, - element - ], - table[6] - ], /* () */0); + if (find$2(label, table[4])) { + return put(table, label, element); + } + else { + table[6] = [ + /* :: */0, + [ + /* tuple */0, + label, + element + ], + table[6] + ]; + return /* () */0; + } } function get_method(table, label) { @@ -1995,7 +2344,12 @@ function get_method(table, label) { } function to_list(arr) { - return arr ? $$Array.to_list(arr) : /* [] */0; + if (arr) { + return $$Array.to_list(arr); + } + else { + return /* [] */0; + } } function narrow(table, vars, virt_meths, concr_meths) { @@ -2022,7 +2376,12 @@ function narrow(table, vars, virt_meths, concr_meths) { table[5] ]; table[7] = fold(function (lab, info, tvars) { - return List.mem(lab, vars$1) ? add(lab, info, tvars) : tvars; + if (List.mem(lab, vars$1)) { + return add(lab, info, tvars); + } + else { + return tvars; + } }, table[7], /* Empty */0); var by_name = [ 0, @@ -2057,11 +2416,16 @@ function narrow(table, vars, virt_meths, concr_meths) { table[3] = by_name[1]; table[4] = by_label[1]; table[6] = List.fold_right(function (met, hm) { - return List.mem(met[1], virt_meth_labs) ? hm : [ + if (List.mem(met[1], virt_meth_labs)) { + return hm; + } + else { + return [ /* :: */0, met, hm ]; + } }, table[6], /* [] */0); return /* () */0; } @@ -2076,11 +2440,16 @@ function widen(table) { table[3] = match[1]; table[4] = match[2]; table[6] = List.fold_right(function (met, hm) { - return List.mem(met[1], virt_meths) ? hm : [ + if (List.mem(met[1], virt_meths)) { + return hm; + } + else { + return [ /* :: */0, met, hm ]; + } }, table[6], match[3]); return /* () */0; } @@ -2110,7 +2479,12 @@ function new_variable(table, name) { } function to_array(arr) { - return Caml_primitive.caml_equal(arr, 0) ? /* array */[] : arr; + if (Caml_primitive.caml_equal(arr, 0)) { + return /* array */[]; + } + else { + return arr; + } } function new_methods_variables(table, meths, vals) { @@ -2283,7 +2657,12 @@ function iter_f(obj, _param) { function run_initializers(obj, table) { var inits = table[8]; - return inits !== /* [] */0 ? iter_f(obj, inits) : 0; + if (inits !== /* [] */0) { + return iter_f(obj, inits); + } + else { + return 0; + } } function run_initializers_opt(obj_0, obj, table) { @@ -2364,7 +2743,12 @@ function lookup_keys(i, keys, tables) { } function lookup_tables(root, keys) { - return root[2] !== /* Empty */0 ? lookup_keys(keys.length - 1, keys, root[2]) : build_path(keys.length - 1, keys, root); + if (root[2] !== /* Empty */0) { + return lookup_keys(keys.length - 1, keys, root[2]); + } + else { + return build_path(keys.length - 1, keys, root); + } } function get_const(x) { diff --git a/jscomp/test/test_list.js b/jscomp/test/test_list.js index dce32e2251..08d1017777 100644 --- a/jscomp/test/test_list.js +++ b/jscomp/test/test_list.js @@ -24,11 +24,21 @@ function length(l) { } function hd(param) { - return param ? param[1] : Pervasives.failwith("hd"); + if (param) { + return param[1]; + } + else { + return Pervasives.failwith("hd"); + } } function tl(param) { - return param ? param[2] : Pervasives.failwith("tl"); + if (param) { + return param[2]; + } + else { + return Pervasives.failwith("tl"); + } } function nth(l, n) { @@ -81,7 +91,12 @@ function rev(l) { } function flatten(param) { - return param ? Pervasives.$at(param[1], flatten(param[2])) : /* [] */0; + if (param) { + return Pervasives.$at(param[1], flatten(param[2])); + } + else { + return /* [] */0; + } } function map(f, param) { @@ -184,7 +199,12 @@ function fold_left(f, _accu, _l) { } function fold_right(f, l, accu) { - return l ? f(l[1], fold_right(f, l[2], accu)) : accu; + if (l) { + return f(l[1], fold_right(f, l[2], accu)); + } + else { + return accu; + } } function map2(f, l1, l2) { @@ -202,7 +222,12 @@ function map2(f, l1, l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.map2") : /* [] */0; + if (l2) { + return Pervasives.invalid_arg("List.map2"); + } + else { + return /* [] */0; + } } } @@ -227,7 +252,12 @@ function rev_map2(f, l1, l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.rev_map2") : accu; + if (l2) { + return Pervasives.invalid_arg("List.rev_map2"); + } + else { + return accu; + } } }; }; @@ -249,7 +279,12 @@ function iter2(f, _l1, _l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.iter2") : /* () */0; + if (l2) { + return Pervasives.invalid_arg("List.iter2"); + } + else { + return /* () */0; + } } }; } @@ -270,49 +305,107 @@ function fold_left2(f, _accu, _l1, _l2) { } } else { - return l2 ? Pervasives.invalid_arg("List.fold_left2") : accu; + if (l2) { + return Pervasives.invalid_arg("List.fold_left2"); + } + else { + return accu; + } } }; } function fold_right2(f, l1, l2, accu) { - return l1 ? ( - l2 ? f(l1[1], l2[1], fold_right2(f, l1[2], l2[2], accu)) : Pervasives.invalid_arg("List.fold_right2") - ) : ( - l2 ? Pervasives.invalid_arg("List.fold_right2") : accu - ); + if (l1) { + if (l2) { + return f(l1[1], l2[1], fold_right2(f, l1[2], l2[2], accu)); + } + else { + return Pervasives.invalid_arg("List.fold_right2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.fold_right2"); + } + else { + return accu; + } + } } function for_all(p, param) { - return param ? +(p(param[1]) && for_all(p, param[2])) : /* true */1; + if (param) { + return +(p(param[1]) && for_all(p, param[2])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[1]) || exists(p, param[2])) : /* false */0; + if (param) { + return +(p(param[1]) || exists(p, param[2])); + } + else { + return /* false */0; + } } function for_all2(p, l1, l2) { - return l1 ? ( - l2 ? +(p(l1[1], l2[1]) && for_all2(p, l1[2], l2[2])) : Pervasives.invalid_arg("List.for_all2") - ) : ( - l2 ? Pervasives.invalid_arg("List.for_all2") : /* true */1 - ); + if (l1) { + if (l2) { + return +(p(l1[1], l2[1]) && for_all2(p, l1[2], l2[2])); + } + else { + return Pervasives.invalid_arg("List.for_all2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.for_all2"); + } + else { + return /* true */1; + } + } } function exists2(p, l1, l2) { - return l1 ? ( - l2 ? +(p(l1[1], l2[1]) || exists2(p, l1[2], l2[2])) : Pervasives.invalid_arg("List.exists2") - ) : ( - l2 ? Pervasives.invalid_arg("List.exists2") : /* false */0 - ); + if (l1) { + if (l2) { + return +(p(l1[1], l2[1]) || exists2(p, l1[2], l2[2])); + } + else { + return Pervasives.invalid_arg("List.exists2"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.exists2"); + } + else { + return /* false */0; + } + } } function mem(x, param) { - return param ? +(Caml_primitive.caml_compare(param[1], x) === 0 || mem(x, param[2])) : /* false */0; + if (param) { + return +(Caml_primitive.caml_compare(param[1], x) === 0 || mem(x, param[2])); + } + else { + return /* false */0; + } } function memq(x, param) { - return param ? +(param[1] === x || memq(x, param[2])) : /* false */0; + if (param) { + return +(param[1] === x || memq(x, param[2])); + } + else { + return /* false */0; + } } function assoc(x, _param) { @@ -352,22 +445,37 @@ function assq(x, _param) { } function mem_assoc(x, param) { - return param ? +(Caml_primitive.caml_compare(param[1][1], x) === 0 || mem_assoc(x, param[2])) : /* false */0; + if (param) { + return +(Caml_primitive.caml_compare(param[1][1], x) === 0 || mem_assoc(x, param[2])); + } + else { + return /* false */0; + } } function mem_assq(x, param) { - return param ? +(param[1][1] === x || mem_assq(x, param[2])) : /* false */0; + if (param) { + return +(param[1][1] === x || mem_assq(x, param[2])); + } + else { + return /* false */0; + } } function remove_assoc(x, param) { if (param) { var l = param[2]; var pair = param[1]; - return Caml_primitive.caml_compare(pair[1], x) ? [ + if (Caml_primitive.caml_compare(pair[1], x)) { + return [ /* :: */0, pair, remove_assoc(x, l) - ] : l; + ]; + } + else { + return l; + } } else { return /* [] */0; @@ -378,11 +486,16 @@ function remove_assq(x, param) { if (param) { var l = param[2]; var pair = param[1]; - return pair[1] === x ? l : [ + if (pair[1] === x) { + return l; + } + else { + return [ /* :: */0, pair, remove_assq(x, l) ]; + } } else { return /* [] */0; @@ -503,19 +616,30 @@ function split(param) { } function combine(l1, l2) { - return l1 ? ( - l2 ? [ - /* :: */0, - [ - /* tuple */0, - l1[1], - l2[1] - ], - combine(l1[2], l2[2]) - ] : Pervasives.invalid_arg("List.combine") - ) : ( - l2 ? Pervasives.invalid_arg("List.combine") : /* [] */0 - ); + if (l1) { + if (l2) { + return [ + /* :: */0, + [ + /* tuple */0, + l1[1], + l2[1] + ], + combine(l1[2], l2[2]) + ]; + } + else { + return Pervasives.invalid_arg("List.combine"); + } + } + else { + if (l2) { + return Pervasives.invalid_arg("List.combine"); + } + else { + return /* [] */0; + } + } } function merge(cmp, l1, l2) { @@ -523,15 +647,20 @@ function merge(cmp, l1, l2) { if (l2) { var h2 = l2[1]; var h1 = l1[1]; - return cmp(h1, h2) <= 0 ? [ + if (cmp(h1, h2) <= 0) { + return [ /* :: */0, h1, merge(cmp, l1[2], l2) - ] : [ + ]; + } + else { + return [ /* :: */0, h2, merge(cmp, l1, l2[2]) ]; + } } else { return l1; @@ -656,87 +785,104 @@ function stable_sort(cmp, l) { var x3 = match$1[1]; var x2 = match[1]; var x1 = l[1]; - return cmp(x1, x2) <= 0 ? ( - cmp(x2, x3) <= 0 ? [ + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { + return [ + /* :: */0, + x1, + [ + /* :: */0, + x2, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x1, x3) <= 0) { + return [ /* :: */0, x1, [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, + x2, /* [] */0 ] ] - ] : ( - cmp(x1, x3) <= 0 ? [ - /* :: */0, - x1, - [ - /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x1, + [ /* :: */0, - x3, - [ - /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] + x2, + /* [] */0 ] - ) - ) : ( - cmp(x1, x3) <= 0 ? [ + ] + ]; + } + } + } + else { + if (cmp(x1, x3) <= 0) { + return [ + /* :: */0, + x2, + [ + /* :: */0, + x1, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x2, x3) <= 0) { + return [ /* :: */0, x2, [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, + x1, /* [] */0 ] ] - ] : ( - cmp(x2, x3) <= 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + [ /* :: */0, - x3, - [ - /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] + x1, + /* [] */0 ] - ) - ); + ] + ]; + } + } + } } else { exit = 1; @@ -757,7 +903,8 @@ function stable_sort(cmp, l) { if (match$2) { var x2$1 = match$2[1]; var x1$1 = l[1]; - return cmp(x1$1, x2$1) <= 0 ? [ + if (cmp(x1$1, x2$1) <= 0) { + return [ /* :: */0, x1$1, [ @@ -765,7 +912,10 @@ function stable_sort(cmp, l) { x2$1, /* [] */0 ] - ] : [ + ]; + } + else { + return [ /* :: */0, x2$1, [ @@ -774,6 +924,7 @@ function stable_sort(cmp, l) { /* [] */0 ] ]; + } } else { exit = 1; @@ -808,87 +959,104 @@ function stable_sort(cmp, l) { var x3 = match$1[1]; var x2 = match[1]; var x1 = l[1]; - return cmp(x1, x2) > 0 ? ( - cmp(x2, x3) > 0 ? [ + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { + return [ + /* :: */0, + x1, + [ + /* :: */0, + x2, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x1, x3) > 0) { + return [ /* :: */0, x1, [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, + x2, /* [] */0 ] ] - ] : ( - cmp(x1, x3) > 0 ? [ - /* :: */0, - x1, - [ - /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x1, + [ /* :: */0, - x3, - [ - /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] - ] + x2, + /* [] */0 ] - ) - ) : ( - cmp(x1, x3) > 0 ? [ + ] + ]; + } + } + } + else { + if (cmp(x1, x3) > 0) { + return [ + /* :: */0, + x2, + [ + /* :: */0, + x1, + [ + /* :: */0, + x3, + /* [] */0 + ] + ] + ]; + } + else { + if (cmp(x2, x3) > 0) { + return [ /* :: */0, x2, [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, + x1, /* [] */0 ] ] - ] : ( - cmp(x2, x3) > 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] - ] : [ + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + [ /* :: */0, - x3, - [ - /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] - ] + x1, + /* [] */0 ] - ) - ); + ] + ]; + } + } + } } else { exit = 1; @@ -909,7 +1077,8 @@ function stable_sort(cmp, l) { if (match$2) { var x2$1 = match$2[1]; var x1$1 = l[1]; - return cmp(x1$1, x2$1) > 0 ? [ + if (cmp(x1$1, x2$1) > 0) { + return [ /* :: */0, x1$1, [ @@ -917,7 +1086,10 @@ function stable_sort(cmp, l) { x2$1, /* [] */0 ] - ] : [ + ]; + } + else { + return [ /* :: */0, x2$1, [ @@ -926,6 +1098,7 @@ function stable_sort(cmp, l) { /* [] */0 ] ]; + } } else { exit = 1; @@ -946,7 +1119,12 @@ function stable_sort(cmp, l) { }; var len = length(l); - return len < 2 ? l : sort(len, l); + if (len < 2) { + return l; + } + else { + return sort(len, l); + } } function sort_uniq(cmp, l) { @@ -1085,33 +1263,40 @@ function sort_uniq(cmp, l) { } else { var c$2 = cmp(x1, x3); - return c$2 ? ( - c$2 < 0 ? [ + if (c$2) { + if (c$2 < 0) { + return [ + /* :: */0, + x1, + [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x1, [ /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1, [ @@ -1120,6 +1305,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1154,33 +1340,40 @@ function sort_uniq(cmp, l) { } else { var c$4 = cmp(x2, x3); - return c$4 ? ( - c$4 < 0 ? [ + if (c$4) { + if (c$4 < 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x2, [ /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, [ @@ -1189,6 +1382,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1206,29 +1400,37 @@ function sort_uniq(cmp, l) { } else { var c$5 = cmp(x2, x3); - return c$5 ? ( - c$5 < 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - /* [] */0 - ] - ] : [ + if (c$5) { + if (c$5 < 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, /* [] */0 ]; + } } } else { @@ -1251,29 +1453,37 @@ function sort_uniq(cmp, l) { var x2$1 = match$2[1]; var x1$1 = l[1]; var c$6 = cmp(x1$1, x2$1); - return c$6 ? ( - c$6 < 0 ? [ - /* :: */0, - x1$1, - [ - /* :: */0, - x2$1, - /* [] */0 - ] - ] : [ + if (c$6) { + if (c$6 < 0) { + return [ + /* :: */0, + x1$1, + [ /* :: */0, x2$1, - [ - /* :: */0, - x1$1, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x2$1, + [ + /* :: */0, + x1$1, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1$1, /* [] */0 ]; + } } else { exit = 1; @@ -1330,33 +1540,40 @@ function sort_uniq(cmp, l) { } else { var c$2 = cmp(x1, x3); - return c$2 ? ( - c$2 > 0 ? [ + if (c$2) { + if (c$2 > 0) { + return [ + /* :: */0, + x1, + [ /* :: */0, - x1, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x1, [ /* :: */0, - x1, - [ - /* :: */0, - x2, - /* [] */0 - ] + x2, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1, [ @@ -1365,6 +1582,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1399,33 +1617,40 @@ function sort_uniq(cmp, l) { } else { var c$4 = cmp(x2, x3); - return c$4 ? ( - c$4 > 0 ? [ + if (c$4) { + if (c$4 > 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, - x2, + x3, [ /* :: */0, - x3, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] - ] : [ + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ /* :: */0, - x3, + x2, [ /* :: */0, - x2, - [ - /* :: */0, - x1, - /* [] */0 - ] + x1, + /* [] */0 ] ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, [ @@ -1434,6 +1659,7 @@ function sort_uniq(cmp, l) { /* [] */0 ] ]; + } } } else { @@ -1451,29 +1677,37 @@ function sort_uniq(cmp, l) { } else { var c$5 = cmp(x2, x3); - return c$5 ? ( - c$5 > 0 ? [ - /* :: */0, - x2, - [ - /* :: */0, - x3, - /* [] */0 - ] - ] : [ + if (c$5) { + if (c$5 > 0) { + return [ + /* :: */0, + x2, + [ /* :: */0, x3, - [ - /* :: */0, - x2, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x3, + [ + /* :: */0, + x2, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x2, /* [] */0 ]; + } } } else { @@ -1496,29 +1730,37 @@ function sort_uniq(cmp, l) { var x2$1 = match$2[1]; var x1$1 = l[1]; var c$6 = cmp(x1$1, x2$1); - return c$6 ? ( - c$6 > 0 ? [ - /* :: */0, - x1$1, - [ - /* :: */0, - x2$1, - /* [] */0 - ] - ] : [ + if (c$6) { + if (c$6 > 0) { + return [ + /* :: */0, + x1$1, + [ /* :: */0, x2$1, - [ - /* :: */0, - x1$1, - /* [] */0 - ] + /* [] */0 + ] + ]; + } + else { + return [ + /* :: */0, + x2$1, + [ + /* :: */0, + x1$1, + /* [] */0 ] - ) : [ + ]; + } + } + else { + return [ /* :: */0, x1$1, /* [] */0 ]; + } } else { exit = 1; @@ -1539,7 +1781,12 @@ function sort_uniq(cmp, l) { }; var len = length(l); - return len < 2 ? l : sort(len, l); + if (len < 2) { + return l; + } + else { + return sort(len, l); + } } var u = List.length; diff --git a/jscomp/test/test_map_find.js b/jscomp/test/test_map_find.js index 67e3c576cc..483b8befd7 100644 --- a/jscomp/test/test_map_find.js +++ b/jscomp/test/test_map_find.js @@ -12,7 +12,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -37,9 +42,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -52,9 +65,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -80,9 +101,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -90,6 +118,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -162,7 +191,12 @@ function compare$1(x, y) { } function height$1(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create$1(l, x, d, r) { @@ -187,9 +221,17 @@ function bal$1(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height$1(ll) >= height$1(lr) ? create$1(ll, lv, ld, create$1(lr, x, d, r)) : ( - lr ? create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(ll) >= height$1(lr)) { + return create$1(ll, lv, ld, create$1(lr, x, d, r)); + } + else { + if (lr) { + return create$1(create$1(ll, lv, ld, lr[1]), lr[2], lr[3], create$1(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -202,9 +244,17 @@ function bal$1(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height$1(rr) >= height$1(rl) ? create$1(create$1(l, x, d, rl), rv, rd, rr) : ( - rl ? create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height$1(rr) >= height$1(rl)) { + return create$1(create$1(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create$1(create$1(l, x, d, rl[1]), rl[2], rl[3], create$1(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -230,9 +280,16 @@ function add$1(x, data, param) { var v = param[2]; var l = param[1]; var c = compare$1(x, v); - return c ? ( - c < 0 ? bal$1(add$1(x, data, l), v, d, r) : bal$1(l, v, d, add$1(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal$1(add$1(x, data, l), v, d, r); + } + else { + return bal$1(l, v, d, add$1(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -240,6 +297,7 @@ function add$1(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js index c54692803a..b80cae4371 100644 --- a/jscomp/test/test_per.js +++ b/jscomp/test/test_per.js @@ -31,15 +31,30 @@ var Exit = [ ]; function min(x, y) { - return Caml_primitive.caml_lessequal(x, y) ? x : y; + if (Caml_primitive.caml_lessequal(x, y)) { + return x; + } + else { + return y; + } } function max(x, y) { - return Caml_primitive.caml_greaterequal(x, y) ? x : y; + if (Caml_primitive.caml_greaterequal(x, y)) { + return x; + } + else { + return y; + } } function abs(x) { - return x >= 0 ? x : -x; + if (x >= 0) { + return x; + } + else { + return -x; + } } function lnot(x) { @@ -72,11 +87,21 @@ function $caret(s1, s2) { } function char_of_int(n) { - return n < 0 || n > 255 ? invalid_arg("char_of_int") : n; + if (n < 0 || n > 255) { + return invalid_arg("char_of_int"); + } + else { + return n; + } } function string_of_bool(b) { - return b ? "true" : "false"; + if (b) { + return "true"; + } + else { + return "false"; + } } function bool_of_string(param) { @@ -131,11 +156,16 @@ function string_of_float(f) { } function $at(l1, l2) { - return l1 ? [ + if (l1) { + return [ /* :: */0, l1[1], $at(l1[2], l2) - ] : l2; + ]; + } + else { + return l2; + } } var stdin = Caml_io.caml_ml_open_descriptor_in(0); @@ -218,11 +248,21 @@ function output_string(oc, s) { } function output(oc, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("output") : Caml_io.caml_ml_output(oc, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("output"); + } + else { + return Caml_io.caml_ml_output(oc, s, ofs, len); + } } function output_substring(oc, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("output_substring") : Caml_io.caml_ml_output(oc, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("output_substring"); + } + else { + return Caml_io.caml_ml_output(oc, s, ofs, len); + } } function output_value(chan, v) { @@ -278,7 +318,12 @@ function open_in_bin(name) { } function input(ic, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("input") : Caml_primitive.caml_ml_input(ic, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("input"); + } + else { + return Caml_primitive.caml_ml_input(ic, s, ofs, len); + } } function unsafe_really_input(ic, s, _ofs, _len) { @@ -302,7 +347,12 @@ function unsafe_really_input(ic, s, _ofs, _len) { } function really_input(ic, s, ofs, len) { - return ofs < 0 || len < 0 || ofs > s.length - len ? invalid_arg("really_input") : unsafe_really_input(ic, s, ofs, len); + if (ofs < 0 || len < 0 || ofs > s.length - len) { + return invalid_arg("really_input"); + } + else { + return unsafe_really_input(ic, s, ofs, len); + } } function really_input_string(ic, len) { diff --git a/jscomp/test/test_primitive.js b/jscomp/test/test_primitive.js index eaf93d20ca..576ae72afd 100644 --- a/jscomp/test/test_primitive.js +++ b/jscomp/test/test_primitive.js @@ -48,7 +48,13 @@ var xxx = "a"; var a = xxx.charCodeAt(0); function u(b) { - return b ? (Pervasives.print_int(1), 32) : 7; + if (b) { + Pervasives.print_int(1); + return 32; + } + else { + return 7; + } } function f2(h, b, _) { @@ -73,9 +79,17 @@ function f(x) { function is_lazy_force(x) { var tag = Caml_obj_runtime.caml_obj_tag(x); - return tag === 250 ? x[1] : ( - tag === 246 ? CamlinternalLazy.force_lazy_block(x) : x - ); + if (tag === 250) { + return x[1]; + } + else { + if (tag === 246) { + return CamlinternalLazy.force_lazy_block(x); + } + else { + return x; + } + } } function fib(n) { diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js index f1f345c994..baa9f99773 100644 --- a/jscomp/test/test_set.js +++ b/jscomp/test/test_set.js @@ -6,7 +6,12 @@ var List = require("../stdlib/list"); function Make(Ord) { var height = function (param) { - return param ? param[4] : 0; + if (param) { + return param[4]; + } + else { + return 0; + } }; var create = function (l, v, r) { var hl = l ? l[4] : 0; @@ -27,9 +32,17 @@ function Make(Ord) { var lr = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, create(lr, v, r)) : ( - lr ? create(create(ll, lv, lr[1]), lr[2], create(lr[3], v, r)) : Pervasives.invalid_arg("Set.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, create(lr, v, r)); + } + else { + if (lr) { + return create(create(ll, lv, lr[1]), lr[2], create(lr[3], v, r)); + } + else { + return Pervasives.invalid_arg("Set.bal"); + } + } } else { return Pervasives.invalid_arg("Set.bal"); @@ -41,9 +54,17 @@ function Make(Ord) { var rr = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, v, rl), rv, rr) : ( - rl ? create(create(l, v, rl[1]), rl[2], create(rl[3], rv, rr)) : Pervasives.invalid_arg("Set.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, v, rl), rv, rr); + } + else { + if (rl) { + return create(create(l, v, rl[1]), rl[2], create(rl[3], rv, rr)); + } + else { + return Pervasives.invalid_arg("Set.bal"); + } + } } else { return Pervasives.invalid_arg("Set.bal"); @@ -66,9 +87,17 @@ function Make(Ord) { var v = t[2]; var l = t[1]; var c = Ord[1](x, v); - return c ? ( - c < 0 ? bal(add(x, l), v, r) : bal(l, v, add(x, r)) - ) : t; + if (c) { + if (c < 0) { + return bal(add(x, l), v, r); + } + else { + return bal(l, v, add(x, r)); + } + } + else { + return t; + } } else { return [ @@ -90,19 +119,37 @@ function Make(Ord) { ]; }; var add_min_element = function (v, param) { - return param ? bal(add_min_element(v, param[1]), param[2], param[3]) : singleton(v); + if (param) { + return bal(add_min_element(v, param[1]), param[2], param[3]); + } + else { + return singleton(v); + } }; var add_max_element = function (v, param) { - return param ? bal(param[1], param[2], add_max_element(v, param[3])) : singleton(v); + if (param) { + return bal(param[1], param[2], add_max_element(v, param[3])); + } + else { + return singleton(v); + } }; var join = function (l, v, r) { if (l) { if (r) { var rh = r[4]; var lh = l[4]; - return lh > rh + 2 ? bal(l[1], l[2], join(l[3], v, r)) : ( - rh > lh + 2 ? bal(join(l, v, r[1]), r[2], r[3]) : create(l, v, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], join(l[3], v, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, r[1]), r[2], r[3]); + } + else { + return create(l, v, r); + } + } } else { return add_max_element(v, l); @@ -149,21 +196,42 @@ function Make(Ord) { var remove_min_elt = function (param) { if (param) { var l = param[1]; - return l ? bal(remove_min_elt(l), param[2], param[3]) : param[3]; + if (l) { + return bal(remove_min_elt(l), param[2], param[3]); + } + else { + return param[3]; + } } else { return Pervasives.invalid_arg("Set.remove_min_elt"); } }; var merge = function (t1, t2) { - return t1 ? ( - t2 ? bal(t1, min_elt(t2), remove_min_elt(t2)) : t1 - ) : t2; + if (t1) { + if (t2) { + return bal(t1, min_elt(t2), remove_min_elt(t2)); + } + else { + return t1; + } + } + else { + return t2; + } }; var concat = function (t1, t2) { - return t1 ? ( - t2 ? join(t1, min_elt(t2), remove_min_elt(t2)) : t1 - ) : t2; + if (t1) { + if (t2) { + return join(t1, min_elt(t2), remove_min_elt(t2)); + } + else { + return t1; + } + } + else { + return t2; + } }; var split = function (x, param) { if (param) { @@ -211,7 +279,12 @@ function Make(Ord) { }; var empty = /* Empty */0; var is_empty = function (param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } }; var mem = function (x, param) { if (param) { @@ -228,9 +301,17 @@ function Make(Ord) { var v = param[2]; var l = param[1]; var c = Ord[1](x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, r) : bal(l, v, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, r); + } + else { + return bal(l, v, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -278,7 +359,12 @@ function Make(Ord) { var l1 = s1[1]; var match = split(v1, s2); var l2 = match[1]; - return match[2] !== 0 ? join(inter(l1, l2), v1, inter(r1, match[3])) : concat(inter(l1, l2), inter(r1, match[3])); + if (match[2] !== 0) { + return join(inter(l1, l2), v1, inter(r1, match[3])); + } + else { + return concat(inter(l1, l2), inter(r1, match[3])); + } } else { return /* Empty */0; @@ -296,7 +382,12 @@ function Make(Ord) { var l1 = s1[1]; var match = split(v1, s2); var l2 = match[1]; - return match[2] !== 0 ? concat(diff(l1, l2), diff(r1, match[3])) : join(diff(l1, l2), v1, diff(r1, match[3])); + if (match[2] !== 0) { + return concat(diff(l1, l2), diff(r1, match[3])); + } + else { + return join(diff(l1, l2), v1, diff(r1, match[3])); + } } else { return s1; @@ -344,7 +435,12 @@ function Make(Ord) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -363,21 +459,29 @@ function Make(Ord) { var v1 = s1[2]; var l1 = s1[1]; var c = Ord[1](v1, s2[2]); - return c ? ( - c < 0 ? +(subset([ - /* Node */0, - l1, - v1, - /* Empty */0, - 0 - ], l2) && subset(r1, s2)) : +(subset([ - /* Node */0, - /* Empty */0, - v1, - r1, - 0 - ], r2) && subset(l1, s2)) - ) : +(subset(l1, l2) && subset(r1, r2)); + if (c) { + if (c < 0) { + return +(subset([ + /* Node */0, + l1, + v1, + /* Empty */0, + 0 + ], l2) && subset(r1, s2)); + } + else { + return +(subset([ + /* Node */0, + /* Empty */0, + v1, + r1, + 0 + ], r2) && subset(l1, s2)); + } + } + else { + return +(subset(l1, l2) && subset(r1, r2)); + } } else { return /* false */0; @@ -414,10 +518,20 @@ function Make(Ord) { }; }; var for_all = function (p, param) { - return param ? +(p(param[2]) && for_all(p, param[1]) && for_all(p, param[3])) : /* true */1; + if (param) { + return +(p(param[2]) && for_all(p, param[1]) && for_all(p, param[3])); + } + else { + return /* true */1; + } }; var exists = function (p, param) { - return param ? +(p(param[2]) || exists(p, param[1]) || exists(p, param[3])) : /* false */0; + if (param) { + return +(p(param[2]) || exists(p, param[1]) || exists(p, param[3])); + } + else { + return /* false */0; + } }; var filter = function (p, param) { if (param) { @@ -425,7 +539,12 @@ function Make(Ord) { var l$prime = filter(p, param[1]); var pv = p(v); var r$prime = filter(p, param[3]); - return pv ? join(l$prime, v, r$prime) : concat(l$prime, r$prime); + if (pv) { + return join(l$prime, v, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -441,15 +560,20 @@ function Make(Ord) { var match$1 = partition(p, param[3]); var rf = match$1[2]; var rt = match$1[1]; - return pv ? [ + if (pv) { + return [ /* tuple */0, join(lt, v, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, rf) ]; + } } else { return [ @@ -460,7 +584,12 @@ function Make(Ord) { } }; var cardinal = function (param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[3]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[3]); + } + else { + return 0; + } }; var elements_aux = function (_accu, _param) { while(/* true */1) { @@ -649,9 +778,17 @@ function Make(Ord) { if (match$2) { var match$3 = match$2[2]; var x3 = match$2[1]; - return match$3 ? ( - match$3[2] ? of_sorted_list(List.sort_uniq(Ord[1], l)) : add(match$3[1], add(x3, add(x2, add(x1, singleton(x0))))) - ) : add(x3, add(x2, add(x1, singleton(x0)))); + if (match$3) { + if (match$3[2]) { + return of_sorted_list(List.sort_uniq(Ord[1], l)); + } + else { + return add(match$3[1], add(x3, add(x2, add(x1, singleton(x0))))); + } + } + else { + return add(x3, add(x2, add(x1, singleton(x0)))); + } } else { return add(x2, add(x1, singleton(x0))); diff --git a/jscomp/test/test_simple_tailcall.js b/jscomp/test/test_simple_tailcall.js index e824029eba..173cbe28c0 100644 --- a/jscomp/test/test_simple_tailcall.js +++ b/jscomp/test/test_simple_tailcall.js @@ -8,7 +8,12 @@ function tailcall() { } function non_length(x) { - return x ? 1 + non_length(x[2]) : 0; + if (x) { + return 1 + non_length(x[2]); + } + else { + return 0; + } } function length(_acc, _x) { diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js index 2923eca61e..893249d05e 100644 --- a/jscomp/test/test_string_map.js +++ b/jscomp/test/test_string_map.js @@ -9,7 +9,12 @@ function compare(x, y) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -34,9 +39,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -49,9 +62,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -77,9 +98,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -87,6 +115,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ diff --git a/jscomp/test/test_switch.js b/jscomp/test/test_switch.js index 3726cc6aed..ef9eeb0d36 100644 --- a/jscomp/test/test_switch.js +++ b/jscomp/test/test_switch.js @@ -3,7 +3,12 @@ function f(param) { if (typeof param === "number") { - return param ? 5 : 4; + if (param) { + return 5; + } + else { + return 4; + } } else { switch (param[0]) { @@ -21,10 +26,15 @@ function f(param) { } function bind(x, f) { - return x[0] ? x : [ + if (x[0]) { + return x; + } + else { + return [ /* Left */0, f(x[1]) ]; + } } exports.f = f; diff --git a/jscomp/test/test_while_side_effect.js b/jscomp/test/test_while_side_effect.js index df071b3943..18c5890129 100644 --- a/jscomp/test/test_while_side_effect.js +++ b/jscomp/test/test_while_side_effect.js @@ -12,7 +12,12 @@ while(console.log(Pervasives.string_of_int(v[1])), ++ v[1], +(v[1] < 10)) { }; function fib(n) { - return 1 < (n >>> 0) ? fib(n - 1) + fib(n - 2) : 1; + if (1 < (n >>> 0)) { + return fib(n - 1) + fib(n - 2); + } + else { + return 1; + } } var x = [ diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js index 8774011ed0..c703c6cbbf 100644 --- a/jscomp/test/ticker.js +++ b/jscomp/test/ticker.js @@ -55,11 +55,21 @@ function split(delim, s) { }; }; var len = s.length; - return len !== 0 ? loop(/* [] */0, len) : /* [] */0; + if (len !== 0) { + return loop(/* [] */0, len); + } + else { + return /* [] */0; + } } function string_of_float_option(param) { - return param ? Pervasives.string_of_float(param[1]) : "nan"; + if (param) { + return Pervasives.string_of_float(param[1]); + } + else { + return "nan"; + } } var Util = [ @@ -69,9 +79,16 @@ var Util = [ ]; function string_of_rank(param) { - return typeof param === "number" ? ( - param !== 0 ? "Visited" : "Uninitialized" - ) : Printf.sprintf([ + if (typeof param === "number") { + if (param !== 0) { + return "Visited"; + } + else { + return "Uninitialized"; + } + } + else { + return Printf.sprintf([ /* Format */0, [ /* String_literal */11, @@ -90,6 +107,7 @@ function string_of_rank(param) { ], "Ranked(%i)" ])(param[1]); + } } function find_ticker_by_name(all_tickers, ticker) { @@ -102,9 +120,19 @@ function print_all_composite(all_tickers) { return List.iter(function (param) { var value = param[1]; var ticker_name = param[3]; - return param[4] ? ( - value ? (console.log(ticker_name), /* () */0) : (console.log(ticker_name), /* () */0) - ) : /* () */0; + if (param[4]) { + if (value) { + console.log(ticker_name); + return /* () */0; + } + else { + console.log(ticker_name); + return /* () */0; + } + } + else { + return /* () */0; + } }, all_tickers); } @@ -113,7 +141,12 @@ function compare(prim, prim$1) { } function height(param) { - return param ? param[5] : 0; + if (param) { + return param[5]; + } + else { + return 0; + } } function create(l, x, d, r) { @@ -149,9 +182,17 @@ function bal(l, x, d, r) { var ld = l[3]; var lv = l[2]; var ll = l[1]; - return height(ll) >= height(lr) ? create(ll, lv, ld, create(lr, x, d, r)) : ( - lr ? create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(ll) >= height(lr)) { + return create(ll, lv, ld, create(lr, x, d, r)); + } + else { + if (lr) { + return create(create(ll, lv, ld, lr[1]), lr[2], lr[3], create(lr[4], x, d, r)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -164,9 +205,17 @@ function bal(l, x, d, r) { var rd = r[3]; var rv = r[2]; var rl = r[1]; - return height(rr) >= height(rl) ? create(create(l, x, d, rl), rv, rd, rr) : ( - rl ? create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)) : Pervasives.invalid_arg("Map.bal") - ); + if (height(rr) >= height(rl)) { + return create(create(l, x, d, rl), rv, rd, rr); + } + else { + if (rl) { + return create(create(l, x, d, rl[1]), rl[2], rl[3], create(rl[4], rv, rd, rr)); + } + else { + return Pervasives.invalid_arg("Map.bal"); + } + } } else { return Pervasives.invalid_arg("Map.bal"); @@ -186,7 +235,12 @@ function bal(l, x, d, r) { } function is_empty(param) { - return param ? /* false */0 : /* true */1; + if (param) { + return /* false */0; + } + else { + return /* true */1; + } } function add(x, data, param) { @@ -196,9 +250,16 @@ function add(x, data, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(add(x, data, l), v, d, r) : bal(l, v, d, add(x, data, r)) - ) : [ + if (c) { + if (c < 0) { + return bal(add(x, data, l), v, d, r); + } + else { + return bal(l, v, d, add(x, data, r)); + } + } + else { + return [ /* Node */0, l, x, @@ -206,6 +267,7 @@ function add(x, data, param) { r, param[5] ]; + } } else { return [ @@ -294,7 +356,12 @@ function max_binding(_param) { function remove_min_binding(param) { if (param) { var l = param[1]; - return l ? bal(remove_min_binding(l), param[2], param[3], param[4]) : param[4]; + if (l) { + return bal(remove_min_binding(l), param[2], param[3], param[4]); + } + else { + return param[4]; + } } else { return Pervasives.invalid_arg("Map.remove_min_elt"); @@ -323,9 +390,17 @@ function remove(x, param) { var v = param[2]; var l = param[1]; var c = compare(x, v); - return c ? ( - c < 0 ? bal(remove(x, l), v, d, r) : bal(l, v, d, remove(x, r)) - ) : merge(l, r); + if (c) { + if (c < 0) { + return bal(remove(x, l), v, d, r); + } + else { + return bal(l, v, d, remove(x, r)); + } + } + else { + return merge(l, r); + } } else { return /* Empty */0; @@ -400,19 +475,39 @@ function fold(f, _m, _accu) { } function for_all(p, param) { - return param ? +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])) : /* true */1; + if (param) { + return +(p(param[2], param[3]) && for_all(p, param[1]) && for_all(p, param[4])); + } + else { + return /* true */1; + } } function exists(p, param) { - return param ? +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])) : /* false */0; + if (param) { + return +(p(param[2], param[3]) || exists(p, param[1]) || exists(p, param[4])); + } + else { + return /* false */0; + } } function add_min_binding(k, v, param) { - return param ? bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]) : singleton(k, v); + if (param) { + return bal(add_min_binding(k, v, param[1]), param[2], param[3], param[4]); + } + else { + return singleton(k, v); + } } function add_max_binding(k, v, param) { - return param ? bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])) : singleton(k, v); + if (param) { + return bal(param[1], param[2], param[3], add_max_binding(k, v, param[4])); + } + else { + return singleton(k, v); + } } function join(l, v, d, r) { @@ -420,9 +515,17 @@ function join(l, v, d, r) { if (r) { var rh = r[5]; var lh = l[5]; - return lh > rh + 2 ? bal(l[1], l[2], l[3], join(l[4], v, d, r)) : ( - rh > lh + 2 ? bal(join(l, v, d, r[1]), r[2], r[3], r[4]) : create(l, v, d, r) - ); + if (lh > rh + 2) { + return bal(l[1], l[2], l[3], join(l[4], v, d, r)); + } + else { + if (rh > lh + 2) { + return bal(join(l, v, d, r[1]), r[2], r[3], r[4]); + } + else { + return create(l, v, d, r); + } + } } else { return add_max_binding(v, d, l); @@ -449,7 +552,12 @@ function concat(t1, t2) { } function concat_or_join(t1, v, d, t2) { - return d ? join(t1, v, d[1], t2) : concat(t1, t2); + if (d) { + return join(t1, v, d[1], t2); + } + else { + return concat(t1, t2); + } } function split$1(x, param) { @@ -556,7 +664,12 @@ function filter(p, param) { var l$prime = filter(p, param[1]); var pvd = p(v, d); var r$prime = filter(p, param[4]); - return pvd ? join(l$prime, v, d, r$prime) : concat(l$prime, r$prime); + if (pvd) { + return join(l$prime, v, d, r$prime); + } + else { + return concat(l$prime, r$prime); + } } else { return /* Empty */0; @@ -574,15 +687,20 @@ function partition(p, param) { var match$1 = partition(p, param[4]); var rf = match$1[2]; var rt = match$1[1]; - return pvd ? [ + if (pvd) { + return [ /* tuple */0, join(lt, v, d, rt), concat(lf, rf) - ] : [ + ]; + } + else { + return [ /* tuple */0, concat(lt, rt), join(lf, v, d, rf) ]; + } } else { return [ @@ -640,7 +758,12 @@ function compare$1(cmp, m1, m2) { } } else { - return e2 ? -1 : 0; + if (e2) { + return -1; + } + else { + return 0; + } } }; }; @@ -649,17 +772,33 @@ function compare$1(cmp, m1, m2) { function equal(cmp, m1, m2) { var equal_aux = function (e1, e2) { - return e1 ? ( - e2 ? +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))) : /* false */0 - ) : ( - e2 ? /* false */0 : /* true */1 - ); + if (e1) { + if (e2) { + return +(compare(e1[1], e2[1]) === 0 && cmp(e1[2], e2[2]) && equal_aux(cons_enum(e1[3], e1[4]), cons_enum(e2[3], e2[4]))); + } + else { + return /* false */0; + } + } + else { + if (e2) { + return /* false */0; + } + else { + return /* true */1; + } + } }; return equal_aux(cons_enum(m1, /* End */0), cons_enum(m2, /* End */0)); } function cardinal(param) { - return param ? cardinal(param[1]) + 1 + cardinal(param[4]) : 0; + if (param) { + return cardinal(param[1]) + 1 + cardinal(param[4]); + } + else { + return 0; + } } function bindings_aux(_accu, _param) { @@ -798,9 +937,17 @@ function compute_update_sequences(all_tickers) { var l$1 = List.sort_uniq(function (param, param$1) { var lhs = param[2]; var rhs = param$1[2]; - return typeof lhs === "number" ? Pervasives.failwith("All nodes should be ranked") : ( - typeof rhs === "number" ? Pervasives.failwith("All nodes should be ranked") : Caml_primitive.caml_int_compare(lhs[1], rhs[1]) - ); + if (typeof lhs === "number") { + return Pervasives.failwith("All nodes should be ranked"); + } + else { + if (typeof rhs === "number") { + return Pervasives.failwith("All nodes should be ranked"); + } + else { + return Caml_primitive.caml_int_compare(lhs[1], rhs[1]); + } + } }, l); return add(k, l$1, map); }, map, map); @@ -838,10 +985,16 @@ function process_quote(ticker_map, new_ticker, new_value) { return /* () */0; } else { - return ticker[3] === new_ticker ? (ticker[1] = [ - /* Some */0, - new_value - ], /* () */0) : Pervasives.failwith("Only single Market ticker should be udpated upon a new quote"); + if (ticker[3] === new_ticker) { + ticker[1] = [ + /* Some */0, + new_value + ]; + return /* () */0; + } + else { + return Pervasives.failwith("Only single Market ticker should be udpated upon a new quote"); + } } }, update_sequence); }