From d6c5d42c8cb7b3472dd6e130c029dcca364154e1 Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Tue, 15 Aug 2023 10:38:54 +0200 Subject: [PATCH] update generated files --- jscomp/test/demo_int_map.js | 20 ++++----- jscomp/test/int_map.js | 76 ++++++++++++++++---------------- jscomp/test/map_find_test.js | 40 ++++++++--------- jscomp/test/map_test.js | 40 ++++++++--------- jscomp/test/ocaml_re_test.js | 36 +++++++-------- jscomp/test/offset.js | 60 ++++++++++++------------- jscomp/test/rec_module_test.js | 60 ++++++++++++------------- jscomp/test/test_for_map.js | 76 ++++++++++++++++---------------- jscomp/test/test_int_map_find.js | 20 ++++----- jscomp/test/test_string_map.js | 20 ++++----- jscomp/test/ticker.js | 76 ++++++++++++++++---------------- jscomp/test/topsort_test.js | 60 ++++++++++++------------- 12 files changed, 292 insertions(+), 292 deletions(-) diff --git a/jscomp/test/demo_int_map.js b/jscomp/test/demo_int_map.js index bfa351a060..9b9d5aedc6 100644 --- a/jscomp/test/demo_int_map.js +++ b/jscomp/test/demo_int_map.js @@ -86,8 +86,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -97,14 +97,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = x - v | 0; if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -112,21 +112,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js index febe2b69ed..1b72bbb29c 100644 --- a/jscomp/test/int_map.js +++ b/jscomp/test/int_map.js @@ -108,8 +108,8 @@ function is_empty(param) { } } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -119,14 +119,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -134,21 +134,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -461,14 +461,14 @@ function merge(t1, t2) { return bal(t1, match[0], match[1], remove_min_binding(t2)); } -function remove(x, m) { - if (typeof m !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { return merge(l, r); @@ -476,21 +476,21 @@ function remove(x, m) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = remove(x, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } } -function update(x, f, m) { - if (typeof m !== "object") { +function update(x, f, param) { + if (typeof param !== "object") { var data = Curry._1(f, undefined); if (data !== undefined) { return { @@ -505,10 +505,10 @@ function update(x, f, m) { return "Empty"; } } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { var data$1 = Curry._1(f, Caml_option.some(d)); @@ -517,7 +517,7 @@ function update(x, f, m) { } var data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { - return m; + return param; } else { return { TAG: "Node", @@ -525,21 +525,21 @@ function update(x, f, m) { v: x, d: data$2, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = update(x, f, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = update(x, f, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -747,9 +747,9 @@ function merge$1(f, s1, s2) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "map.ml", - 393, - 10 + "map.res", + 552, + 11 ], Error: new Error() }; @@ -792,20 +792,20 @@ function union(f, s1, s2) { } } -function filter(p, m) { - if (typeof m !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pvd = Curry._2(p, v, d); var r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { - return m; + return param; } else { return join(l$p, v, d, r$p); } diff --git a/jscomp/test/map_find_test.js b/jscomp/test/map_find_test.js index 80f8f6f738..3c7f673180 100644 --- a/jscomp/test/map_find_test.js +++ b/jscomp/test/map_find_test.js @@ -89,8 +89,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -100,14 +100,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -115,21 +115,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -265,8 +265,8 @@ function bal$1(l, x, d, r) { }; } -function add$1(x, data, m) { - if (typeof m !== "object") { +function add$1(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -276,14 +276,14 @@ function add$1(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -291,21 +291,21 @@ function add$1(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add$1(x, data, l); if (l === ll) { - return m; + return param; } else { return bal$1(ll, v, d, r); } } var rr = add$1(x, data, r); if (r === rr) { - return m; + return param; } else { return bal$1(l, v, d, rr); } diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js index 2673871e26..8b6e659327 100644 --- a/jscomp/test/map_test.js +++ b/jscomp/test/map_test.js @@ -90,8 +90,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -101,14 +101,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -116,21 +116,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -305,8 +305,8 @@ function bal$1(l, x, d, r) { }; } -function add$1(x, data, m) { - if (typeof m !== "object") { +function add$1(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -316,14 +316,14 @@ function add$1(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -331,21 +331,21 @@ function add$1(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add$1(x, data, l); if (l === ll) { - return m; + return param; } else { return bal$1(ll, v, d, r); } } var rr = add$1(x, data, r); if (r === rr) { - return m; + return param; } else { return bal$1(l, v, d, rr); } diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js index fe9c3fc1b0..105e000cd0 100644 --- a/jscomp/test/ocaml_re_test.js +++ b/jscomp/test/ocaml_re_test.js @@ -377,8 +377,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -388,14 +388,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -403,21 +403,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -571,8 +571,8 @@ function bal$1(l, v, r) { }; } -function add$1(x, t) { - if (typeof t !== "object") { +function add$1(x, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -581,24 +581,24 @@ function add$1(x, t) { h: 1 }; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { - return t; + return param; } if (c < 0) { var ll = add$1(x, l); if (l === ll) { - return t; + return param; } else { return bal$1(ll, v, r); } } var rr = add$1(x, r); if (r === rr) { - return t; + return param; } else { return bal$1(l, v, rr); } diff --git a/jscomp/test/offset.js b/jscomp/test/offset.js index 694c817866..361b23e053 100644 --- a/jscomp/test/offset.js +++ b/jscomp/test/offset.js @@ -89,8 +89,8 @@ function bal(l, v, r) { }; } -function add(x, t) { - if (typeof t !== "object") { +function add(x, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -99,24 +99,24 @@ function add(x, t) { h: 1 }; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { - return t; + return param; } if (c < 0) { var ll = add(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = add(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -316,13 +316,13 @@ function mem(x, _param) { }; } -function remove(x, t) { - if (typeof t !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { if (typeof l !== "object") { @@ -336,14 +336,14 @@ function remove(x, t) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = remove(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -571,19 +571,19 @@ function exists(p, _param) { }; } -function filter(p, t) { - if (typeof t !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pv = Curry._1(p, v); var r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { - return t; + return param; } else { return join(l$p, v, r$p); } @@ -813,18 +813,18 @@ function find_opt(x, _param) { }; } -function map(f, t) { - if (typeof t !== "object") { +function map(f, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = map(f, l); var v$p = Curry._1(f, v); var r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { - return t; + return param; } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { @@ -951,9 +951,9 @@ function of_list(l) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "set.ml", - 510, - 18 + "set.res", + 691, + 20 ], Error: new Error() }; diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js index 71a0304801..88e1ea91db 100644 --- a/jscomp/test/rec_module_test.js +++ b/jscomp/test/rec_module_test.js @@ -177,8 +177,8 @@ function bal(l, v, r) { }; } -function add(x, t) { - if (typeof t !== "object") { +function add(x, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -187,24 +187,24 @@ function add(x, t) { h: 1 }; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Curry._2(AAA.compare, x, v); if (c === 0) { - return t; + return param; } if (c < 0) { var ll = add(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = add(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -404,13 +404,13 @@ function mem(x, _param) { }; } -function remove(x, t) { - if (typeof t !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Curry._2(AAA.compare, x, v); if (c === 0) { if (typeof l !== "object") { @@ -424,14 +424,14 @@ function remove(x, t) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = remove(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -659,19 +659,19 @@ function exists(p, _param) { }; } -function filter(p, t) { - if (typeof t !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pv = Curry._1(p, v); var r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { - return t; + return param; } else { return join(l$p, v, r$p); } @@ -901,18 +901,18 @@ function find_opt(x, _param) { }; } -function map(f, t) { - if (typeof t !== "object") { +function map(f, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = map(f, l); var v$p = Curry._1(f, v); var r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { - return t; + return param; } else if ((l$p === "Empty" || Curry._2(AAA.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(AAA.compare, v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { @@ -1039,9 +1039,9 @@ function of_list(l) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "set.ml", - 510, - 18 + "set.res", + 691, + 20 ], Error: new Error() }; diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js index de4474f45f..3e2f06acf9 100644 --- a/jscomp/test/test_for_map.js +++ b/jscomp/test/test_for_map.js @@ -108,8 +108,8 @@ function is_empty(param) { } } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -119,14 +119,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -134,21 +134,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -461,14 +461,14 @@ function merge(t1, t2) { return bal(t1, match[0], match[1], remove_min_binding(t2)); } -function remove(x, m) { - if (typeof m !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { return merge(l, r); @@ -476,21 +476,21 @@ function remove(x, m) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = remove(x, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } } -function update(x, f, m) { - if (typeof m !== "object") { +function update(x, f, param) { + if (typeof param !== "object") { var data = Curry._1(f, undefined); if (data !== undefined) { return { @@ -505,10 +505,10 @@ function update(x, f, m) { return "Empty"; } } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { var data$1 = Curry._1(f, Caml_option.some(d)); @@ -517,7 +517,7 @@ function update(x, f, m) { } var data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { - return m; + return param; } else { return { TAG: "Node", @@ -525,21 +525,21 @@ function update(x, f, m) { v: x, d: data$2, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = update(x, f, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = update(x, f, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -747,9 +747,9 @@ function merge$1(f, s1, s2) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "map.ml", - 393, - 10 + "map.res", + 552, + 11 ], Error: new Error() }; @@ -792,20 +792,20 @@ function union(f, s1, s2) { } } -function filter(p, m) { - if (typeof m !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pvd = Curry._2(p, v, d); var r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { - return m; + return param; } else { return join(l$p, v, d, r$p); } diff --git a/jscomp/test/test_int_map_find.js b/jscomp/test/test_int_map_find.js index b8e9b38eb2..44bcc8a15d 100644 --- a/jscomp/test/test_int_map_find.js +++ b/jscomp/test/test_int_map_find.js @@ -88,8 +88,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -99,14 +99,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -114,21 +114,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js index a65c9416a0..b74952007f 100644 --- a/jscomp/test/test_string_map.js +++ b/jscomp/test/test_string_map.js @@ -88,8 +88,8 @@ function bal(l, x, d, r) { }; } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -99,14 +99,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -114,21 +114,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js index 21a4416886..7ba853fbeb 100644 --- a/jscomp/test/ticker.js +++ b/jscomp/test/ticker.js @@ -198,8 +198,8 @@ function is_empty(param) { } } -function add(x, data, m) { - if (typeof m !== "object") { +function add(x, data, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -209,14 +209,14 @@ function add(x, data, m) { h: 1 }; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml_obj.compare(x, v); if (c === 0) { if (d === data) { - return m; + return param; } else { return { TAG: "Node", @@ -224,21 +224,21 @@ function add(x, data, m) { v: x, d: data, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = add(x, data, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = add(x, data, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -551,14 +551,14 @@ function merge(t1, t2) { return bal(t1, match[0], match[1], remove_min_binding(t2)); } -function remove(x, m) { - if (typeof m !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml_obj.compare(x, v); if (c === 0) { return merge(l, r); @@ -566,21 +566,21 @@ function remove(x, m) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = remove(x, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } } -function update(x, f, m) { - if (typeof m !== "object") { +function update(x, f, param) { + if (typeof param !== "object") { var data = Curry._1(f, undefined); if (data !== undefined) { return { @@ -595,10 +595,10 @@ function update(x, f, m) { return "Empty"; } } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var c = Caml_obj.compare(x, v); if (c === 0) { var data$1 = Curry._1(f, Caml_option.some(d)); @@ -607,7 +607,7 @@ function update(x, f, m) { } var data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { - return m; + return param; } else { return { TAG: "Node", @@ -615,21 +615,21 @@ function update(x, f, m) { v: x, d: data$2, r: r, - h: m.h + h: param.h }; } } if (c < 0) { var ll = update(x, f, l); if (l === ll) { - return m; + return param; } else { return bal(ll, v, d, r); } } var rr = update(x, f, r); if (r === rr) { - return m; + return param; } else { return bal(l, v, d, rr); } @@ -837,9 +837,9 @@ function merge$1(f, s1, s2) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "map.ml", - 393, - 10 + "map.res", + 552, + 11 ], Error: new Error() }; @@ -882,20 +882,20 @@ function union(f, s1, s2) { } } -function filter(p, m) { - if (typeof m !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = m.r; - var d = m.d; - var v = m.v; - var l = m.l; + var r = param.r; + var d = param.d; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pvd = Curry._2(p, v, d); var r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { - return m; + return param; } else { return join(l$p, v, d, r$p); } diff --git a/jscomp/test/topsort_test.js b/jscomp/test/topsort_test.js index 8dd76da64f..99cc0d59e1 100644 --- a/jscomp/test/topsort_test.js +++ b/jscomp/test/topsort_test.js @@ -533,8 +533,8 @@ function bal(l, v, r) { }; } -function add(x, t) { - if (typeof t !== "object") { +function add(x, param) { + if (typeof param !== "object") { return { TAG: "Node", l: "Empty", @@ -543,24 +543,24 @@ function add(x, t) { h: 1 }; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { - return t; + return param; } if (c < 0) { var ll = add(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = add(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -760,13 +760,13 @@ function mem(x, _param) { }; } -function remove(x, t) { - if (typeof t !== "object") { +function remove(x, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var c = Caml.string_compare(x, v); if (c === 0) { if (typeof l !== "object") { @@ -780,14 +780,14 @@ function remove(x, t) { if (c < 0) { var ll = remove(x, l); if (l === ll) { - return t; + return param; } else { return bal(ll, v, r); } } var rr = remove(x, r); if (r === rr) { - return t; + return param; } else { return bal(l, v, rr); } @@ -1015,19 +1015,19 @@ function exists(p, _param) { }; } -function filter(p, t) { - if (typeof t !== "object") { +function filter(p, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = filter(p, l); var pv = Curry._1(p, v); var r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { - return t; + return param; } else { return join(l$p, v, r$p); } @@ -1257,18 +1257,18 @@ function find_opt(x, _param) { }; } -function map(f, t) { - if (typeof t !== "object") { +function map(f, param) { + if (typeof param !== "object") { return "Empty"; } - var r = t.r; - var v = t.v; - var l = t.l; + var r = param.r; + var v = param.v; + var l = param.l; var l$p = map(f, l); var v$p = Curry._1(f, v); var r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { - return t; + return param; } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { @@ -1395,9 +1395,9 @@ function of_list(l) { throw { RE_EXN_ID: "Assert_failure", _1: [ - "set.ml", - 510, - 18 + "set.res", + 691, + 20 ], Error: new Error() };