diff --git a/jscomp/core/lam_convert.ml b/jscomp/core/lam_convert.ml index 32d6b3fe7b..442dfe4ab1 100644 --- a/jscomp/core/lam_convert.ml +++ b/jscomp/core/lam_convert.ml @@ -549,7 +549,7 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : (* we need do this eargly in case [aux fn] add some wrapper *) Lam.apply (convert_aux fn) (Ext_list.map args convert_aux) - { ap_loc = loc; ap_inlined; ap_status = App_na } + { ap_loc = loc; ap_inlined; ap_status = App_uncurry } | Lfunction { params; body; attr } -> let new_map, body = rename_optional_parameters Map_ident.empty params body diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js index 156d96b340..711ea7d6dd 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; function bar(x) { let f = x.twoArgs; - return Curry._2(f, 3, "a"); + return f(3, "a"); } export { diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js index 3ab09d2586..3650a8a9b3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js @@ -1,6 +1,5 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; import * as ErrorHandler from "./ErrorHandler.res.js"; function notification(s) { @@ -16,7 +15,7 @@ let Error1 = { let MyErrorHandler = ErrorHandler.Make(Error1); -Curry._1(MyErrorHandler.notify, "abc"); +MyErrorHandler.notify("abc"); export { Error1, diff --git a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js index 78be0122f9..447f327d1d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; function Make($$Error) { let notify = function (x) { - return Curry._1($$Error.notification, x); + return $$Error.notification(x); }; return { notify: notify diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js index 169ba35a06..48388edd95 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js @@ -1,6 +1,5 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; import * as React from "react"; import * as ImportHooks from "./ImportHooks.res.js"; import * as ImportHookDefault from "./ImportHookDefault.res.js"; @@ -14,9 +13,9 @@ function Hooks(Props) { let count = match[0]; return React.createElement("div", undefined, React.createElement("p", undefined, "Hooks example " + (vehicle.name + (" clicked " + (String(count) + " times")))), React.createElement("button", { onClick: (function (param) { - Curry._1(setCount, (function (param) { + setCount(function (param) { return count + 1 | 0; - })); + }); }) }, "Click me"), React.createElement(ImportHooks.make, { person: { @@ -42,7 +41,7 @@ function Hooks(Props) { function Hooks$Another$anotherComponent(Props) { let vehicle = Props.vehicle; let callback = Props.callback; - Curry._1(callback, undefined); + callback(); return React.createElement("div", undefined, "Another Hook " + vehicle.name); } @@ -98,7 +97,7 @@ let NoProps = { }; function functionWithRenamedArgs(_to, _Type, cb) { - Curry._1(cb, _to); + cb(_to); return _to.name + _Type.name; } @@ -106,7 +105,7 @@ function Hooks$WithRename$componentWithRenamedArgs(Props) { let _to = Props._to; let _Type = Props._Type; let cb = Props.cb; - Curry._1(cb, _to); + cb(_to); return _to.name + _Type.name; } @@ -114,8 +113,7 @@ let WithRename = { componentWithRenamedArgs: Hooks$WithRename$componentWithRenamedArgs }; -function Hooks$WithRef$makeWithRef(Props) { - let vehicle = Props.vehicle; +function makeWithRef(vehicle) { return function (ref) { if (ref == null) { return null; @@ -127,12 +125,16 @@ function Hooks$WithRef$makeWithRef(Props) { }; } +function Hooks$WithRef$makeWithRef(Props) { + return makeWithRef(Props.vehicle); +} + let WithRef = { makeWithRef: Hooks$WithRef$makeWithRef }; let testForwardRef = React.forwardRef(function (x, y) { - return Curry._1(Hooks$WithRef$makeWithRef(x), y); + return makeWithRef(x.vehicle)(y); }); let input = React.forwardRef(function (r, ref) { @@ -164,7 +166,7 @@ let Fun = { function Hooks$RenderPropRequiresConversion(Props) { let renderVehicle = Props.renderVehicle; - return Curry._1(renderVehicle, { + return renderVehicle({ vehicle: { name: "Car" }, diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js index 4e620cbeaf..8f0f909427 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js @@ -1,6 +1,5 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; import * as Belt_Array from "rescript/lib/es6/belt_Array.js"; function fromArray(a) { @@ -52,13 +51,17 @@ let rangeBy = Belt_Array.rangeBy; let makeByU = Belt_Array.makeByU; function makeBy(c, f) { - return Belt_Array.makeBy(c, Curry.__1(f)); + return Belt_Array.makeBy(c, (function (x) { + return f(x); + })); } let makeByAndShuffleU = Belt_Array.makeByAndShuffleU; function makeByAndShuffle(c, f) { - return Belt_Array.makeByAndShuffle(c, Curry.__1(f)); + return Belt_Array.makeByAndShuffle(c, (function (x) { + return f(x); + })); } let zip = Belt_Array.zip; @@ -66,7 +69,9 @@ let zip = Belt_Array.zip; let zipByU = Belt_Array.zipByU; function zipBy(a1, a2, f) { - return Belt_Array.zipBy(a1, a2, Curry.__2(f)); + return Belt_Array.zipBy(a1, a2, (function (x, y) { + return f(x, y); + })); } let unzip = Belt_Array.unzip; @@ -86,97 +91,129 @@ function copy(a) { let forEachU = Belt_Array.forEachU; function forEach(a, f) { - Belt_Array.forEach(a, Curry.__1(f)); + Belt_Array.forEach(a, (function (x) { + f(x); + })); } let mapU = Belt_Array.mapU; function map(a, f) { - return Belt_Array.map(a, Curry.__1(f)); + return Belt_Array.map(a, (function (x) { + return f(x); + })); } let keepWithIndexU = Belt_Array.keepWithIndexU; function keepWithIndex(a, f) { - return Belt_Array.keepWithIndex(a, Curry.__2(f)); + return Belt_Array.keepWithIndex(a, (function (x, y) { + return f(x, y); + })); } let keepMapU = Belt_Array.keepMapU; function keepMap(a, f) { - return Belt_Array.keepMap(a, Curry.__1(f)); + return Belt_Array.keepMap(a, (function (x) { + return f(x); + })); } let forEachWithIndexU = Belt_Array.forEachWithIndexU; function forEachWithIndex(a, f) { - Belt_Array.forEachWithIndex(a, Curry.__2(f)); + Belt_Array.forEachWithIndex(a, (function (x, y) { + f(x, y); + })); } let mapWithIndexU = Belt_Array.mapWithIndexU; function mapWithIndex(a, f) { - return Belt_Array.mapWithIndex(a, Curry.__2(f)); + return Belt_Array.mapWithIndex(a, (function (x, y) { + return f(x, y); + })); } let partitionU = Belt_Array.partitionU; function partition(a, f) { - return Belt_Array.partition(a, Curry.__1(f)); + return Belt_Array.partition(a, (function (x) { + return f(x); + })); } let reduceU = Belt_Array.reduceU; function reduce(a, b, f) { - return Belt_Array.reduce(a, b, Curry.__2(f)); + return Belt_Array.reduce(a, b, (function (x, y) { + return f(x, y); + })); } let reduceReverseU = Belt_Array.reduceReverseU; function reduceReverse(a, b, f) { - return Belt_Array.reduceReverse(a, b, Curry.__2(f)); + return Belt_Array.reduceReverse(a, b, (function (x, y) { + return f(x, y); + })); } let reduceReverse2U = Belt_Array.reduceReverse2U; function reduceReverse2(a1, a2, c, f) { - return Belt_Array.reduceReverse2(a1, a2, c, Curry.__3(f)); + return Belt_Array.reduceReverse2(a1, a2, c, (function (x, y, z) { + return f(x, y, z); + })); } let someU = Belt_Array.someU; function some(a, f) { - return Belt_Array.some(a, Curry.__1(f)); + return Belt_Array.some(a, (function (x) { + return f(x); + })); } let everyU = Belt_Array.everyU; function every(a, f) { - return Belt_Array.every(a, Curry.__1(f)); + return Belt_Array.every(a, (function (x) { + return f(x); + })); } let every2U = Belt_Array.every2U; function every2(a1, a2, f) { - return Belt_Array.every2(a1, a2, Curry.__2(f)); + return Belt_Array.every2(a1, a2, (function (x, y) { + return f(x, y); + })); } let some2U = Belt_Array.some2U; function some2(a1, a2, f) { - return Belt_Array.some2(a1, a2, Curry.__2(f)); + return Belt_Array.some2(a1, a2, (function (x, y) { + return f(x, y); + })); } let cmpU = Belt_Array.cmpU; function cmp(a1, a2, f) { - return Belt_Array.cmp(a1, a2, Curry.__2(f)); + return Belt_Array.cmp(a1, a2, (function (x, y) { + return f(x, y); + })); } let eqU = Belt_Array.eqU; function eq(a1, a2, f) { - return Belt_Array.eq(a1, a2, Curry.__2(f)); + return Belt_Array.eq(a1, a2, (function (x, y) { + return f(x, y); + })); } let $$Array$1 = { diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js index 6431c1d0c1..84f321dd72 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js @@ -1,6 +1,5 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; import ImportJsValueGen from "./ImportJsValue.gen"; import * as ImportJsValueGen$1 from "./ImportJsValue.gen"; @@ -29,7 +28,7 @@ let areaValue = ImportJsValueGen$1.area({ function getAbs(x) { let getAbs$1 = x.getAbs; - return Curry._1(getAbs$1, undefined); + return getAbs$1(); } let AbsoluteValue = { diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js index 4725a1d0fd..8420bac6b1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js @@ -1,6 +1,5 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as Curry from "rescript/lib/es6/curry.js"; function uncurried0() { return ""; @@ -23,15 +22,15 @@ function curried3(x, y, z) { } function callback(cb) { - return String(Curry._1(cb, undefined)); + return String(cb()); } function callback2(auth) { - return Curry._1(auth.login, undefined); + return auth.login(); } function callback2U(auth) { - return Curry._1(auth.loginU, undefined); + return auth.loginU(); } function sumU(n, m) { diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js index c3d3a8a6c4..f11c6c55cc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE import * as List from "rescript/lib/es6/list.js"; -import * as Curry from "rescript/lib/es6/curry.js"; import * as Belt_Option from "rescript/lib/es6/belt_Option.js"; function swap(tree) { @@ -21,7 +20,7 @@ function mutuallyRecursiveConverter(param) { } function testFunctionOnOptionsAsArgument(a, foo) { - return Curry._1(foo, a); + return foo(a); } function jsonStringify(prim) { diff --git a/jscomp/ml/translcore.ml b/jscomp/ml/translcore.ml index a5733de523..c0f72ed7f3 100644 --- a/jscomp/ml/translcore.ml +++ b/jscomp/ml/translcore.ml @@ -1036,14 +1036,8 @@ and transl_cases_try cases = List.map transl_case_try cases and transl_apply ?(inlined = Default_inline) ?(uncurried_partial_application=None) lam sargs loc = - let lapply funct args = - match funct with - (* Attention: This may not be what we need to change the application arity*) - | Lapply ap -> Lapply { ap with ap_args = ap.ap_args @ args; ap_loc = loc } - | lexp -> - Lapply - { ap_loc = loc; ap_func = lexp; ap_args = args; ap_inlined = inlined } - in + let lapply ap_func ap_args = + Lapply { ap_loc = loc; ap_func; ap_args; ap_inlined = inlined } in let rec build_apply lam args = function | (None, optional) :: l -> let defs = ref [] in diff --git a/jscomp/test/DerivingAccessorsCurried.js b/jscomp/test/DerivingAccessorsCurried.js index 2ad2d0eb53..49a7d6079e 100644 --- a/jscomp/test/DerivingAccessorsCurried.js +++ b/jscomp/test/DerivingAccessorsCurried.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function myField(param) { return param.myField; @@ -23,7 +22,7 @@ function doubleNum(param_0, param_1) { } function compose(a, accessor) { - return Curry._1(accessor, a); + return accessor(a); } let _composedMyField = 1; diff --git a/jscomp/test/DerivingAccessorsUncurried.js b/jscomp/test/DerivingAccessorsUncurried.js index 2ad2d0eb53..49a7d6079e 100644 --- a/jscomp/test/DerivingAccessorsUncurried.js +++ b/jscomp/test/DerivingAccessorsUncurried.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function myField(param) { return param.myField; @@ -23,7 +22,7 @@ function doubleNum(param_0, param_1) { } function compose(a, accessor) { - return Curry._1(accessor, a); + return accessor(a); } let _composedMyField = 1; diff --git a/jscomp/test/Import.js b/jscomp/test/Import.js index b4dddc9291..b094a389db 100644 --- a/jscomp/test/Import.js +++ b/jscomp/test/Import.js @@ -1,19 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); async function eachIntAsync(list, f) { - return Curry._2(await import("../../lib/js/belt_List.js").then(function (m) { + return (await import("../../lib/js/belt_List.js").then(function (m) { return m.forEach; - }), list, f); + }))(list, f); } function eachIntLazy(list, f) { return import("../../lib/js/belt_List.js").then(function (m) { return m.forEach; }).then(function (each) { - return Promise.resolve(Curry._2(each, list, f)); + return Promise.resolve(each(list, f)); }); } diff --git a/jscomp/test/PartialApplicationNoRuntimeCurry.js b/jscomp/test/PartialApplicationNoRuntimeCurry.js index f96fa7badd..89cd1695ef 100644 --- a/jscomp/test/PartialApplicationNoRuntimeCurry.js +++ b/jscomp/test/PartialApplicationNoRuntimeCurry.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function add(x) { return function (y, z) { @@ -12,7 +11,7 @@ function add(x) { function f(u) { let f$1 = add(u); return function (extra) { - return Curry._2(f$1, 1, extra); + return f$1(1, extra); }; } diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js index 24c3fa3fba..4b284ff2ca 100644 --- a/jscomp/test/UncurriedAlways.js +++ b/jscomp/test/UncurriedAlways.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function foo(x, y) { return x + y | 0; @@ -160,7 +159,7 @@ let OptMixed = { }; function fn(cb) { - return Curry._1(cb, undefined); + return cb(); } console.log({ @@ -169,7 +168,7 @@ console.log({ }); function fn1(a, b, param) { - return Curry._1(a, undefined) + b | 0; + return a() + b | 0; } function a$1(__x) { @@ -204,11 +203,11 @@ let PartialApplication = { }; function hello1(y, f) { - return Curry._1(f, y); + return f(y); } function hello2(y, f) { - return Curry._1(f, y); + return f(y); } let ReverseApplication = { @@ -218,25 +217,25 @@ let ReverseApplication = { function f(a, b, c) { return [ - Curry._1(b, a), - Curry._1(c, a) + b(a), + c(a) ]; } function f2(a, b, c, d, e) { - let __tuple_internal_obj = Curry._1(a, b); - let param_0 = Curry._2(c, __tuple_internal_obj, d); - let param_1 = Curry._3(d, __tuple_internal_obj, 1, 2); - let param_2 = Curry._1(e, __tuple_internal_obj); + let __tuple_internal_obj = a(b); + let param_0 = c(__tuple_internal_obj, d); + let param_1 = d(__tuple_internal_obj, 1, 2); + let param_2 = e(__tuple_internal_obj); return (param_0 + param_1 | 0) + param_2 | 0; } function f3$1(foo, x) { - return Curry._1(foo, x); + return foo(x); } function f4(x, f) { - return Curry._2(f, x, 3); + return f(x, 3); } let Pipe = { diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js index 71167e6651..2aa967abd0 100644 --- a/jscomp/test/UncurriedExternals.js +++ b/jscomp/test/UncurriedExternals.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let React = require("react"); function dd() { @@ -20,7 +19,7 @@ let M = { }) }; -let hh = Curry._2(M.sum, 1.0, 2.0); +let hh = M.sum(1.0, 2.0); let mf = 3 % 4; diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js index 0a7b0b1a72..fc4bad2165 100644 --- a/jscomp/test/UntaggedVariants.js +++ b/jscomp/test/UntaggedVariants.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Js_dict = require("../../lib/js/js_dict.js"); let Belt_Array = require("../../lib/js/belt_Array.js"); let Caml_array = require("../../lib/js/caml_array.js"); @@ -373,7 +372,7 @@ function classify$9(v) { case "object" : return v.x; case "function" : - return Curry._1(v, 3); + return v(3); } } @@ -575,7 +574,7 @@ function test(t) { case "string" : return t; case "function" : - return Curry._1(t, undefined); + return t(); } } diff --git a/jscomp/test/a_recursive_type.js b/jscomp/test/a_recursive_type.js index ccd7a52800..7727b37026 100644 --- a/jscomp/test/a_recursive_type.js +++ b/jscomp/test/a_recursive_type.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function g(x) { - return Curry._1(x._0, x); + return x._0(x); } let loop = g({ @@ -12,7 +11,7 @@ let loop = g({ _0: g }); -let non_terminate = Curry._1(g, { +let non_terminate = g({ TAG: "A", _0: g }); diff --git a/jscomp/test/ari_regress_test.js b/jscomp/test/ari_regress_test.js index 0fb1d223ff..da79d0742c 100644 --- a/jscomp/test/ari_regress_test.js +++ b/jscomp/test/ari_regress_test.js @@ -2,27 +2,13 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); -function f(x) { - return function (extra) { - return x + extra | 0; - }; -} - -let g = Curry._1(f(3), 4); +let g = 7; let h = { contents: 0 }; -function gg(x, y) { - let u = x + y | 0; - return function (z) { - return u + z | 0; - }; -} - function g1(x, y) { let u = x + y | 0; h.contents = h.contents + 1 | 0; @@ -31,10 +17,12 @@ function g1(x, y) { }; } -let x = Curry._1(gg(3, 5), 6); +let u = 8; + +let x = u + 6 | 0; function v(__x) { - return Curry._2(g1(3, 4), 6, __x); + return g1(3, 4)(6, __x); } let suites_0 = [ @@ -93,4 +81,4 @@ let suites = { Mt.from_pair_suites("Ari_regress_test", suites); -/* g Not a pure module */ +/* Not a pure module */ diff --git a/jscomp/test/arith_lexer.js b/jscomp/test/arith_lexer.js index 3fe31466a5..7ede8cf05e 100644 --- a/jscomp/test/arith_lexer.js +++ b/jscomp/test/arith_lexer.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Lexing = require("../../lib/js/lexing.js"); let Pervasives = require("../../lib/js/pervasives.js"); let Caml_format = require("../../lib/js/caml_format.js"); @@ -152,7 +151,7 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) { case 9 : return "EOF"; default: - Curry._1(lexbuf.refill_buff, lexbuf); + lexbuf.refill_buff(lexbuf); ___ocaml_lex_state = __ocaml_lex_state$1; continue; } diff --git a/jscomp/test/arity.js b/jscomp/test/arity.js index bde98e4f6a..c102b0bb09 100644 --- a/jscomp/test/arity.js +++ b/jscomp/test/arity.js @@ -1,16 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function u(f, a, b) { - console.log(Curry._2(f, a, b)); - console.log(Curry._2(f, a, b)); + console.log(f(a, b)); + console.log(f(a, b)); } function u2(f, a, b) { - console.log(Curry._2(f, a, b)); - console.log(Curry._2(f, a, b)); + console.log(f(a, b)); + console.log(f(a, b)); } function f(x, y) { @@ -23,7 +22,7 @@ function add(prim0, prim1) { function h(u) { let m = u.hi; - return Curry._2(m, 1, 2); + return m(1, 2); } let nested = { diff --git a/jscomp/test/arity_deopt.js b/jscomp/test/arity_deopt.js index 9f0ced9551..72352a0e4b 100644 --- a/jscomp/test/arity_deopt.js +++ b/jscomp/test/arity_deopt.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -53,11 +52,11 @@ function f3(x) { eq("File \"arity_deopt.res\", line 47, characters 11-18", 6, 6); -eq("File \"arity_deopt.res\", line 48, characters 11-18", 6, Curry._2(f1(1), 2, 3)); +eq("File \"arity_deopt.res\", line 48, characters 11-18", 6, 6); -eq("File \"arity_deopt.res\", line 49, characters 11-18", 6, Curry._1(f2(1, 2), 3)); +eq("File \"arity_deopt.res\", line 49, characters 11-18", 6, 6); -eq("File \"arity_deopt.res\", line 50, characters 11-18", 6, Curry._2(f3(1), 2, 3)); +eq("File \"arity_deopt.res\", line 50, characters 11-18", 6, 6); Mt.from_pair_suites("Arity_deopt", suites.contents); diff --git a/jscomp/test/arity_infer.js b/jscomp/test/arity_infer.js index 287497a2b3..e79d4a0c52 100644 --- a/jscomp/test/arity_infer.js +++ b/jscomp/test/arity_infer.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f0(x) { let tmp; @@ -25,7 +24,7 @@ function f1(x) { RE_EXN_ID: "Not_found" } }); - return Curry._1(undefined, x); + return undefined(x); } function f3(x) { diff --git a/jscomp/test/array_test.js b/jscomp/test/array_test.js index 3c43f34ab2..8e971d222b 100644 --- a/jscomp/test/array_test.js +++ b/jscomp/test/array_test.js @@ -5,7 +5,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_array = require("../../lib/js/caml_array.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); @@ -20,7 +19,7 @@ function starts_with(xs, prefix, p) { } try { for(let i = 0; i < len2; ++i){ - if (!Curry._2(p, Caml_array.get(xs, i), Caml_array.get(prefix, i))) { + if (!p(Caml_array.get(xs, i), Caml_array.get(prefix, i))) { throw new Error(H, { cause: { RE_EXN_ID: H diff --git a/jscomp/test/async_await.js b/jscomp/test/async_await.js index 9f8973e2a9..ae29f57668 100644 --- a/jscomp/test/async_await.js +++ b/jscomp/test/async_await.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function next(n) { @@ -14,7 +13,7 @@ async function useNext() { function Make(I) { let get = async function (key) { - return await Curry._1(I.get, key); + return await I.get(key); }; return { get: get diff --git a/jscomp/test/async_inline.js b/jscomp/test/async_inline.js index fda60ccfe8..e08f9e8df5 100644 --- a/jscomp/test/async_inline.js +++ b/jscomp/test/async_inline.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let React = require("react"); async function willBeInlined() { @@ -25,7 +24,7 @@ function wrapSomethingAsync2() { } async function doSomethingAsync(someAsyncFunction) { - return await Curry._1(someAsyncFunction, undefined); + return await someAsyncFunction(); } let broken = doSomethingAsync; @@ -35,7 +34,7 @@ let M = { }; async function broken$1(someAsyncFunction) { - return await Curry._1(someAsyncFunction, undefined); + return await someAsyncFunction(); } let broken$2 = broken$1; diff --git a/jscomp/test/basic_module_test.js b/jscomp/test/basic_module_test.js index cc3f95312f..cc66bb5a9e 100644 --- a/jscomp/test/basic_module_test.js +++ b/jscomp/test/basic_module_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Offset = require("./offset.js"); let Pr6726 = require("./pr6726.js"); let Mt_global = require("./mt_global.js"); @@ -15,7 +14,7 @@ function test(set) { count.contents = Offset.$$Set.cardinal(set) + count.contents | 0; } -test(Curry._1(Offset.M.$$Set.singleton, "42")); +test(Offset.M.$$Set.singleton("42")); let suites = { contents: /* [] */0 diff --git a/jscomp/test/bench.js b/jscomp/test/bench.js index ae9119dd39..d23518c4a5 100644 --- a/jscomp/test/bench.js +++ b/jscomp/test/bench.js @@ -1,25 +1,28 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let Pervasives = require("../../lib/js/pervasives.js"); function map(f, a) { - let f$1 = Curry.__1(f); + let f$1 = function (x) { + return f(x); + }; let l = a.length; if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f$1, a[0])); + let r = Caml_array.make(l, f$1(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f$1, a[i]); + r[i] = f$1(a[i]); } return r; } function init(l, f) { - let f$1 = Curry.__1(f); + let f$1 = function (x) { + return f(x); + }; if (l === 0) { return []; } @@ -31,18 +34,20 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f$1, 0)); + let res = Caml_array.make(l, f$1(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f$1, i); + res[i] = f$1(i); } return res; } function fold_left(f, x, a) { - let f$1 = Curry.__2(f); + let f$1 = function (x, y) { + return f(x, y); + }; let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f$1, r, a[i]); + r = f$1(r, a[i]); } return r; } diff --git a/jscomp/test/bs_abstract_test.js b/jscomp/test/bs_abstract_test.js index 8c745a5e94..650119951d 100644 --- a/jscomp/test/bs_abstract_test.js +++ b/jscomp/test/bs_abstract_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let v = { hd: 3, @@ -18,31 +17,31 @@ let f = { }; function uf(u) { - return Curry._1(u.y0, 1); + return u.y0(1); } function uf1(u) { return function (extra) { - return Curry._2(u.y1, 1, extra); + return u.y1(1, extra); }; } function uf2(u) { - return Curry._2(u.y1, 1, 2); + return u.y1(1, 2); } function uff(f) { - return Curry._1(f.yyyy, 1); + return f.yyyy(1); } function uff2(f) { - return Curry._2(f.yyyy1, 1, 2); + return f.yyyy1(1, 2); } function uff3(f) { let x = f.yyyy2; if (x !== undefined) { - return Curry._1(x, 0); + return x(0); } else { return 0; } diff --git a/jscomp/test/bs_auto_uncurry.js b/jscomp/test/bs_auto_uncurry.js index 107dab66c6..3ea45355c0 100644 --- a/jscomp/test/bs_auto_uncurry.js +++ b/jscomp/test/bs_auto_uncurry.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_splice_call = require("../../lib/js/caml_splice_call.js"); -let Curry$1 = {}; +let Curry = {}; let Block = {}; @@ -75,7 +74,7 @@ function h(x, y, z) { } function h1(x, y, u, z) { - return map2(x, y, Curry._1(z, u)); + return map2(x, y, z(u)); } function add3(x) { @@ -135,7 +134,7 @@ function hh(xs, a) { ]); } -exports.Curry = Curry$1; +exports.Curry = Curry; exports.Block = Block; exports.xbs = xbs; exports.f = f; diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js index 2d9e79e69a..a57ca4a829 100644 --- a/jscomp/test/bs_queue_test.js +++ b/jscomp/test/bs_queue_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Belt_Array = require("../../lib/js/belt_Array.js"); let Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js"); @@ -25,7 +24,7 @@ function b(loc, x) { function does_raise(f, q) { try { - Curry._1(f, q); + f(q); return false; } catch (exn){ diff --git a/jscomp/test/bs_splice_partial.js b/jscomp/test/bs_splice_partial.js index eaf7fa5ef8..aa01df223d 100644 --- a/jscomp/test/bs_splice_partial.js +++ b/jscomp/test/bs_splice_partial.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function test(g) { g.xx(10, 3, "xxx", 1, 2, 3); @@ -27,9 +26,9 @@ function test_hi__2(x) { } function test_cb(x) { - Curry._1(x.cb("hI", 1, 2, 3), 3); - Curry._1(x.cb("hI", 1, 2, 3), 3); - return Curry._1(x.cb2("hI", 1, 2, 3), 3); + x.cb("hI", 1, 2, 3)(3); + x.cb("hI", 1, 2, 3)(3); + return x.cb2("hI", 1, 2, 3)(3); } function f(x) { diff --git a/jscomp/test/bs_unwrap_test.js b/jscomp/test/bs_unwrap_test.js index af678fe568..9280a5b7ba 100644 --- a/jscomp/test/bs_unwrap_test.js +++ b/jscomp/test/bs_unwrap_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); console.log([ @@ -86,7 +85,7 @@ function ff0(x, p) { } function ff1(x, p) { - console.log(Caml_option.option_unwrap(Curry._1(x, undefined)), p); + console.log(Caml_option.option_unwrap(x()), p); } function test00() { diff --git a/jscomp/test/chain_code_test.js b/jscomp/test/chain_code_test.js index 6b7a391c90..a290de375a 100644 --- a/jscomp/test/chain_code_test.js +++ b/jscomp/test/chain_code_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -38,7 +37,7 @@ function f2(h) { } function f3(h, x, y) { - return Curry._2(Curry._2(h.paint, x, y).draw, x, y); + return h.paint(x, y).draw(x, y); } function f4(h, x, y) { diff --git a/jscomp/test/class_type_ffi_test.js b/jscomp/test/class_type_ffi_test.js index 755b799b54..b38f435362 100644 --- a/jscomp/test/class_type_ffi_test.js +++ b/jscomp/test/class_type_ffi_test.js @@ -1,81 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function test_set(x) { x.length__aux = 3; } function ff(fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) { - return Curry.app(fn, [ - a0, - a1, - a2, - a3, - a4, - a5, - a6, - a7, - a8, - a9, - a10, - a11 - ]); + return fn(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } function ff2(fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) { - return Curry.app(fn, [ - a0, - a1, - a2, - a3, - a4, - a5, - a6, - a7, - a8, - a9, - a10, - a11, - a12 - ]); + return fn(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } function off2(o, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) { - return Curry.app(o.huge_method, [ - a0, - a1, - a2, - a3, - a4, - a5, - a6, - a7, - a8, - a9, - a10, - a11, - a12 - ]); + return o.huge_method(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } function mk_f() { return function (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) { - return Curry.app(a0, [ - a1, - a2, - a3, - a4, - a5, - a6, - a7, - a8, - a9, - a10, - a11, - a12 - ]); + return a0(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); }; } diff --git a/jscomp/test/coercion_module_alias_test.js b/jscomp/test/coercion_module_alias_test.js index abdd32ce6f..996ebb34db 100644 --- a/jscomp/test/coercion_module_alias_test.js +++ b/jscomp/test/coercion_module_alias_test.js @@ -3,7 +3,6 @@ let Char = require("../../lib/js/char.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function l(prim) { console.log(prim); @@ -153,7 +152,7 @@ let M9 = { C$p: C$p$1 }; -let prim$4 = Curry._1(Char.chr, 66); +let prim$4 = Char.chr(66); console.log(prim$4); @@ -161,7 +160,7 @@ let M10 = { C$p: Char }; -let prim$5 = Curry._1(M10.C$p.chr, 66); +let prim$5 = M10.C$p.chr(66); console.log(prim$5); diff --git a/jscomp/test/cps_test.js b/jscomp/test/cps_test.js index 20edce5c06..8939bea0dd 100644 --- a/jscomp/test/cps_test.js +++ b/jscomp/test/cps_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function test() { @@ -15,11 +14,11 @@ function test() { let acc = _acc; let n = _n; if (n === 0) { - return Curry._1(acc, undefined); + return acc(); } _acc = (function () { v.contents = v.contents + n | 0; - return Curry._1(acc, undefined); + return acc(); }); _n = n - 1 | 0; continue; @@ -44,7 +43,7 @@ function test_closure() { })); } $$Array.iter((function (i) { - v.contents = v.contents + Curry._1(i, 0) | 0; + v.contents = v.contents + i(0) | 0; }), arr); return v.contents; } @@ -63,7 +62,7 @@ function test_closure2() { })); } $$Array.iter((function (i) { - v.contents = v.contents + Curry._1(i, 0) | 0; + v.contents = v.contents + i(0) | 0; }), arr); return v.contents; } diff --git a/jscomp/test/defunctor_make_test.js b/jscomp/test/defunctor_make_test.js index 2da3f40a1e..75b6eca17b 100644 --- a/jscomp/test/defunctor_make_test.js +++ b/jscomp/test/defunctor_make_test.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); function getcompare(x) { return x; @@ -120,7 +119,7 @@ function add(x, data, compare, x_) { let d = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(compare, x, v); + let c = compare(x, v); if (c === 0) { return { TAG: "Node", diff --git a/jscomp/test/demo_page.js b/jscomp/test/demo_page.js index e0dc2d539c..03af90cb46 100644 --- a/jscomp/test/demo_page.js +++ b/jscomp/test/demo_page.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let React = require("react"); let ReactDom = require("react-dom"); @@ -27,7 +26,7 @@ function map(f, x) { } else { return { TAG: "Cons", - _0: Curry._1(f, x._0), + _0: f(x._0), _1: map(f, x._1) }; } diff --git a/jscomp/test/earger_curry_test.js b/jscomp/test/earger_curry_test.js index 6ffeaa098d..f7ad48dad5 100644 --- a/jscomp/test/earger_curry_test.js +++ b/jscomp/test/earger_curry_test.js @@ -2,25 +2,28 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let Pervasives = require("../../lib/js/pervasives.js"); function map(f, a) { - let f$1 = Curry.__1(f); + let f$1 = function (x) { + return f(x); + }; let l = a.length; if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f$1, a[0])); + let r = Caml_array.make(l, f$1(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f$1, a[i]); + r[i] = f$1(a[i]); } return r; } function init(l, f) { - let f$1 = Curry.__1(f); + let f$1 = function (x) { + return f(x); + }; if (l === 0) { return []; } @@ -32,18 +35,20 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f$1, 0)); + let res = Caml_array.make(l, f$1(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f$1, i); + res[i] = f$1(i); } return res; } function fold_left(f, x, a) { - let f$1 = Curry.__2(f); + let f$1 = function (x, y) { + return f(x, y); + }; let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f$1, r, a[i]); + r = f$1(r, a[i]); } return r; } @@ -128,13 +133,13 @@ function g(x) { return u; } -let a = Curry._2(f(0), 3, 4); +let a = f(0)(3, 4); -let b = Curry._2(f(0), 3, 5); +let b = f(0)(3, 5); -let c = Curry._2(g(0), 3, 4); +let c = g(0)(3, 4); -let d = Curry._2(g(0), 3, 5); +let d = g(0)(3, 5); eq("File \"earger_curry_test.res\", line 141, characters 5-12", a, 10); diff --git a/jscomp/test/event_ffi.js b/jscomp/test/event_ffi.js index c2a6a955a5..d4144f53a3 100644 --- a/jscomp/test/event_ffi.js +++ b/jscomp/test/event_ffi.js @@ -2,36 +2,35 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function h0(x) { - return Curry._1(x, undefined); + return x(); } function h00(x) { - return Curry._1(x, undefined); + return x(); } function h1(x, y) { - return Curry._1(x, y); + return x(y); } function h10(x) { - return Curry._1(x, 3); + return x(3); } function h30(x) { return function (a) { - return Curry._3(x, 3, 3, a); + return x(3, 3, a); }; } function h33(x) { - return Curry._3(x, 1, 2, 3); + return x(1, 2, 3); } function h34(x) { - return Curry._4(x, 1, 2, 3, 4); + return x(1, 2, 3)(4); } function ocaml_run(b, c) { diff --git a/jscomp/test/exception_raise_test.js b/jscomp/test/exception_raise_test.js index 30b487ca53..e46937b21b 100644 --- a/jscomp/test/exception_raise_test.js +++ b/jscomp/test/exception_raise_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Js_exn = require("../../lib/js/js_exn.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -19,7 +18,7 @@ let D = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.D"); function appf(g, x) { let A = /* @__PURE__ */Caml_exceptions.create("A"); try { - return Curry._1(g, x); + return g(x); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); @@ -190,7 +189,7 @@ function eq(loc, x, y) { } try { - (Curry._1((()=>{throw 2}), undefined)); + ((()=>{throw 2})()); } catch (raw_e$2){ let e = Caml_js_exceptions.internalToOCamlException(raw_e$2); @@ -212,12 +211,12 @@ catch (raw_e$3){ function fff0(x, g) { let val; try { - val = Curry._1(x, undefined); + val = x(); } catch (exn){ return 1; } - return Curry._1(g, undefined); + return g(); } function input_lines(ic, _acc) { diff --git a/jscomp/test/exception_rebound_err_test.js b/jscomp/test/exception_rebound_err_test.js index 71d7eff048..3c0843c748 100644 --- a/jscomp/test/exception_rebound_err_test.js +++ b/jscomp/test/exception_rebound_err_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -68,7 +67,7 @@ function test_js_error4() { function f(g) { try { - return Curry._1(g, undefined); + return g(); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); diff --git a/jscomp/test/exception_value_test.js b/jscomp/test/exception_value_test.js index 60384a916d..a48c45483f 100644 --- a/jscomp/test/exception_value_test.js +++ b/jscomp/test/exception_value_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Js_exn = require("../../lib/js/js_exn.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -51,7 +50,7 @@ let u = { function test_not_found(f, param) { try { - return Curry._1(f, undefined); + return f(); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); diff --git a/jscomp/test/ext_array_test.js b/jscomp/test/ext_array_test.js index d8e014a68f..de2c274cb2 100644 --- a/jscomp/test/ext_array_test.js +++ b/jscomp/test/ext_array_test.js @@ -3,7 +3,6 @@ let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -66,7 +65,7 @@ function filter(f, a) { return reverse_of_list(acc); } let v = a[i]; - if (Curry._1(f, v)) { + if (f(v)) { _i = i + 1 | 0; _acc = { hd: v, @@ -90,7 +89,7 @@ function filter_map(f, a) { return reverse_of_list(acc); } let v = a[i]; - let v$1 = Curry._1(f, v); + let v$1 = f(v); if (v$1 !== undefined) { _i = i + 1 | 0; _acc = { @@ -129,7 +128,7 @@ function map2i(f, a, b) { }); } return $$Array.mapi((function (i, a) { - return Curry._3(f, i, a, b[i]); + return f(i, a, b[i]); }), a); } @@ -141,7 +140,7 @@ function tolist_aux(a, f, _i, _res) { return res; } let v = a[i]; - let v$1 = Curry._1(f, v); + let v$1 = f(v); _res = v$1 !== undefined ? ({ hd: Caml_option.valFromOption(v$1), tl: res @@ -164,7 +163,7 @@ function of_list_map(f, a) { return []; } let tl = a.tl; - let hd = Curry._1(f, a.hd); + let hd = f(a.hd); let len = List.length(tl) + 1 | 0; let arr = Caml_array.make(len, hd); let _i = 1; @@ -175,7 +174,7 @@ function of_list_map(f, a) { if (!x) { return arr; } - arr[i] = Curry._1(f, x.hd); + arr[i] = f(x.hd); _x = x.tl; _i = i + 1 | 0; continue; @@ -190,7 +189,7 @@ function rfind_with_index(arr, cmp, v) { if (i < 0) { return i; } - if (Curry._2(cmp, arr[i], v)) { + if (cmp(arr[i], v)) { return i; } _i = i - 1 | 0; @@ -221,7 +220,7 @@ function find_with_index(arr, cmp, v) { if (i >= len) { return -1; } - if (Curry._2(cmp, arr[i], v)) { + if (cmp(arr[i], v)) { return i; } _i = i + 1 | 0; @@ -252,7 +251,7 @@ function exists(p, a) { if (i === n) { return false; } - if (Curry._1(p, a[i])) { + if (p(a[i])) { return true; } _i = i + 1 | 0; @@ -270,7 +269,7 @@ function unsafe_loop(_index, len, p, xs, ys) { if (index >= len) { return true; } - if (!Curry._2(p, xs[index], ys[index])) { + if (!p(xs[index], ys[index])) { return false; } _index = index + 1 | 0; diff --git a/jscomp/test/ext_bytes_test.js b/jscomp/test/ext_bytes_test.js index c8de2ffa23..6e333d5bf1 100644 --- a/jscomp/test/ext_bytes_test.js +++ b/jscomp/test/ext_bytes_test.js @@ -5,7 +5,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let Char = require("../../lib/js/char.js"); let Bytes = require("../../lib/js/bytes.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_bytes = require("../../lib/js/caml_bytes.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -136,7 +135,7 @@ function starts_with(xs, prefix, p) { } try { for(let i = 0; i < len2; ++i){ - if (!Curry._2(p, Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) { + if (!p(Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) { throw new Error(H, { cause: { RE_EXN_ID: H diff --git a/jscomp/test/ext_filename_test.js b/jscomp/test/ext_filename_test.js index 7837155517..b4df9c0f72 100644 --- a/jscomp/test/ext_filename_test.js +++ b/jscomp/test/ext_filename_test.js @@ -5,7 +5,6 @@ let Sys = require("../../lib/js/sys.js"); let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); let Bytes = require("../../lib/js/bytes.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_sys = require("../../lib/js/caml_sys.js"); let Filename = require("../../lib/js/filename.js"); let Pervasives = require("../../lib/js/pervasives.js"); @@ -33,18 +32,18 @@ function path_as_directory(x) { } function absolute_path(s) { - let s$1 = Curry._1(Filename.is_relative, s) ? Filename.concat(CamlinternalLazy.force(cwd), s) : s; + let s$1 = Filename.is_relative(s) ? Filename.concat(CamlinternalLazy.force(cwd), s) : s; let aux = function (_s) { while(true) { let s = _s; - let base = Curry._1(Filename.basename, s); - let dir = Curry._1(Filename.dirname, s); + let base = Filename.basename(s); + let dir = Filename.dirname(s); if (dir === s) { return dir; } if (base !== Filename.current_dir_name) { if (base === Filename.parent_dir_name) { - return Curry._1(Filename.dirname, aux(dir)); + return Filename.dirname(aux(dir)); } else { return Filename.concat(aux(dir), base); } @@ -96,8 +95,8 @@ function chop_extension_if_any(fname) { let os_path_separator_char = Filename.dir_sep.codePointAt(0); function relative_path(file_or_dir_1, file_or_dir_2) { - let relevant_dir1 = file_or_dir_1.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_1.VAL) : file_or_dir_1.VAL; - let relevant_dir2 = file_or_dir_2.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_2.VAL) : file_or_dir_2.VAL; + let relevant_dir1 = file_or_dir_1.NAME === "File" ? Filename.dirname(file_or_dir_1.VAL) : file_or_dir_1.VAL; + let relevant_dir2 = file_or_dir_2.NAME === "File" ? Filename.dirname(file_or_dir_2.VAL) : file_or_dir_2.VAL; let dir1 = Ext_string_test.split(undefined, relevant_dir1, os_path_separator_char); let dir2 = Ext_string_test.split(undefined, relevant_dir2, os_path_separator_char); let go = function (_dir1, _dir2) { @@ -142,7 +141,7 @@ function node_relative_path(node_modules_shorten, file1, dep_file) { }) : ({ NAME: "Dir", VAL: absolute_path(file1.VAL) - })) + (node_sep + Curry._1(Filename.basename, file2)); + })) + (node_sep + Filename.basename(file2)); } let skip = function (_i) { while(true) { @@ -173,7 +172,7 @@ function find_root_filename(_cwd, filename) { if (Caml_sys.sys_file_exists(Filename.concat(cwd, filename))) { return cwd; } - let cwd$p = Curry._1(Filename.dirname, cwd); + let cwd$p = Filename.dirname(cwd); if (cwd$p.length < cwd.length) { _cwd = cwd$p; continue; @@ -198,12 +197,12 @@ let package_dir = CamlinternalLazy.from_fun(function () { }); function module_name_of_file(file) { - let s = Filename.chop_extension(Curry._1(Filename.basename, file)); + let s = Filename.chop_extension(Filename.basename(file)); return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s))); } function module_name_of_file_if_any(file) { - let s = chop_extension_if_any(Curry._1(Filename.basename, file)); + let s = chop_extension_if_any(Filename.basename(file)); return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s))); } @@ -212,7 +211,7 @@ function combine(p1, p2) { return p2; } else if (p2 === "" || p2 === Filename.current_dir_name) { return p1; - } else if (Curry._1(Filename.is_relative, p2)) { + } else if (Filename.is_relative(p2)) { return Filename.concat(p1, p2); } else { return p2; @@ -225,14 +224,14 @@ function split_aux(p) { while(true) { let acc = _acc; let p$1 = _p; - let dir = Curry._1(Filename.dirname, p$1); + let dir = Filename.dirname(p$1); if (dir === p$1) { return [ dir, acc ]; } - let new_path = Curry._1(Filename.basename, p$1); + let new_path = Filename.basename(p$1); if (new_path === Filename.dir_sep) { _p = dir; continue; diff --git a/jscomp/test/ext_list_test.js b/jscomp/test/ext_list_test.js index ea80d22098..f502e1c310 100644 --- a/jscomp/test/ext_list_test.js +++ b/jscomp/test/ext_list_test.js @@ -3,7 +3,6 @@ let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); let Ext_string_test = require("./ext_string_test.js"); @@ -14,7 +13,7 @@ function filter_map(f, _xs) { return /* [] */0; } let ys = xs.tl; - let z = Curry._1(f, xs.hd); + let z = f(xs.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -39,7 +38,7 @@ function excludes(p, l) { } let l = x.tl; let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { excluded.contents = true; _x = l; continue; @@ -79,7 +78,7 @@ function exclude_with_fact(p, l) { } let l = x.tl; let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { excluded.contents = Caml_option.some(x$1); _x = l; continue; @@ -115,12 +114,12 @@ function exclude_with_fact2(p1, p2, l) { } let l = x.tl; let x$1 = x.hd; - if (Curry._1(p1, x$1)) { + if (p1(x$1)) { excluded1.contents = Caml_option.some(x$1); _x = l; continue; } - if (Curry._1(p2, x$1)) { + if (p2(x$1)) { excluded2.contents = Caml_option.some(x$1); _x = l; continue; @@ -170,7 +169,7 @@ function filter_mapi(f, xs) { return /* [] */0; } let ys = xs.tl; - let z = Curry._2(f, i, xs.hd); + let z = f(i, xs.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -193,7 +192,7 @@ function filter_map2(f, _xs, _ys) { if (ys) { let vs = ys.tl; let us = xs.tl; - let z = Curry._2(f, xs.hd, ys.hd); + let z = f(xs.hd, ys.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -233,7 +232,7 @@ function filter_map2i(f, xs, ys) { if (ys) { let vs = ys.tl; let us = xs.tl; - let z = Curry._3(f, i, xs.hd, ys.hd); + let z = f(i, xs.hd, ys.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -274,7 +273,7 @@ function rev_map_append(f, _l1, _l2) { return l2; } _l2 = { - hd: Curry._1(f, l1.hd), + hd: f(l1.hd), tl: l2 }; _l1 = l1.tl; @@ -294,7 +293,7 @@ function flat_map2(f, lx, ly) { if (ly$1) { _ly = ly$1.tl; _lx = lx$1.tl; - _acc = List.rev_append(Curry._2(f, lx$1.hd, ly$1.hd), acc); + _acc = List.rev_append(f(lx$1.hd, ly$1.hd), acc); continue; } throw new Error("Invalid_argument", { @@ -324,7 +323,7 @@ function flat_map_aux(f, _acc, append, _lx) { return List.rev_append(acc, append); } _lx = lx.tl; - _acc = List.rev_append(Curry._1(f, lx.hd), acc); + _acc = List.rev_append(f(lx.hd), acc); continue; }; } @@ -345,7 +344,7 @@ function map2_last(f, l1, l2) { if (l2) { if (!l2.tl) { return { - hd: Curry._3(f, true, u, l2.hd), + hd: f(true, u, l2.hd), tl: /* [] */0 }; } @@ -360,7 +359,7 @@ function map2_last(f, l1, l2) { } } if (l2) { - let r = Curry._3(f, false, u, l2.hd); + let r = f(false, u, l2.hd); return { hd: r, tl: map2_last(f, l1$1, l2.tl) @@ -392,11 +391,11 @@ function map_last(f, l1) { let u = l1.hd; if (!l1$1) { return { - hd: Curry._2(f, true, u), + hd: f(true, u), tl: /* [] */0 }; } - let r = Curry._2(f, false, u); + let r = f(false, u); return { hd: r, tl: map_last(f, l1$1) @@ -410,7 +409,7 @@ function fold_right2_last(f, l1, l2, accu) { if (!l1$1) { if (l2) { if (!l2.tl) { - return Curry._4(f, true, last1, l2.hd, accu); + return f(true, last1, l2.hd, accu); } } else { @@ -423,7 +422,7 @@ function fold_right2_last(f, l1, l2, accu) { } } if (l2) { - return Curry._4(f, false, last1, l2.hd, fold_right2_last(f, l1$1, l2.tl, accu)); + return f(false, last1, l2.hd, fold_right2_last(f, l1$1, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -569,7 +568,7 @@ function aux(cmp, x, xss) { } let ys = xss.tl; let y = xss.hd; - if (Curry._2(cmp, x, List.hd(y))) { + if (cmp(x, List.hd(y))) { return { hd: { hd: x, @@ -625,7 +624,7 @@ function find_first_not(p, _x) { return; } let a = x.hd; - if (!Curry._1(p, a)) { + if (!p(a)) { return Caml_option.some(a); } _x = x.tl; @@ -639,7 +638,7 @@ function for_all_opt(p, _x) { if (!x) { return; } - let v = Curry._1(p, x.hd); + let v = p(x.hd); if (v !== undefined) { return v; } @@ -650,7 +649,7 @@ function for_all_opt(p, _x) { function fold(f, l, init) { return List.fold_left((function (acc, i) { - return Curry._2(f, i, init); + return f(i, init); }), init, l); } @@ -665,7 +664,7 @@ function rev_map_acc(acc, f, l) { } _x = x.tl; _accu = { - hd: Curry._1(f, x.hd), + hd: f(x.hd), tl: accu }; continue; @@ -675,7 +674,7 @@ function rev_map_acc(acc, f, l) { function map_acc(acc, f, l) { if (l) { return { - hd: Curry._1(f, l.hd), + hd: f(l.hd), tl: map_acc(acc, f, l.tl) }; } else { @@ -686,7 +685,7 @@ function map_acc(acc, f, l) { function rev_iter(f, xs) { if (xs) { rev_iter(f, xs.tl); - return Curry._1(f, xs.hd); + return f(xs.hd); } } @@ -705,7 +704,7 @@ function for_all2_no_exn(p, _l1, _l2) { if (!l2) { return false; } - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -721,7 +720,7 @@ function find_no_exn(p, _x) { return; } let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { return Caml_option.some(x$1); } _x = x.tl; @@ -735,7 +734,7 @@ function find_opt(p, _x) { if (!x) { return; } - let v = Curry._1(p, x.hd); + let v = p(x.hd); if (v !== undefined) { return v; } @@ -758,7 +757,7 @@ function split_map(f, xs) { List.rev(cs) ]; } - let match = Curry._1(f, xs$1.hd); + let match = f(xs$1.hd); _xs = xs$1.tl; _cs = { hd: match[1], @@ -776,7 +775,7 @@ function reduce_from_right(fn, lst) { let match = List.rev(lst); if (match) { return List.fold_left((function (x, y) { - return Curry._2(fn, y, x); + return fn(y, x); }), match.hd, match.tl); } throw new Error("Invalid_argument", { diff --git a/jscomp/test/ext_pervasives_test.js b/jscomp/test/ext_pervasives_test.js index e2da1da2c2..87cf58893c 100644 --- a/jscomp/test/ext_pervasives_test.js +++ b/jscomp/test/ext_pervasives_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_string = require("../../lib/js/caml_string.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -9,15 +8,15 @@ let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function $$finally(v, action, f) { let e; try { - e = Curry._1(f, v); + e = f(v); } catch (e$1){ - Curry._1(action, v); + action(v); throw new Error(e$1.RE_EXN_ID, { cause: e$1 }); } - Curry._1(action, v); + action(v); return e; } diff --git a/jscomp/test/ext_string_test.js b/jscomp/test/ext_string_test.js index 45c8749f01..9939699352 100644 --- a/jscomp/test/ext_string_test.js +++ b/jscomp/test/ext_string_test.js @@ -3,7 +3,6 @@ let List = require("../../lib/js/list.js"); let Bytes = require("../../lib/js/bytes.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Caml_bytes = require("../../lib/js/caml_bytes.js"); let Caml_string = require("../../lib/js/caml_string.js"); @@ -31,7 +30,7 @@ function split_by(keep_emptyOpt, is_delim, str) { }; } } - if (Curry._1(is_delim, Caml_string.get(str, pos))) { + if (is_delim(Caml_string.get(str, pos))) { let new_len = (last_pos - pos | 0) - 1 | 0; if (new_len !== 0 || keep_empty) { let v = $$String.sub(str, pos + 1 | 0, new_len); @@ -207,7 +206,7 @@ function unsafe_for_all_range(s, _start, finish, p) { if (start > finish) { return true; } - if (!Curry._1(p, s.codePointAt(start))) { + if (!p(s.codePointAt(start))) { return false; } _start = start + 1 | 0; diff --git a/jscomp/test/ffi_arity_test.js b/jscomp/test/ffi_arity_test.js index 6bd8dc9f7c..eb3eb30760 100644 --- a/jscomp/test/ffi_arity_test.js +++ b/jscomp/test/ffi_arity_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); function f(v) { if (v % 2 === 0) { @@ -21,7 +20,7 @@ let v = [ 2, 3 ].map(function (a, b) { - return Curry._1(f(a), b); + return f(a)(b); }); let vv = [ @@ -119,10 +118,10 @@ Mt.from_pair_suites("Ffi_arity_test", { }); function bar(fn) { - return Curry._1(fn, undefined); + return fn(); } -(Curry._1((function(){console.log("forgiving arity")}), undefined)); +((function(){console.log("forgiving arity")})()); exports.f = f; exports.v = v; diff --git a/jscomp/test/ffi_js_test.js b/jscomp/test/ffi_js_test.js index 0f0e5300f5..b97a7f580d 100644 --- a/jscomp/test/ffi_js_test.js +++ b/jscomp/test/ffi_js_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let keys = (function (x){return Object.keys(x)}); @@ -52,7 +51,7 @@ let string_config = { eq("File \"ffi_js_test.res\", line 30, characters 12-19", [ 6, - Curry._2($$higher_order(1), 2, 3) + $$higher_order(1)(2, 3) ]); let same_type_0 = { diff --git a/jscomp/test/flexible_array_test.js b/jscomp/test/flexible_array_test.js index 38dbe985db..c2d2426b27 100644 --- a/jscomp/test/flexible_array_test.js +++ b/jscomp/test/flexible_array_test.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_array = require("../../lib/js/caml_array.js"); @@ -245,7 +244,7 @@ function filter_from(i, p, s) { let u = empty; for(let i$1 = i ,i_finish = length(s); i$1 < i_finish; ++i$1){ let ele = get(s, i$1); - if (Curry._1(p, ele)) { + if (p(ele)) { u = push_back(u, ele); } diff --git a/jscomp/test/for_loop_test.js b/jscomp/test/for_loop_test.js index 76fad4f6f0..167938029a 100644 --- a/jscomp/test/for_loop_test.js +++ b/jscomp/test/for_loop_test.js @@ -3,7 +3,6 @@ let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function for_3(x) { @@ -22,7 +21,7 @@ function for_3(x) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -44,7 +43,7 @@ function for_4(x) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -65,7 +64,7 @@ function for_5(x, u) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -103,7 +102,7 @@ function for_6(x, u) { inspect_3 = v2.contents; } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return [ v.contents, @@ -128,7 +127,7 @@ function for_7() { } } $$Array.iter((function (f) { - Curry._1(f, undefined); + f(); }), arr); return v.contents; } @@ -150,7 +149,7 @@ function for_8() { } } $$Array.iter((function (f) { - Curry._1(f, undefined); + f(); }), arr); return v.contents; } @@ -194,10 +193,10 @@ function for_9() { })); } $$Array.iter((function (f) { - Curry._1(f, undefined); + f(); }), arr); $$Array.iter((function (f) { - Curry._1(f, undefined); + f(); }), arr2); return [[ vv.contents, diff --git a/jscomp/test/fun_pattern_match.js b/jscomp/test/fun_pattern_match.js index 4d4068f335..a7f1adbd17 100644 --- a/jscomp/test/fun_pattern_match.js +++ b/jscomp/test/fun_pattern_match.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); function f(param, v) { return ((((param.x0 + param.x1 | 0) + param.x2 | 0) + param.x3 | 0) + param.x4 | 0) + v | 0; @@ -69,7 +68,7 @@ function r() { let match = r(); -let v = Curry._1(match.VAL, undefined); +let v = match.VAL(); console.log(v); diff --git a/jscomp/test/functor_app_test.js b/jscomp/test/functor_app_test.js index 04dc323448..53402b6e29 100644 --- a/jscomp/test/functor_app_test.js +++ b/jscomp/test/functor_app_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Functor_def = require("./functor_def.js"); let Functor_inst = require("./functor_inst.js"); @@ -35,9 +34,9 @@ let Y0 = Functor_def.Make(Functor_inst); let Y1 = Functor_def.Make(Functor_inst); -eq("File \"functor_app_test.res\", line 15, characters 3-10", Curry._2(Y0.h, 1, 2), 4); +eq("File \"functor_app_test.res\", line 15, characters 3-10", Y0.h(1, 2), 4); -eq("File \"functor_app_test.res\", line 16, characters 3-10", Curry._2(Y1.h, 2, 3), 6); +eq("File \"functor_app_test.res\", line 16, characters 3-10", Y1.h(2, 3), 6); let v = Functor_def.$$return(); diff --git a/jscomp/test/functor_def.js b/jscomp/test/functor_def.js index 000a6fc513..8c1046548d 100644 --- a/jscomp/test/functor_def.js +++ b/jscomp/test/functor_def.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let v = { contents: 0 @@ -19,7 +18,7 @@ function $$return() { function Make(U) { let h = function (x, x$1) { console.log(f(x$1, x$1)); - return Curry._2(U.say, x$1, x$1); + return U.say(x$1, x$1); }; return { h: h diff --git a/jscomp/test/functors.js b/jscomp/test/functors.js index d0b513a63c..f56f95b996 100644 --- a/jscomp/test/functors.js +++ b/jscomp/test/functors.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function O(X) { let cow = function (x) { - return Curry._1(X.foo, x); + return X.foo(x); }; let sheep = function (x) { - return 1 + Curry._1(X.foo, x) | 0; + return 1 + X.foo(x) | 0; }; return { cow: cow, @@ -18,10 +17,10 @@ function O(X) { function F(X, Y) { let cow = function (x) { - return Curry._1(Y.foo, Curry._1(X.foo, x)); + return Y.foo(X.foo(x)); }; let sheep = function (x) { - return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; + return 1 + Y.foo(X.foo(x)) | 0; }; return { cow: cow, @@ -31,7 +30,7 @@ function F(X, Y) { function F1(X, Y) { let sheep = function (x) { - return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; + return 1 + Y.foo(X.foo(x)) | 0; }; return { sheep: sheep @@ -40,7 +39,7 @@ function F1(X, Y) { function F2(X, Y) { let sheep = function (x) { - return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; + return 1 + Y.foo(X.foo(x)) | 0; }; return { sheep: sheep @@ -50,7 +49,7 @@ function F2(X, Y) { let M = { F: (function (funarg, funarg$1) { let sheep = function (x) { - return 1 + Curry._1(funarg$1.foo, Curry._1(funarg.foo, x)) | 0; + return 1 + funarg$1.foo(funarg.foo(x)) | 0; }; return { sheep: sheep diff --git a/jscomp/test/global_module_alias_test.js b/jscomp/test/global_module_alias_test.js index 4621458071..99890d07ea 100644 --- a/jscomp/test/global_module_alias_test.js +++ b/jscomp/test/global_module_alias_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -114,7 +113,7 @@ eq("File \"global_module_alias_test.res\", line 80, characters 12-19", g(), 4); let V = xx(); -eq("File \"global_module_alias_test.res\", line 84, characters 5-12", Curry._1(V.length, { +eq("File \"global_module_alias_test.res\", line 84, characters 5-12", V.length({ hd: 1, tl: { hd: 2, @@ -129,7 +128,7 @@ eq("File \"global_module_alias_test.res\", line 85, characters 5-12", v.contents let H$1 = f(); -eq("File \"global_module_alias_test.res\", line 87, characters 5-12", Curry._1(H$1.length, { +eq("File \"global_module_alias_test.res\", line 87, characters 5-12", H$1.length({ hd: 1, tl: { hd: 2, diff --git a/jscomp/test/gpr496_test.js b/jscomp/test/gpr496_test.js index 43385d80b2..89eb671d8d 100644 --- a/jscomp/test/gpr496_test.js +++ b/jscomp/test/gpr496_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -68,7 +67,7 @@ eq("File \"gpr496_test.res\", line 32, characters 12-19", expected, u); eq("File \"gpr496_test.res\", line 34, characters 12-19", expected, expected2); function ff(x, y) { - return Caml.bool_min(x, Curry._1(y, undefined)); + return Caml.bool_min(x, y()); } eq("File \"gpr496_test.res\", line 37, characters 12-19", true < false ? true : false, false); diff --git a/jscomp/test/gpr_1245_test.js b/jscomp/test/gpr_1245_test.js index 2219bc5c2c..3ad00c8c05 100644 --- a/jscomp/test/gpr_1245_test.js +++ b/jscomp/test/gpr_1245_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -28,7 +27,7 @@ function g() { } function a0(f) { - let u = Curry._1(f, undefined); + let u = f(); if (u !== null) { console.log(u); console.log(u); @@ -41,7 +40,7 @@ function a0(f) { function a1(f) { let E = /* @__PURE__ */Caml_exceptions.create("E"); try { - return Curry._1(f, undefined); + return f(); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); diff --git a/jscomp/test/gpr_1268.js b/jscomp/test/gpr_1268.js index 883fd90291..ffc1dafced 100644 --- a/jscomp/test/gpr_1268.js +++ b/jscomp/test/gpr_1268.js @@ -1,18 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f_add2(a, b, x, y) { - return add(Curry._1(b, y), Curry._1(a, x)); + return add(b(y), a(x)); } function f(a, b, x, y) { - return Curry._1(a, x) + Curry._1(b, y) | 0; + return a(x) + b(y) | 0; } function f1(a, b, x, y) { - return add(Curry._1(a, x), Curry._1(b, y)); + return add(a(x), b(y)); } function f2(x) { diff --git a/jscomp/test/gpr_1409_test.js b/jscomp/test/gpr_1409_test.js index a615c1147a..ec0b717f46 100644 --- a/jscomp/test/gpr_1409_test.js +++ b/jscomp/test/gpr_1409_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let String_set = require("./string_set.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -40,7 +39,7 @@ let b = { function map(f, x) { if (x !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x))); + return Caml_option.some(f(Caml_option.valFromOption(x))); } } @@ -102,11 +101,11 @@ function test5(f, x) { let tmp = { hi: 2 }; - let tmp$1 = Curry._1(f, x); + let tmp$1 = f(x); if (tmp$1 !== undefined) { tmp._open = tmp$1; } - let tmp$2 = Curry._1(f, x); + let tmp$2 = f(x); if (tmp$2 !== undefined) { tmp.xx__hi = tmp$2; } @@ -125,7 +124,7 @@ function test6(f, x) { if (tmp$1 !== undefined) { tmp._open = tmp$1; } - let tmp$2 = Curry._1(f, x$1); + let tmp$2 = f(x$1); if (tmp$2 !== undefined) { tmp.xx__hi = tmp$2; } diff --git a/jscomp/test/gpr_1423_app_test.js b/jscomp/test/gpr_1423_app_test.js index 0e89c61761..da8edcbc0e 100644 --- a/jscomp/test/gpr_1423_app_test.js +++ b/jscomp/test/gpr_1423_app_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -30,7 +29,7 @@ function eq(loc, x, y) { } function foo(f) { - console.log(Curry._2(f, "a1", undefined)); + console.log(f("a1", undefined)); } foo(function (none, extra) { @@ -38,7 +37,7 @@ foo(function (none, extra) { }); function foo2(f) { - return Curry._2(f, "a1", undefined); + return f("a1", undefined); } eq("File \"gpr_1423_app_test.res\", line 15, characters 12-19", "a1a2", "a1a2"); diff --git a/jscomp/test/gpr_1692_test.js b/jscomp/test/gpr_1692_test.js index 6b9bc38ad1..884c49a7dc 100644 --- a/jscomp/test/gpr_1692_test.js +++ b/jscomp/test/gpr_1692_test.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); -(Curry._1((function (f) { +((function (f) { return 0; - }), "")); + })("")); /* Not a pure module */ diff --git a/jscomp/test/gpr_1891_test.js b/jscomp/test/gpr_1891_test.js index 2237c480ad..0be949d234 100644 --- a/jscomp/test/gpr_1891_test.js +++ b/jscomp/test/gpr_1891_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function foo(x) { if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) { @@ -29,7 +28,7 @@ function foo3(x) { function foo4(x, h) { if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) { - return Curry._1(h, undefined); + return h(); } } diff --git a/jscomp/test/gpr_2633_test.js b/jscomp/test/gpr_2633_test.js index ac7f5d007c..43ff22b9d0 100644 --- a/jscomp/test/gpr_2633_test.js +++ b/jscomp/test/gpr_2633_test.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function on1(foo, event) { foo.on(event.NAME, event.VAL); } function on2(foo, h, event) { - foo.on(Curry._1(h, event).NAME, Curry._1(h, event).VAL); + foo.on(h(event).NAME, h(event).VAL); } exports.on1 = on1; diff --git a/jscomp/test/gpr_2682_test.js b/jscomp/test/gpr_2682_test.js index 0a3b2bd26d..c7fceff492 100644 --- a/jscomp/test/gpr_2682_test.js +++ b/jscomp/test/gpr_2682_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let sum = ((a,b) => a + b); @@ -44,7 +43,7 @@ forIn({ let f3 = (()=>true); -let bbbb = Curry._1(f3, undefined); +let bbbb = f3(); if (!bbbb) { throw new Error("Assert_failure", { diff --git a/jscomp/test/gpr_3536_test.js b/jscomp/test/gpr_3536_test.js index 51f486cf3f..e07b0156a2 100644 --- a/jscomp/test/gpr_3536_test.js +++ b/jscomp/test/gpr_3536_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -19,7 +18,7 @@ function eq(loc, x, y) { let X = {}; function xx(obj, a0, a1, a2, a3, a4, a5) { - return (Curry._2(a4, Curry._2(a2, Curry._2(a0, obj, a1), a3), a5) - 1 | 0) - 3 | 0; + return (a4(a2(a0(obj, a1), a3), a5) - 1 | 0) - 3 | 0; } eq("File \"gpr_3536_test.res\", line 18, characters 12-19", 5, 5); diff --git a/jscomp/test/gpr_3566_test.js b/jscomp/test/gpr_3566_test.js index 6bcf903005..5604508e53 100644 --- a/jscomp/test/gpr_3566_test.js +++ b/jscomp/test/gpr_3566_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -105,24 +104,24 @@ function Test7($star) { } function Test8($star) { - let Curry$1 = {}; + let Curry = {}; let f = function (x) { - return Curry._1(x, 1); + return x(1); }; return { - Curry: Curry$1, + Curry: Curry, f: f }; } function Test9($star) { let f = function (x) { - return Curry._1(x, 1); + return x(1); }; - let Curry$1 = {}; + let Curry = {}; return { f: f, - Curry: Curry$1 + Curry: Curry }; } diff --git a/jscomp/test/gpr_3875_test.js b/jscomp/test/gpr_3875_test.js index f3a5efdbdf..51d9d0db8d 100644 --- a/jscomp/test/gpr_3875_test.js +++ b/jscomp/test/gpr_3875_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let result = { contents: "" @@ -40,7 +39,7 @@ function compilerBug(a, b, c, f) { } } - if (Curry._1(f, undefined)) { + if (f()) { result.contents = "Some x, f returns true"; } else { result.contents = "Some x, f returns false"; diff --git a/jscomp/test/gpr_3931_test.js b/jscomp/test/gpr_3931_test.js index 7c6e386b5f..cba2beac9b 100644 --- a/jscomp/test/gpr_3931_test.js +++ b/jscomp/test/gpr_3931_test.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let PA = Caml_module.init_mod([ @@ -57,7 +56,7 @@ Caml_module.update_mod({ print: print$1 }); -Curry._1(PA.print, [ +PA.print([ 1, 2 ]); diff --git a/jscomp/test/gpr_405_test.js b/jscomp/test/gpr_405_test.js index 072699a11f..de96727ae0 100644 --- a/jscomp/test/gpr_405_test.js +++ b/jscomp/test/gpr_405_test.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); let Hashtbl = require("../../lib/js/hashtbl.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -14,7 +13,7 @@ function Make(funarg) { }); let find_default = function (htbl, x) { try { - return Curry._2(H.find, htbl, x); + return H.find(htbl, x); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); @@ -27,10 +26,10 @@ function Make(funarg) { } }; let min_cutset = function (gr, first_node) { - let n_labels = Curry._1(H.create, 97); - let l_labels = Curry._1(H.create, 97); - let already_processed = Curry._1(H.create, 97); - let on_the_stack = Curry._1(H.create, 97); + let n_labels = H.create(97); + let l_labels = H.create(97); + let already_processed = H.create(97); + let on_the_stack = H.create(97); let cut_set = { contents: /* [] */0 }; @@ -62,12 +61,12 @@ function Make(funarg) { } }); } - Curry._3(H.add, on_the_stack, top, true); - Curry._3(H.add, n_labels, top, counter.contents); + H.add(on_the_stack, top, true); + H.add(n_labels, top, counter.contents); counter.contents = counter.contents + 1 | 0; - Curry._3(H.add, l_labels, top, 0); - Curry._3(H.add, already_processed, top, true); - let _successors = Curry._2(funarg.succ, gr, top); + H.add(l_labels, top, 0); + H.add(already_processed, top, true); + let _successors = funarg.succ(gr, top); let _top = top; let _rest_of_stack = rest_of_stack; while(true) { @@ -85,19 +84,19 @@ function Make(funarg) { tl: rest_of_stack$1 }); } - let x = find_default(on_the_stack, successor) ? Curry._2(H.find, n_labels, successor) : Curry._2(H.find, l_labels, successor); - Curry._3(H.add, l_labels, top$1, Caml.int_max(Curry._2(H.find, l_labels, top$1), x)); + let x = find_default(on_the_stack, successor) ? H.find(n_labels, successor) : H.find(l_labels, successor); + H.add(l_labels, top$1, Caml.int_max(H.find(l_labels, top$1), x)); _successors = successors.tl; continue; } - if (Curry._2(H.find, l_labels, top$1) === Curry._2(H.find, n_labels, top$1)) { + if (H.find(l_labels, top$1) === H.find(n_labels, top$1)) { cut_set.contents = { hd: top$1, tl: cut_set.contents }; - Curry._3(H.add, l_labels, top$1, 0); + H.add(l_labels, top$1, 0); } - if (Curry._2(H.find, l_labels, top$1) > Curry._2(H.find, n_labels, top$1)) { + if (H.find(l_labels, top$1) > H.find(n_labels, top$1)) { throw new Error("Invalid_argument", { cause: { RE_EXN_ID: "Invalid_argument", @@ -110,8 +109,8 @@ function Make(funarg) { } let match = rest_of_stack$1.hd; let new_top = match[0]; - Curry._3(H.add, on_the_stack, top$1, false); - Curry._3(H.add, l_labels, new_top, Caml.int_max(Curry._2(H.find, l_labels, top$1), Curry._2(H.find, l_labels, new_top))); + H.add(on_the_stack, top$1, false); + H.add(l_labels, new_top, Caml.int_max(H.find(l_labels, top$1), H.find(l_labels, new_top))); _rest_of_stack = rest_of_stack$1.tl; _top = new_top; _successors = match[1]; diff --git a/jscomp/test/gpr_4069_test.js b/jscomp/test/gpr_4069_test.js index bbb85781f4..6f99c9ae1b 100644 --- a/jscomp/test/gpr_4069_test.js +++ b/jscomp/test/gpr_4069_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f(value) { if (value == null) { @@ -12,7 +11,7 @@ function f(value) { } function fxx(v) { - let match = Curry._1(v, undefined); + let match = v(); switch (match) { case 1 : return /* 'a' */97; @@ -26,7 +25,7 @@ function fxx(v) { } function fxxx2(v) { - if (Curry._1(v, undefined)) { + if (v()) { return 2; } else { return 1; @@ -34,7 +33,7 @@ function fxxx2(v) { } function fxxx3(v) { - if (Curry._1(v, undefined)) { + if (v()) { return 2; } else { return 1; diff --git a/jscomp/test/gpr_4274_test.js b/jscomp/test/gpr_4274_test.js index 51f473a418..395c96e869 100644 --- a/jscomp/test/gpr_4274_test.js +++ b/jscomp/test/gpr_4274_test.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Belt_List = require("../../lib/js/belt_List.js"); let Belt_Array = require("../../lib/js/belt_Array.js"); let N = {}; function f(X, xs) { - Curry._2(X.forEach, xs, { + X.forEach(xs, { i: (function (x) { console.log(x.x); }) diff --git a/jscomp/test/gpr_858_unit2_test.js b/jscomp/test/gpr_858_unit2_test.js index 1ce0450df7..5a84b19c17 100644 --- a/jscomp/test/gpr_858_unit2_test.js +++ b/jscomp/test/gpr_858_unit2_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let delayed = { contents: (function () { @@ -14,7 +13,7 @@ for(let i = 1; i <= 2; ++i){ if (x !== 0) { let prev = delayed.contents; delayed.contents = (function () { - Curry._1(prev, undefined); + prev(); f(((n + 1 | 0) + i | 0) - i | 0, x - 1 | 0); }); return; @@ -36,6 +35,6 @@ for(let i = 1; i <= 2; ++i){ f(0, i); } -Curry._1(delayed.contents, undefined); +delayed.contents(); /* Not a pure module */ diff --git a/jscomp/test/hash_sugar_desugar.js b/jscomp/test/hash_sugar_desugar.js index e4006b29a8..32667634e3 100644 --- a/jscomp/test/hash_sugar_desugar.js +++ b/jscomp/test/hash_sugar_desugar.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function h1(u) { return u.p; @@ -9,7 +8,7 @@ function h1(u) { function h3(u) { let f = u.hi; - return Curry._2(f, 1, 2); + return f(1, 2); } function g5(u) { @@ -25,12 +24,12 @@ function h6(u) { } function h7(u) { - return Curry._2(u.m, 1, 2); + return u.m(1, 2); } function h8(u) { let f = u.hi; - return Curry._2(f, 1, 2); + return f(1, 2); } function chain_g(h) { diff --git a/jscomp/test/inline_map2_test.js b/jscomp/test/inline_map2_test.js index 6f68d660f0..cbf6192f59 100644 --- a/jscomp/test/inline_map2_test.js +++ b/jscomp/test/inline_map2_test.js @@ -4,7 +4,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); function Make(Ord) { @@ -125,7 +124,7 @@ function Make(Ord) { let d = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return { TAG: "Node", @@ -151,7 +150,7 @@ function Make(Ord) { } }); } - let c = Curry._2(Ord.compare, x, x_._1); + let c = Ord.compare(x, x_._1); if (c === 0) { return x_._2; } @@ -165,7 +164,7 @@ function Make(Ord) { if (typeof x_ !== "object") { return false; } - let c = Curry._2(Ord.compare, x, x_._1); + let c = Ord.compare(x, x_._1); if (c === 0) { return true; } @@ -239,7 +238,7 @@ function Make(Ord) { let d = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -262,7 +261,7 @@ function Make(Ord) { return; } iter(f, x._0); - Curry._2(f, x._1, x._2); + f(x._1, x._2); _x = x._3; continue; }; @@ -272,7 +271,7 @@ function Make(Ord) { return "Empty"; } let l$p = map(f, x._0); - let d$p = Curry._1(f, x._2); + let d$p = f(x._2); let r$p = map(f, x._3); return { TAG: "Node", @@ -289,7 +288,7 @@ function Make(Ord) { } let v = x._1; let l$p = mapi(f, x._0); - let d$p = Curry._2(f, v, x._2); + let d$p = f(v, x._2); let r$p = mapi(f, x._3); return { TAG: "Node", @@ -307,7 +306,7 @@ function Make(Ord) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m._1, m._2, fold(f, m._0, accu)); + _accu = f(m._1, m._2, fold(f, m._0, accu)); _m = m._3; continue; }; @@ -318,7 +317,7 @@ function Make(Ord) { if (typeof x !== "object") { return true; } - if (!Curry._2(p, x._1, x._2)) { + if (!p(x._1, x._2)) { return false; } if (!for_all(p, x._0)) { @@ -334,7 +333,7 @@ function Make(Ord) { if (typeof x !== "object") { return false; } - if (Curry._2(p, x._1, x._2)) { + if (p(x._1, x._2)) { return true; } if (exists(p, x._0)) { @@ -404,7 +403,7 @@ function Make(Ord) { let d = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -437,7 +436,7 @@ function Make(Ord) { let v1 = s1._1; if (s1._4 >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); + return concat_or_join(merge(f, s1._0, match[0]), v1, f(v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); } } @@ -455,7 +454,7 @@ function Make(Ord) { } let v2 = s2._1; let match$1 = split(v2, s1); - return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); + return concat_or_join(merge(f, match$1[0], s2._0), v2, f(v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); }; let filter = function (p, x) { if (typeof x !== "object") { @@ -464,7 +463,7 @@ function Make(Ord) { let d = x._2; let v = x._1; let l$p = filter(p, x._0); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, x._3); if (pvd) { return join(l$p, v, d, r$p); @@ -484,7 +483,7 @@ function Make(Ord) { let match = partition(p, x._0); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, x._3); let rf = match$1[1]; let rt = match$1[0]; @@ -534,11 +533,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -563,10 +562,10 @@ function Make(Ord) { if (typeof e2 !== "object") { return false; } - if (Curry._2(Ord.compare, e1._0, e2._0) !== 0) { + if (Ord.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); @@ -907,7 +906,7 @@ function iter(f, _x) { return; } iter(f, x._0); - Curry._2(f, x._1, x._2); + f(x._1, x._2); _x = x._3; continue; }; @@ -918,7 +917,7 @@ function map(f, x) { return "Empty"; } let l$p = map(f, x._0); - let d$p = Curry._1(f, x._2); + let d$p = f(x._2); let r$p = map(f, x._3); return { TAG: "Node", @@ -936,7 +935,7 @@ function mapi(f, x) { } let v = x._1; let l$p = mapi(f, x._0); - let d$p = Curry._2(f, v, x._2); + let d$p = f(v, x._2); let r$p = mapi(f, x._3); return { TAG: "Node", @@ -955,7 +954,7 @@ function fold(f, _m, _accu) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m._1, m._2, fold(f, m._0, accu)); + _accu = f(m._1, m._2, fold(f, m._0, accu)); _m = m._3; continue; }; @@ -967,7 +966,7 @@ function for_all(p, _x) { if (typeof x !== "object") { return true; } - if (!Curry._2(p, x._1, x._2)) { + if (!p(x._1, x._2)) { return false; } if (!for_all(p, x._0)) { @@ -984,7 +983,7 @@ function exists(p, _x) { if (typeof x !== "object") { return false; } - if (Curry._2(p, x._1, x._2)) { + if (p(x._1, x._2)) { return true; } if (exists(p, x._0)) { @@ -1094,7 +1093,7 @@ function merge(f, s1, s2) { let v1 = s1._1; if (s1._4 >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); + return concat_or_join(merge(f, s1._0, match[0]), v1, f(v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); } } @@ -1112,7 +1111,7 @@ function merge(f, s1, s2) { } let v2 = s2._1; let match$1 = split(v2, s1); - return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); + return concat_or_join(merge(f, match$1[0], s2._0), v2, f(v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); } function filter(p, x) { @@ -1122,7 +1121,7 @@ function filter(p, x) { let d = x._2; let v = x._1; let l$p = filter(p, x._0); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, x._3); if (pvd) { return join(l$p, v, d, r$p); @@ -1143,7 +1142,7 @@ function partition(p, x) { let match = partition(p, x._0); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, x._3); let rf = match$1[1]; let rt = match$1[0]; @@ -1199,7 +1198,7 @@ function compare(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -1228,7 +1227,7 @@ function equal(cmp, m1, m2) { if (e1._0 !== e2._0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); @@ -1600,7 +1599,7 @@ function iter$1(f, _x) { return; } iter$1(f, x._0); - Curry._2(f, x._1, x._2); + f(x._1, x._2); _x = x._3; continue; }; @@ -1611,7 +1610,7 @@ function map$1(f, x) { return "Empty"; } let l$p = map$1(f, x._0); - let d$p = Curry._1(f, x._2); + let d$p = f(x._2); let r$p = map$1(f, x._3); return { TAG: "Node", @@ -1629,7 +1628,7 @@ function mapi$1(f, x) { } let v = x._1; let l$p = mapi$1(f, x._0); - let d$p = Curry._2(f, v, x._2); + let d$p = f(v, x._2); let r$p = mapi$1(f, x._3); return { TAG: "Node", @@ -1648,7 +1647,7 @@ function fold$1(f, _m, _accu) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m._1, m._2, fold$1(f, m._0, accu)); + _accu = f(m._1, m._2, fold$1(f, m._0, accu)); _m = m._3; continue; }; @@ -1660,7 +1659,7 @@ function for_all$1(p, _x) { if (typeof x !== "object") { return true; } - if (!Curry._2(p, x._1, x._2)) { + if (!p(x._1, x._2)) { return false; } if (!for_all$1(p, x._0)) { @@ -1677,7 +1676,7 @@ function exists$1(p, _x) { if (typeof x !== "object") { return false; } - if (Curry._2(p, x._1, x._2)) { + if (p(x._1, x._2)) { return true; } if (exists$1(p, x._0)) { @@ -1787,7 +1786,7 @@ function merge$1(f, s1, s2) { let v1 = s1._1; if (s1._4 >= height$1(s2)) { let match = split$1(v1, s2); - return concat_or_join$1(merge$1(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge$1(f, s1._3, match[2])); + return concat_or_join$1(merge$1(f, s1._0, match[0]), v1, f(v1, Caml_option.some(s1._2), match[1]), merge$1(f, s1._3, match[2])); } } @@ -1805,7 +1804,7 @@ function merge$1(f, s1, s2) { } let v2 = s2._1; let match$1 = split$1(v2, s1); - return concat_or_join$1(merge$1(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge$1(f, match$1[2], s2._3)); + return concat_or_join$1(merge$1(f, match$1[0], s2._0), v2, f(v2, match$1[1], Caml_option.some(s2._2)), merge$1(f, match$1[2], s2._3)); } function filter$1(p, x) { @@ -1815,7 +1814,7 @@ function filter$1(p, x) { let d = x._2; let v = x._1; let l$p = filter$1(p, x._0); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter$1(p, x._3); if (pvd) { return join$1(l$p, v, d, r$p); @@ -1836,7 +1835,7 @@ function partition$1(p, x) { let match = partition$1(p, x._0); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition$1(p, x._3); let rf = match$1[1]; let rt = match$1[0]; @@ -1892,7 +1891,7 @@ function compare$1(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -1921,7 +1920,7 @@ function equal$1(cmp, m1, m2) { if (Caml.string_compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum$1(e2._2, e2._3); diff --git a/jscomp/test/inline_regression_test.js b/jscomp/test/inline_regression_test.js index edc92a61f6..f67cdb3232 100644 --- a/jscomp/test/inline_regression_test.js +++ b/jscomp/test/inline_regression_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Filename = require("../../lib/js/filename.js"); let Caml_string = require("../../lib/js/caml_string.js"); @@ -17,7 +16,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n)) { + if (!is_dir_sep(name, n)) { let _n$1 = n; let p = n + 1 | 0; while(true) { @@ -25,7 +24,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n$1 < 0) { return $$String.sub(name, 0, p); } - if (Curry._2(is_dir_sep, name, n$1)) { + if (is_dir_sep(name, n$1)) { return $$String.sub(name, n$1 + 1 | 0, (p - n$1 | 0) - 1 | 0); } _n$1 = n$1 - 1 | 0; diff --git a/jscomp/test/int_hashtbl_test.js b/jscomp/test/int_hashtbl_test.js index d372054b09..bf32e0b592 100644 --- a/jscomp/test/int_hashtbl_test.js +++ b/jscomp/test/int_hashtbl_test.js @@ -5,14 +5,13 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Hashtbl = require("../../lib/js/hashtbl.js"); function f(H) { - let tbl = Curry._1(H.create, 17); - Curry._3(H.add, tbl, 1, /* '1' */49); - Curry._3(H.add, tbl, 2, /* '2' */50); - let extra = Curry._3(H.fold, (function (k, v, acc) { + let tbl = H.create(17); + H.add(tbl, 1, /* '1' */49); + H.add(tbl, 2, /* '2' */50); + let extra = H.fold((function (k, v, acc) { return { hd: [ k, @@ -27,14 +26,14 @@ function f(H) { } function g(H, count) { - let tbl = Curry._1(H.create, 17); + let tbl = H.create(17); for(let i = 0; i <= count; ++i){ - Curry._3(H.replace, tbl, (i << 1), String(i)); + H.replace(tbl, (i << 1), String(i)); } for(let i$1 = 0; i$1 <= count; ++i$1){ - Curry._3(H.replace, tbl, (i$1 << 1), String(i$1)); + H.replace(tbl, (i$1 << 1), String(i$1)); } - let v = Curry._3(H.fold, (function (k, v, acc) { + let v = H.fold((function (k, v, acc) { return { hd: [ k, diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js index b776fbda6d..4e161c5c06 100644 --- a/jscomp/test/int_map.js +++ b/jscomp/test/int_map.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); function height(param) { @@ -188,7 +187,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -203,7 +202,7 @@ function find_first(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -225,7 +224,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -240,7 +239,7 @@ function find_first_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -266,7 +265,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -281,7 +280,7 @@ function find_last(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -303,7 +302,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -318,7 +317,7 @@ function find_last_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -501,7 +500,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -521,7 +520,7 @@ function update(x, f, param) { let l = param.l; let c = Caml.int_compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -562,7 +561,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -573,7 +572,7 @@ function map(f, param) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -591,7 +590,7 @@ function mapi(f, param) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -610,7 +609,7 @@ function fold(f, _m, _accu) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -622,7 +621,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -639,7 +638,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -749,7 +748,7 @@ function merge$1(f, s1, s2) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -767,7 +766,7 @@ function merge$1(f, s1, s2) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } function union(f, s1, s2) { @@ -787,7 +786,7 @@ function union(f, s1, s2) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -797,7 +796,7 @@ function union(f, s1, s2) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -812,7 +811,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -837,7 +836,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -893,7 +892,7 @@ function compare(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -922,7 +921,7 @@ function equal(cmp, m1, m2) { if (e1._0 !== e2._0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/jscomp/test/int_switch_test.js b/jscomp/test/int_switch_test.js index e289b646f8..caff715926 100644 --- a/jscomp/test/int_switch_test.js +++ b/jscomp/test/int_switch_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -21,7 +20,7 @@ function b(loc, x) { } function f(x) { - let match = Curry._1(x, undefined); + let match = x(); switch (match) { case 1 : return /* 'a' */97; @@ -35,7 +34,7 @@ function f(x) { } function f22(x) { - let match = Curry._1(x, undefined); + let match = x(); switch (match) { case 1 : return /* 'a' */97; @@ -49,7 +48,7 @@ function f22(x) { } function f33(x) { - let match = Curry._1(x, undefined); + let match = x(); switch (match) { case "A" : return /* 'a' */97; diff --git a/jscomp/test/js_exception_catch_test.js b/jscomp/test/js_exception_catch_test.js index 49f44cfb0c..0d08a67689 100644 --- a/jscomp/test/js_exception_catch_test.js +++ b/jscomp/test/js_exception_catch_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Js_exn = require("../../lib/js/js_exn.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -96,7 +95,7 @@ let C = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.C"); function test(f) { try { - Curry._1(f, undefined); + f(); return "No_error"; } catch (raw_e){ diff --git a/jscomp/test/label_uncurry.js b/jscomp/test/label_uncurry.js index 571687690e..fcfa996b3e 100644 --- a/jscomp/test/label_uncurry.js +++ b/jscomp/test/label_uncurry.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_format = require("../../lib/js/caml_format.js"); function f(x) { @@ -13,8 +12,8 @@ function u(x, y) { } function u1(f) { - console.log(Curry._2(f, 2, "x")); - console.log(Curry._2(f, 2, "x")); + console.log(f(2, "x")); + console.log(f(2, "x")); } function h(x) { diff --git a/jscomp/test/libqueue_test.js b/jscomp/test/libqueue_test.js index 146b72d8ea..9154961b61 100644 --- a/jscomp/test/libqueue_test.js +++ b/jscomp/test/libqueue_test.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Queue = require("../../lib/js/queue.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -37,7 +36,7 @@ let Q = { function does_raise(f, q) { try { - Curry._1(f, q); + f(q); return false; } catch (raw_exn){ diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js index 501aa76e42..2b04082cb6 100644 --- a/jscomp/test/map_test.js +++ b/jscomp/test/map_test.js @@ -4,7 +4,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function height(param) { if (typeof param !== "object") { @@ -179,7 +178,7 @@ function compare(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -208,7 +207,7 @@ function equal(cmp, m1, m2) { if (e1._0 !== e2._0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/jscomp/test/mario_game.js b/jscomp/test/mario_game.js index 7ee3fdde3c..635e2e3132 100644 --- a/jscomp/test/mario_game.js +++ b/jscomp/test/mario_game.js @@ -3,7 +3,6 @@ let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Random = require("../../lib/js/random.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_int32 = require("../../lib/js/caml_int32.js"); @@ -1449,7 +1448,7 @@ function render_bbox(sprite, param) { let match = sprite.params.bbox_offset; let match$1 = sprite.params.bbox_size; context.strokeStyle = "#FF0000"; - return Curry._4(context.strokeRect, param[0] + match[0], param[1] + match[1], match$1[0], match$1[1]); + return context.strokeRect(param[0] + match[0], param[1] + match[1], match$1[0], match$1[1]); } function render(sprite, param) { @@ -1459,17 +1458,7 @@ function render(sprite, param) { let sw = match$1[0]; let match$2 = sprite.params.frame_size; let sx = match[0] + sprite.frame.contents * sw; - return Curry.app(context.drawImage, [ - sprite.img, - sx, - match[1], - sw, - match$1[1], - param[0], - param[1], - match$2[0], - match$2[1] - ]); + return context.drawImage(sprite.img, sx, match[1], sw, match$1[1], param[0], param[1], match$2[0], match$2[1]); } function draw_bgd(bgd, off_x) { @@ -1484,34 +1473,34 @@ function draw_bgd(bgd, off_x) { } function clear_canvas(canvas) { - let context = Curry._1(canvas.getContext, "2d"); + let context = canvas.getContext("2d"); let cwidth = canvas.width; let cheight = canvas.height; - Curry._4(context.clearRect, 0, 0, cwidth, cheight); + context.clearRect(0, 0, cwidth, cheight); } function hud(canvas, score, coins) { let score_string = String(score); let coin_string = String(coins); - let context = Curry._1(canvas.getContext, "2d"); + let context = canvas.getContext("2d"); context.font = "10px 'Press Start 2P'"; - Curry._3(context.fillText, "Score: " + score_string, canvas.width - 140, 18); - Curry._3(context.fillText, "Coins: " + coin_string, 120, 18); + context.fillText("Score: " + score_string, canvas.width - 140, 18); + context.fillText("Coins: " + coin_string, 120, 18); } function fps(canvas, fps_val) { let fps_str = String(fps_val | 0); - let context = Curry._1(canvas.getContext, "2d"); - Curry._3(context.fillText, fps_str, 10, 18); + let context = canvas.getContext("2d"); + context.fillText(fps_str, 10, 18); } function game_win(ctx) { - Curry._4(ctx.rect, 0, 0, 512, 512); + ctx.rect(0, 0, 512, 512); ctx.fillStyle = "black"; - Curry._1(ctx.fill, undefined); + ctx.fill(); ctx.fillStyle = "white"; ctx.font = "20px 'Press Start 2P'"; - Curry._3(ctx.fillText, "You win!", 180, 128); + ctx.fillText("You win!", 180, 128); throw new Error("Failure", { cause: { RE_EXN_ID: "Failure", @@ -1521,12 +1510,12 @@ function game_win(ctx) { } function game_loss(ctx) { - Curry._4(ctx.rect, 0, 0, 512, 512); + ctx.rect(0, 0, 512, 512); ctx.fillStyle = "black"; - Curry._1(ctx.fill, undefined); + ctx.fill(); ctx.fillStyle = "white"; ctx.font = "20px 'Press Start 2P'"; - Curry._3(ctx.fillText, "GAME OVER. You lose!", 60, 128); + ctx.fillText("GAME OVER. You lose!", 60, 128); throw new Error("Failure", { cause: { RE_EXN_ID: "Failure", @@ -2294,7 +2283,7 @@ function run_update_collid(state, collid, all_collids) { function update_loop(canvas, param, map_dim) { let player = param[0]; - let ctx = Curry._1(canvas.getContext, "2d"); + let ctx = canvas.getContext("2d"); let cwidth = canvas.width / 1; let cheight = canvas.height / 1; let viewport = make$3([ @@ -2311,7 +2300,7 @@ function update_loop(canvas, param, map_dim) { multiplier: 1, game_over: false }; - Curry._2(state.ctx.scale, 1, 1); + state.ctx.scale(1, 1); let update_helper = function (time, state, player, objs, parts) { if (state.game_over === true) { return game_win(state.ctx); @@ -3331,7 +3320,7 @@ function load(param) { } }); } - let context = Curry._1(canvas.getContext, "2d"); + let context = canvas.getContext("2d"); document.addEventListener("keydown", keydown, true); document.addEventListener("keyup", keyup, true); Random.self_init(); diff --git a/jscomp/test/meth_annotation.js b/jscomp/test/meth_annotation.js index d17f914446..3471959ac4 100644 --- a/jscomp/test/meth_annotation.js +++ b/jscomp/test/meth_annotation.js @@ -1,8 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); -Curry._2(john.say, "hey", "jude"); +john.say("hey", "jude"); /* Not a pure module */ diff --git a/jscomp/test/method_name_test.js b/jscomp/test/method_name_test.js index 2d8f6c23dc..3c0e9a5a9d 100644 --- a/jscomp/test/method_name_test.js +++ b/jscomp/test/method_name_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -30,18 +29,18 @@ function eq(loc, x, y) { } function f(x, i, file, v) { - Curry._1(x.case, i); - Curry._2(x.case__set, i, v); - Curry._1(x._open, file); - Curry._1(x.open__, file); + x.case(i); + x.case__set(i, v); + x._open(file); + x.open__(file); return x._MAX_LENGTH; } function ff(x, i, v) { x.make__config = v; x.make_config = v; - Curry._1(x.case__unsafe, i); - return Curry._1(x._open__, 3); + x.case__unsafe(i); + return x._open__(3); } let u = { diff --git a/jscomp/test/mock_mt.js b/jscomp/test/mock_mt.js index 3fed04d922..70eea7c7fc 100644 --- a/jscomp/test/mock_mt.js +++ b/jscomp/test/mock_mt.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function from_pair_suites(name, suites) { console.log([ @@ -11,7 +10,7 @@ function from_pair_suites(name, suites) { ]); List.iter((function (param) { let name = param[0]; - let fn = Curry._1(param[1], undefined); + let fn = param[1](); switch (fn.TAG) { case "Eq" : console.log([ diff --git a/jscomp/test/module_alias_test.js b/jscomp/test/module_alias_test.js index f80976c3a0..ad1d061bc7 100644 --- a/jscomp/test/module_alias_test.js +++ b/jscomp/test/module_alias_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -38,7 +37,7 @@ function f(x) { let h = f(/* [] */0); -let a = Curry._1(h.length, { +let a = h.length({ hd: 1, tl: { hd: 2, diff --git a/jscomp/test/more_poly_variant_test.js b/jscomp/test/more_poly_variant_test.js index 13dc1abaf5..7e9057076a 100644 --- a/jscomp/test/more_poly_variant_test.js +++ b/jscomp/test/more_poly_variant_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function map(f) { return function (x) { @@ -12,8 +11,8 @@ function map(f) { return { NAME: "Cons", VAL: [ - Curry._1(f, match[0]), - Curry._1(map(f), match[1]) + f(match[0]), + map(f)(match[1]) ] }; }; diff --git a/jscomp/test/number_lexer.js b/jscomp/test/number_lexer.js index d0042c47fa..abd9c0a68c 100644 --- a/jscomp/test/number_lexer.js +++ b/jscomp/test/number_lexer.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Lexing = require("../../lib/js/lexing.js"); function l(prim) { @@ -127,47 +126,47 @@ function __ocaml_lex_token_rec(l, lexbuf, ___ocaml_lex_state) { let __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - Curry._1(l, "new line"); + l("new line"); ___ocaml_lex_state = 0; continue; case 1 : - Curry._1(l, "number"); - Curry._1(l, Lexing.lexeme(lexbuf)); + l("number"); + l(Lexing.lexeme(lexbuf)); ___ocaml_lex_state = 0; continue; case 2 : - Curry._1(l, "ident"); - Curry._1(l, Lexing.lexeme(lexbuf)); + l("ident"); + l(Lexing.lexeme(lexbuf)); ___ocaml_lex_state = 0; continue; case 3 : - Curry._1(l, "+"); + l("+"); ___ocaml_lex_state = 0; continue; case 4 : - Curry._1(l, "-"); + l("-"); ___ocaml_lex_state = 0; continue; case 5 : - Curry._1(l, "*"); + l("*"); ___ocaml_lex_state = 0; continue; case 6 : - Curry._1(l, "/"); + l("/"); ___ocaml_lex_state = 0; continue; case 7 : - Curry._1(l, "("); + l("("); ___ocaml_lex_state = 0; continue; case 8 : - Curry._1(l, ")"); + l(")"); ___ocaml_lex_state = 0; continue; case 9 : - return Curry._1(l, "eof"); + return l("eof"); default: - Curry._1(lexbuf.refill_buff, lexbuf); + lexbuf.refill_buff(lexbuf); ___ocaml_lex_state = __ocaml_lex_state$1; continue; } diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js index 24cb054fa0..dfcd0828f2 100644 --- a/jscomp/test/ocaml_re_test.js +++ b/jscomp/test/ocaml_re_test.js @@ -7,7 +7,6 @@ let Char = require("../../lib/js/char.js"); let List = require("../../lib/js/list.js"); let $$Array = require("../../lib/js/array.js"); let Bytes = require("../../lib/js/bytes.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Hashtbl = require("../../lib/js/hashtbl.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); @@ -668,7 +667,7 @@ function first(f, _x) { if (!x) { return; } - let res = Curry._1(f, x.hd); + let res = f(x.hd); if (res !== undefined) { return res; } @@ -1012,7 +1011,7 @@ function mark_used_indices(tbl) { return List.iter((function (x) { switch (x.TAG) { case "TSeq" : - return Curry._1(mark_used_indices(tbl), x._0); + return mark_used_indices(tbl)(x._0); case "TExp" : case "TMatch" : break; @@ -1043,7 +1042,7 @@ function find_free(tbl, _idx, len) { function free_index(tbl_ref, l) { let tbl = tbl_ref.contents; reset_table(tbl); - Curry._1(mark_used_indices(tbl), l); + mark_used_indices(tbl)(l); let len = tbl.length; let idx = find_free(tbl, 0, len); if (idx === len) { @@ -1490,7 +1489,7 @@ function iter(_n, f, _v) { if (n === 0) { return v; } - _v = Curry._1(f, v); + _v = f(v); _n = n - 1 | 0; continue; }; @@ -1500,9 +1499,9 @@ function category(re, c) { if (c === -1) { return Re_automata_Category.inexistant; } else if (c === re.lnl) { - return Curry._2(Re_automata_Category.$plus$plus, Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.lastnewline, Re_automata_Category.newline), Re_automata_Category.not_letter); + return Re_automata_Category.$plus$plus(Re_automata_Category.$plus$plus(Re_automata_Category.lastnewline, Re_automata_Category.newline), Re_automata_Category.not_letter); } else { - return Curry._1(Re_automata_Category.from_char, Caml_bytes.get(re.col_repr, c)); + return Re_automata_Category.from_char(Caml_bytes.get(re.col_repr, c)); } } @@ -1531,13 +1530,13 @@ function mk_state(ncol, desc) { function find_state(re, desc) { try { - return Curry._2(Re_automata_State.Table.find, re.states, desc); + return Re_automata_State.Table.find(re.states, desc); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { let st = mk_state(re.ncol, desc); - Curry._3(Re_automata_State.Table.add, re.states, desc, st); + Re_automata_State.Table.add(re.states, desc, st); return st; } throw new Error(exn.RE_EXN_ID, { @@ -1636,7 +1635,7 @@ function find_initial_state(re, cat) { catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - let st = find_state(re, Curry._2(Re_automata_State.create, cat, re.initial)); + let st = find_state(re, Re_automata_State.create(cat, re.initial)); re.initial_states = { hd: [ cat, @@ -1826,7 +1825,7 @@ function split(s, cm) { return; } let match = t.hd; - Curry._2(f, match[0], match[1]); + f(match[0], match[1]); _t = t.tl; continue; }; @@ -2304,7 +2303,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) if (typeof x !== "object") { switch (x) { case "Beg_of_line" : - let c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); + let c$1 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.newline); return [ mk_expr(ids, { TAG: "After", @@ -2313,7 +2312,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "End_of_line" : - let c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); + let c$2 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.newline); return [ mk_expr(ids, { TAG: "Before", @@ -2322,8 +2321,8 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Beg_of_word" : - let c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); - let c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); + let c$3 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.not_letter); + let c$4 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.letter); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "After", @@ -2335,8 +2334,8 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "End_of_word" : - let c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); - let c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); + let c$5 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.letter); + let c$6 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.not_letter); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "After", @@ -2387,7 +2386,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Last_end_of_line" : - let c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline); + let c$7 = Re_automata_Category.$plus$plus(Re_automata_Category.inexistant, Re_automata_Category.lastnewline); return [ mk_expr(ids, { TAG: "Before", @@ -3204,7 +3203,7 @@ function compile(r) { tbl: { contents: [false] }, - states: Curry._1(Re_automata_State.Table.create, 97), + states: Re_automata_State.Table.create(97), group_count: group_count }; } @@ -3248,14 +3247,14 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) { pos: pos, last: last }; - let initial_cat = pos === 0 ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, pos - 1 | 0))); + let initial_cat = pos === 0 ? Re_automata_Category.$plus$plus(Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Re_automata_Category.$plus$plus(Re_automata_Category.search_boundary, category(re, get_color(re, s, pos - 1 | 0))); let initial_state = find_initial_state(re, initial_cat); let st = scan_str(info, s, initial_state, groups); let res; if (st.idx === -3 || partial) { res = status(st.desc); } else { - let final_cat = last === slen ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, last))); + let final_cat = last === slen ? Re_automata_Category.$plus$plus(Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Re_automata_Category.$plus$plus(Re_automata_Category.search_boundary, category(re, get_color(re, s, last))); let match = final(info, st, final_cat); if (groups) { Caml_array.set(info.positions, match[0], last + 1 | 0); diff --git a/jscomp/test/offset.js b/jscomp/test/offset.js index f14004e9c2..efec476040 100644 --- a/jscomp/test/offset.js +++ b/jscomp/test/offset.js @@ -3,7 +3,6 @@ let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -525,7 +524,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -538,7 +537,7 @@ function fold(f, _s, _accu) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -550,7 +549,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -567,7 +566,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -586,7 +585,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -610,7 +609,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -686,7 +685,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -696,7 +695,7 @@ function find_first(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -717,7 +716,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -727,7 +726,7 @@ function find_first_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -752,7 +751,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -762,7 +761,7 @@ function find_last(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -783,7 +782,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -793,7 +792,7 @@ function find_last_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -831,7 +830,7 @@ function map(f, param) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/jscomp/test/optional_ffi_test.js b/jscomp/test/optional_ffi_test.js index 8174b34ca3..ee8af83093 100644 --- a/jscomp/test/optional_ffi_test.js +++ b/jscomp/test/optional_ffi_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); let suites = { @@ -63,11 +62,11 @@ function side_effect(x) { } function bug_to_fix(f, x) { - return hey(Curry._1(f, x), 3); + return hey(f(x), 3); } function bug_to_fix2(f, x) { - return hey(Caml_option.option_get(Curry._1(f, x)), 3); + return hey(Caml_option.option_get(f(x)), 3); } let counter2 = { diff --git a/jscomp/test/pipe_syntax.js b/jscomp/test/pipe_syntax.js index e532c986ca..79f97aeb38 100644 --- a/jscomp/test/pipe_syntax.js +++ b/jscomp/test/pipe_syntax.js @@ -1,66 +1,65 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); function t0(x, f) { - return Curry._1(f, Curry._1(f, Curry._1(f, x))); + return f(f(f(x))); } function t1(x, f) { - return Curry._1(f, x); + return f(x); } function t2(x, f, g) { - return Curry._1(f, Curry._3(g, Curry._1(f, x), x, x)); + return f(g(f(x), x, x)); } function t3(x, f) { - return Curry._3(f, x, 1, 2); + return f(x, 1, 2); } function f(a, b, c) { return [ - Curry._1(b, a), - Curry._1(c, a) + b(a), + c(a) ]; } function f1(a, b, c, d) { - let __tuple_internal_obj = Curry._1(a, b); + let __tuple_internal_obj = a(b); return [ - Curry._1(c, __tuple_internal_obj), - Curry._1(d, __tuple_internal_obj) + c(__tuple_internal_obj), + d(__tuple_internal_obj) ]; } function f2(a, b, c, d) { - let __tuple_internal_obj = Curry._1(a, b); - let u = Curry._1(c, __tuple_internal_obj); - let v = Curry._1(d, __tuple_internal_obj); + let __tuple_internal_obj = a(b); + let u = c(__tuple_internal_obj); + let v = d(__tuple_internal_obj); return u + v | 0; } function f3(a, b, c, d, e) { - let __tuple_internal_obj = Curry._1(a, b); - let param_0 = Curry._2(c, __tuple_internal_obj, d); - let param_1 = Curry._3(d, __tuple_internal_obj, 1, 2); - let param_2 = Curry._1(e, __tuple_internal_obj); + let __tuple_internal_obj = a(b); + let param_0 = c(__tuple_internal_obj, d); + let param_1 = d(__tuple_internal_obj, 1, 2); + let param_2 = e(__tuple_internal_obj); return (param_0 + param_1 | 0) + param_2 | 0; } function f4(a, b, c) { return [ - Curry._2(b, a, c), - Curry._2(b, a, c) + b(a, c), + b(a, c) ]; } function f5(a, b, c, d) { - let v0 = Curry._3(b, a, c, c); - let v1 = Curry._3(b, a, c, c); - let v2 = Curry._3(b, a, d, d); + let v0 = b(a, c, c); + let v1 = b(a, c, c); + let v2 = b(a, d, d); return (v0 + v1 | 0) + v2 | 0; } diff --git a/jscomp/test/polymorphism_test.js b/jscomp/test/polymorphism_test.js index 135478b74a..040ba393b5 100644 --- a/jscomp/test/polymorphism_test.js +++ b/jscomp/test/polymorphism_test.js @@ -1,13 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function map(f, x) { if (!x) { return /* [] */0; } - let r = Curry._1(f, x.hd); + let r = f(x.hd); return { hd: r, tl: map(f, x.tl) diff --git a/jscomp/test/print_alpha_test.js b/jscomp/test/print_alpha_test.js index fd2baba15c..e9f3efb844 100644 --- a/jscomp/test/print_alpha_test.js +++ b/jscomp/test/print_alpha_test.js @@ -2,11 +2,12 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); function f(h, param) { console.log(3); - return Curry.__2(h); + return function (x, y) { + return h(x, y); + }; } Mt.from_pair_suites("Print_alpha_test", { @@ -15,9 +16,9 @@ Mt.from_pair_suites("Print_alpha_test", { (function () { return { TAG: "Eq", - _0: Curry._2(f((function (prim0, prim1) { + _0: f((function (prim0, prim1) { return prim0 + prim1 | 0; - }), undefined), 1, 2), + }), undefined)(1, 2), _1: 3 }; }) diff --git a/jscomp/test/queue_402.js b/jscomp/test/queue_402.js index a4044126e3..9adf63c154 100644 --- a/jscomp/test/queue_402.js +++ b/jscomp/test/queue_402.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); @@ -122,7 +121,7 @@ function iter(f, q) { let _cell = tail.next; while(true) { let cell = _cell; - Curry._1(f, cell.content); + f(cell.content); if (cell === tail) { return; } @@ -141,7 +140,7 @@ function fold(f, accu, q) { while(true) { let cell = _cell; let accu$1 = _accu; - let accu$2 = Curry._2(f, accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); if (cell === tail) { return accu$2; } diff --git a/jscomp/test/queue_test.js b/jscomp/test/queue_test.js index 1671b5341b..a13947853a 100644 --- a/jscomp/test/queue_test.js +++ b/jscomp/test/queue_test.js @@ -3,24 +3,23 @@ let Mt = require("./mt.js"); let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Queue = require("../../lib/js/queue.js"); let Queue_402 = require("./queue_402.js"); let Caml_array = require("../../lib/js/caml_array.js"); function Test(Queue) { let to_array = function (q) { - let v = Caml_array.make(Curry._1(Queue.length, q), 0); - Curry._3(Queue.fold, (function (i, e) { + let v = Caml_array.make(Queue.length(q), 0); + Queue.fold((function (i, e) { Caml_array.set(v, i, e); return i + 1 | 0; }), 0, q); return v; }; let queue_1 = function (x) { - let q = Curry._1(Queue.create, undefined); + let q = Queue.create(); $$Array.iter((function (x) { - Curry._2(Queue.add, x, q); + Queue.add(x, q); }), x); return to_array(q); }; diff --git a/jscomp/test/random_test.js b/jscomp/test/random_test.js index 2dfa988eb6..c17e6947e0 100644 --- a/jscomp/test/random_test.js +++ b/jscomp/test/random_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Int64 = require("../../lib/js/int64.js"); let Random = require("../../lib/js/random.js"); let Mt_global = require("./mt_global.js"); @@ -34,7 +33,7 @@ function approx(f) { }; } -Curry._2(neq("File \"random_test.res\", line 9, characters 2-9"), (Random.self_init(), Random.int(10000)), (Random.self_init(), Random.int(1000))); +Mt_global.collect_neq(id, suites, "File \"random_test.res\", line 9, characters 2-9", (Random.self_init(), Random.int(10000)), (Random.self_init(), Random.int(1000))); Random.init(0); @@ -44,7 +43,7 @@ for(let i = 0; i <= 9; ++i){ Caml_array.set(v, i, Random.bool()); } -Curry._2(eq("File \"random_test.res\", line 28, characters 12-19"), v, [ +Mt_global.collect_eq(id, suites, "File \"random_test.res\", line 28, characters 12-19", v, [ true, true, true, diff --git a/jscomp/test/raw_output_test.js b/jscomp/test/raw_output_test.js index 7654ebf6ea..156dcbbf3f 100644 --- a/jscomp/test/raw_output_test.js +++ b/jscomp/test/raw_output_test.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function mk(fn) { - return Curry._1(fn, undefined); + return fn(); } (((_)=> console.log('should works'))()); diff --git a/jscomp/test/reactTestUtils.js b/jscomp/test/reactTestUtils.js index b94a28de95..05a3759b7c 100644 --- a/jscomp/test/reactTestUtils.js +++ b/jscomp/test/reactTestUtils.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Belt_Array = require("../../lib/js/belt_Array.js"); let Belt_Option = require("../../lib/js/belt_Option.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -9,14 +8,14 @@ let TestUtils = require("react-dom/test-utils"); function act(func) { let reactFunc = function () { - Curry._1(func, undefined); + func(); }; TestUtils.act(reactFunc); } function actAsync(func) { return TestUtils.act(function () { - return Curry._1(func, undefined); + return func(); }); } diff --git a/jscomp/test/reasonReact.js b/jscomp/test/reasonReact.js index 807c016789..49bd1161a1 100644 --- a/jscomp/test/reasonReact.js +++ b/jscomp/test/reasonReact.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let React = require("react"); function createDomElement(s, props, children) { @@ -9,7 +8,7 @@ function createDomElement(s, props, children) { s, props ].concat(children); - return Curry._2(React.createElement.apply, null, vararg); + return React.createElement.apply(null, vararg); } function anyToUnit(param) { @@ -74,7 +73,7 @@ function element(keyOpt, refOpt, component) { }; let jsElementWrapped = component.jsElementWrapped; if (jsElementWrapped !== undefined) { - return Curry._2(jsElementWrapped, key, ref); + return jsElementWrapped(key, ref); } else { return React.createElement(component.reactClassInternal, { key: key, @@ -85,7 +84,9 @@ function element(keyOpt, refOpt, component) { } function wrapReasonForJs(component, jsPropsToReason) { - let uncurriedJsPropsToReason = Curry.__1(jsPropsToReason); + let uncurriedJsPropsToReason = function (jsProps) { + return jsPropsToReason(jsProps); + }; component.reactClassInternal.prototype.jsPropsToReason = uncurriedJsPropsToReason; return component.reactClassInternal; } @@ -102,7 +103,7 @@ function wrapJsForReason(reactClass, props, children) { reactClass, props$1 ].concat(children); - return Curry._2(React.createElement.apply, null, varargs); + return React.createElement.apply(null, varargs); }); return { debugName: dummyInteropComponent.debugName, diff --git a/jscomp/test/reasonReactRouter.js b/jscomp/test/reasonReactRouter.js index 234e6c534b..16a967a133 100644 --- a/jscomp/test/reasonReactRouter.js +++ b/jscomp/test/reasonReactRouter.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let React = require("react"); function safeMakeEvent(eventName) { @@ -143,7 +142,7 @@ function watchUrl(callback) { }; } let watcherID = function () { - Curry._1(callback, url()); + callback(url()); }; window.addEventListener("popstate", watcherID); return watcherID; @@ -170,15 +169,15 @@ function useUrl(serverUrl, param) { let url$1 = match[0]; React.useEffect((function () { let watcherId = watchUrl(function (url) { - Curry._1(setUrl, (function (param) { + setUrl(function (param) { return url; - })); + }); }); let newUrl = url(); if (urlNotEqual(newUrl, url$1)) { - Curry._1(setUrl, (function (param) { + setUrl(function (param) { return newUrl; - })); + }); } return (function () { unwatchUrl(watcherId); diff --git a/jscomp/test/rec_fun_test.js b/jscomp/test/rec_fun_test.js index 7d2e007f27..43b6b52903 100644 --- a/jscomp/test/rec_fun_test.js +++ b/jscomp/test/rec_fun_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let suites = { @@ -39,7 +38,7 @@ function g() { let next = function (i, b) { called.contents = called.contents + 1 | 0; if (b) { - Curry._2(v.contents, i, false); + v.contents(i, false); } return i + 1 | 0; }; diff --git a/jscomp/test/rec_module_opt.js b/jscomp/test/rec_module_opt.js index f8d0ba2c31..61b06f835b 100644 --- a/jscomp/test/rec_module_opt.js +++ b/jscomp/test/rec_module_opt.js @@ -3,7 +3,6 @@ let $$Set = require("../../lib/js/set.js"); let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let A = Caml_module.init_mod([ @@ -30,7 +29,7 @@ function compare(t1, t2) { } else if (t2.TAG === "Leaf") { return -1; } else { - return Curry._2(ASet.compare, t1._0, t2._0); + return ASet.compare(t1._0, t2._0); } } diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js index 7dc570996a..2e22414f15 100644 --- a/jscomp/test/rec_module_test.js +++ b/jscomp/test/rec_module_test.js @@ -4,7 +4,6 @@ let Mt = require("./mt.js"); let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let Caml_option = require("../../lib/js/caml_option.js"); @@ -38,7 +37,7 @@ function even(n) { } else if (n === 1) { return false; } else { - return Curry._1(B.odd, n - 1 | 0); + return B.odd(n - 1 | 0); } } @@ -58,7 +57,7 @@ function odd(n) { } else if (n === 0) { return false; } else { - return Curry._1(A.even, n - 1 | 0); + return A.even(n - 1 | 0); } } @@ -114,12 +113,12 @@ function even$1(n) { } else if (n === 1) { return false; } else { - return Curry._1(BB.odd, n - 1 | 0); + return BB.odd(n - 1 | 0); } } function x() { - return Curry._1(BB.y, undefined) + 3 | 0; + return BB.y() + 3 | 0; } Caml_module.update_mod({ @@ -145,7 +144,7 @@ function odd$1(n) { } else if (n === 0) { return false; } else { - return Curry._1(AA.even, n - 1 | 0); + return AA.even(n - 1 | 0); } } @@ -285,7 +284,7 @@ function add(x, param) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(AAA.compare, x, v); + let c = AAA.compare(x, v); if (c === 0) { return param; } @@ -455,7 +454,7 @@ function split(x, param) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(AAA.compare, x, v); + let c = AAA.compare(x, v); if (c === 0) { return [ l, @@ -493,7 +492,7 @@ function mem(x, _param) { if (typeof param !== "object") { return false; } - let c = Curry._2(AAA.compare, x, param.v); + let c = AAA.compare(x, param.v); if (c === 0) { return true; } @@ -509,7 +508,7 @@ function remove(x, param) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(AAA.compare, x, v); + let c = AAA.compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -632,7 +631,7 @@ function compare(s1, s2) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(AAA.compare, e1._0, e2._0); + let c = AAA.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -661,7 +660,7 @@ function subset(_s1, _s2) { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(AAA.compare, v1, s2.v); + let c = AAA.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -704,7 +703,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -717,7 +716,7 @@ function fold(f, _s, _accu) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -729,7 +728,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -746,7 +745,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -765,7 +764,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -789,7 +788,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -845,7 +844,7 @@ function find(x, _param) { }); } let v = param.v; - let c = Curry._2(AAA.compare, x, v); + let c = AAA.compare(x, v); if (c === 0) { return v; } @@ -865,7 +864,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -875,7 +874,7 @@ function find_first(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -896,7 +895,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -906,7 +905,7 @@ function find_first_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -931,7 +930,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -941,7 +940,7 @@ function find_last(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -962,7 +961,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -972,7 +971,7 @@ function find_last_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -993,7 +992,7 @@ function find_opt(x, _param) { return; } let v = param.v; - let c = Curry._2(AAA.compare, x, v); + let c = AAA.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -1010,11 +1009,11 @@ function map(f, param) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { 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)) { + } else if ((l$p === "Empty" || AAA.compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || AAA.compare(v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { return union(l$p, add(v$p, r$p)); @@ -1231,10 +1230,10 @@ let suites_0 = [ false ], _1: [ - Curry._1(A.even, 2), - Curry._1(AA.even, 4), - Curry._1(B.odd, 2), - Curry._1(BB.odd, 4) + A.even(2), + AA.even(4), + B.odd(2), + BB.odd(4) ] }; }) @@ -1246,7 +1245,7 @@ let suites_1 = { (function (param) { return { TAG: "Eq", - _0: Curry._1(BB.y, undefined), + _0: BB.y(), _1: 32 }; }) @@ -1257,7 +1256,7 @@ let suites_1 = { (function (param) { return { TAG: "Eq", - _0: Curry._1(AA.x, undefined), + _0: AA.x(), _1: 35 }; }) @@ -1269,7 +1268,7 @@ let suites_1 = { return { TAG: "Eq", _0: true, - _1: Curry._1(A.even, 2) + _1: A.even(2) }; }) ], @@ -1280,7 +1279,7 @@ let suites_1 = { return { TAG: "Eq", _0: true, - _1: Curry._1(AA.even, 4) + _1: AA.even(4) }; }) ], @@ -1291,7 +1290,7 @@ let suites_1 = { return { TAG: "Eq", _0: false, - _1: Curry._1(B.odd, 2) + _1: B.odd(2) }; }) ], diff --git a/jscomp/test/recmodule.js b/jscomp/test/recmodule.js index 5169b4380d..c5b9cec6fc 100644 --- a/jscomp/test/recmodule.js +++ b/jscomp/test/recmodule.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let Entity = {}; function MakeLayer(Deps) { let getLight = function (id) { - return Curry._1(Deps.presentLight, { + return Deps.presentLight({ id: id, name: "Light 1" }); @@ -24,10 +23,10 @@ let UseCase = { function MakeLayer$1(Deps, UC) { let presentLight = function (light) { - return Curry._2(Deps.presentJson, light, 200); + return Deps.presentJson(light, 200); }; let handleGetLight = function (req) { - return Curry._1(UC.getLight, req.params.id); + return UC.getLight(req.params.id); }; return { handleGetLight: handleGetLight, @@ -154,11 +153,11 @@ Caml_module.update_mod({ }); function presentLight(light) { - return Curry._2(I.presentJson, light, 200); + return I.presentJson(light, 200); } function handleGetLight(req) { - return Curry._1(U.getLight, req.params.id); + return U.getLight(req.params.id); } Caml_module.update_mod({ @@ -179,7 +178,7 @@ Caml_module.update_mod({ }); function getLight(id) { - return Curry._1(A.presentLight, { + return A.presentLight({ id: id, name: "Light 1" }); diff --git a/jscomp/test/record_extension_test.js b/jscomp/test/record_extension_test.js index 9e6b29e605..2067603615 100644 --- a/jscomp/test/record_extension_test.js +++ b/jscomp/test/record_extension_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_format = require("../../lib/js/caml_format.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -64,7 +63,7 @@ let C = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.C"); function u(f) { try { - return Curry._1(f, undefined); + return f(); } catch (raw_x){ let x = Caml_js_exceptions.internalToOCamlException(raw_x); diff --git a/jscomp/test/record_with_test.js b/jscomp/test/record_with_test.js index c1cadd2cad..045fc38e5b 100644 --- a/jscomp/test/record_with_test.js +++ b/jscomp/test/record_with_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let v = { syntax: undefined, @@ -25,7 +24,7 @@ let u_v = { }; function f(g, h) { - let init = Curry._1(g, h); + let init = g(h); return { syntax: init.syntax, imports: 0, diff --git a/jscomp/test/recursive_module.js b/jscomp/test/recursive_module.js index 2574e8eeb4..4efd37878f 100644 --- a/jscomp/test/recursive_module.js +++ b/jscomp/test/recursive_module.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let Lazy = require("../../lib/js/lazy.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -179,7 +178,7 @@ eq("File \"recursive_module.res\", line 59, characters 3-10", CamlinternalLazy.f let tmp$1; try { - Curry._1(Int3.u, 3); + Int3.u(3); tmp$1 = 3; } catch (raw_exn$1){ diff --git a/jscomp/test/recursive_module_test.js b/jscomp/test/recursive_module_test.js index fc4bf1f9d0..6edee60332 100644 --- a/jscomp/test/recursive_module_test.js +++ b/jscomp/test/recursive_module_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_module = require("../../lib/js/caml_module.js"); let suites = { @@ -73,7 +72,7 @@ function fact(n) { if (n <= 1) { return 1; } else { - return Math.imul(n, Curry._1(M.fact, n - 1 | 0)); + return Math.imul(n, M.fact(n - 1 | 0)); } } @@ -94,7 +93,7 @@ let Fact = { fact: fact$1 }; -eq("File \"recursive_module_test.res\", line 29, characters 12-19", 120, Curry._1(fact$1, 5)); +eq("File \"recursive_module_test.res\", line 29, characters 12-19", 120, fact$1(5)); add([ "File \"recursive_module_test.res\", line 31, characters 14-21", @@ -102,7 +101,7 @@ add([ return { TAG: "ThrowAny", _0: (function () { - Curry._1(Int3.u, 3); + Int3.u(3); }) }; }) diff --git a/jscomp/test/res_debug.js b/jscomp/test/res_debug.js index 0ff8b6dbb2..da1289ce18 100644 --- a/jscomp/test/res_debug.js +++ b/jscomp/test/res_debug.js @@ -1,12 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_option = require("../../lib/js/caml_option.js"); function f(window, a, b) { - return Curry._2(window.location, a, b); + return window.location(a, b); } let v0 = { @@ -29,7 +28,7 @@ function testMatch(v) { function optionMap(x, f) { if (x !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x))); + return Caml_option.some(f(Caml_option.valFromOption(x))); } } diff --git a/jscomp/test/set_gen.js b/jscomp/test/set_gen.js index ab3ba89780..4c211f46ae 100644 --- a/jscomp/test/set_gen.js +++ b/jscomp/test/set_gen.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Pervasives = require("../../lib/js/pervasives.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); @@ -122,7 +121,7 @@ function iter(f, _x) { return; } iter(f, x._0); - Curry._1(f, x._1); + f(x._1); _x = x._2; continue; }; @@ -135,7 +134,7 @@ function fold(f, _s, _accu) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s._1, fold(f, s._0, accu)); + _accu = f(s._1, fold(f, s._0, accu)); _s = s._2; continue; }; @@ -147,7 +146,7 @@ function for_all(p, _x) { if (typeof x !== "object") { return true; } - if (!Curry._1(p, x._1)) { + if (!p(x._1)) { return false; } if (!for_all(p, x._0)) { @@ -164,7 +163,7 @@ function exists(p, _x) { if (typeof x !== "object") { return false; } - if (Curry._1(p, x._1)) { + if (p(x._1)) { return true; } if (exists(p, x._0)) { @@ -411,7 +410,7 @@ function filter(p, x) { } let v = x._1; let l$p = filter(p, x._0); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, x._2); if (pv) { return internal_join(l$p, v, r$p); @@ -431,7 +430,7 @@ function partition(p, x) { let match = partition(p, x._0); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, x._2); let rf = match$1[1]; let rt = match$1[0]; @@ -635,7 +634,7 @@ function is_ordered(cmp, tree) { let min_v = match$1[0]; let match$2 = is_ordered_min_max(r); if (typeof match$2 !== "object") { - if (match$2 === "Empty" && Curry._2(cmp, max_v, v) < 0) { + if (match$2 === "Empty" && cmp(max_v, v) < 0) { return { NAME: "V", VAL: [ @@ -648,7 +647,7 @@ function is_ordered(cmp, tree) { } } let match$3 = match$2.VAL; - if (Curry._2(cmp, max_v, match$3[0]) < 0) { + if (cmp(max_v, match$3[0]) < 0) { return { NAME: "V", VAL: [ @@ -678,7 +677,7 @@ function is_ordered(cmp, tree) { } } let match$5 = match$4.VAL; - if (Curry._2(cmp, v, match$5[0]) < 0) { + if (cmp(v, match$5[0]) < 0) { return { NAME: "V", VAL: [ @@ -712,7 +711,7 @@ function compare_aux(cmp, _e1, _e2) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(cmp, e1._0, e2._0); + let c = cmp(e1._0, e2._0); if (c !== 0) { return c; } diff --git a/jscomp/test/sexp.js b/jscomp/test/sexp.js index 0b90d79a65..ec021c83c3 100644 --- a/jscomp/test/sexp.js +++ b/jscomp/test/sexp.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Hashtbl = require("../../lib/js/hashtbl.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Pervasives = require("../../lib/js/pervasives.js"); @@ -149,14 +148,14 @@ function $$return(x) { function $great$pipe$eq(e, f) { if (e !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(e))); + return Caml_option.some(f(Caml_option.valFromOption(e))); } } function $great$great$eq(e, f) { if (e !== undefined) { - return Curry._1(f, Caml_option.valFromOption(e)); + return f(Caml_option.valFromOption(e)); } } @@ -170,7 +169,7 @@ function map_opt(f, l) { if (!l$1) { return List.rev(acc); } - let y = Curry._1(f, l$1.hd); + let y = f(l$1.hd); if (y === undefined) { return; } @@ -191,7 +190,7 @@ function list_any(f, e) { if (!l) { return; } - let res = Curry._1(f, l.hd); + let res = f(l.hd); if (res !== undefined) { return res; } @@ -213,7 +212,7 @@ function list_all(f, e) { return List.rev(acc); } let tl = l.tl; - let y = Curry._1(f, l.hd); + let y = f(l.hd); if (y !== undefined) { _l = tl; _acc = { @@ -235,7 +234,7 @@ function _try_atom(e, f) { return; } try { - return Caml_option.some(Curry._1(f, e.VAL)); + return Caml_option.some(f(e.VAL)); } catch (exn){ return; @@ -285,8 +284,8 @@ function to_pair_with(f1, f2) { return function (e) { return $great$great$eq(to_pair(e), (function (param) { let y = param[1]; - return $great$great$eq(Curry._1(f1, param[0]), (function (x) { - return $great$great$eq(Curry._1(f2, y), (function (y) { + return $great$great$eq(f1(param[0]), (function (x) { + return $great$great$eq(f2(y), (function (y) { return [ x, y @@ -328,9 +327,9 @@ function to_triple_with(f1, f2, f3) { return $great$great$eq(to_triple(e), (function (param) { let z = param[2]; let y = param[1]; - return $great$great$eq(Curry._1(f1, param[0]), (function (x) { - return $great$great$eq(Curry._1(f2, y), (function (y) { - return $great$great$eq(Curry._1(f3, z), (function (z) { + return $great$great$eq(f1(param[0]), (function (x) { + return $great$great$eq(f2(y), (function (y) { + return $great$great$eq(f3(z), (function (z) { return [ x, y, @@ -413,7 +412,7 @@ function get_field(name) { function field(name, f) { return function (e) { - return $great$great$eq(Curry._1(get_field(name), e), f); + return $great$great$eq(get_field(name)(e), f); }; } @@ -471,7 +470,7 @@ function _get_variant(s, args, _l) { } let match = l.hd; if (Caml_obj.equal(s, match[0])) { - return Curry._1(match[1], args); + return match[1](args); } _l = l.tl; continue; diff --git a/jscomp/test/sexpm.js b/jscomp/test/sexpm.js index b593f96512..9ac601aa21 100644 --- a/jscomp/test/sexpm.js +++ b/jscomp/test/sexpm.js @@ -6,7 +6,6 @@ let Caml = require("../../lib/js/caml.js"); let Char = require("../../lib/js/char.js"); let List = require("../../lib/js/list.js"); let Bytes = require("../../lib/js/bytes.js"); -let Curry = require("../../lib/js/curry.js"); let Buffer = require("../../lib/js/buffer.js"); let $$String = require("../../lib/js/string.js"); let Caml_bytes = require("../../lib/js/caml_bytes.js"); @@ -152,13 +151,13 @@ function _is_digit(c) { } function _refill(t, k_succ, k_fail) { - let n = Curry._3(t.refill, t.buf, 0, t.buf.length); + let n = t.refill(t.buf, 0, t.buf.length); t.i = 0; t.len = n; if (n === 0) { - return Curry._1(k_fail, t); + return k_fail(t); } else { - return Curry._1(k_succ, t); + return k_succ(t); } } @@ -292,7 +291,7 @@ function expr_list(acc, k, t) { let c = _get(t); if (c > 32 || c < 9) { if (c === 41) { - return Curry._2(k, undefined, { + return k(undefined, { NAME: "List", VAL: List.rev(acc) }); @@ -310,7 +309,7 @@ function expr_list(acc, k, t) { tl: acc }, k, t); } else { - return Curry._2(k, undefined, { + return k(undefined, { NAME: "List", VAL: List.rev({ hd: e, @@ -339,7 +338,7 @@ function expr_list(acc, k, t) { function _return_atom(last, k, t) { let s = Buffer.contents(t.atom); t.atom.position = 0; - return Curry._2(k, last, { + return k(last, { NAME: "Atom", VAL: s }); @@ -428,13 +427,13 @@ function escaped(k, t) { if (c < 117) { switch (c) { case 92 : - return Curry._1(k, /* '\\' */92); + return k(/* '\\' */92); case 98 : - return Curry._1(k, /* '\b' */8); + return k(/* '\b' */8); case 110 : - return Curry._1(k, /* '\n' */10); + return k(/* '\n' */10); case 114 : - return Curry._1(k, /* '\r' */13); + return k(/* '\r' */13); case 93 : case 94 : case 95 : @@ -457,17 +456,17 @@ function escaped(k, t) { case 115 : break; case 116 : - return Curry._1(k, /* '\t' */9); + return k(/* '\t' */9); } } } else if (c === 34) { - return Curry._1(k, /* '"' */34); + return k(/* '"' */34); } if (_is_digit(c)) { return read2int(c - /* '0' */48 | 0, (function (n) { - return Curry._1(k, Char.chr(n)); + return k(Char.chr(n)); }), t); } else { return _error(t, "unexpected escaped char '" + (c + "'")); @@ -496,7 +495,7 @@ function read1int(i, k, t) { } let c = _get(t); if (_is_digit(c)) { - return Curry._1(k, Math.imul(10, i) + (c - /* '0' */48 | 0) | 0); + return k(Math.imul(10, i) + (c - /* '0' */48 | 0) | 0); } else { return _error(t, "unexpected escaped char '" + (c + "' when reading byte")); } @@ -511,7 +510,7 @@ function skip_comment(k, t) { } let match = _get(t); if (match === 10) { - return Curry._2(k, undefined, undefined); + return k(undefined, undefined); } continue; }; diff --git a/jscomp/test/small_inline_test.js b/jscomp/test/small_inline_test.js index f68a3a8a52..9e13d19432 100644 --- a/jscomp/test/small_inline_test.js +++ b/jscomp/test/small_inline_test.js @@ -1,30 +1,29 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function $pipe$great(x, f) { - return Curry._1(f, x); + return f(x); } function hello1(y, f) { - return Curry._1(f, y); + return f(y); } function hello2(y, f) { - return Curry._1(f, y); + return f(y); } function hello3(y, f) { - return Curry._1(f, y); + return f(y); } function hello4(y, f) { - return Curry._1(f, y); + return f(y); } function hello5(y, f) { - return Curry._1(f, y); + return f(y); } function f(_x) { diff --git a/jscomp/test/stack_comp_test.js b/jscomp/test/stack_comp_test.js index d44a82031f..dabb3ee849 100644 --- a/jscomp/test/stack_comp_test.js +++ b/jscomp/test/stack_comp_test.js @@ -3,7 +3,6 @@ let Mt = require("./mt.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Stack = require("../../lib/js/stack.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Mt_global = require("./mt_global.js"); @@ -58,7 +57,7 @@ let S = { function does_raise(f, s) { try { - Curry._1(f, s); + f(s); return false; } catch (raw_exn){ diff --git a/jscomp/test/stream_parser_test.js b/jscomp/test/stream_parser_test.js index 87ec80ec7f..d8c949d0ee 100644 --- a/jscomp/test/stream_parser_test.js +++ b/jscomp/test/stream_parser_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Queue = require("../../lib/js/queue.js"); let Genlex = require("../../lib/js/genlex.js"); let Stream = require("../../lib/js/stream.js"); @@ -22,7 +21,7 @@ function parse(token) { return Queue.pop(look_ahead); } try { - return Curry._1(token, undefined); + return token(); } catch (exn){ return { @@ -162,7 +161,7 @@ function l_parse(token) { return Queue.pop(look_ahead); } try { - return Curry._1(token, undefined); + return token(); } catch (exn){ return { diff --git a/jscomp/test/submodule_call.js b/jscomp/test/submodule_call.js index abc1e34326..6bbfb22c22 100644 --- a/jscomp/test/submodule_call.js +++ b/jscomp/test/submodule_call.js @@ -1,18 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Submodule = require("./submodule.js"); let a0 = Submodule.A0.a0(1, 2); -let a1 = Curry._2(Submodule.A0.A1.a1, 1, 2); +let a1 = Submodule.A0.A1.a1(1, 2); -let a2 = Curry._2(Submodule.A0.A1.A2.a2, 1, 2); +let a2 = Submodule.A0.A1.A2.a2(1, 2); -let a3 = Curry._2(Submodule.A0.A1.A2.A3.a3, 1, 2); +let a3 = Submodule.A0.A1.A2.A3.a3(1, 2); -let a4 = Curry._2(Submodule.A0.A1.A2.A3.A4.a4, 1, 2); +let a4 = Submodule.A0.A1.A2.A3.A4.a4(1, 2); exports.a0 = a0; exports.a1 = a1; diff --git a/jscomp/test/test_ari.js b/jscomp/test/test_ari.js index aa63ea0ad0..32407d6233 100644 --- a/jscomp/test/test_ari.js +++ b/jscomp/test/test_ari.js @@ -4,7 +4,6 @@ let U = require("U"); let VV = require("VV"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function f(x, y) { return x + y | 0; @@ -15,7 +14,7 @@ function f1(x, y) { } function f3(g, x) { - return Curry._1(g, x); + return g(x); } function f2(extra) { diff --git a/jscomp/test/test_bs_this.js b/jscomp/test/test_bs_this.js index 78bf4f3d43..a2890643aa 100644 --- a/jscomp/test/test_bs_this.js +++ b/jscomp/test/test_bs_this.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function uux_this(x, y) { let o = this ; @@ -40,7 +39,7 @@ function f(x) { let o = this ; console.log(o); }); - return Curry._2(x.addEventListener, "onload", (function () { + return x.addEventListener("onload", (function () { let o = this ; console.log(o.response); })); diff --git a/jscomp/test/test_case_set.js b/jscomp/test/test_case_set.js index 418dcc977e..7b74291121 100644 --- a/jscomp/test/test_case_set.js +++ b/jscomp/test/test_case_set.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f(x) { x.case = 3; } function g(x) { - return Curry._1(x.item, 3); + return x.item(3); } exports.f = f; diff --git a/jscomp/test/test_closure.js b/jscomp/test/test_closure.js index 6cdfa5133e..d19b24cb89 100644 --- a/jscomp/test/test_closure.js +++ b/jscomp/test/test_closure.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let v = { @@ -24,7 +23,7 @@ function f() { let u = f(); $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), u); if (v.contents !== 45) { diff --git a/jscomp/test/test_cps.js b/jscomp/test/test_cps.js index 4b1ecfd676..f1dff037ec 100644 --- a/jscomp/test/test_cps.js +++ b/jscomp/test/test_cps.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function f(_n, _acc) { @@ -9,11 +8,11 @@ function f(_n, _acc) { let acc = _acc; let n = _n; if (n === 0) { - return Curry._1(acc, undefined); + return acc(); } _acc = (function () { console.log(String(n)); - return Curry._1(acc, undefined); + return acc(); }); _n = n - 1 | 0; continue; diff --git a/jscomp/test/test_demo.js b/jscomp/test/test_demo.js index 4dc6253a4e..4a5a6409e0 100644 --- a/jscomp/test/test_demo.js +++ b/jscomp/test/test_demo.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function fib(x) { if (x === 2 || x === 1) { @@ -26,7 +25,7 @@ function map(f, x) { } else { return { TAG: "Cons", - _0: Curry._1(f, x._0), + _0: f(x._0), _1: map(f, x._1) }; } @@ -58,7 +57,9 @@ function g1(x, y) { }; } -let x = Curry._1(g(3, 5), 6); +let u = 8; + +let x = u + 6 | 0; function v(extra) { let u = 7; @@ -80,4 +81,4 @@ exports.g = g; exports.g1 = g1; exports.x = x; exports.v = v; -/* x Not a pure module */ +/* No side effect */ diff --git a/jscomp/test/test_external.js b/jscomp/test/test_external.js index 13d3d54156..6267a58ca0 100644 --- a/jscomp/test/test_external.js +++ b/jscomp/test/test_external.js @@ -1,13 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let xx = document(); alert("hehha"); -let b = Curry._1(ff("x"), 3); +let b = ff("x")(3); exports.xx = xx; exports.b = b; diff --git a/jscomp/test/test_fib.js b/jscomp/test/test_fib.js index 1b6c660c76..ccc19ec289 100644 --- a/jscomp/test/test_fib.js +++ b/jscomp/test/test_fib.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function fib(x) { if (x === 0 || x === 1) { @@ -57,7 +56,7 @@ function map(f, x) { } else { return { TAG: "Cons", - _0: Curry._1(f, x._0), + _0: f(x._0), _1: map(f, x._1) }; } diff --git a/jscomp/test/test_for_loop.js b/jscomp/test/test_for_loop.js index 9934349ded..343bc858c5 100644 --- a/jscomp/test/test_for_loop.js +++ b/jscomp/test/test_for_loop.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function for_(x) { @@ -33,7 +32,7 @@ function for_3(x) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -55,7 +54,7 @@ function for_4(x) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -76,7 +75,7 @@ function for_5(x, u) { })); } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } @@ -112,7 +111,7 @@ function for_6(x, u) { } } $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); return v.contents; } diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js index 125d43872e..6c0aa0b9e9 100644 --- a/jscomp/test/test_for_map.js +++ b/jscomp/test/test_for_map.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); function height(param) { @@ -188,7 +187,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -203,7 +202,7 @@ function find_first(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -225,7 +224,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -240,7 +239,7 @@ function find_first_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -266,7 +265,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -281,7 +280,7 @@ function find_last(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -303,7 +302,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -318,7 +317,7 @@ function find_last_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -501,7 +500,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -521,7 +520,7 @@ function update(x, f, param) { let l = param.l; let c = Caml.int_compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -562,7 +561,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -573,7 +572,7 @@ function map(f, param) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -591,7 +590,7 @@ function mapi(f, param) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -610,7 +609,7 @@ function fold(f, _m, _accu) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -622,7 +621,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -639,7 +638,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -749,7 +748,7 @@ function merge$1(f, s1, s2) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -767,7 +766,7 @@ function merge$1(f, s1, s2) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } function union(f, s1, s2) { @@ -787,7 +786,7 @@ function union(f, s1, s2) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -797,7 +796,7 @@ function union(f, s1, s2) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -812,7 +811,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -837,7 +836,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -893,7 +892,7 @@ function compare(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -922,7 +921,7 @@ function equal(cmp, m1, m2) { if (e1._0 !== e2._0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/jscomp/test/test_google_closure.js b/jscomp/test/test_google_closure.js index d399ff9dce..521a669292 100644 --- a/jscomp/test/test_google_closure.js +++ b/jscomp/test/test_google_closure.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); function f(a, b, param) { @@ -21,7 +20,7 @@ function f3(extra) { return 101; } -let b = Curry._1(f3, 2); +let b = f3(2); let arr = $$Array.init(2, (function (param) { return 0; @@ -31,7 +30,7 @@ for(let i = 0; i <= 1; ++i){ let f3$1 = function (extra) { return i + 1 | 0; }; - Caml_array.set(arr, i, Curry._1(f3$1, 2)); + Caml_array.set(arr, i, f3$1(2)); } console.log([ diff --git a/jscomp/test/test_list.js b/jscomp/test/test_list.js index 2822fd6b14..564d252d74 100644 --- a/jscomp/test/test_list.js +++ b/jscomp/test/test_list.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Pervasives = require("../../lib/js/pervasives.js"); @@ -110,7 +109,7 @@ function map(f, x) { if (!x) { return /* [] */0; } - let r = Curry._1(f, x.hd); + let r = f(x.hd); return { hd: r, tl: map(f, x.tl) @@ -121,7 +120,7 @@ function mapi(i, f, x) { if (!x) { return /* [] */0; } - let r = Curry._2(f, i, x.hd); + let r = f(i, x.hd); return { hd: r, tl: mapi(i + 1 | 0, f, x.tl) @@ -143,7 +142,7 @@ function rev_map(f, l) { } _x = x.tl; _accu = { - hd: Curry._1(f, x.hd), + hd: f(x.hd), tl: accu }; continue; @@ -156,7 +155,7 @@ function iter(f, _x) { if (!x) { return; } - Curry._1(f, x.hd); + f(x.hd); _x = x.tl; continue; }; @@ -171,7 +170,7 @@ function iteri(f, l) { if (!x) { return; } - Curry._2(f, i, x.hd); + f(i, x.hd); _x = x.tl; _i = i + 1 | 0; continue; @@ -186,14 +185,14 @@ function fold_left(f, _accu, _l) { return accu; } _l = l.tl; - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); continue; }; } function fold_right(f, l, accu) { if (l) { - return Curry._2(f, l.hd, fold_right(f, l.tl, accu)); + return f(l.hd, fold_right(f, l.tl, accu)); } else { return accu; } @@ -202,7 +201,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - let r = Curry._2(f, l1.hd, l2.hd); + let r = f(l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -239,7 +238,7 @@ function rev_map2(f, l1, l2) { _l2 = l2$1.tl; _l1 = l1$1.tl; _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; continue; @@ -269,7 +268,7 @@ function iter2(f, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -302,7 +301,7 @@ function fold_left2(f, _accu, _l1, _l2) { if (l2) { _l2 = l2.tl; _l1 = l1.tl; - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); continue; } throw new Error("Invalid_argument", { @@ -327,7 +326,7 @@ function fold_left2(f, _accu, _l1, _l2) { function fold_right2(f, l1, l2, accu) { if (l1) { if (l2) { - return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); + return f(l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -353,7 +352,7 @@ function for_all(p, _x) { if (!x) { return true; } - if (!Curry._1(p, x.hd)) { + if (!p(x.hd)) { return false; } _x = x.tl; @@ -367,7 +366,7 @@ function exists(p, _x) { if (!x) { return false; } - if (Curry._1(p, x.hd)) { + if (p(x.hd)) { return true; } _x = x.tl; @@ -381,7 +380,7 @@ function for_all2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -413,7 +412,7 @@ function exists2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -570,7 +569,7 @@ function find(p, _x) { let x = _x; if (x) { let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { return x$1; } _x = x.tl; @@ -596,7 +595,7 @@ function find_all(p) { } let l = x.tl; let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { _x = l; _accu = { hd: x$1, @@ -626,7 +625,7 @@ function partition(p, l) { } let l$1 = x.tl; let x$1 = x.hd; - if (Curry._1(p, x$1)) { + if (p(x$1)) { _x = l$1; _yes = { hd: x$1, @@ -702,7 +701,7 @@ function merge(cmp, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { return { hd: h1, tl: merge(cmp, l1.tl, l2) @@ -751,8 +750,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) <= 0) { - if (Curry._2(cmp, x2, x3) <= 0) { + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { return { hd: x1, tl: { @@ -763,7 +762,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x1, tl: { @@ -786,7 +785,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x2, tl: { @@ -797,7 +796,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) <= 0) { + } else if (cmp(x2, x3) <= 0) { return { hd: x2, tl: { @@ -831,7 +830,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) <= 0) { + if (cmp(x1$1, x2$1) <= 0) { return { hd: x1$1, tl: { @@ -871,7 +870,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) > 0) { + if (cmp(h1, h2) > 0) { _accu = { hd: h1, tl: accu @@ -897,8 +896,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) > 0) { - if (Curry._2(cmp, x2, x3) > 0) { + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { return { hd: x1, tl: { @@ -909,7 +908,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x1, tl: { @@ -932,7 +931,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x2, tl: { @@ -943,7 +942,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) > 0) { + } else if (cmp(x2, x3) > 0) { return { hd: x2, tl: { @@ -977,7 +976,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) > 0) { + if (cmp(x1$1, x2$1) > 0) { return { hd: x1$1, tl: { @@ -1017,7 +1016,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { _accu = { hd: h1, tl: accu @@ -1052,9 +1051,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1079,7 +1078,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1101,7 +1100,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1134,7 +1133,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1156,7 +1155,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1199,7 +1198,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1247,7 +1246,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1283,9 +1282,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1310,7 +1309,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1332,7 +1331,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1365,7 +1364,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1387,7 +1386,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1430,7 +1429,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1478,7 +1477,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, diff --git a/jscomp/test/test_match_exception.js b/jscomp/test/test_match_exception.js index 3e2ab2cf40..4fa365dee3 100644 --- a/jscomp/test/test_match_exception.js +++ b/jscomp/test/test_match_exception.js @@ -1,12 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function f(g, x) { try { - return Curry._1(g, x); + return g(x); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); diff --git a/jscomp/test/test_nested_print.js b/jscomp/test/test_nested_print.js index a7e5bfb8d1..d74ed08696 100644 --- a/jscomp/test/test_nested_print.js +++ b/jscomp/test/test_nested_print.js @@ -1,14 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function u(x, x$1) { return x$1 + x$1 | 0; } function f(g, x) { - let u = Curry._1(g, x); + let u = g(x); return u + u | 0; } diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js index 5b471c91dc..0f46ead324 100644 --- a/jscomp/test/test_per.js +++ b/jscomp/test/test_per.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_sys = require("../../lib/js/caml_sys.js"); let Caml_bytes = require("../../lib/js/caml_bytes.js"); @@ -443,17 +442,17 @@ let exit_function = { function at_exit(f) { let g = exit_function.contents; exit_function.contents = (function () { - Curry._1(f, undefined); - Curry._1(g, undefined); + f(); + g(); }); } function do_at_exit() { - Curry._1(exit_function.contents, undefined); + exit_function.contents(); } function exit(retcode) { - Curry._1(exit_function.contents, undefined); + exit_function.contents(); return Caml_sys.sys_exit(retcode); } diff --git a/jscomp/test/test_primitive.js b/jscomp/test/test_primitive.js index a61a29b06b..7ac5a138b3 100644 --- a/jscomp/test/test_primitive.js +++ b/jscomp/test/test_primitive.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let Caml_string = require("../../lib/js/caml_string.js"); let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); @@ -55,7 +54,7 @@ function u(b) { } function f2(h, b, param) { - return Curry._1(h, b ? 32 : 7); + return h(b ? 32 : 7); } Caml_array.set(v, 1, 3.0); diff --git a/jscomp/test/test_seq.js b/jscomp/test/test_seq.js index 8d6b6861c6..fe6bb57c1a 100644 --- a/jscomp/test/test_seq.js +++ b/jscomp/test/test_seq.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Pervasives = require("../../lib/js/pervasives.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); @@ -50,7 +49,7 @@ function v(speclist) { } function f(g, speclist) { - return Curry._1(g, assoc3("-help", speclist)); + return g(assoc3("-help", speclist)); } function add_help(speclist) { diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js index 064c3ee923..b20f62893c 100644 --- a/jscomp/test/test_set.js +++ b/jscomp/test/test_set.js @@ -2,7 +2,6 @@ 'use strict'; let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); function Make(Ord) { let height = function (x) { @@ -101,7 +100,7 @@ function Make(Ord) { let r = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return x_; } else if (c < 0) { @@ -231,7 +230,7 @@ function Make(Ord) { let r = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -267,7 +266,7 @@ function Make(Ord) { if (typeof x_ !== "object") { return false; } - let c = Curry._2(Ord.compare, x, x_._1); + let c = Ord.compare(x, x_._1); if (c === 0) { return true; } @@ -282,7 +281,7 @@ function Make(Ord) { let r = x_._2; let v = x_._1; let l = x_._0; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return merge(l, r); } else if (c < 0) { @@ -382,7 +381,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -412,7 +411,7 @@ function Make(Ord) { } let r2 = s2._2; let l2 = s2._0; - let c = Curry._2(Ord.compare, v1, s2._1); + let c = Ord.compare(v1, s2._1); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -454,7 +453,7 @@ function Make(Ord) { return; } iter(f, x_._0); - Curry._1(f, x_._1); + f(x_._1); _x_ = x_._2; continue; }; @@ -466,7 +465,7 @@ function Make(Ord) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s._1, fold(f, s._0, accu)); + _accu = f(s._1, fold(f, s._0, accu)); _s = s._2; continue; }; @@ -477,7 +476,7 @@ function Make(Ord) { if (typeof x !== "object") { return true; } - if (!Curry._1(p, x._1)) { + if (!p(x._1)) { return false; } if (!for_all(p, x._0)) { @@ -493,7 +492,7 @@ function Make(Ord) { if (typeof x !== "object") { return false; } - if (Curry._1(p, x._1)) { + if (p(x._1)) { return true; } if (exists(p, x._0)) { @@ -509,7 +508,7 @@ function Make(Ord) { } let v = x._1; let l$p = filter(p, x._0); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, x._2); if (pv) { return join(l$p, v, r$p); @@ -528,7 +527,7 @@ function Make(Ord) { let match = partition(p, x._0); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, x._2); let rf = match$1[1]; let rt = match$1[0]; @@ -580,7 +579,7 @@ function Make(Ord) { }); } let v = x_._1; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return v; } diff --git a/jscomp/test/test_simple_ref.js b/jscomp/test/test_simple_ref.js index 1aa08a2aae..3fd4056ff3 100644 --- a/jscomp/test/test_simple_ref.js +++ b/jscomp/test/test_simple_ref.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let v = { contents: 0 @@ -25,7 +24,7 @@ let c = { let not_real_escape = a; function real_escape(f, v) { - return Curry._1(f, c); + return f(c); } let u = h; diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js index 4c0b077ed7..9aa866bb25 100644 --- a/jscomp/test/test_string_map.js +++ b/jscomp/test/test_string_map.js @@ -2,7 +2,6 @@ 'use strict'; let Caml = require("../../lib/js/caml.js"); -let Curry = require("../../lib/js/curry.js"); function height(param) { if (typeof param !== "object") { @@ -159,7 +158,7 @@ function find(x, _param) { function timing(label, f) { console.time(label); - Curry._1(f, undefined); + f(); console.timeEnd(label); } diff --git a/jscomp/test/test_switch.js b/jscomp/test/test_switch.js index 6cd0bab8e5..cf69436849 100644 --- a/jscomp/test/test_switch.js +++ b/jscomp/test/test_switch.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f(x) { if (typeof x !== "object") { @@ -28,7 +27,7 @@ function bind(x, f) { if (x.TAG === "Left") { return { TAG: "Left", - _0: Curry._1(f, x._0) + _0: f(x._0) }; } else { return x; diff --git a/jscomp/test/test_trywith.js b/jscomp/test/test_trywith.js index 8753b5e568..1f81560003 100644 --- a/jscomp/test/test_trywith.js +++ b/jscomp/test/test_trywith.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -15,7 +14,7 @@ let Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_blo function ff(g, x) { try { - Curry._1(g, x); + g(x); } catch (raw_exn){ let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); @@ -27,7 +26,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$1){ let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); @@ -39,7 +38,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$2){ let exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2); @@ -51,7 +50,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$3){ let exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3); @@ -63,7 +62,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$4){ let exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4); @@ -75,7 +74,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$5){ let exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5); @@ -87,7 +86,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$6){ let exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6); @@ -99,7 +98,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$7){ let exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7); @@ -111,7 +110,7 @@ function ff(g, x) { } try { - Curry._1(g, x); + g(x); } catch (raw_exn$8){ let exn$8 = Caml_js_exceptions.internalToOCamlException(raw_exn$8); @@ -123,7 +122,7 @@ function ff(g, x) { } try { - return Curry._1(g, x); + return g(x); } catch (raw_exn$9){ let exn$9 = Caml_js_exceptions.internalToOCamlException(raw_exn$9); diff --git a/jscomp/test/test_type_based_arity.js b/jscomp/test/test_type_based_arity.js index eb66db3e62..89fd9368c5 100644 --- a/jscomp/test/test_type_based_arity.js +++ b/jscomp/test/test_type_based_arity.js @@ -1,66 +1,65 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f0(g, x) { - return Curry._1(g, x); + return g(x); } function f1(g, x) { - Curry._1(g, x); + g(x); } let X = {}; function f2(g, x) { - return Curry._1(g, x); + return g(x); } function f3(g, x) { - Curry._1(g, x); + g(x); } function f4(g, x) { - return Curry._1(g, x); + return g(x); } function f5(g, x) { - return Curry._1(g, x); + return g(x); } function f6(g, x) { - return Curry._1(g, x); + return g(x); } function f7(g, x) { - return Curry._1(g, x); + return g(x); } let X0 = {}; function f8(g, x) { - return Curry._1(g, x); + return g(x); } function f9(g, x) { - return Curry._1(g, x); + return g(x); } function f10(g, x) { - return Curry._1(g, x); + return g(x); } function f11(g, x) { - return Curry._1(g, x); + return g(x); } function f12(g, x) { - return Curry._1(g, x); + return g(x); } function f13(g, x) { - return Curry._1(g, x); + return g(x); } let X2 = { @@ -68,7 +67,7 @@ let X2 = { }; function f14(h, g, x) { - Curry._2(h, g, x); + h(g, x); } exports.f0 = f0; diff --git a/jscomp/test/test_while_closure.js b/jscomp/test/test_while_closure.js index 905541aea4..ebca37f982 100644 --- a/jscomp/test/test_while_closure.js +++ b/jscomp/test/test_while_closure.js @@ -2,7 +2,6 @@ 'use strict'; let $$Array = require("../../lib/js/array.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_array = require("../../lib/js/caml_array.js"); let v = { @@ -27,7 +26,7 @@ function f() { f(); $$Array.iter((function (x) { - Curry._1(x, undefined); + x(); }), arr); console.log(String(v.contents)); diff --git a/jscomp/test/test_zero_nullable.js b/jscomp/test/test_zero_nullable.js index 41bdcb3fb3..72737d80b0 100644 --- a/jscomp/test/test_zero_nullable.js +++ b/jscomp/test/test_zero_nullable.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Caml_option = require("../../lib/js/caml_option.js"); let suites = { @@ -47,7 +46,7 @@ function f2(x) { } function f5(h, x) { - let u = Curry._1(h, 32); + let u = h(32); if (u !== null) { return u + 1 | 0; } else { @@ -56,7 +55,7 @@ function f5(h, x) { } function f4(h, x) { - let u = Curry._1(h, 32); + let u = h(32); let v = 32 + x | 0; if (u !== null) { return u + 1 | 0; @@ -132,7 +131,7 @@ function f2$1(x) { } function f5$1(h, x) { - let u = Curry._1(h, 32); + let u = h(32); if (u !== undefined) { return u + 1 | 0; } else { @@ -141,7 +140,7 @@ function f5$1(h, x) { } function f4$1(h, x) { - let u = Curry._1(h, 32); + let u = h(32); let v = 32 + x | 0; if (u !== undefined) { return u + 1 | 0; @@ -217,7 +216,7 @@ function f2$2(x) { } function f5$2(h, x) { - let u = Curry._1(h, 32); + let u = h(32); if (u == null) { return 3; } else { @@ -226,7 +225,7 @@ function f5$2(h, x) { } function f4$2(h, x) { - let u = Curry._1(h, 32); + let u = h(32); let v = 32 + x | 0; if (u == null) { return 1 + v | 0; diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js index 58c91f9fd1..c785f5687c 100644 --- a/jscomp/test/ticker.js +++ b/jscomp/test/ticker.js @@ -3,7 +3,6 @@ let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Pervasives = require("../../lib/js/pervasives.js"); @@ -280,7 +279,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -295,7 +294,7 @@ function find_first(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -317,7 +316,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -332,7 +331,7 @@ function find_first_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -358,7 +357,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -373,7 +372,7 @@ function find_last(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -395,7 +394,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -410,7 +409,7 @@ function find_last_opt(f, _param) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -593,7 +592,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -613,7 +612,7 @@ function update(x, f, param) { let l = param.l; let c = Caml_obj.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -654,7 +653,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -665,7 +664,7 @@ function map(f, param) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -683,7 +682,7 @@ function mapi(f, param) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -702,7 +701,7 @@ function fold(f, _m, _accu) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -714,7 +713,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -731,7 +730,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -841,7 +840,7 @@ function merge$1(f, s1, s2) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split$1(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -859,7 +858,7 @@ function merge$1(f, s1, s2) { } let v2 = s2.v; let match$1 = split$1(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } function union(f, s1, s2) { @@ -879,7 +878,7 @@ function union(f, s1, s2) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -889,7 +888,7 @@ function union(f, s1, s2) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -904,7 +903,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -929,7 +928,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -985,7 +984,7 @@ function compare(cmp, m1, m2) { if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -1014,7 +1013,7 @@ function equal(cmp, m1, m2) { if (!Caml_obj.equal(e1._0, e2._0)) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/jscomp/test/topsort_test.js b/jscomp/test/topsort_test.js index e624fc366f..d9f7b1d719 100644 --- a/jscomp/test/topsort_test.js +++ b/jscomp/test/topsort_test.js @@ -3,7 +3,6 @@ let Caml = require("../../lib/js/caml.js"); let List = require("../../lib/js/list.js"); -let Curry = require("../../lib/js/curry.js"); let $$String = require("../../lib/js/string.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Pervasives = require("../../lib/js/pervasives.js"); @@ -976,7 +975,7 @@ function iter(f, _param) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -989,7 +988,7 @@ function fold(f, _s, _accu) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -1001,7 +1000,7 @@ function for_all(p, _param) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -1018,7 +1017,7 @@ function exists(p, _param) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -1037,7 +1036,7 @@ function filter(p, param) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -1061,7 +1060,7 @@ function partition(p, param) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -1137,7 +1136,7 @@ function find_first(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -1147,7 +1146,7 @@ function find_first(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -1168,7 +1167,7 @@ function find_first_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -1178,7 +1177,7 @@ function find_first_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -1203,7 +1202,7 @@ function find_last(f, _param) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -1213,7 +1212,7 @@ function find_last(f, _param) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -1234,7 +1233,7 @@ function find_last_opt(f, _param) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -1244,7 +1243,7 @@ function find_last_opt(f, _param) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -1282,7 +1281,7 @@ function map(f, param) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/jscomp/test/tramp_fib.js b/jscomp/test/tramp_fib.js index e33d838404..be13bb677f 100644 --- a/jscomp/test/tramp_fib.js +++ b/jscomp/test/tramp_fib.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let suites = { contents: /* [] */0 @@ -18,14 +17,14 @@ function eq(loc, x, y) { function fib(n, k) { if (n === 0 || n === 1) { - return Curry._1(k, 1); + return k(1); } else { return { TAG: "Suspend", _0: (function () { return fib(n - 1 | 0, (function (v0) { return fib(n - 2 | 0, (function (v1) { - return Curry._1(k, v0 + v1 | 0); + return k(v0 + v1 | 0); })); })); }) @@ -46,7 +45,7 @@ function iter(_bounce) { if (bounce.TAG === "Continue") { return bounce._0; } - _bounce = Curry._1(bounce._0, undefined); + _bounce = bounce._0(); continue; }; } diff --git a/jscomp/test/tuple_alloc.js b/jscomp/test/tuple_alloc.js index b664061415..412bddc78b 100644 --- a/jscomp/test/tuple_alloc.js +++ b/jscomp/test/tuple_alloc.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let v = { contents: 0 @@ -28,14 +27,14 @@ function incr2() { } function f(a, b, d, e) { - let h = Curry._1(a, b); - let u = Curry._1(d, h); - let v = Curry._1(e, h); + let h = a(b); + let u = d(h); + let v = e(h); return u + v | 0; } function kf(cb, v) { - Curry._1(cb, v); + cb(v); return v + v | 0; } diff --git a/jscomp/test/type_disambiguate.js b/jscomp/test/type_disambiguate.js index c2c94901be..22dd58bcc4 100644 --- a/jscomp/test/type_disambiguate.js +++ b/jscomp/test/type_disambiguate.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let N = {}; @@ -11,7 +10,7 @@ function f(e) { function f1(e) { let c = e.c; - return ((e.a + e.b | 0) + c | 0) + Curry._1(e.d, c) | 0; + return ((e.a + e.b | 0) + c | 0) + e.d(c) | 0; } exports.N = N; diff --git a/jscomp/test/unboxed_crash.js b/jscomp/test/unboxed_crash.js index 96af2b0708..f556f3b58a 100644 --- a/jscomp/test/unboxed_crash.js +++ b/jscomp/test/unboxed_crash.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function g(x) { - return Curry._1(x, x); + return x(x); } let loop = g(g); diff --git a/jscomp/test/unboxed_use_case.js b/jscomp/test/unboxed_use_case.js index 45124f4231..a4b2d91ae6 100644 --- a/jscomp/test/unboxed_use_case.js +++ b/jscomp/test/unboxed_use_case.js @@ -1,13 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); function map_pair(r, param) { return [ - Curry._1(r, param[0]), - Curry._1(r, param[1]) + r(param[0]), + r(param[1]) ]; } diff --git a/jscomp/test/uncurried_default.args.js b/jscomp/test/uncurried_default.args.js index 7eb06af33c..21822c00fe 100644 --- a/jscomp/test/uncurried_default.args.js +++ b/jscomp/test/uncurried_default.args.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function withOpt(xOpt, y) { let x = xOpt !== undefined ? xOpt : 1; @@ -11,11 +10,11 @@ function withOpt(xOpt, y) { }; } -let testWithOpt = Curry._2(withOpt(undefined, 3), undefined, 4); +let testWithOpt = withOpt(undefined, 3)(undefined, 4); -let partial = Curry._2(withOpt(10, 3), 4, 11); +let partial = withOpt(10, 3)(4, 11); -let total = Curry._2(withOpt(10, 3), 4, 11); +let total = withOpt(10, 3)(4, 11); function foo1(xOpt, y) { let x = xOpt !== undefined ? xOpt : 3; @@ -63,9 +62,9 @@ function withOpt$1(xOpt, y) { }; } -let testWithOpt$1 = Curry._2(withOpt$1(undefined, 3), undefined, 4); +let testWithOpt$1 = withOpt$1(undefined, 3)(undefined, 4); -let total$1 = Curry._2(withOpt$1(10, 3), 4, 11); +let total$1 = withOpt$1(10, 3)(4, 11); function foo1$1(xOpt, y) { let x = xOpt !== undefined ? xOpt : 3; @@ -93,7 +92,7 @@ function foo3$1(xOpt, yOpt, param) { } function foo(func) { - return Curry._1(func, undefined) + 1 | 0; + return func() + 1 | 0; } let M = { diff --git a/jscomp/test/uncurry_glob_test.js b/jscomp/test/uncurry_glob_test.js index adb2b3035b..cd2c5f391a 100644 --- a/jscomp/test/uncurry_glob_test.js +++ b/jscomp/test/uncurry_glob_test.js @@ -1,10 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function M(U) { - let v = Curry._2(U.f, 100, "x"); + let v = U.f(100, "x"); return { v: v }; @@ -15,11 +14,11 @@ function f() { } function $plus$great(a, h) { - return Curry._1(h, a); + return h(a); } function u(h) { - return Curry._1(h, 3); + return h(3); } exports.M = M; diff --git a/jscomp/test/uncurry_test.js b/jscomp/test/uncurry_test.js index f4b1c0cb4a..80632c7bcc 100644 --- a/jscomp/test/uncurry_test.js +++ b/jscomp/test/uncurry_test.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); function f0() { return 0; @@ -35,7 +34,7 @@ function xx() { } function log2(logger, message, obj) { - Curry._2(logger.log2, message, obj); + logger.log2(message, obj); } exports.f0 = f0; diff --git a/jscomp/test/unsafe_ppx_test.js b/jscomp/test/unsafe_ppx_test.js index 2d053349d0..f0e9d4a747 100644 --- a/jscomp/test/unsafe_ppx_test.js +++ b/jscomp/test/unsafe_ppx_test.js @@ -2,7 +2,6 @@ 'use strict'; let Mt = require("./mt.js"); -let Curry = require("../../lib/js/curry.js"); let Pervasives = require("../../lib/js/pervasives.js"); let Ffi_js_test = require("./ffi_js_test.js"); @@ -25,28 +24,30 @@ function g(a) { }); let regression2 = Math.max; regression(a, Pervasives.failwith); - Curry._2(regression2, 3, 2); - Curry._2(regression3, 3, 2); - Curry._2(regression4, 3, (function (x) { + regression2(3, 2); + regression3(3, 2); + regression4(3, (function (x) { return x; })); } let max2 = Math.max; -let umax = Curry.__2(max2); +function umax(a, b) { + return max2(a, b); +} function u(h) { - return Curry._2(max2, 3, h); + return max2(3, h); } let max3 = Math.max; function uu(h) { - return Curry._2(max2, 3, h); + return max2(3, h); } -let empty = Curry._1(Object.keys, 3); +let empty = Object.keys(3); let v = $$test(1, 2); @@ -57,7 +58,7 @@ Mt.from_pair_suites("Unsafe_ppx_test", { return { TAG: "Eq", _0: 2, - _1: Curry._2(max, 1, 2) + _1: max(1, 2) }; }) ], @@ -79,7 +80,7 @@ Mt.from_pair_suites("Unsafe_ppx_test", { return { TAG: "Eq", _0: 2, - _1: Curry._2(Math.max, 1, 2) + _1: Math.max(1, 2) }; }) ], diff --git a/jscomp/test/variant.js b/jscomp/test/variant.js index 27a8b3a8d2..40c6abea1f 100644 --- a/jscomp/test/variant.js +++ b/jscomp/test/variant.js @@ -1,7 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -let Curry = require("../../lib/js/curry.js"); let Caml_obj = require("../../lib/js/caml_obj.js"); let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); @@ -116,7 +115,7 @@ let ED = /* @__PURE__ */Caml_exceptions.create("Variant.ED"); function fooExn(f) { try { - return Curry._1(f, undefined); + return f(); } catch (raw_n){ let n = Caml_js_exceptions.internalToOCamlException(raw_n); diff --git a/lib/es6/arg.js b/lib/es6/arg.js index dcefd7bd82..c65c77c67f 100644 --- a/lib/es6/arg.js +++ b/lib/es6/arg.js @@ -4,7 +4,6 @@ import * as Sys from "./sys.js"; import * as Caml from "./caml.js"; import * as List from "./list.js"; import * as $$Array from "./array.js"; -import * as Curry from "./curry.js"; import * as Buffer from "./buffer.js"; import * as $$String from "./string.js"; import * as Caml_obj from "./caml_obj.js"; @@ -337,12 +336,12 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let treat_action = function (f) { switch (f.TAG) { case "Unit" : - return Curry._1(f._0, undefined); + return f._0(); case "Bool" : let arg = get_arg(); let s$1 = bool_of_string_opt(arg); if (s$1 !== undefined) { - Curry._1(f._0, s$1); + f._0(s$1); } else { throw new Error(Stop, { cause: { @@ -367,7 +366,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist return; case "String" : let arg$1 = get_arg(); - Curry._1(f._0, arg$1); + f._0(arg$1); return consume_arg(); case "Set_string" : f._0.contents = get_arg(); @@ -376,7 +375,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let arg$2 = get_arg(); let x = int_of_string_opt(arg$2); if (x !== undefined) { - Curry._1(f._0, x); + f._0(x); } else { throw new Error(Stop, { cause: { @@ -414,7 +413,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let arg$4 = get_arg(); let x$2 = float_of_string_opt(arg$4); if (x$2 !== undefined) { - Curry._1(f._0, x$2); + f._0(x$2); } else { throw new Error(Stop, { cause: { @@ -454,7 +453,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let symb = f._0; let arg$6 = get_arg(); if (List.mem(arg$6, symb)) { - Curry._1(f._1, arg$6); + f._1(arg$6); return consume_arg(); } throw new Error(Stop, { @@ -471,7 +470,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist case "Rest" : let f$1 = f._0; while(current.contents < (argv.contents.length - 1 | 0)) { - Curry._1(f$1, Caml_array.get(argv.contents, current.contents + 1 | 0)); + f$1(Caml_array.get(argv.contents, current.contents + 1 | 0)); consume_arg(); }; return; @@ -485,7 +484,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }); } let arg$7 = get_arg(); - let newarg = Curry._1(f._0, arg$7); + let newarg = f._0(arg$7); consume_arg(); let before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); let after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); @@ -505,7 +504,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; treat_action(match[0]); } else { - Curry._1(anonfun, s); + anonfun(s); } } catch (raw_m){ diff --git a/lib/es6/array.js b/lib/es6/array.js index 9ca9bf4969..c027a50579 100644 --- a/lib/es6/array.js +++ b/lib/es6/array.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_obj from "./caml_obj.js"; import * as Caml_array from "./caml_array.js"; import * as Caml_exceptions from "./caml_exceptions.js"; @@ -22,9 +21,9 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f, 0)); + let res = Caml_array.make(l, f(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } @@ -97,7 +96,7 @@ function blit(a1, ofs1, a2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } @@ -111,7 +110,7 @@ function iter2(f, a, b) { }); } for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, a[i], b[i]); + f(a[i], b[i]); } } @@ -120,9 +119,9 @@ function map(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f, a[0])); + let r = Caml_array.make(l, f(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } @@ -141,16 +140,16 @@ function map2(f, a, b) { if (la === 0) { return []; } - let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + let r = Caml_array.make(la, f(a[0], b[0])); for(let i = 1; i < la; ++i){ - r[i] = Curry._2(f, a[i], b[i]); + r[i] = f(a[i], b[i]); } return r; } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -159,9 +158,9 @@ function mapi(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + let r = Caml_array.make(l, f(0, a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } @@ -220,7 +219,7 @@ function of_list(param) { function fold_left(f, x, a) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } @@ -228,7 +227,7 @@ function fold_left(f, x, a) { function fold_right(f, a, x) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, a[i], r); + r = f(a[i], r); } return r; } @@ -241,7 +240,7 @@ function exists(p, a) { if (i === n) { return false; } - if (Curry._1(p, a[i])) { + if (p(a[i])) { return true; } _i = i + 1 | 0; @@ -257,7 +256,7 @@ function for_all(p, a) { if (i === n) { return true; } - if (!Curry._1(p, a[i])) { + if (!p(a[i])) { return false; } _i = i + 1 | 0; @@ -304,15 +303,15 @@ function sort(cmp, a) { let i31 = ((i + i | 0) + i | 0) + 1 | 0; let x = i31; if ((i31 + 2 | 0) < l) { - if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if (cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; } - if (Curry._2(cmp, Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { + if (cmp(Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { x = i31 + 2 | 0; } return x; } - if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if ((i31 + 1 | 0) < l && cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { return i31 + 1 | 0; } if (i31 < l) { @@ -331,7 +330,7 @@ function sort(cmp, a) { while(true) { let i$1 = _i; let j = maxson(l, i$1); - if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { + if (cmp(Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } Caml_array.set(a, i$1, Caml_array.get(a, j)); @@ -386,7 +385,7 @@ function sort(cmp, a) { } }); } - if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) { + if (cmp(Caml_array.get(a, father), e) >= 0) { return Caml_array.set(a, i, e); } Caml_array.set(a, i, Caml_array.get(a, father)); @@ -429,7 +428,7 @@ function stable_sort(cmp, a) { let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { Caml_array.set(dst, d, s1); let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -455,7 +454,7 @@ function stable_sort(cmp, a) { for(let i = 0; i < len; ++i){ let e = Caml_array.get(a, srcofs + i | 0); let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { + while(j >= dstofs && cmp(Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; }; diff --git a/lib/es6/arrayLabels.js b/lib/es6/arrayLabels.js index c938c3b9b1..cf122ba8dd 100644 --- a/lib/es6/arrayLabels.js +++ b/lib/es6/arrayLabels.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_obj from "./caml_obj.js"; import * as Caml_array from "./caml_array.js"; import * as Caml_exceptions from "./caml_exceptions.js"; @@ -22,9 +21,9 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f, 0)); + let res = Caml_array.make(l, f(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } @@ -97,7 +96,7 @@ function blit(a1, ofs1, a2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } @@ -111,7 +110,7 @@ function iter2(f, a, b) { }); } for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, a[i], b[i]); + f(a[i], b[i]); } } @@ -120,9 +119,9 @@ function map(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f, a[0])); + let r = Caml_array.make(l, f(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } @@ -141,16 +140,16 @@ function map2(f, a, b) { if (la === 0) { return []; } - let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + let r = Caml_array.make(la, f(a[0], b[0])); for(let i = 1; i < la; ++i){ - r[i] = Curry._2(f, a[i], b[i]); + r[i] = f(a[i], b[i]); } return r; } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -159,9 +158,9 @@ function mapi(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + let r = Caml_array.make(l, f(0, a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } @@ -220,7 +219,7 @@ function of_list(param) { function fold_left(f, x, a) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } @@ -228,7 +227,7 @@ function fold_left(f, x, a) { function fold_right(f, a, x) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, a[i], r); + r = f(a[i], r); } return r; } @@ -241,7 +240,7 @@ function exists(p, a) { if (i === n) { return false; } - if (Curry._1(p, a[i])) { + if (p(a[i])) { return true; } _i = i + 1 | 0; @@ -257,7 +256,7 @@ function for_all(p, a) { if (i === n) { return true; } - if (!Curry._1(p, a[i])) { + if (!p(a[i])) { return false; } _i = i + 1 | 0; @@ -304,15 +303,15 @@ function sort(cmp, a) { let i31 = ((i + i | 0) + i | 0) + 1 | 0; let x = i31; if ((i31 + 2 | 0) < l) { - if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if (cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; } - if (Curry._2(cmp, Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { + if (cmp(Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { x = i31 + 2 | 0; } return x; } - if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if ((i31 + 1 | 0) < l && cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { return i31 + 1 | 0; } if (i31 < l) { @@ -331,7 +330,7 @@ function sort(cmp, a) { while(true) { let i$1 = _i; let j = maxson(l, i$1); - if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { + if (cmp(Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } Caml_array.set(a, i$1, Caml_array.get(a, j)); @@ -386,7 +385,7 @@ function sort(cmp, a) { } }); } - if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) { + if (cmp(Caml_array.get(a, father), e) >= 0) { return Caml_array.set(a, i, e); } Caml_array.set(a, i, Caml_array.get(a, father)); @@ -429,7 +428,7 @@ function stable_sort(cmp, a) { let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { Caml_array.set(dst, d, s1); let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -455,7 +454,7 @@ function stable_sort(cmp, a) { for(let i = 0; i < len; ++i){ let e = Caml_array.get(a, srcofs + i | 0); let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { + while(j >= dstofs && cmp(Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; }; diff --git a/lib/es6/belt_Array.js b/lib/es6/belt_Array.js index 58ddfcb68f..ddfd231929 100644 --- a/lib/es6/belt_Array.js +++ b/lib/es6/belt_Array.js @@ -1,7 +1,6 @@ import * as Caml from "./caml.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function get(arr, i) { @@ -108,13 +107,15 @@ function makeByU(l, f) { } let res = new Array(l); for(let i = 0; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } function makeBy(l, f) { - return makeByU(l, Curry.__1(f)); + return makeByU(l, (function (a) { + return f(a); + })); } function makeByAndShuffleU(l, f) { @@ -124,7 +125,9 @@ function makeByAndShuffleU(l, f) { } function makeByAndShuffle(l, f) { - return makeByAndShuffleU(l, Curry.__1(f)); + return makeByAndShuffleU(l, (function (a) { + return f(a); + })); } function range(start, finish) { @@ -174,13 +177,15 @@ function zipByU(xs, ys, f) { let len = lenx < leny ? lenx : leny; let s = new Array(len); for(let i = 0; i < len; ++i){ - s[i] = Curry._2(f, xs[i], ys[i]); + s[i] = f(xs[i], ys[i]); } return s; } function zipBy(xs, ys, f) { - return zipByU(xs, ys, Curry.__2(f)); + return zipByU(xs, ys, (function (a, b) { + return f(a, b); + })); } function concat(a1, a2) { @@ -290,25 +295,29 @@ function blit(a1, ofs1, a2, ofs2, len) { function forEachU(a, f) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function forEach(a, f) { - forEachU(a, Curry.__1(f)); + forEachU(a, (function (a) { + f(a); + })); } function mapU(a, f) { let l = a.length; let r = new Array(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } function map(a, f) { - return mapU(a, Curry.__1(f)); + return mapU(a, (function (a) { + return f(a); + })); } function flatMapU(a, f) { @@ -316,7 +325,9 @@ function flatMapU(a, f) { } function flatMap(a, f) { - return concatMany(mapU(a, Curry.__1(f))); + return concatMany(mapU(a, (function (a) { + return f(a); + }))); } function getByU(a, p) { @@ -325,7 +336,7 @@ function getByU(a, p) { let r; while(r === undefined && i < l) { let v = a[i]; - if (Curry._1(p, v)) { + if (p(v)) { r = Caml_option.some(v); } i = i + 1 | 0; @@ -334,7 +345,9 @@ function getByU(a, p) { } function getBy(a, p) { - return getByU(a, Curry.__1(p)); + return getByU(a, (function (a) { + return p(a); + })); } function getIndexByU(a, p) { @@ -343,7 +356,7 @@ function getIndexByU(a, p) { let r; while(r === undefined && i < l) { let v = a[i]; - if (Curry._1(p, v)) { + if (p(v)) { r = i; } i = i + 1 | 0; @@ -352,7 +365,9 @@ function getIndexByU(a, p) { } function getIndexBy(a, p) { - return getIndexByU(a, Curry.__1(p)); + return getIndexByU(a, (function (a) { + return p(a); + })); } function keepU(a, f) { @@ -361,7 +376,7 @@ function keepU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - if (Curry._1(f, v)) { + if (f(v)) { r[j] = v; j = j + 1 | 0; } @@ -372,7 +387,9 @@ function keepU(a, f) { } function keep(a, f) { - return keepU(a, Curry.__1(f)); + return keepU(a, (function (a) { + return f(a); + })); } function keepWithIndexU(a, f) { @@ -381,7 +398,7 @@ function keepWithIndexU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - if (Curry._2(f, v, i)) { + if (f(v, i)) { r[j] = v; j = j + 1 | 0; } @@ -392,7 +409,9 @@ function keepWithIndexU(a, f) { } function keepWithIndex(a, f) { - return keepWithIndexU(a, Curry.__2(f)); + return keepWithIndexU(a, (function (a, i) { + return f(a, i); + })); } function keepMapU(a, f) { @@ -401,7 +420,7 @@ function keepMapU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - let v$1 = Curry._1(f, v); + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -413,79 +432,93 @@ function keepMapU(a, f) { } function keepMap(a, f) { - return keepMapU(a, Curry.__1(f)); + return keepMapU(a, (function (a) { + return f(a); + })); } function forEachWithIndexU(a, f) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } function forEachWithIndex(a, f) { - forEachWithIndexU(a, Curry.__2(f)); + forEachWithIndexU(a, (function (a, b) { + f(a, b); + })); } function mapWithIndexU(a, f) { let l = a.length; let r = new Array(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } function mapWithIndex(a, f) { - return mapWithIndexU(a, Curry.__2(f)); + return mapWithIndexU(a, (function (a, b) { + return f(a, b); + })); } function reduceU(a, x, f) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } function reduce(a, x, f) { - return reduceU(a, x, Curry.__2(f)); + return reduceU(a, x, (function (a, b) { + return f(a, b); + })); } function reduceReverseU(a, x, f) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } function reduceReverse(a, x, f) { - return reduceReverseU(a, x, Curry.__2(f)); + return reduceReverseU(a, x, (function (a, b) { + return f(a, b); + })); } function reduceReverse2U(a, b, x, f) { let r = x; let len = Caml.int_min(a.length, b.length); for(let i = len - 1 | 0; i >= 0; --i){ - r = Curry._3(f, r, a[i], b[i]); + r = f(r, a[i], b[i]); } return r; } function reduceReverse2(a, b, x, f) { - return reduceReverse2U(a, b, x, Curry.__3(f)); + return reduceReverse2U(a, b, x, (function (a, b, c) { + return f(a, b, c); + })); } function reduceWithIndexU(a, x, f) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._3(f, r, a[i], i); + r = f(r, a[i], i); } return r; } function reduceWithIndex(a, x, f) { - return reduceWithIndexU(a, x, Curry.__3(f)); + return reduceWithIndexU(a, x, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(arr, b) { @@ -496,7 +529,7 @@ function everyU(arr, b) { if (i === len) { return true; } - if (!Curry._1(b, arr[i])) { + if (!b(arr[i])) { return false; } _i = i + 1 | 0; @@ -505,7 +538,9 @@ function everyU(arr, b) { } function every(arr, f) { - return everyU(arr, Curry.__1(f)); + return everyU(arr, (function (b) { + return f(b); + })); } function someU(arr, b) { @@ -516,7 +551,7 @@ function someU(arr, b) { if (i === len) { return false; } - if (Curry._1(b, arr[i])) { + if (b(arr[i])) { return true; } _i = i + 1 | 0; @@ -525,7 +560,9 @@ function someU(arr, b) { } function some(arr, f) { - return someU(arr, Curry.__1(f)); + return someU(arr, (function (b) { + return f(b); + })); } function everyAux2(arr1, arr2, _i, b, len) { @@ -534,7 +571,7 @@ function everyAux2(arr1, arr2, _i, b, len) { if (i === len) { return true; } - if (!Curry._2(b, arr1[i], arr2[i])) { + if (!b(arr1[i], arr2[i])) { return false; } _i = i + 1 | 0; @@ -547,7 +584,9 @@ function every2U(a, b, p) { } function every2(a, b, p) { - return every2U(a, b, Curry.__2(p)); + return every2U(a, b, (function (a, b) { + return p(a, b); + })); } function some2U(a, b, p) { @@ -558,7 +597,7 @@ function some2U(a, b, p) { if (i === len) { return false; } - if (Curry._2(p, a[i], b[i])) { + if (p(a[i], b[i])) { return true; } _i = i + 1 | 0; @@ -567,7 +606,9 @@ function some2U(a, b, p) { } function some2(a, b, p) { - return some2U(a, b, Curry.__2(p)); + return some2U(a, b, (function (a, b) { + return p(a, b); + })); } function eqU(a, b, p) { @@ -581,7 +622,9 @@ function eqU(a, b, p) { } function eq(a, b, p) { - return eqU(a, b, Curry.__2(p)); + return eqU(a, b, (function (a, b) { + return p(a, b); + })); } function cmpU(a, b, p) { @@ -598,7 +641,7 @@ function cmpU(a, b, p) { if (i === lena) { return 0; } - let c = Curry._2(p, a[i], b[i]); + let c = p(a[i], b[i]); if (c !== 0) { return c; } @@ -609,7 +652,9 @@ function cmpU(a, b, p) { } function cmp(a, b, p) { - return cmpU(a, b, Curry.__2(p)); + return cmpU(a, b, (function (a, b) { + return p(a, b); + })); } function partitionU(a, f) { @@ -620,7 +665,7 @@ function partitionU(a, f) { let a2 = new Array(l); for(let ii = 0; ii < l; ++ii){ let v = a[ii]; - if (Curry._1(f, v)) { + if (f(v)) { a1[i] = v; i = i + 1 | 0; } else { @@ -637,7 +682,9 @@ function partitionU(a, f) { } function partition(a, f) { - return partitionU(a, Curry.__1(f)); + return partitionU(a, (function (x) { + return f(x); + })); } function unzip(a) { @@ -667,28 +714,32 @@ function joinWithU(a, sep, toString) { let res = _res; let i = _i; if (i === lastIndex) { - return res + Curry._1(toString, a[i]); + return res + toString(a[i]); } - _res = res + (Curry._1(toString, a[i]) + sep); + _res = res + (toString(a[i]) + sep); _i = i + 1 | 0; continue; }; } function joinWith(a, sep, toString) { - return joinWithU(a, sep, Curry.__1(toString)); + return joinWithU(a, sep, (function (x) { + return toString(x); + })); } function initU(n, f) { let v = new Array(n); for(let i = 0; i < n; ++i){ - v[i] = Curry._1(f, i); + v[i] = f(i); } return v; } function init(n, f) { - return initU(n, Curry.__1(f)); + return initU(n, (function (i) { + return f(i); + })); } export { diff --git a/lib/es6/belt_HashMap.js b/lib/es6/belt_HashMap.js index 6039cadba7..abefcddf27 100644 --- a/lib/es6/belt_HashMap.js +++ b/lib/es6/belt_HashMap.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalBuckets from "./belt_internalBuckets.js"; import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; @@ -15,7 +14,7 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { if (old_bucket === undefined) { return; } - let nidx = Curry._1(hash, old_bucket.key) & (h_buckets.length - 1 | 0); + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; @@ -31,7 +30,7 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(eq, key, info, _cell) { while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { cell.value = info; return false; } @@ -47,7 +46,7 @@ function replaceInBucket(eq, key, info, _cell) { function set0(h, key, value, eq, hash) { let h_buckets = h.buckets; let buckets_len = h_buckets.length; - let i = Curry._1(hash, key) & (buckets_len - 1 | 0); + let i = hash(key) & (buckets_len - 1 | 0); let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(eq, key, value, l)) { @@ -98,13 +97,13 @@ function set(h, key, value) { function remove(h, key) { let h_buckets = h.buckets; - let i = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let i = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[i]; if (bucket === undefined) { return; } let eq = h.eq; - if (Curry._2(eq, bucket.key, key)) { + if (eq(bucket.key, key)) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; @@ -118,7 +117,7 @@ function remove(h, key) { return; } let cell_next = bucket$1.next; - if (Curry._2(eq, bucket$1.key, key)) { + if (eq(bucket$1.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; return; @@ -132,25 +131,25 @@ function remove(h, key) { function get(h, key) { let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } let eq = h.eq; - if (Curry._2(eq, key, cell1.key)) { + if (eq(key, cell1.key)) { return Caml_option.some(cell1.value); } let cell2 = cell1.next; if (cell2 === undefined) { return; } - if (Curry._2(eq, key, cell2.key)) { + if (eq(key, cell2.key)) { return Caml_option.some(cell2.value); } let cell3 = cell2.next; if (cell3 !== undefined) { - if (Curry._2(eq, key, cell3.key)) { + if (eq(key, cell3.key)) { return Caml_option.some(cell3.value); } else { let _buckets = cell3.next; @@ -159,7 +158,7 @@ function get(h, key) { if (buckets === undefined) { return; } - if (Curry._2(eq, key, buckets.key)) { + if (eq(key, buckets.key)) { return Caml_option.some(buckets.value); } _buckets = buckets.next; @@ -172,14 +171,14 @@ function get(h, key) { function has(h, key) { let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[nid]; if (bucket !== undefined) { let _cell = bucket; let eq = h.eq; while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return true; } let nextCell = cell.next; diff --git a/lib/es6/belt_HashSet.js b/lib/es6/belt_HashSet.js index 23b2a84a8e..78a9a88609 100644 --- a/lib/es6/belt_HashSet.js +++ b/lib/es6/belt_HashSet.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_internalSetBuckets from "./belt_internalSetBuckets.js"; import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; @@ -10,7 +9,7 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { if (old_bucket === undefined) { return; } - let nidx = Curry._1(hash, old_bucket.key) & (h_buckets.length - 1 | 0); + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; @@ -26,13 +25,13 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { function remove(h, key) { let eq = h.eq; let h_buckets = h.buckets; - let i = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let i = h.hash(key) & (h_buckets.length - 1 | 0); let l = h_buckets[i]; if (l === undefined) { return; } let next_cell = l.next; - if (Curry._2(eq, l.key, key)) { + if (eq(l.key, key)) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; @@ -43,7 +42,7 @@ function remove(h, key) { let cell = _cell; let prec = _prec; let cell_next = cell.next; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; return; @@ -63,7 +62,7 @@ function remove(h, key) { function addBucket(h, key, _cell, eq) { while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return; } let n = cell.next; @@ -83,7 +82,7 @@ function addBucket(h, key, _cell, eq) { function add0(h, key, hash, eq) { let h_buckets = h.buckets; let buckets_len = h_buckets.length; - let i = Curry._1(hash, key) & (buckets_len - 1 | 0); + let i = hash(key) & (buckets_len - 1 | 0); let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l, eq); @@ -126,13 +125,13 @@ function add(h, key) { function has(h, key) { let eq = h.eq; let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[nid]; if (bucket !== undefined) { let _cell = bucket; while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return true; } let nextCell = cell.next; diff --git a/lib/es6/belt_Id.js b/lib/es6/belt_Id.js index ff1ebbb299..562e578fb4 100644 --- a/lib/es6/belt_Id.js +++ b/lib/es6/belt_Id.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; function MakeComparableU(M) { return M; @@ -8,7 +7,9 @@ function MakeComparableU(M) { function MakeComparable(M) { let cmp = M.cmp; - let cmp$1 = Curry.__2(cmp); + let cmp$1 = function (a, b) { + return cmp(a, b); + }; return { cmp: cmp$1 }; @@ -21,7 +22,9 @@ function comparableU(cmp) { } function comparable(cmp) { - let cmp$1 = Curry.__2(cmp); + let cmp$1 = function (a, b) { + return cmp(a, b); + }; return { cmp: cmp$1 }; @@ -33,9 +36,13 @@ function MakeHashableU(M) { function MakeHashable(M) { let hash = M.hash; - let hash$1 = Curry.__1(hash); + let hash$1 = function (a) { + return hash(a); + }; let eq = M.eq; - let eq$1 = Curry.__2(eq); + let eq$1 = function (a, b) { + return eq(a, b); + }; return { hash: hash$1, eq: eq$1 @@ -50,8 +57,12 @@ function hashableU(hash, eq) { } function hashable(hash, eq) { - let hash$1 = Curry.__1(hash); - let eq$1 = Curry.__2(eq); + let hash$1 = function (a) { + return hash(a); + }; + let eq$1 = function (a, b) { + return eq(a, b); + }; return { hash: hash$1, eq: eq$1 diff --git a/lib/es6/belt_List.js b/lib/es6/belt_List.js index c3960a9084..e55399c63a 100644 --- a/lib/es6/belt_List.js +++ b/lib/es6/belt_List.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_Array from "./belt_Array.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_SortArray from "./belt_SortArray.js"; @@ -113,7 +112,7 @@ function partitionAux(p, _cell, _precX, _precY) { hd: h, tl: /* [] */0 }; - if (Curry._1(p, h)) { + if (p(h)) { precX.tl = next; _precX = next; _cell = t; @@ -179,7 +178,7 @@ function copyAuxWitFilter(f, _cellX, _prec) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._1(f, h)) { + if (f(h)) { let next = { hd: h, tl: /* [] */0 @@ -204,7 +203,7 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(f, h, i)) { + if (f(h, i)) { let next = { hd: h, tl: /* [] */0 @@ -229,7 +228,7 @@ function copyAuxWitFilterMap(f, _cellX, _prec) { return; } let t = cellX.tl; - let h = Curry._1(f, cellX.hd); + let h = f(cellX.hd); if (h !== undefined) { let next = { hd: Caml_option.valFromOption(h), @@ -254,7 +253,7 @@ function removeAssocAuxWithMap(_cellX, x, _prec, f) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(f, h[0], x)) { + if (f(h[0], x)) { prec.tl = t; return true; } @@ -278,7 +277,7 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(eq, h[0], x)) { + if (eq(h[0], x)) { prec.tl = { hd: [ x, @@ -307,7 +306,7 @@ function copyAuxWithMap(_cellX, _prec, f) { return; } let next = { - hd: Curry._1(f, cellX.hd), + hd: f(cellX.hd), tl: /* [] */0 }; prec.tl = next; @@ -355,7 +354,7 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { return; } let next = { - hd: Curry._2(f, cellX.hd, cellY.hd), + hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; prec.tl = next; @@ -375,7 +374,7 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { return; } let next = { - hd: Curry._2(f, i, cellX.hd), + hd: f(i, cellX.hd), tl: /* [] */0 }; prec.tl = next; @@ -519,7 +518,7 @@ function mapU(xs, f) { return /* [] */0; } let cell = { - hd: Curry._1(f, xs.hd), + hd: f(xs.hd), tl: /* [] */0 }; copyAuxWithMap(xs.tl, cell, f); @@ -527,7 +526,9 @@ function mapU(xs, f) { } function map(xs, f) { - return mapU(xs, Curry.__1(f)); + return mapU(xs, (function (x) { + return f(x); + })); } function zipByU(l1, l2, f) { @@ -538,7 +539,7 @@ function zipByU(l1, l2, f) { return /* [] */0; } let cell = { - hd: Curry._2(f, l1.hd, l2.hd), + hd: f(l1.hd, l2.hd), tl: /* [] */0 }; copyAuxWithMap2(f, l1.tl, l2.tl, cell); @@ -546,7 +547,9 @@ function zipByU(l1, l2, f) { } function zipBy(l1, l2, f) { - return zipByU(l1, l2, Curry.__2(f)); + return zipByU(l1, l2, (function (x, y) { + return f(x, y); + })); } function mapWithIndexU(xs, f) { @@ -554,7 +557,7 @@ function mapWithIndexU(xs, f) { return /* [] */0; } let cell = { - hd: Curry._2(f, 0, xs.hd), + hd: f(0, xs.hd), tl: /* [] */0 }; copyAuxWithMapI(f, 1, xs.tl, cell); @@ -562,7 +565,9 @@ function mapWithIndexU(xs, f) { } function mapWithIndex(xs, f) { - return mapWithIndexU(xs, Curry.__2(f)); + return mapWithIndexU(xs, (function (i, x) { + return f(i, x); + })); } function makeByU(n, f) { @@ -570,14 +575,14 @@ function makeByU(n, f) { return /* [] */0; } let headX = { - hd: Curry._1(f, 0), + hd: f(0), tl: /* [] */0 }; let cur = headX; let i = 1; while(i < n) { let v = { - hd: Curry._1(f, i), + hd: f(i), tl: /* [] */0 }; cur.tl = v; @@ -588,7 +593,9 @@ function makeByU(n, f) { } function makeBy(n, f) { - return makeByU(n, Curry.__1(f)); + return makeByU(n, (function (x) { + return f(x); + })); } function make(n, v) { @@ -754,7 +761,7 @@ function mapReverseU(l, f) { } _xs = xs.tl; _accu = { - hd: Curry._1(f, xs.hd), + hd: f(xs.hd), tl: accu }; continue; @@ -762,7 +769,9 @@ function mapReverseU(l, f) { } function mapReverse(l, f) { - return mapReverseU(l, Curry.__1(f)); + return mapReverseU(l, (function (x) { + return f(x); + })); } function forEachU(_xs, f) { @@ -771,14 +780,16 @@ function forEachU(_xs, f) { if (!xs) { return; } - Curry._1(f, xs.hd); + f(xs.hd); _xs = xs.tl; continue; }; } function forEach(xs, f) { - forEachU(xs, Curry.__1(f)); + forEachU(xs, (function (x) { + return f(x); + })); } function forEachWithIndexU(l, f) { @@ -790,7 +801,7 @@ function forEachWithIndexU(l, f) { if (!xs) { return; } - Curry._2(f, i, xs.hd); + f(i, xs.hd); _i = i + 1 | 0; _xs = xs.tl; continue; @@ -798,7 +809,9 @@ function forEachWithIndexU(l, f) { } function forEachWithIndex(l, f) { - forEachWithIndexU(l, Curry.__2(f)); + forEachWithIndexU(l, (function (i, x) { + return f(i, x); + })); } function reduceU(_l, _accu, f) { @@ -808,19 +821,21 @@ function reduceU(_l, _accu, f) { if (!l) { return accu; } - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); _l = l.tl; continue; }; } function reduce(l, accu, f) { - return reduceU(l, accu, Curry.__2(f)); + return reduceU(l, accu, (function (acc, x) { + return f(acc, x); + })); } function reduceReverseUnsafeU(l, accu, f) { if (l) { - return Curry._2(f, reduceReverseUnsafeU(l.tl, accu, f), l.hd); + return f(reduceReverseUnsafeU(l.tl, accu, f), l.hd); } else { return accu; } @@ -836,7 +851,9 @@ function reduceReverseU(l, acc, f) { } function reduceReverse(l, accu, f) { - return reduceReverseU(l, accu, Curry.__2(f)); + return reduceReverseU(l, accu, (function (a, b) { + return f(a, b); + })); } function reduceWithIndexU(l, acc, f) { @@ -851,14 +868,16 @@ function reduceWithIndexU(l, acc, f) { return acc$1; } _i = i + 1 | 0; - _acc = Curry._3(f, acc$1, l$1.hd, i); + _acc = f(acc$1, l$1.hd, i); _l = l$1.tl; continue; }; } function reduceWithIndex(l, acc, f) { - return reduceWithIndexU(l, acc, Curry.__3(f)); + return reduceWithIndexU(l, acc, (function (acc, x, i) { + return f(acc, x, i); + })); } function mapReverse2U(l1, l2, f) { @@ -876,7 +895,7 @@ function mapReverse2U(l1, l2, f) { return accu; } _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; _l2 = l2$1.tl; @@ -886,7 +905,9 @@ function mapReverse2U(l1, l2, f) { } function mapReverse2(l1, l2, f) { - return mapReverse2U(l1, l2, Curry.__2(f)); + return mapReverse2U(l1, l2, (function (a, b) { + return f(a, b); + })); } function forEach2U(_l1, _l2, f) { @@ -899,7 +920,7 @@ function forEach2U(_l1, _l2, f) { if (!l2) { return; } - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -907,7 +928,9 @@ function forEach2U(_l1, _l2, f) { } function forEach2(l1, l2, f) { - forEach2U(l1, l2, Curry.__2(f)); + forEach2U(l1, l2, (function (a, b) { + return f(a, b); + })); } function reduce2U(_l1, _l2, _accu, f) { @@ -921,7 +944,7 @@ function reduce2U(_l1, _l2, _accu, f) { if (!l2) { return accu; } - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -929,12 +952,14 @@ function reduce2U(_l1, _l2, _accu, f) { } function reduce2(l1, l2, acc, f) { - return reduce2U(l1, l2, acc, Curry.__3(f)); + return reduce2U(l1, l2, acc, (function (a, b, c) { + return f(a, b, c); + })); } function reduceReverse2UnsafeU(l1, l2, accu, f) { if (l1 && l2) { - return Curry._3(f, reduceReverse2UnsafeU(l1.tl, l2.tl, accu, f), l1.hd, l2.hd); + return f(reduceReverse2UnsafeU(l1.tl, l2.tl, accu, f), l1.hd, l2.hd); } else { return accu; } @@ -950,7 +975,9 @@ function reduceReverse2U(l1, l2, acc, f) { } function reduceReverse2(l1, l2, acc, f) { - return reduceReverse2U(l1, l2, acc, Curry.__3(f)); + return reduceReverse2U(l1, l2, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(_xs, p) { @@ -959,7 +986,7 @@ function everyU(_xs, p) { if (!xs) { return true; } - if (!Curry._1(p, xs.hd)) { + if (!p(xs.hd)) { return false; } _xs = xs.tl; @@ -968,7 +995,9 @@ function everyU(_xs, p) { } function every(xs, p) { - return everyU(xs, Curry.__1(p)); + return everyU(xs, (function (x) { + return p(x); + })); } function someU(_xs, p) { @@ -977,7 +1006,7 @@ function someU(_xs, p) { if (!xs) { return false; } - if (Curry._1(p, xs.hd)) { + if (p(xs.hd)) { return true; } _xs = xs.tl; @@ -986,7 +1015,9 @@ function someU(_xs, p) { } function some(xs, p) { - return someU(xs, Curry.__1(p)); + return someU(xs, (function (x) { + return p(x); + })); } function every2U(_l1, _l2, p) { @@ -999,7 +1030,7 @@ function every2U(_l1, _l2, p) { if (!l2) { return true; } - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -1009,7 +1040,9 @@ function every2U(_l1, _l2, p) { } function every2(l1, l2, p) { - return every2U(l1, l2, Curry.__2(p)); + return every2U(l1, l2, (function (a, b) { + return p(a, b); + })); } function cmpByLength(_l1, _l2) { @@ -1046,7 +1079,7 @@ function cmpU(_l1, _l2, p) { if (!l2) { return 1; } - let c = Curry._2(p, l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } @@ -1057,7 +1090,9 @@ function cmpU(_l1, _l2, p) { } function cmp(l1, l2, f) { - return cmpU(l1, l2, Curry.__2(f)); + return cmpU(l1, l2, (function (x, y) { + return f(x, y); + })); } function eqU(_l1, _l2, p) { @@ -1074,7 +1109,7 @@ function eqU(_l1, _l2, p) { if (!l2) { return false; } - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -1084,7 +1119,9 @@ function eqU(_l1, _l2, p) { } function eq(l1, l2, f) { - return eqU(l1, l2, Curry.__2(f)); + return eqU(l1, l2, (function (x, y) { + return f(x, y); + })); } function some2U(_l1, _l2, p) { @@ -1097,7 +1134,7 @@ function some2U(_l1, _l2, p) { if (!l2) { return false; } - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -1107,7 +1144,9 @@ function some2U(_l1, _l2, p) { } function some2(l1, l2, p) { - return some2U(l1, l2, Curry.__2(p)); + return some2U(l1, l2, (function (a, b) { + return p(a, b); + })); } function hasU(_xs, x, eq) { @@ -1116,7 +1155,7 @@ function hasU(_xs, x, eq) { if (!xs) { return false; } - if (Curry._2(eq, xs.hd, x)) { + if (eq(xs.hd, x)) { return true; } _xs = xs.tl; @@ -1125,7 +1164,9 @@ function hasU(_xs, x, eq) { } function has(xs, x, eq) { - return hasU(xs, x, Curry.__2(eq)); + return hasU(xs, x, (function (a, b) { + return eq(a, b); + })); } function getAssocU(_xs, x, eq) { @@ -1135,7 +1176,7 @@ function getAssocU(_xs, x, eq) { return; } let match = xs.hd; - if (Curry._2(eq, match[0], x)) { + if (eq(match[0], x)) { return Caml_option.some(match[1]); } _xs = xs.tl; @@ -1144,7 +1185,9 @@ function getAssocU(_xs, x, eq) { } function getAssoc(xs, x, eq) { - return getAssocU(xs, x, Curry.__2(eq)); + return getAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function hasAssocU(_xs, x, eq) { @@ -1153,7 +1196,7 @@ function hasAssocU(_xs, x, eq) { if (!xs) { return false; } - if (Curry._2(eq, xs.hd[0], x)) { + if (eq(xs.hd[0], x)) { return true; } _xs = xs.tl; @@ -1162,7 +1205,9 @@ function hasAssocU(_xs, x, eq) { } function hasAssoc(xs, x, eq) { - return hasAssocU(xs, x, Curry.__2(eq)); + return hasAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function removeAssocU(xs, x, eq) { @@ -1171,7 +1216,7 @@ function removeAssocU(xs, x, eq) { } let l = xs.tl; let pair = xs.hd; - if (Curry._2(eq, pair[0], x)) { + if (eq(pair[0], x)) { return l; } let cell = { @@ -1187,7 +1232,9 @@ function removeAssocU(xs, x, eq) { } function removeAssoc(xs, x, eq) { - return removeAssocU(xs, x, Curry.__2(eq)); + return removeAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function setAssocU(xs, x, k, eq) { @@ -1202,7 +1249,7 @@ function setAssocU(xs, x, k, eq) { } let l = xs.tl; let pair = xs.hd; - if (Curry._2(eq, pair[0], x)) { + if (eq(pair[0], x)) { return { hd: [ x, @@ -1230,7 +1277,9 @@ function setAssocU(xs, x, k, eq) { } function setAssoc(xs, x, k, eq) { - return setAssocU(xs, x, k, Curry.__2(eq)); + return setAssocU(xs, x, k, (function (a, b) { + return eq(a, b); + })); } function sortU(xs, cmp) { @@ -1240,7 +1289,9 @@ function sortU(xs, cmp) { } function sort(xs, cmp) { - return sortU(xs, Curry.__2(cmp)); + return sortU(xs, (function (x, y) { + return cmp(x, y); + })); } function getByU(_xs, p) { @@ -1250,7 +1301,7 @@ function getByU(_xs, p) { return; } let x = xs.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _xs = xs.tl; @@ -1259,7 +1310,9 @@ function getByU(_xs, p) { } function getBy(xs, p) { - return getByU(xs, Curry.__1(p)); + return getByU(xs, (function (a) { + return p(a); + })); } function keepU(_xs, p) { @@ -1270,7 +1323,7 @@ function keepU(_xs, p) { } let t = xs.tl; let h = xs.hd; - if (Curry._1(p, h)) { + if (p(h)) { let cell = { hd: h, tl: /* [] */0 @@ -1284,7 +1337,9 @@ function keepU(_xs, p) { } function keep(xs, p) { - return keepU(xs, Curry.__1(p)); + return keepU(xs, (function (x) { + return p(x); + })); } function keepWithIndexU(xs, p) { @@ -1298,7 +1353,7 @@ function keepWithIndexU(xs, p) { } let t = xs$1.tl; let h = xs$1.hd; - if (Curry._2(p, h, i)) { + if (p(h, i)) { let cell = { hd: h, tl: /* [] */0 @@ -1313,7 +1368,9 @@ function keepWithIndexU(xs, p) { } function keepWithIndex(xs, p) { - return keepWithIndexU(xs, Curry.__2(p)); + return keepWithIndexU(xs, (function (x, i) { + return p(x, i); + })); } function keepMapU(_xs, p) { @@ -1323,7 +1380,7 @@ function keepMapU(_xs, p) { return /* [] */0; } let t = xs.tl; - let h = Curry._1(p, xs.hd); + let h = p(xs.hd); if (h !== undefined) { let cell = { hd: Caml_option.valFromOption(h), @@ -1338,7 +1395,9 @@ function keepMapU(_xs, p) { } function keepMap(xs, p) { - return keepMapU(xs, Curry.__1(p)); + return keepMapU(xs, (function (x) { + return p(x); + })); } function partitionU(l, p) { @@ -1357,7 +1416,7 @@ function partitionU(l, p) { hd: h, tl: /* [] */0 }; - let b = Curry._1(p, h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { return [ @@ -1373,7 +1432,9 @@ function partitionU(l, p) { } function partition(l, p) { - return partitionU(l, Curry.__1(p)); + return partitionU(l, (function (x) { + return p(x); + })); } function unzip(xs) { diff --git a/lib/es6/belt_Map.js b/lib/es6/belt_Map.js index 8234a5b949..095b87f0a7 100644 --- a/lib/es6/belt_Map.js +++ b/lib/es6/belt_Map.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_MapDict from "./belt_MapDict.js"; function fromArray(data, id) { @@ -59,7 +58,9 @@ function updateU(m, key, f) { } function update(m, key, f) { - return updateU(m, key, Curry.__1(f)); + return updateU(m, key, (function (a) { + return f(a); + })); } function split(m, x) { @@ -90,7 +91,9 @@ function mergeU(s1, s2, f) { } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function make(id) { @@ -109,7 +112,9 @@ function findFirstByU(m, f) { } function findFirstBy(m, f) { - return Belt_MapDict.findFirstByU(m.data, Curry.__2(f)); + return Belt_MapDict.findFirstByU(m.data, (function (a, b) { + return f(a, b); + })); } function forEachU(m, f) { @@ -117,7 +122,9 @@ function forEachU(m, f) { } function forEach(m, f) { - Belt_MapDict.forEachU(m.data, Curry.__2(f)); + Belt_MapDict.forEachU(m.data, (function (a, b) { + f(a, b); + })); } function reduceU(m, acc, f) { @@ -125,7 +132,9 @@ function reduceU(m, acc, f) { } function reduce(m, acc, f) { - return reduceU(m, acc, Curry.__3(f)); + return reduceU(m, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(m, f) { @@ -133,7 +142,9 @@ function everyU(m, f) { } function every(m, f) { - return Belt_MapDict.everyU(m.data, Curry.__2(f)); + return Belt_MapDict.everyU(m.data, (function (a, b) { + return f(a, b); + })); } function someU(m, f) { @@ -141,7 +152,9 @@ function someU(m, f) { } function some(m, f) { - return Belt_MapDict.someU(m.data, Curry.__2(f)); + return Belt_MapDict.someU(m.data, (function (a, b) { + return f(a, b); + })); } function keepU(m, f) { @@ -152,7 +165,9 @@ function keepU(m, f) { } function keep(m, f) { - return keepU(m, Curry.__2(f)); + return keepU(m, (function (a, b) { + return f(a, b); + })); } function partitionU(m, p) { @@ -171,7 +186,9 @@ function partitionU(m, p) { } function partition(m, p) { - return partitionU(m, Curry.__2(p)); + return partitionU(m, (function (a, b) { + return p(a, b); + })); } function mapU(m, f) { @@ -182,7 +199,9 @@ function mapU(m, f) { } function map(m, f) { - return mapU(m, Curry.__1(f)); + return mapU(m, (function (a) { + return f(a); + })); } function mapWithKeyU(m, f) { @@ -193,7 +212,9 @@ function mapWithKeyU(m, f) { } function mapWithKey(m, f) { - return mapWithKeyU(m, Curry.__2(f)); + return mapWithKeyU(m, (function (a, b) { + return f(a, b); + })); } function size(map) { @@ -277,7 +298,9 @@ function eqU(m1, m2, veq) { } function eq(m1, m2, veq) { - return eqU(m1, m2, Curry.__2(veq)); + return eqU(m1, m2, (function (a, b) { + return veq(a, b); + })); } function cmpU(m1, m2, vcmp) { @@ -285,7 +308,9 @@ function cmpU(m1, m2, vcmp) { } function cmp(m1, m2, vcmp) { - return cmpU(m1, m2, Curry.__2(vcmp)); + return cmpU(m1, m2, (function (a, b) { + return vcmp(a, b); + })); } function getData(m) { diff --git a/lib/es6/belt_MapDict.js b/lib/es6/belt_MapDict.js index 29f3f5cdc5..ad544897de 100644 --- a/lib/es6/belt_MapDict.js +++ b/lib/es6/belt_MapDict.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; @@ -9,7 +8,7 @@ function set(t, newK, newD, cmp) { return Belt_internalAVLtree.singleton(newK, newD); } let k = t.k; - let c = Curry._2(cmp, newK, k); + let c = cmp(newK, k); if (c === 0) { return Belt_internalAVLtree.updateValue(t, newD); } @@ -26,9 +25,9 @@ function set(t, newK, newD, cmp) { function updateU(t, newK, f, cmp) { if (t !== undefined) { let k = t.k; - let c = Curry._2(cmp, newK, k); + let c = cmp(newK, k); if (c === 0) { - let newD = Curry._1(f, Caml_option.some(t.v)); + let newD = f(Caml_option.some(t.v)); if (newD !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD)); } @@ -67,7 +66,7 @@ function updateU(t, newK, f, cmp) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let newD$1 = Curry._1(f, undefined); + let newD$1 = f(undefined); if (newD$1 !== undefined) { return Belt_internalAVLtree.singleton(newK, Caml_option.valFromOption(newD$1)); } else { @@ -76,14 +75,16 @@ function updateU(t, newK, f, cmp) { } function update(t, newK, f, cmp) { - return updateU(t, newK, Curry.__1(f), cmp); + return updateU(t, newK, (function (a) { + return f(a); + }), cmp); } function removeAux0(n, x, cmp) { let v = n.k; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -144,7 +145,7 @@ function splitAuxPivot(n, x, pres, cmp) { let d = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { pres.contents = Caml_option.some(d); return [ @@ -202,7 +203,7 @@ function mergeU(s1, s2, f, cmp) { if (s1 === undefined) { if (s2 !== undefined) { return Belt_internalAVLtree.keepMapU(s2, (function (k, v) { - return Curry._3(f, k, undefined, Caml_option.some(v)); + return f(k, undefined, Caml_option.some(v)); })); } else { return; @@ -210,7 +211,7 @@ function mergeU(s1, s2, f, cmp) { } if (s2 === undefined) { return Belt_internalAVLtree.keepMapU(s1, (function (k, v) { - return Curry._3(f, k, Caml_option.some(v), undefined); + return f(k, Caml_option.some(v), undefined); })); } if (s1.h >= s2.h) { @@ -224,7 +225,7 @@ function mergeU(s1, s2, f, cmp) { let match = splitAuxPivot(s2, v1, d2, cmp); let d2$1 = d2.contents; let newLeft = mergeU(l1, match[0], f, cmp); - let newD = Curry._3(f, v1, Caml_option.some(d1), d2$1); + let newD = f(v1, Caml_option.some(d1), d2$1); let newRight = mergeU(r1, match[1], f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight); } @@ -238,13 +239,15 @@ function mergeU(s1, s2, f, cmp) { let match$1 = splitAuxPivot(s1, v2, d1$1, cmp); let d1$2 = d1$1.contents; let newLeft$1 = mergeU(match$1[0], l2, f, cmp); - let newD$1 = Curry._3(f, v2, d1$2, Caml_option.some(d2$2)); + let newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); let newRight$1 = mergeU(match$1[1], r2, f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft$1, v2, newD$1, newRight$1); } function merge(s1, s2, f, cmp) { - return mergeU(s1, s2, Curry.__3(f), cmp); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + }), cmp); } function removeMany(t, keys, cmp) { diff --git a/lib/es6/belt_MapInt.js b/lib/es6/belt_MapInt.js index 074c9c4a08..ced1b1814e 100644 --- a/lib/es6/belt_MapInt.js +++ b/lib/es6/belt_MapInt.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalMapInt from "./belt_internalMapInt.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; @@ -25,7 +24,7 @@ function updateU(t, x, f) { if (t !== undefined) { let k = t.k; if (x === k) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } @@ -64,7 +63,7 @@ function updateU(t, x, f) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,7 +72,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - return updateU(t, x, Curry.__1(f)); + return updateU(t, x, (function (a) { + return f(a); + })); } function removeAux(n, x) { diff --git a/lib/es6/belt_MapString.js b/lib/es6/belt_MapString.js index f531c8c023..0880dca3cd 100644 --- a/lib/es6/belt_MapString.js +++ b/lib/es6/belt_MapString.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; import * as Belt_internalMapString from "./belt_internalMapString.js"; @@ -25,7 +24,7 @@ function updateU(t, x, f) { if (t !== undefined) { let k = t.k; if (x === k) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } @@ -64,7 +63,7 @@ function updateU(t, x, f) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,7 +72,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - return updateU(t, x, Curry.__1(f)); + return updateU(t, x, (function (a) { + return f(a); + })); } function removeAux(n, x) { diff --git a/lib/es6/belt_MutableMap.js b/lib/es6/belt_MutableMap.js index 88108b9d1b..009ef39219 100644 --- a/lib/es6/belt_MutableMap.js +++ b/lib/es6/belt_MutableMap.js @@ -1,12 +1,11 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; function removeMutateAux(nt, x, cmp) { let k = nt.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { let l = nt.l; let r = nt.r; @@ -89,9 +88,9 @@ function removeMany(d, xs) { function updateDone(t, x, f, cmp) { if (t !== undefined) { let k = t.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -118,7 +117,7 @@ function updateDone(t, x, f, cmp) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -137,7 +136,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function make(id) { @@ -193,7 +194,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function reduceU(d, acc, cb) { @@ -201,7 +204,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__3(cb)); + return reduceU(d, acc, (function (a, b, c) { + return cb(a, b, c); + })); } function everyU(d, p) { @@ -209,7 +214,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(p)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return p(a, b); + })); } function someU(d, p) { @@ -217,7 +224,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(p)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return p(a, b); + })); } function size(d) { @@ -249,7 +258,9 @@ function cmpU(m1, m2, cmp) { } function cmp(m1, m2, cmp$1) { - return cmpU(m1, m2, Curry.__2(cmp$1)); + return cmpU(m1, m2, (function (a, b) { + return cmp$1(a, b); + })); } function eqU(m1, m2, cmp) { @@ -257,7 +268,9 @@ function eqU(m1, m2, cmp) { } function eq(m1, m2, cmp) { - return eqU(m1, m2, Curry.__2(cmp)); + return eqU(m1, m2, (function (a, b) { + return cmp(a, b); + })); } function mapU(m, f) { @@ -268,7 +281,9 @@ function mapU(m, f) { } function map(m, f) { - return mapU(m, Curry.__1(f)); + return mapU(m, (function (a) { + return f(a); + })); } function mapWithKeyU(m, f) { @@ -279,7 +294,9 @@ function mapWithKeyU(m, f) { } function mapWithKey(m, f) { - return mapWithKeyU(m, Curry.__2(f)); + return mapWithKeyU(m, (function (a, b) { + return f(a, b); + })); } function get(m, x) { diff --git a/lib/es6/belt_MutableMapInt.js b/lib/es6/belt_MutableMapInt.js index e89c0f59e9..f1549c8441 100644 --- a/lib/es6/belt_MutableMapInt.js +++ b/lib/es6/belt_MutableMapInt.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalMapInt from "./belt_internalMapInt.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; @@ -67,7 +66,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { @@ -77,7 +78,9 @@ function mapU(d, f) { } function map(d, f) { - return mapU(d, Curry.__1(f)); + return mapU(d, (function (a) { + return f(a); + })); } function mapWithKeyU(d, f) { @@ -87,7 +90,9 @@ function mapWithKeyU(d, f) { } function mapWithKey(d, f) { - return mapWithKeyU(d, Curry.__2(f)); + return mapWithKeyU(d, (function (a, b) { + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -95,7 +100,9 @@ function reduceU(d, acc, f) { } function reduce(d, acc, f) { - return reduceU(d, acc, Curry.__3(f)); + return reduceU(d, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(d, f) { @@ -103,7 +110,9 @@ function everyU(d, f) { } function every(d, f) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -111,7 +120,9 @@ function someU(d, f) { } function some(d, f) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -193,7 +204,7 @@ function updateDone(t, x, f) { if (t !== undefined) { let k = t.k; if (k === x) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -221,7 +232,7 @@ function updateDone(t, x, f) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,7 +251,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { @@ -286,7 +299,9 @@ function cmpU(d0, d1, f) { } function cmp(d0, d1, f) { - return cmpU(d0, d1, Curry.__2(f)); + return cmpU(d0, d1, (function (a, b) { + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -294,7 +309,9 @@ function eqU(d0, d1, f) { } function eq(d0, d1, f) { - return eqU(d0, d1, Curry.__2(f)); + return eqU(d0, d1, (function (a, b) { + return f(a, b); + })); } function get(d, x) { diff --git a/lib/es6/belt_MutableMapString.js b/lib/es6/belt_MutableMapString.js index 2bb72dbeb7..60243c3480 100644 --- a/lib/es6/belt_MutableMapString.js +++ b/lib/es6/belt_MutableMapString.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; import * as Belt_internalMapString from "./belt_internalMapString.js"; @@ -67,7 +66,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { @@ -77,7 +78,9 @@ function mapU(d, f) { } function map(d, f) { - return mapU(d, Curry.__1(f)); + return mapU(d, (function (a) { + return f(a); + })); } function mapWithKeyU(d, f) { @@ -87,7 +90,9 @@ function mapWithKeyU(d, f) { } function mapWithKey(d, f) { - return mapWithKeyU(d, Curry.__2(f)); + return mapWithKeyU(d, (function (a, b) { + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -95,7 +100,9 @@ function reduceU(d, acc, f) { } function reduce(d, acc, f) { - return reduceU(d, acc, Curry.__3(f)); + return reduceU(d, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(d, f) { @@ -103,7 +110,9 @@ function everyU(d, f) { } function every(d, f) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -111,7 +120,9 @@ function someU(d, f) { } function some(d, f) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -193,7 +204,7 @@ function updateDone(t, x, f) { if (t !== undefined) { let k = t.k; if (k === x) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -221,7 +232,7 @@ function updateDone(t, x, f) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,7 +251,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { @@ -286,7 +299,9 @@ function cmpU(d0, d1, f) { } function cmp(d0, d1, f) { - return cmpU(d0, d1, Curry.__2(f)); + return cmpU(d0, d1, (function (a, b) { + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -294,7 +309,9 @@ function eqU(d0, d1, f) { } function eq(d0, d1, f) { - return eqU(d0, d1, Curry.__2(f)); + return eqU(d0, d1, (function (a, b) { + return f(a, b); + })); } function get(d, x) { diff --git a/lib/es6/belt_MutableQueue.js b/lib/es6/belt_MutableQueue.js index 6298b62fe0..792e610d4b 100644 --- a/lib/es6/belt_MutableQueue.js +++ b/lib/es6/belt_MutableQueue.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function make() { @@ -157,7 +156,7 @@ function mapU(q, f) { let cell = _cell; let prev = _prev; if (cell !== undefined) { - let content = Curry._1(f, cell.content); + let content = f(cell.content); let res = { content: content, next: undefined @@ -177,7 +176,9 @@ function mapU(q, f) { } function map(q, f) { - return mapU(q, Curry.__1(f)); + return mapU(q, (function (a) { + return f(a); + })); } function isEmpty(q) { @@ -195,14 +196,16 @@ function forEachU(q, f) { if (cell === undefined) { return; } - Curry._1(f, cell.content); + f(cell.content); _cell = cell.next; continue; }; } function forEach(q, f) { - forEachU(q, Curry.__1(f)); + forEachU(q, (function (a) { + f(a); + })); } function reduceU(q, accu, f) { @@ -214,7 +217,7 @@ function reduceU(q, accu, f) { if (cell === undefined) { return accu$1; } - let accu$2 = Curry._2(f, accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = cell.next; _accu = accu$2; continue; @@ -222,7 +225,9 @@ function reduceU(q, accu, f) { } function reduce(q, accu, f) { - return reduceU(q, accu, Curry.__2(f)); + return reduceU(q, accu, (function (a, b) { + return f(a, b); + })); } function transfer(q1, q2) { diff --git a/lib/es6/belt_MutableSet.js b/lib/es6/belt_MutableSet.js index 893bcfca79..49ca11d976 100644 --- a/lib/es6/belt_MutableSet.js +++ b/lib/es6/belt_MutableSet.js @@ -1,12 +1,11 @@ -import * as Curry from "./curry.js"; import * as Belt_SortArray from "./belt_SortArray.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function remove0(nt, x, cmp) { let k = nt.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { let l = nt.l; let r = nt.r; @@ -81,7 +80,7 @@ function removeMany(d, xs) { function removeCheck0(nt, x, removed, cmp) { let k = nt.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { removed.contents = true; let l = nt.l; @@ -133,7 +132,7 @@ function removeCheck(d, v) { function addCheck0(t, x, added, cmp) { if (t !== undefined) { let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -218,7 +217,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -226,7 +227,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -234,7 +237,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -242,7 +247,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -340,7 +347,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -359,7 +368,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { @@ -388,7 +399,7 @@ function intersect(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(match, 0, tmp); Belt_internalAVLset.fillArray(match$1, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0 || Curry._2(cmp, tmp[totalSize - 1 | 0], tmp[0]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { cmp: cmp, data: undefined @@ -424,7 +435,7 @@ function diff(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(match, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0 || Curry._2(cmp, tmp[totalSize - 1 | 0], tmp[0]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { cmp: cmp, data: Belt_internalAVLset.copy(dataa) @@ -460,7 +471,7 @@ function union(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(datab, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) { return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) diff --git a/lib/es6/belt_MutableSetInt.js b/lib/es6/belt_MutableSetInt.js index db281ee9a8..1507932c69 100644 --- a/lib/es6/belt_MutableSetInt.js +++ b/lib/es6/belt_MutableSetInt.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_SortArrayInt from "./belt_SortArrayInt.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; import * as Belt_internalSetInt from "./belt_internalSetInt.js"; @@ -215,7 +214,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -223,7 +224,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -231,7 +234,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -239,7 +244,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -328,7 +335,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -344,7 +353,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { diff --git a/lib/es6/belt_MutableSetString.js b/lib/es6/belt_MutableSetString.js index 7dc13b6c0b..004803ecb6 100644 --- a/lib/es6/belt_MutableSetString.js +++ b/lib/es6/belt_MutableSetString.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; import * as Belt_SortArrayString from "./belt_SortArrayString.js"; import * as Belt_internalSetString from "./belt_internalSetString.js"; @@ -215,7 +214,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -223,7 +224,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -231,7 +234,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -239,7 +244,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -328,7 +335,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -344,7 +353,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { diff --git a/lib/es6/belt_MutableStack.js b/lib/es6/belt_MutableStack.js index 26e944b37d..1197f56c81 100644 --- a/lib/es6/belt_MutableStack.js +++ b/lib/es6/belt_MutableStack.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function make() { @@ -92,14 +91,16 @@ function forEachU(s, f) { if (s$1 === undefined) { return; } - Curry._1(f, s$1.head); + f(s$1.head); _s = s$1.tail; continue; }; } function forEach(s, f) { - forEachU(s, Curry.__1(f)); + forEachU(s, (function (x) { + f(x); + })); } function dynamicPopIterU(s, f) { @@ -109,13 +110,15 @@ function dynamicPopIterU(s, f) { return; } s.root = match.tail; - Curry._1(f, match.head); + f(match.head); continue; }; } function dynamicPopIter(s, f) { - dynamicPopIterU(s, Curry.__1(f)); + dynamicPopIterU(s, (function (x) { + f(x); + })); } export { diff --git a/lib/es6/belt_Option.js b/lib/es6/belt_Option.js index 52331baede..840279441c 100644 --- a/lib/es6/belt_Option.js +++ b/lib/es6/belt_Option.js @@ -1,28 +1,31 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function keepU(opt, p) { - if (opt !== undefined && Curry._1(p, Caml_option.valFromOption(opt))) { + if (opt !== undefined && p(Caml_option.valFromOption(opt))) { return opt; } } function keep(opt, p) { - return keepU(opt, Curry.__1(p)); + return keepU(opt, (function (x) { + return p(x); + })); } function forEachU(opt, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } } function forEach(opt, f) { - forEachU(opt, Curry.__1(f)); + forEachU(opt, (function (x) { + f(x); + })); } function getExn(x) { @@ -38,36 +41,42 @@ function getExn(x) { function mapWithDefaultU(opt, $$default, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } else { return $$default; } } function mapWithDefault(opt, $$default, f) { - return mapWithDefaultU(opt, $$default, Curry.__1(f)); + return mapWithDefaultU(opt, $$default, (function (x) { + return f(x); + })); } function mapU(opt, f) { if (opt !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(opt))); + return Caml_option.some(f(Caml_option.valFromOption(opt))); } } function map(opt, f) { - return mapU(opt, Curry.__1(f)); + return mapU(opt, (function (x) { + return f(x); + })); } function flatMapU(opt, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } } function flatMap(opt, f) { - return flatMapU(opt, Curry.__1(f)); + return flatMapU(opt, (function (x) { + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -97,7 +106,7 @@ function isNone(x) { function eqU(a, b, f) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(f, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return f(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return false; } @@ -107,13 +116,15 @@ function eqU(a, b, f) { } function eq(a, b, f) { - return eqU(a, b, Curry.__2(f)); + return eqU(a, b, (function (x, y) { + return f(x, y); + })); } function cmpU(a, b, f) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(f, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return f(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return 1; } @@ -125,7 +136,9 @@ function cmpU(a, b, f) { } function cmp(a, b, f) { - return cmpU(a, b, Curry.__2(f)); + return cmpU(a, b, (function (x, y) { + return f(x, y); + })); } export { diff --git a/lib/es6/belt_Range.js b/lib/es6/belt_Range.js index da82accec9..6dc8c014d2 100644 --- a/lib/es6/belt_Range.js +++ b/lib/es6/belt_Range.js @@ -1,15 +1,16 @@ -import * as Curry from "./curry.js"; function forEachU(s, f, action) { for(let i = s; i <= f; ++i){ - Curry._1(action, i); + action(i); } } function forEach(s, f, action) { - forEachU(s, f, Curry.__1(action)); + forEachU(s, f, (function (a) { + action(a); + })); } function everyU(_s, f, p) { @@ -18,7 +19,7 @@ function everyU(_s, f, p) { if (s > f) { return true; } - if (!Curry._1(p, s)) { + if (!p(s)) { return false; } _s = s + 1 | 0; @@ -27,7 +28,9 @@ function everyU(_s, f, p) { } function every(s, f, p) { - return everyU(s, f, Curry.__1(p)); + return everyU(s, f, (function (a) { + return p(a); + })); } function everyByU(s, f, step, p) { @@ -38,7 +41,7 @@ function everyByU(s, f, step, p) { if (s$1 > f) { return true; } - if (!Curry._1(p, s$1)) { + if (!p(s$1)) { return false; } _s = s$1 + step | 0; @@ -50,7 +53,9 @@ function everyByU(s, f, step, p) { } function everyBy(s, f, step, p) { - return everyByU(s, f, step, Curry.__1(p)); + return everyByU(s, f, step, (function (a) { + return p(a); + })); } function someU(_s, f, p) { @@ -59,7 +64,7 @@ function someU(_s, f, p) { if (s > f) { return false; } - if (Curry._1(p, s)) { + if (p(s)) { return true; } _s = s + 1 | 0; @@ -68,7 +73,9 @@ function someU(_s, f, p) { } function some(s, f, p) { - return someU(s, f, Curry.__1(p)); + return someU(s, f, (function (a) { + return p(a); + })); } function someByU(s, f, step, p) { @@ -79,7 +86,7 @@ function someByU(s, f, step, p) { if (s$1 > f) { return false; } - if (Curry._1(p, s$1)) { + if (p(s$1)) { return true; } _s = s$1 + step | 0; @@ -91,7 +98,9 @@ function someByU(s, f, step, p) { } function someBy(s, f, step, p) { - return someByU(s, f, step, Curry.__1(p)); + return someByU(s, f, step, (function (a) { + return p(a); + })); } export { diff --git a/lib/es6/belt_Result.js b/lib/es6/belt_Result.js index c4020cb2ea..e3594b9633 100644 --- a/lib/es6/belt_Result.js +++ b/lib/es6/belt_Result.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; function getExn(x) { if (x.TAG === "Ok") { @@ -15,21 +14,23 @@ function getExn(x) { function mapWithDefaultU(opt, $$default, f) { if (opt.TAG === "Ok") { - return Curry._1(f, opt._0); + return f(opt._0); } else { return $$default; } } function mapWithDefault(opt, $$default, f) { - return mapWithDefaultU(opt, $$default, Curry.__1(f)); + return mapWithDefaultU(opt, $$default, (function (x) { + return f(x); + })); } function mapU(opt, f) { if (opt.TAG === "Ok") { return { TAG: "Ok", - _0: Curry._1(f, opt._0) + _0: f(opt._0) }; } else { return { @@ -40,12 +41,14 @@ function mapU(opt, f) { } function map(opt, f) { - return mapU(opt, Curry.__1(f)); + return mapU(opt, (function (x) { + return f(x); + })); } function flatMapU(opt, f) { if (opt.TAG === "Ok") { - return Curry._1(f, opt._0); + return f(opt._0); } else { return { TAG: "Error", @@ -55,7 +58,9 @@ function flatMapU(opt, f) { } function flatMap(opt, f) { - return flatMapU(opt, Curry.__1(f)); + return flatMapU(opt, (function (x) { + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -85,7 +90,7 @@ function isError(x) { function eqU(a, b, f) { if (a.TAG === "Ok") { if (b.TAG === "Ok") { - return Curry._2(f, a._0, b._0); + return f(a._0, b._0); } else { return false; } @@ -97,13 +102,15 @@ function eqU(a, b, f) { } function eq(a, b, f) { - return eqU(a, b, Curry.__2(f)); + return eqU(a, b, (function (x, y) { + return f(x, y); + })); } function cmpU(a, b, f) { if (a.TAG === "Ok") { if (b.TAG === "Ok") { - return Curry._2(f, a._0, b._0); + return f(a._0, b._0); } else { return 1; } @@ -115,7 +122,9 @@ function cmpU(a, b, f) { } function cmp(a, b, f) { - return cmpU(a, b, Curry.__2(f)); + return cmpU(a, b, (function (x, y) { + return f(x, y); + })); } export { diff --git a/lib/es6/belt_Set.js b/lib/es6/belt_Set.js index 816c874348..e2046a6ac2 100644 --- a/lib/es6/belt_Set.js +++ b/lib/es6/belt_Set.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_SetDict from "./belt_SetDict.js"; function fromArray(data, id) { @@ -128,7 +127,9 @@ function forEachU(m, f) { } function forEach(m, f) { - Belt_SetDict.forEachU(m.data, Curry.__1(f)); + Belt_SetDict.forEachU(m.data, (function (a) { + f(a); + })); } function reduceU(m, acc, f) { @@ -136,7 +137,9 @@ function reduceU(m, acc, f) { } function reduce(m, acc, f) { - return reduceU(m, acc, Curry.__2(f)); + return reduceU(m, acc, (function (a, b) { + return f(a, b); + })); } function everyU(m, f) { @@ -144,7 +147,9 @@ function everyU(m, f) { } function every(m, f) { - return Belt_SetDict.everyU(m.data, Curry.__1(f)); + return Belt_SetDict.everyU(m.data, (function (a) { + return f(a); + })); } function someU(m, f) { @@ -152,7 +157,9 @@ function someU(m, f) { } function some(m, f) { - return Belt_SetDict.someU(m.data, Curry.__1(f)); + return Belt_SetDict.someU(m.data, (function (a) { + return f(a); + })); } function keepU(m, f) { @@ -163,7 +170,9 @@ function keepU(m, f) { } function keep(m, f) { - return keepU(m, Curry.__1(f)); + return keepU(m, (function (a) { + return f(a); + })); } function partitionU(m, f) { @@ -182,7 +191,9 @@ function partitionU(m, f) { } function partition(m, f) { - return partitionU(m, Curry.__1(f)); + return partitionU(m, (function (a) { + return f(a); + })); } function size(m) { diff --git a/lib/es6/belt_SetDict.js b/lib/es6/belt_SetDict.js index 424be90fed..4231c26328 100644 --- a/lib/es6/belt_SetDict.js +++ b/lib/es6/belt_SetDict.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function add(t, x, cmp) { @@ -8,7 +7,7 @@ function add(t, x, cmp) { return Belt_internalAVLset.singleton(x); } let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -37,7 +36,7 @@ function remove(t, x, cmp) { let v = t.v; let l = t.l; let r = t.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -91,7 +90,7 @@ function splitAuxNoPivot(cmp, n, x) { let v = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return [ l, @@ -128,7 +127,7 @@ function splitAuxPivot(cmp, n, x, pres) { let v = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { pres.contents = true; return [ diff --git a/lib/es6/belt_SortArray.js b/lib/es6/belt_SortArray.js index 8c0b788b83..11810837e4 100644 --- a/lib/es6/belt_SortArray.js +++ b/lib/es6/belt_SortArray.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { @@ -11,7 +10,7 @@ function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { return acc; } let v = xs[acc]; - if (!Curry._2(lt, v, prec)) { + if (!lt(v, prec)) { return acc; } _acc = acc + 1 | 0; @@ -27,7 +26,7 @@ function strictlySortedLengthU(xs, lt) { } let x0 = xs[0]; let x1 = xs[1]; - if (Curry._2(lt, x0, x1)) { + if (lt(x0, x1)) { let _prec = x1; let _acc = 2; while(true) { @@ -37,14 +36,14 @@ function strictlySortedLengthU(xs, lt) { return acc; } let v = xs[acc]; - if (!Curry._2(lt, prec, v)) { + if (!lt(prec, v)) { return acc; } _acc = acc + 1 | 0; _prec = v; continue; }; - } else if (Curry._2(lt, x1, x0)) { + } else if (lt(x1, x0)) { return -sortedLengthAuxMore(xs, x1, 2, len, lt) | 0; } else { return 1; @@ -52,7 +51,9 @@ function strictlySortedLengthU(xs, lt) { } function strictlySortedLength(xs, lt) { - return strictlySortedLengthU(xs, Curry.__2(lt)); + return strictlySortedLengthU(xs, (function (x, y) { + return lt(x, y); + })); } function isSortedU(a, cmp) { @@ -67,7 +68,7 @@ function isSortedU(a, cmp) { if (i === last_bound) { return true; } - if (Curry._2(cmp, a[i], a[i + 1 | 0]) > 0) { + if (cmp(a[i], a[i + 1 | 0]) > 0) { return false; } _i = i + 1 | 0; @@ -77,7 +78,9 @@ function isSortedU(a, cmp) { } function isSorted(a, cmp) { - return isSortedU(a, Curry.__2(cmp)); + return isSortedU(a, (function (x, y) { + return cmp(x, y); + })); } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -94,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { dst[d] = s1; let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -131,7 +134,7 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; let i1$1 = i1 + 1 | 0; @@ -181,7 +184,9 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -198,7 +203,7 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -234,7 +239,9 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -251,7 +258,7 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; let d$1 = d + 1 | 0; @@ -293,14 +300,16 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function insertionSort(src, srcofs, dst, dstofs, len, cmp) { for(let i = 0; i < len; ++i){ let e = src[srcofs + i | 0]; let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, dst[j], e) > 0) { + while(j >= dstofs && cmp(dst[j], e) > 0) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; }; @@ -333,7 +342,9 @@ function stableSortInPlaceByU(a, cmp) { } function stableSortInPlaceBy(a, cmp) { - stableSortInPlaceByU(a, Curry.__2(cmp)); + stableSortInPlaceByU(a, (function (x, y) { + return cmp(x, y); + })); } function stableSortByU(a, cmp) { @@ -343,7 +354,9 @@ function stableSortByU(a, cmp) { } function stableSortBy(a, cmp) { - return stableSortByU(a, Curry.__2(cmp)); + return stableSortByU(a, (function (x, y) { + return cmp(x, y); + })); } function binarySearchByU(sorted, key, cmp) { @@ -352,12 +365,12 @@ function binarySearchByU(sorted, key, cmp) { return -1; } let lo = sorted[0]; - let c = Curry._2(cmp, key, lo); + let c = cmp(key, lo); if (c < 0) { return -1; } let hi = sorted[len - 1 | 0]; - let c2 = Curry._2(cmp, key, hi); + let c2 = cmp(key, hi); if (c2 > 0) { return -(len + 1 | 0) | 0; } else { @@ -368,13 +381,13 @@ function binarySearchByU(sorted, key, cmp) { let lo$1 = _lo; let mid = (lo$1 + hi$1 | 0) / 2 | 0; let midVal = sorted[mid]; - let c$1 = Curry._2(cmp, key, midVal); + let c$1 = cmp(key, midVal); if (c$1 === 0) { return mid; } if (c$1 < 0) { if (hi$1 === mid) { - if (Curry._2(cmp, sorted[lo$1], key) === 0) { + if (cmp(sorted[lo$1], key) === 0) { return lo$1; } else { return -(hi$1 + 1 | 0) | 0; @@ -384,7 +397,7 @@ function binarySearchByU(sorted, key, cmp) { continue; } if (lo$1 === mid) { - if (Curry._2(cmp, sorted[hi$1], key) === 0) { + if (cmp(sorted[hi$1], key) === 0) { return hi$1; } else { return -(hi$1 + 1 | 0) | 0; @@ -397,7 +410,9 @@ function binarySearchByU(sorted, key, cmp) { } function binarySearchBy(sorted, key, cmp) { - return binarySearchByU(sorted, key, Curry.__2(cmp)); + return binarySearchByU(sorted, key, (function (x, y) { + return cmp(x, y); + })); } let Int; diff --git a/lib/es6/belt_internalAVLset.js b/lib/es6/belt_internalAVLset.js index 3fe519d075..6f6efe8a31 100644 --- a/lib/es6/belt_internalAVLset.js +++ b/lib/es6/belt_internalAVLset.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_SortArray from "./belt_SortArray.js"; @@ -171,14 +170,16 @@ function forEachU(_n, f) { return; } forEachU(n.l, f); - Curry._1(f, n.v); + f(n.v); _n = n.r; continue; }; } function forEach(n, f) { - forEachU(n, Curry.__1(f)); + forEachU(n, (function (a) { + f(a); + })); } function reduceU(_s, _accu, f) { @@ -188,14 +189,16 @@ function reduceU(_s, _accu, f) { if (s === undefined) { return accu; } - _accu = Curry._2(f, reduceU(s.l, accu, f), s.v); + _accu = f(reduceU(s.l, accu, f), s.v); _s = s.r; continue; }; } function reduce(s, accu, f) { - return reduceU(s, accu, Curry.__2(f)); + return reduceU(s, accu, (function (a, b) { + return f(a, b); + })); } function everyU(_n, p) { @@ -204,7 +207,7 @@ function everyU(_n, p) { if (n === undefined) { return true; } - if (!Curry._1(p, n.v)) { + if (!p(n.v)) { return false; } if (!everyU(n.l, p)) { @@ -216,7 +219,9 @@ function everyU(_n, p) { } function every(n, p) { - return everyU(n, Curry.__1(p)); + return everyU(n, (function (a) { + return p(a); + })); } function someU(_n, p) { @@ -225,7 +230,7 @@ function someU(_n, p) { if (n === undefined) { return false; } - if (Curry._1(p, n.v)) { + if (p(n.v)) { return true; } if (someU(n.l, p)) { @@ -237,7 +242,9 @@ function someU(_n, p) { } function some(n, p) { - return someU(n, Curry.__1(p)); + return someU(n, (function (a) { + return p(a); + })); } function addMinElement(n, v) { @@ -299,7 +306,7 @@ function partitionSharedU(n, p) { let match = partitionSharedU(n.l, p); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, value); + let pv = p(value); let match$1 = partitionSharedU(n.r, p); let rf = match$1[1]; let rt = match$1[0]; @@ -317,7 +324,9 @@ function partitionSharedU(n, p) { } function partitionShared(n, p) { - return partitionSharedU(n, Curry.__1(p)); + return partitionSharedU(n, (function (a) { + return p(a); + })); } function lengthNode(n) { @@ -415,7 +424,7 @@ function fillArrayWithPartition(_n, cursor, arr, p) { if (l !== undefined) { fillArrayWithPartition(l, cursor, arr, p); } - if (Curry._1(p, v)) { + if (p(v)) { let c = cursor.forward; arr[c] = v; cursor.forward = c + 1 | 0; @@ -440,7 +449,7 @@ function fillArrayWithFilter(_n, _i, arr, p) { let l = n.l; let r = n.r; let next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; - let rnext = Curry._1(p, v) ? (arr[next] = v, next + 1 | 0) : next; + let rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; if (r === undefined) { return rnext; } @@ -540,7 +549,7 @@ function keepSharedU(n, p) { let l = n.l; let r = n.r; let newL = keepSharedU(l, p); - let pv = Curry._1(p, v); + let pv = p(v); let newR = keepSharedU(r, p); if (pv) { if (l === newL && r === newR) { @@ -554,7 +563,9 @@ function keepSharedU(n, p) { } function keepShared(n, p) { - return keepSharedU(n, Curry.__1(p)); + return keepSharedU(n, (function (a) { + return p(a); + })); } function keepCopyU(n, p) { @@ -568,7 +579,9 @@ function keepCopyU(n, p) { } function keepCopy(n, p) { - return keepCopyU(n, Curry.__1(p)); + return keepCopyU(n, (function (x) { + return p(x); + })); } function partitionCopyU(n, p) { @@ -594,7 +607,9 @@ function partitionCopyU(n, p) { } function partitionCopy(n, p) { - return partitionCopyU(n, Curry.__1(p)); + return partitionCopyU(n, (function (a) { + return p(a); + })); } function has(_t, x, cmp) { @@ -604,7 +619,7 @@ function has(_t, x, cmp) { return false; } let v = t.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return true; } @@ -630,7 +645,7 @@ function cmp(s1, s2, cmp$1) { } let h2 = e2.hd; let h1 = e1.hd; - let c = Curry._2(cmp$1, h1.v, h2.v); + let c = cmp$1(h1.v, h2.v); if (c !== 0) { return c; } @@ -665,7 +680,7 @@ function subset(_s1, _s2, cmp) { let v2 = s2.v; let l2 = s2.l; let r2 = s2.r; - let c = Curry._2(cmp, v1, v2); + let c = cmp(v1, v2); if (c === 0) { if (!subset(l1, l2, cmp)) { return false; @@ -696,7 +711,7 @@ function get(_n, x, cmp) { return; } let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return Caml_option.some(v); } @@ -712,7 +727,7 @@ function getUndefined(_n, x, cmp) { return; } let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return v; } @@ -726,7 +741,7 @@ function getExn(_n, x, cmp) { let n = _n; if (n !== undefined) { let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return v; } @@ -840,7 +855,7 @@ function addMutate(cmp, t, x) { return singleton(x); } let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -861,7 +876,7 @@ function fromArray(xs, cmp) { return; } let next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { - return Curry._2(cmp, x, y) < 0; + return cmp(x, y) < 0; })); let result; if (next >= 0) { diff --git a/lib/es6/belt_internalAVLtree.js b/lib/es6/belt_internalAVLtree.js index ac02e1ae3a..b2406181e3 100644 --- a/lib/es6/belt_internalAVLtree.js +++ b/lib/es6/belt_internalAVLtree.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_SortArray from "./belt_SortArray.js"; @@ -255,7 +254,7 @@ function findFirstByU(n, p) { } let v = n.k; let d = n.v; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); if (pvd) { return [ v, @@ -270,7 +269,9 @@ function findFirstByU(n, p) { } function findFirstBy(n, p) { - return findFirstByU(n, Curry.__2(p)); + return findFirstByU(n, (function (a, b) { + return p(a, b); + })); } function forEachU(_n, f) { @@ -280,14 +281,16 @@ function forEachU(_n, f) { return; } forEachU(n.l, f); - Curry._2(f, n.k, n.v); + f(n.k, n.v); _n = n.r; continue; }; } function forEach(n, f) { - forEachU(n, Curry.__2(f)); + forEachU(n, (function (a, b) { + f(a, b); + })); } function mapU(n, f) { @@ -295,7 +298,7 @@ function mapU(n, f) { return; } let newLeft = mapU(n.l, f); - let newD = Curry._1(f, n.v); + let newD = f(n.v); let newRight = mapU(n.r, f); return { k: n.k, @@ -307,7 +310,9 @@ function mapU(n, f) { } function map(n, f) { - return mapU(n, Curry.__1(f)); + return mapU(n, (function (a) { + return f(a); + })); } function mapWithKeyU(n, f) { @@ -316,7 +321,7 @@ function mapWithKeyU(n, f) { } let key = n.k; let newLeft = mapWithKeyU(n.l, f); - let newD = Curry._2(f, key, n.v); + let newD = f(key, n.v); let newRight = mapWithKeyU(n.r, f); return { k: key, @@ -328,7 +333,9 @@ function mapWithKeyU(n, f) { } function mapWithKey(n, f) { - return mapWithKeyU(n, Curry.__2(f)); + return mapWithKeyU(n, (function (a, b) { + return f(a, b); + })); } function reduceU(_m, _accu, f) { @@ -342,14 +349,16 @@ function reduceU(_m, _accu, f) { let d = m.v; let l = m.l; let r = m.r; - _accu = Curry._3(f, reduceU(l, accu, f), v, d); + _accu = f(reduceU(l, accu, f), v, d); _m = r; continue; }; } function reduce(m, accu, f) { - return reduceU(m, accu, Curry.__3(f)); + return reduceU(m, accu, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(_n, p) { @@ -358,7 +367,7 @@ function everyU(_n, p) { if (n === undefined) { return true; } - if (!Curry._2(p, n.k, n.v)) { + if (!p(n.k, n.v)) { return false; } if (!everyU(n.l, p)) { @@ -370,7 +379,9 @@ function everyU(_n, p) { } function every(n, p) { - return everyU(n, Curry.__2(p)); + return everyU(n, (function (a, b) { + return p(a, b); + })); } function someU(_n, p) { @@ -379,7 +390,7 @@ function someU(_n, p) { if (n === undefined) { return false; } - if (Curry._2(p, n.k, n.v)) { + if (p(n.k, n.v)) { return true; } if (someU(n.l, p)) { @@ -391,7 +402,9 @@ function someU(_n, p) { } function some(n, p) { - return someU(n, Curry.__2(p)); + return someU(n, (function (a, b) { + return p(a, b); + })); } function addMinElement(n, k, v) { @@ -468,7 +481,7 @@ function keepSharedU(n, p) { let v = n.k; let d = n.v; let newLeft = keepSharedU(n.l, p); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let newRight = keepSharedU(n.r, p); if (pvd) { return join(newLeft, v, d, newRight); @@ -478,7 +491,9 @@ function keepSharedU(n, p) { } function keepShared(n, p) { - return keepSharedU(n, Curry.__2(p)); + return keepSharedU(n, (function (a, b) { + return p(a, b); + })); } function keepMapU(n, p) { @@ -488,7 +503,7 @@ function keepMapU(n, p) { let v = n.k; let d = n.v; let newLeft = keepMapU(n.l, p); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let newRight = keepMapU(n.r, p); if (pvd !== undefined) { return join(newLeft, v, Caml_option.valFromOption(pvd), newRight); @@ -498,7 +513,9 @@ function keepMapU(n, p) { } function keepMap(n, p) { - return keepMapU(n, Curry.__2(p)); + return keepMapU(n, (function (a, b) { + return p(a, b); + })); } function partitionSharedU(n, p) { @@ -513,7 +530,7 @@ function partitionSharedU(n, p) { let match = partitionSharedU(n.l, p); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, key, value); + let pvd = p(key, value); let match$1 = partitionSharedU(n.r, p); let rf = match$1[1]; let rt = match$1[0]; @@ -531,7 +548,9 @@ function partitionSharedU(n, p) { } function partitionShared(n, p) { - return partitionSharedU(n, Curry.__2(p)); + return partitionSharedU(n, (function (a, b) { + return p(a, b); + })); } function lengthNode(n) { @@ -798,11 +817,11 @@ function cmpU(s1, s2, kcmp, vcmp) { } let h2 = e2.hd; let h1 = e1.hd; - let c = Curry._2(kcmp, h1.k, h2.k); + let c = kcmp(h1.k, h2.k); if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -818,7 +837,9 @@ function cmpU(s1, s2, kcmp, vcmp) { } function cmp(s1, s2, kcmp, vcmp) { - return cmpU(s1, s2, kcmp, Curry.__2(vcmp)); + return cmpU(s1, s2, kcmp, (function (a, b) { + return vcmp(a, b); + })); } function eqU(s1, s2, kcmp, veq) { @@ -838,7 +859,7 @@ function eqU(s1, s2, kcmp, veq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(Curry._2(kcmp, h1.k, h2.k) === 0 && Curry._2(veq, h1.v, h2.v))) { + if (!(kcmp(h1.k, h2.k) === 0 && veq(h1.v, h2.v))) { return false; } _e2 = stackAllLeft(h2.r, e2.tl); @@ -851,7 +872,9 @@ function eqU(s1, s2, kcmp, veq) { } function eq(s1, s2, kcmp, veq) { - return eqU(s1, s2, kcmp, Curry.__2(veq)); + return eqU(s1, s2, kcmp, (function (a, b) { + return veq(a, b); + })); } function get(_n, x, cmp) { @@ -861,7 +884,7 @@ function get(_n, x, cmp) { return; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return Caml_option.some(n.v); } @@ -877,7 +900,7 @@ function getUndefined(_n, x, cmp) { return; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -891,7 +914,7 @@ function getExn(_n, x, cmp) { let n = _n; if (n !== undefined) { let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -913,7 +936,7 @@ function getWithDefault(_n, x, def, cmp) { return def; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -929,7 +952,7 @@ function has(_n, x, cmp) { return false; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return true; } @@ -1029,7 +1052,7 @@ function updateMutate(t, x, data, cmp) { return singleton(x, data); } let k = t.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { t.v = data; return t; @@ -1051,7 +1074,7 @@ function fromArray(xs, cmp) { return; } let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { - return Curry._2(cmp, param[0], param$1[0]) < 0; + return cmp(param[0], param$1[0]) < 0; })); let result; if (next >= 0) { diff --git a/lib/es6/belt_internalBuckets.js b/lib/es6/belt_internalBuckets.js index 0d70574944..7842375964 100644 --- a/lib/es6/belt_internalBuckets.js +++ b/lib/es6/belt_internalBuckets.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_Array from "./belt_Array.js"; import * as Caml_option from "./caml_option.js"; @@ -73,7 +72,7 @@ function do_bucket_iter(f, _buckets) { if (buckets === undefined) { return; } - Curry._2(f, buckets.key, buckets.value); + f(buckets.key, buckets.value); _buckets = buckets.next; continue; }; @@ -87,7 +86,9 @@ function forEachU(h, f) { } function forEach(h, f) { - forEachU(h, Curry.__2(f)); + forEachU(h, (function (a, b) { + return f(a, b); + })); } function do_bucket_fold(f, _b, _accu) { @@ -97,7 +98,7 @@ function do_bucket_fold(f, _b, _accu) { if (b === undefined) { return accu; } - _accu = Curry._3(f, accu, b.key, b.value); + _accu = f(accu, b.key, b.value); _b = b.next; continue; }; @@ -113,7 +114,9 @@ function reduceU(h, init, f) { } function reduce(h, init, f) { - return reduceU(h, init, Curry.__3(f)); + return reduceU(h, init, (function (a, b, c) { + return f(a, b, c); + })); } function getMaxBucketLength(h) { @@ -153,7 +156,7 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { let cell = _cell; let prec = _prec; let n = cell.next; - let data = Curry._2(f, cell.key, cell.value); + let data = f(cell.key, cell.value); if (data !== undefined) { if (prec !== undefined) { cell.next = cell; @@ -195,7 +198,9 @@ function keepMapInPlaceU(h, f) { } function keepMapInPlace(h, f) { - keepMapInPlaceU(h, Curry.__2(f)); + keepMapInPlaceU(h, (function (a, b) { + return f(a, b); + })); } function fillArray(_i, arr, _cell) { @@ -220,7 +225,7 @@ function fillArrayMap(_i, arr, _cell, f) { while(true) { let cell = _cell; let i = _i; - arr[i] = Curry._1(f, cell); + arr[i] = f(cell); let v = cell.next; if (v === undefined) { return i + 1 | 0; diff --git a/lib/es6/belt_internalMapInt.js b/lib/es6/belt_internalMapInt.js index 122784a58c..845b33e8f4 100644 --- a/lib/es6/belt_internalMapInt.js +++ b/lib/es6/belt_internalMapInt.js @@ -1,7 +1,6 @@ import * as Caml from "./caml.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_SortArray from "./belt_SortArray.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; @@ -195,7 +194,7 @@ function mergeU(s1, s2, f) { let l1 = s1.l; let r1 = s1.r; let match = split(v1, s2); - return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, Curry._3(f, v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { @@ -206,11 +205,13 @@ function mergeU(s1, s2, f) { let l2 = s2.l; let r2 = s2.r; let match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, Curry._3(f, v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { @@ -229,7 +230,7 @@ function compareAux(_e1, _e2, vcmp) { if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -252,7 +253,9 @@ function cmpU(s1, s2, cmp) { } function cmp(s1, s2, f) { - return cmpU(s1, s2, Curry.__2(f)); + return cmpU(s1, s2, (function (a, b) { + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { @@ -267,7 +270,7 @@ function eqAux(_e1, _e2, eq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(h1.k === h2.k && Curry._2(eq, h1.v, h2.v))) { + if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); @@ -287,7 +290,9 @@ function eqU(s1, s2, eq) { } function eq(s1, s2, f) { - return eqU(s1, s2, Curry.__2(f)); + return eqU(s1, s2, (function (a, b) { + return f(a, b); + })); } function addMutate(t, x, data) { diff --git a/lib/es6/belt_internalMapString.js b/lib/es6/belt_internalMapString.js index 303a845146..d264f68795 100644 --- a/lib/es6/belt_internalMapString.js +++ b/lib/es6/belt_internalMapString.js @@ -1,7 +1,6 @@ import * as Caml from "./caml.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as Belt_SortArray from "./belt_SortArray.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; @@ -195,7 +194,7 @@ function mergeU(s1, s2, f) { let l1 = s1.l; let r1 = s1.r; let match = split(v1, s2); - return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, Curry._3(f, v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { @@ -206,11 +205,13 @@ function mergeU(s1, s2, f) { let l2 = s2.l; let r2 = s2.r; let match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, Curry._3(f, v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { @@ -229,7 +230,7 @@ function compareAux(_e1, _e2, vcmp) { if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -252,7 +253,9 @@ function cmpU(s1, s2, cmp) { } function cmp(s1, s2, f) { - return cmpU(s1, s2, Curry.__2(f)); + return cmpU(s1, s2, (function (a, b) { + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { @@ -267,7 +270,7 @@ function eqAux(_e1, _e2, eq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(h1.k === h2.k && Curry._2(eq, h1.v, h2.v))) { + if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); @@ -287,7 +290,9 @@ function eqU(s1, s2, eq) { } function eq(s1, s2, f) { - return eqU(s1, s2, Curry.__2(f)); + return eqU(s1, s2, (function (a, b) { + return f(a, b); + })); } function addMutate(t, x, data) { diff --git a/lib/es6/belt_internalSetBuckets.js b/lib/es6/belt_internalSetBuckets.js index b045a4bfa0..e4b289dd09 100644 --- a/lib/es6/belt_internalSetBuckets.js +++ b/lib/es6/belt_internalSetBuckets.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Belt_Array from "./belt_Array.js"; function copyAuxCont(_c, _prec) { @@ -70,7 +69,7 @@ function doBucketIter(f, _buckets) { if (buckets === undefined) { return; } - Curry._1(f, buckets.key); + f(buckets.key); _buckets = buckets.next; continue; }; @@ -84,7 +83,9 @@ function forEachU(h, f) { } function forEach(h, f) { - forEachU(h, Curry.__1(f)); + forEachU(h, (function (a) { + f(a); + })); } function fillArray(_i, arr, _cell) { @@ -123,7 +124,7 @@ function doBucketFold(f, _b, _accu) { if (b === undefined) { return accu; } - _accu = Curry._2(f, accu, b.key); + _accu = f(accu, b.key); _b = b.next; continue; }; @@ -139,7 +140,9 @@ function reduceU(h, init, f) { } function reduce(h, init, f) { - return reduceU(h, init, Curry.__2(f)); + return reduceU(h, init, (function (a, b) { + return f(a, b); + })); } function getMaxBucketLength(h) { diff --git a/lib/es6/buffer.js b/lib/es6/buffer.js index 034ec0ea08..a396c734a2 100644 --- a/lib/es6/buffer.js +++ b/lib/es6/buffer.js @@ -1,7 +1,6 @@ import * as Bytes from "./bytes.js"; -import * as Curry from "./curry.js"; import * as $$String from "./string.js"; import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_string from "./caml_string.js"; @@ -447,7 +446,7 @@ function add_substitute(b, f, s) { } let j = i + 1 | 0; let match = find_ident(s, j, lim); - add_string(b, Curry._1(f, match[0])); + add_string(b, f(match[0])); _i = match[1]; _previous = /* ' ' */32; continue; diff --git a/lib/es6/bytes.js b/lib/es6/bytes.js index c47cca3ffb..39bf696da3 100644 --- a/lib/es6/bytes.js +++ b/lib/es6/bytes.js @@ -2,7 +2,6 @@ import * as Caml from "./caml.js"; import * as Char from "./char.js"; -import * as Curry from "./curry.js"; import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; @@ -64,7 +63,7 @@ function make(n, c) { function init(n, f) { let s = Caml_bytes.create(n); for(let i = 0; i < n; ++i){ - s[i] = Curry._1(f, i); + s[i] = f(i); } return s; } @@ -232,13 +231,13 @@ function blit_string(s1, ofs1, s2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -446,7 +445,7 @@ function map(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, s[i]); + r[i] = f(s[i]); } return r; } @@ -458,7 +457,7 @@ function mapi(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, s[i]); + r[i] = f(i, s[i]); } return r; } @@ -476,7 +475,7 @@ function apply1(f, s) { return s; } let r = copy(s); - r[0] = Curry._1(f, s[0]); + r[0] = f(s[0]); return r; } diff --git a/lib/es6/bytesLabels.js b/lib/es6/bytesLabels.js index c47cca3ffb..39bf696da3 100644 --- a/lib/es6/bytesLabels.js +++ b/lib/es6/bytesLabels.js @@ -2,7 +2,6 @@ import * as Caml from "./caml.js"; import * as Char from "./char.js"; -import * as Curry from "./curry.js"; import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; @@ -64,7 +63,7 @@ function make(n, c) { function init(n, f) { let s = Caml_bytes.create(n); for(let i = 0; i < n; ++i){ - s[i] = Curry._1(f, i); + s[i] = f(i); } return s; } @@ -232,13 +231,13 @@ function blit_string(s1, ofs1, s2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -446,7 +445,7 @@ function map(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, s[i]); + r[i] = f(s[i]); } return r; } @@ -458,7 +457,7 @@ function mapi(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, s[i]); + r[i] = f(i, s[i]); } return r; } @@ -476,7 +475,7 @@ function apply1(f, s) { return s; } let r = copy(s); - r[0] = Curry._1(f, s[0]); + r[0] = f(s[0]); return r; } diff --git a/lib/es6/camlinternalLazy.js b/lib/es6/camlinternalLazy.js index 6315f50de6..cf6061cc29 100644 --- a/lib/es6/camlinternalLazy.js +++ b/lib/es6/camlinternalLazy.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_exceptions from "./caml_exceptions.js"; function is_val(l) { @@ -10,7 +9,7 @@ function is_val(l) { let Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); function forward_with_closure(blk, closure) { - let result = Curry._1(closure, undefined); + let result = closure(); blk.VAL = result; blk.LAZY_DONE = true; return result; diff --git a/lib/es6/filename.js b/lib/es6/filename.js index 0c8667c1ee..1c278eaa94 100644 --- a/lib/es6/filename.js +++ b/lib/es6/filename.js @@ -2,7 +2,6 @@ import * as Sys from "./sys.js"; import * as Bytes from "./bytes.js"; -import * as Curry from "./curry.js"; import * as Buffer from "./buffer.js"; import * as $$String from "./string.js"; import * as Caml_sys from "./caml_sys.js"; @@ -19,7 +18,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n)) { + if (!is_dir_sep(name, n)) { let _n$1 = n; let p = n + 1 | 0; while(true) { @@ -27,7 +26,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n$1 < 0) { return $$String.sub(name, 0, p); } - if (Curry._2(is_dir_sep, name, n$1)) { + if (is_dir_sep(name, n$1)) { return $$String.sub(name, n$1 + 1 | 0, (p - n$1 | 0) - 1 | 0); } _n$1 = n$1 - 1 | 0; @@ -50,21 +49,21 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { if (n < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n)) { + if (!is_dir_sep(name, n)) { let _n$1 = n; while(true) { let n$1 = _n$1; if (n$1 < 0) { return current_dir_name; } - if (Curry._2(is_dir_sep, name, n$1)) { + if (is_dir_sep(name, n$1)) { let _n$2 = n$1; while(true) { let n$2 = _n$2; if (n$2 < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n$2)) { + if (!is_dir_sep(name, n$2)) { return $$String.sub(name, 0, n$2 + 1 | 0); } _n$2 = n$2 - 1 | 0; @@ -375,7 +374,7 @@ let dir_sep = match[2]; function concat(dirname, filename) { let l = dirname.length; - if (l === 0 || Curry._2(is_dir_sep$2, dirname, l - 1 | 0)) { + if (l === 0 || is_dir_sep$2(dirname, l - 1 | 0)) { return dirname + filename; } else { return dirname + (dir_sep + filename); @@ -399,14 +398,14 @@ function extension_len(name) { let _i = name.length - 1 | 0; while(true) { let i = _i; - if (i < 0 || Curry._2(is_dir_sep$2, name, i)) { + if (i < 0 || is_dir_sep$2(name, i)) { return 0; } if (Caml_string.get(name, i) === /* '.' */46) { let _i$1 = i - 1 | 0; while(true) { let i$1 = _i$1; - if (i$1 < 0 || Curry._2(is_dir_sep$2, name, i$1)) { + if (i$1 < 0 || is_dir_sep$2(name, i$1)) { return 0; } if (Caml_string.get(name, i$1) !== /* '.' */46) { diff --git a/lib/es6/hashtbl.js b/lib/es6/hashtbl.js index 3148f3046b..c0ea9129b9 100644 --- a/lib/es6/hashtbl.js +++ b/lib/es6/hashtbl.js @@ -2,7 +2,6 @@ import * as Caml from "./caml.js"; import * as $$Array from "./array.js"; -import * as Curry from "./curry.js"; import * as Random from "./random.js"; import * as Caml_obj from "./caml_obj.js"; import * as Caml_hash from "./caml_hash.js"; @@ -178,7 +177,7 @@ function resize(indexfun, h) { data: data, next: "Empty" }); - let nidx = Curry._2(indexfun, h, key); + let nidx = indexfun(h, key); let tail = Caml_array.get(ndata_tail, nidx); if (typeof tail !== "object") { Caml_array.set(ndata, nidx, cell); @@ -450,7 +449,7 @@ function iter(f, h) { let key = param.key; let data = param.data; let next = param.next; - Curry._2(f, key, data); + f(key, data); _param = next; continue; }; @@ -498,7 +497,7 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { let key = param.key; let data = param.data; let next = param.next; - let data$1 = Curry._2(f, key, data); + let data$1 = f(key, data); if (data$1 !== undefined) { if (typeof prec !== "object") { Caml_array.set(h.data, i, param); @@ -552,7 +551,7 @@ function fold(f, h, init) { let key = b.key; let data = b.data; let next = b.next; - _accu = Curry._3(f, key, data, accu); + _accu = f(key, data, accu); _b = next; continue; }; @@ -618,7 +617,7 @@ function stats(h) { function MakeSeeded(H) { let key_index = function (h, key) { - return Curry._2(H.hash, h.seed, key) & (h.data.length - 1 | 0); + return H.hash(h.seed, key) & (h.data.length - 1 | 0); }; let add = function (h, key, data) { let i = key_index(h, key); @@ -647,7 +646,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { return Caml_array.set(h.data, i, next); @@ -673,7 +672,7 @@ function MakeSeeded(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(H.equal, key, k1)) { + if (H.equal(key, k1)) { return d1; } if (typeof next1 !== "object") { @@ -686,7 +685,7 @@ function MakeSeeded(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(H.equal, key, k2)) { + if (H.equal(key, k2)) { return d2; } if (typeof next2 !== "object") { @@ -699,7 +698,7 @@ function MakeSeeded(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(H.equal, key, k3)) { + if (H.equal(key, k3)) { return d3; } else { let _param = next3; @@ -715,7 +714,7 @@ function MakeSeeded(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(H.equal, key, k)) { + if (H.equal(key, k)) { return data; } _param = next; @@ -731,7 +730,7 @@ function MakeSeeded(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(H.equal, key, k1)) { + if (H.equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { @@ -740,7 +739,7 @@ function MakeSeeded(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(H.equal, key, k2)) { + if (H.equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { @@ -749,7 +748,7 @@ function MakeSeeded(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(H.equal, key, k3)) { + if (H.equal(key, k3)) { return Caml_option.some(d3); } else { let _param = next3; @@ -761,7 +760,7 @@ function MakeSeeded(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(H.equal, key, k)) { + if (H.equal(key, k)) { return Caml_option.some(data); } _param = next; @@ -779,7 +778,7 @@ function MakeSeeded(H) { let k = param.key; let d = param.data; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { return { hd: d, tl: find_in_bucket(next) @@ -799,7 +798,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { param.key = key; param.data = data; return false; @@ -836,7 +835,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { return true; } _param = next; @@ -866,7 +865,7 @@ function MakeSeeded(H) { function Make(H) { let equal = H.equal; let key_index = function (h, key) { - return Curry._1(H.hash, key) & (h.data.length - 1 | 0); + return H.hash(key) & (h.data.length - 1 | 0); }; let add = function (h, key, data) { let i = key_index(h, key); @@ -895,7 +894,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { return Caml_array.set(h.data, i, next); @@ -921,7 +920,7 @@ function Make(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(equal, key, k1)) { + if (equal(key, k1)) { return d1; } if (typeof next1 !== "object") { @@ -934,7 +933,7 @@ function Make(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(equal, key, k2)) { + if (equal(key, k2)) { return d2; } if (typeof next2 !== "object") { @@ -947,7 +946,7 @@ function Make(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(equal, key, k3)) { + if (equal(key, k3)) { return d3; } else { let _param = next3; @@ -963,7 +962,7 @@ function Make(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(equal, key, k)) { + if (equal(key, k)) { return data; } _param = next; @@ -979,7 +978,7 @@ function Make(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(equal, key, k1)) { + if (equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { @@ -988,7 +987,7 @@ function Make(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(equal, key, k2)) { + if (equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { @@ -997,7 +996,7 @@ function Make(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(equal, key, k3)) { + if (equal(key, k3)) { return Caml_option.some(d3); } else { let _param = next3; @@ -1009,7 +1008,7 @@ function Make(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(equal, key, k)) { + if (equal(key, k)) { return Caml_option.some(data); } _param = next; @@ -1027,7 +1026,7 @@ function Make(H) { let k = param.key; let d = param.data; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { return { hd: d, tl: find_in_bucket(next) @@ -1047,7 +1046,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { param.key = key; param.data = data; return false; @@ -1084,7 +1083,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { return true; } _param = next; diff --git a/lib/es6/hashtblLabels.js b/lib/es6/hashtblLabels.js index 168edfb9c1..7c623f7274 100644 --- a/lib/es6/hashtblLabels.js +++ b/lib/es6/hashtblLabels.js @@ -1,22 +1,31 @@ -import * as Curry from "./curry.js"; import * as Hashtbl from "./hashtbl.js"; -let add = Hashtbl.add; +function add(tbl, key, data) { + Hashtbl.add(tbl, key, data); +} -let replace = Hashtbl.replace; +function replace(tbl, key, data) { + Hashtbl.replace(tbl, key, data); +} function iter(f, tbl) { - Hashtbl.iter(Curry.__2(f), tbl); + Hashtbl.iter((function (key, data) { + f(key, data); + }), tbl); } function filter_map_inplace(f, tbl) { - Hashtbl.filter_map_inplace(Curry.__2(f), tbl); + Hashtbl.filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); } function fold(f, tbl, init) { - return Hashtbl.fold(Curry.__3(f), tbl, init); + return Hashtbl.fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); } function MakeSeeded(H) { @@ -26,16 +35,26 @@ function MakeSeeded(H) { let iter = include.iter; let filter_map_inplace = include.filter_map_inplace; let fold = include.fold; - let add$1 = Curry.__3(add); - let replace$1 = Curry.__3(replace); + let add$1 = function (tbl, key, data) { + add(tbl, key, data); + }; + let replace$1 = function (tbl, key, data) { + replace(tbl, key, data); + }; let iter$1 = function (f, tbl) { - Curry._2(iter, Curry.__2(f), tbl); + iter((function (key, data) { + f(key, data); + }), tbl); }; let filter_map_inplace$1 = function (f, tbl) { - Curry._2(filter_map_inplace, Curry.__2(f), tbl); + filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); }; let fold$1 = function (f, tbl, init) { - return Curry._3(fold, Curry.__3(f), tbl, init); + return fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); }; return { create: include.create, @@ -59,7 +78,7 @@ function MakeSeeded(H) { function Make(H) { let hash = function (_seed, x) { - return Curry._1(H.hash, x); + return H.hash(x); }; let H_equal = H.equal; let H$1 = { @@ -73,19 +92,29 @@ function Make(H) { let iter = include.iter; let filter_map_inplace = include.filter_map_inplace; let fold = include.fold; - let add$1 = Curry.__3(add); - let replace$1 = Curry.__3(replace); + let add$1 = function (tbl, key, data) { + add(tbl, key, data); + }; + let replace$1 = function (tbl, key, data) { + replace(tbl, key, data); + }; let iter$1 = function (f, tbl) { - Curry._2(iter, Curry.__2(f), tbl); + iter((function (key, data) { + f(key, data); + }), tbl); }; let filter_map_inplace$1 = function (f, tbl) { - Curry._2(filter_map_inplace, Curry.__2(f), tbl); + filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); }; let fold$1 = function (f, tbl, init) { - return Curry._3(fold, Curry.__3(f), tbl, init); + return fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); }; let create$1 = function (sz) { - return Curry._2(create, false, sz); + return create(false, sz); }; return { create: create$1, diff --git a/lib/es6/js_dict.js b/lib/es6/js_dict.js index fe3266980f..aada879bc8 100644 --- a/lib/es6/js_dict.js +++ b/lib/es6/js_dict.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function get(dict, k) { @@ -69,7 +68,7 @@ function map(f, source) { let l = keys.length; for(let i = 0; i < l; ++i){ let key = keys[i]; - target[key] = Curry._1(f, source[key]); + target[key] = f(source[key]); } return target; } diff --git a/lib/es6/js_null.js b/lib/es6/js_null.js index 1c8221b3d3..c6706e56a8 100644 --- a/lib/es6/js_null.js +++ b/lib/es6/js_null.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function test(x) { @@ -18,7 +17,7 @@ function getExn(f) { function bind(x, f) { if (x !== null) { - return Curry._1(f, x); + return f(x); } else { return null; } @@ -26,7 +25,7 @@ function bind(x, f) { function iter(x, f) { if (x !== null) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/es6/js_null_undefined.js b/lib/es6/js_null_undefined.js index 4eaa8bb6c1..58e5799d43 100644 --- a/lib/es6/js_null_undefined.js +++ b/lib/es6/js_null_undefined.js @@ -1,19 +1,18 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function bind(x, f) { if (x == null) { return x; } else { - return Curry._1(f, x); + return f(x); } } function iter(x, f) { if (!(x == null)) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/es6/js_option.js b/lib/es6/js_option.js index 348111e698..73e0a2f8ad 100644 --- a/lib/es6/js_option.js +++ b/lib/es6/js_option.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function some(x) { @@ -13,7 +12,7 @@ function isSome(x) { function isSomeValue(eq, v, x) { if (x !== undefined) { - return Curry._2(eq, v, Caml_option.valFromOption(x)); + return eq(v, Caml_option.valFromOption(x)); } else { return false; } @@ -35,7 +34,7 @@ function getExn(x) { function equal(eq, a, b) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(eq, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return eq(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return false; } @@ -46,14 +45,14 @@ function equal(eq, a, b) { function andThen(f, x) { if (x !== undefined) { - return Curry._1(f, Caml_option.valFromOption(x)); + return f(Caml_option.valFromOption(x)); } } function map(f, x) { if (x !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x))); + return Caml_option.some(f(Caml_option.valFromOption(x))); } } @@ -71,7 +70,7 @@ function filter(f, x) { return; } let x$1 = Caml_option.valFromOption(x); - if (Curry._1(f, x$1)) { + if (f(x$1)) { return Caml_option.some(x$1); } diff --git a/lib/es6/js_undefined.js b/lib/es6/js_undefined.js index 3a22b46f6b..68411f013f 100644 --- a/lib/es6/js_undefined.js +++ b/lib/es6/js_undefined.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function test(x) { @@ -22,14 +21,14 @@ function getExn(f) { function bind(x, f) { if (x !== undefined) { - return Curry._1(f, x); + return f(x); } } function iter(x, f) { if (x !== undefined) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/es6/lazy.js b/lib/es6/lazy.js index 1adb9d296b..14e2ebd88b 100644 --- a/lib/es6/lazy.js +++ b/lib/es6/lazy.js @@ -1,11 +1,10 @@ -import * as Curry from "./curry.js"; import * as CamlinternalLazy from "./camlinternalLazy.js"; function from_fun(f) { return CamlinternalLazy.from_fun(function () { - return Curry._1(f, undefined); + return f(); }); } diff --git a/lib/es6/lexing.js b/lib/es6/lexing.js index 68c6aedf48..e2f6ccdb75 100644 --- a/lib/es6/lexing.js +++ b/lib/es6/lexing.js @@ -1,7 +1,6 @@ import * as Bytes from "./bytes.js"; -import * as Curry from "./curry.js"; import * as Caml_array from "./caml_array.js"; import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_lexer from "./caml_lexer.js"; @@ -47,7 +46,7 @@ function from_function(f) { return { refill_buff: (function (x) { let aux_buffer = Caml_bytes.create(512); - let read = Curry._2(f, aux_buffer, aux_buffer.length); + let read = f(aux_buffer, aux_buffer.length); let n = read > 0 ? read : (x.lex_eof_reached = true, 0); if ((x.lex_buffer_len + n | 0) > x.lex_buffer.length) { if (((x.lex_buffer_len - x.lex_start_pos | 0) + n | 0) <= x.lex_buffer.length) { diff --git a/lib/es6/list.js b/lib/es6/list.js index 679fc2fd40..02a588f97a 100644 --- a/lib/es6/list.js +++ b/lib/es6/list.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_obj from "./caml_obj.js"; import * as Pervasives from "./pervasives.js"; import * as Caml_option from "./caml_option.js"; @@ -137,7 +136,7 @@ function init_tailrec_aux(_acc, _i, n, f) { } _i = i + 1 | 0; _acc = { - hd: Curry._1(f, i), + hd: f(i), tl: acc }; continue; @@ -148,7 +147,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - let r = Curry._1(f, i); + let r = f(i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -183,7 +182,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - let r = Curry._1(f, param.hd); + let r = f(param.hd); return { hd: r, tl: map(f, param.tl) @@ -194,7 +193,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - let r = Curry._2(f, i, param.hd); + let r = f(i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -216,7 +215,7 @@ function rev_map(f, l) { } _param = param.tl; _accu = { - hd: Curry._1(f, param.hd), + hd: f(param.hd), tl: accu }; continue; @@ -229,7 +228,7 @@ function iter(f, _param) { if (!param) { return; } - Curry._1(f, param.hd); + f(param.hd); _param = param.tl; continue; }; @@ -244,7 +243,7 @@ function iteri(f, l) { if (!param) { return; } - Curry._2(f, i, param.hd); + f(i, param.hd); _param = param.tl; _i = i + 1 | 0; continue; @@ -259,14 +258,14 @@ function fold_left(f, _accu, _l) { return accu; } _l = l.tl; - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); continue; }; } function fold_right(f, l, accu) { if (l) { - return Curry._2(f, l.hd, fold_right(f, l.tl, accu)); + return f(l.hd, fold_right(f, l.tl, accu)); } else { return accu; } @@ -275,7 +274,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - let r = Curry._2(f, l1.hd, l2.hd); + let r = f(l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -312,7 +311,7 @@ function rev_map2(f, l1, l2) { _l2 = l2$1.tl; _l1 = l1$1.tl; _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; continue; @@ -342,7 +341,7 @@ function iter2(f, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -375,7 +374,7 @@ function fold_left2(f, _accu, _l1, _l2) { if (l2) { _l2 = l2.tl; _l1 = l1.tl; - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); continue; } throw new Error("Invalid_argument", { @@ -400,7 +399,7 @@ function fold_left2(f, _accu, _l1, _l2) { function fold_right2(f, l1, l2, accu) { if (l1) { if (l2) { - return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); + return f(l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -426,7 +425,7 @@ function for_all(p, _param) { if (!param) { return true; } - if (!Curry._1(p, param.hd)) { + if (!p(param.hd)) { return false; } _param = param.tl; @@ -440,7 +439,7 @@ function exists(p, _param) { if (!param) { return false; } - if (Curry._1(p, param.hd)) { + if (p(param.hd)) { return true; } _param = param.tl; @@ -454,7 +453,7 @@ function for_all2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -486,7 +485,7 @@ function exists2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -673,7 +672,7 @@ function find(p, _param) { let param = _param; if (param) { let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return x; } _param = param.tl; @@ -694,7 +693,7 @@ function find_opt(p, _param) { return; } let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _param = param.tl; @@ -713,7 +712,7 @@ function find_all(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _accu = { hd: x, @@ -742,7 +741,7 @@ function partition(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _yes = { hd: x, @@ -818,7 +817,7 @@ function merge(cmp, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { return { hd: h1, tl: merge(cmp, l1.tl, l2) @@ -867,8 +866,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) <= 0) { - if (Curry._2(cmp, x2, x3) <= 0) { + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { return { hd: x1, tl: { @@ -879,7 +878,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x1, tl: { @@ -902,7 +901,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x2, tl: { @@ -913,7 +912,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) <= 0) { + } else if (cmp(x2, x3) <= 0) { return { hd: x2, tl: { @@ -947,7 +946,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) <= 0) { + if (cmp(x1$1, x2$1) <= 0) { return { hd: x1$1, tl: { @@ -987,7 +986,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) > 0) { + if (cmp(h1, h2) > 0) { _accu = { hd: h1, tl: accu @@ -1013,8 +1012,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) > 0) { - if (Curry._2(cmp, x2, x3) > 0) { + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { return { hd: x1, tl: { @@ -1025,7 +1024,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x1, tl: { @@ -1048,7 +1047,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x2, tl: { @@ -1059,7 +1058,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) > 0) { + } else if (cmp(x2, x3) > 0) { return { hd: x2, tl: { @@ -1093,7 +1092,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) > 0) { + if (cmp(x1$1, x2$1) > 0) { return { hd: x1$1, tl: { @@ -1133,7 +1132,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { _accu = { hd: h1, tl: accu @@ -1168,9 +1167,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1195,7 +1194,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1217,7 +1216,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1250,7 +1249,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1272,7 +1271,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1315,7 +1314,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1363,7 +1362,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1399,9 +1398,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1426,7 +1425,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1448,7 +1447,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1481,7 +1480,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1503,7 +1502,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1546,7 +1545,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1594,7 +1593,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, diff --git a/lib/es6/listLabels.js b/lib/es6/listLabels.js index 78e516c64d..a12d7fcd6d 100644 --- a/lib/es6/listLabels.js +++ b/lib/es6/listLabels.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_obj from "./caml_obj.js"; import * as Pervasives from "./pervasives.js"; import * as Caml_option from "./caml_option.js"; @@ -137,7 +136,7 @@ function init_tailrec_aux(_acc, _i, n, f) { } _i = i + 1 | 0; _acc = { - hd: Curry._1(f, i), + hd: f(i), tl: acc }; continue; @@ -148,7 +147,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - let r = Curry._1(f, i); + let r = f(i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -183,7 +182,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - let r = Curry._1(f, param.hd); + let r = f(param.hd); return { hd: r, tl: map(f, param.tl) @@ -194,7 +193,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - let r = Curry._2(f, i, param.hd); + let r = f(i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -216,7 +215,7 @@ function rev_map(f, l) { } _param = param.tl; _accu = { - hd: Curry._1(f, param.hd), + hd: f(param.hd), tl: accu }; continue; @@ -229,7 +228,7 @@ function iter(f, _param) { if (!param) { return; } - Curry._1(f, param.hd); + f(param.hd); _param = param.tl; continue; }; @@ -244,7 +243,7 @@ function iteri(f, l) { if (!param) { return; } - Curry._2(f, i, param.hd); + f(i, param.hd); _param = param.tl; _i = i + 1 | 0; continue; @@ -259,14 +258,14 @@ function fold_left(f, _accu, _l) { return accu; } _l = l.tl; - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); continue; }; } function fold_right(f, l, accu) { if (l) { - return Curry._2(f, l.hd, fold_right(f, l.tl, accu)); + return f(l.hd, fold_right(f, l.tl, accu)); } else { return accu; } @@ -275,7 +274,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - let r = Curry._2(f, l1.hd, l2.hd); + let r = f(l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -312,7 +311,7 @@ function rev_map2(f, l1, l2) { _l2 = l2$1.tl; _l1 = l1$1.tl; _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; continue; @@ -342,7 +341,7 @@ function iter2(f, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -375,7 +374,7 @@ function fold_left2(f, _accu, _l1, _l2) { if (l2) { _l2 = l2.tl; _l1 = l1.tl; - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); continue; } throw new Error("Invalid_argument", { @@ -400,7 +399,7 @@ function fold_left2(f, _accu, _l1, _l2) { function fold_right2(f, l1, l2, accu) { if (l1) { if (l2) { - return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); + return f(l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -426,7 +425,7 @@ function for_all(p, _param) { if (!param) { return true; } - if (!Curry._1(p, param.hd)) { + if (!p(param.hd)) { return false; } _param = param.tl; @@ -440,7 +439,7 @@ function exists(p, _param) { if (!param) { return false; } - if (Curry._1(p, param.hd)) { + if (p(param.hd)) { return true; } _param = param.tl; @@ -454,7 +453,7 @@ function for_all2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -486,7 +485,7 @@ function exists2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -673,7 +672,7 @@ function find(p, _param) { let param = _param; if (param) { let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return x; } _param = param.tl; @@ -694,7 +693,7 @@ function find_opt(p, _param) { return; } let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _param = param.tl; @@ -713,7 +712,7 @@ function find_all(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _accu = { hd: x, @@ -742,7 +741,7 @@ function partition(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _yes = { hd: x, @@ -818,7 +817,7 @@ function merge(cmp, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { return { hd: h1, tl: merge(cmp, l1.tl, l2) @@ -867,8 +866,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) <= 0) { - if (Curry._2(cmp, x2, x3) <= 0) { + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { return { hd: x1, tl: { @@ -879,7 +878,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x1, tl: { @@ -902,7 +901,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x2, tl: { @@ -913,7 +912,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) <= 0) { + } else if (cmp(x2, x3) <= 0) { return { hd: x2, tl: { @@ -947,7 +946,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) <= 0) { + if (cmp(x1$1, x2$1) <= 0) { return { hd: x1$1, tl: { @@ -987,7 +986,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) > 0) { + if (cmp(h1, h2) > 0) { _accu = { hd: h1, tl: accu @@ -1013,8 +1012,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) > 0) { - if (Curry._2(cmp, x2, x3) > 0) { + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { return { hd: x1, tl: { @@ -1025,7 +1024,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x1, tl: { @@ -1048,7 +1047,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x2, tl: { @@ -1059,7 +1058,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) > 0) { + } else if (cmp(x2, x3) > 0) { return { hd: x2, tl: { @@ -1093,7 +1092,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) > 0) { + if (cmp(x1$1, x2$1) > 0) { return { hd: x1$1, tl: { @@ -1133,7 +1132,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { _accu = { hd: h1, tl: accu @@ -1168,9 +1167,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1195,7 +1194,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1217,7 +1216,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1250,7 +1249,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1272,7 +1271,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1315,7 +1314,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1363,7 +1362,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1399,9 +1398,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1426,7 +1425,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1448,7 +1447,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1481,7 +1480,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1503,7 +1502,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1546,7 +1545,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1594,7 +1593,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, diff --git a/lib/es6/map.js b/lib/es6/map.js index 0f78c18808..9add13e742 100644 --- a/lib/es6/map.js +++ b/lib/es6/map.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(funarg) { @@ -121,7 +120,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -161,7 +160,7 @@ function Make(funarg) { } }); } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return param.d; } @@ -180,7 +179,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -195,7 +194,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -216,7 +215,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -231,7 +230,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -256,7 +255,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -271,7 +270,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -292,7 +291,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -307,7 +306,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -327,7 +326,7 @@ function Make(funarg) { if (typeof param !== "object") { return; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -341,7 +340,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -459,7 +458,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -480,7 +479,7 @@ function Make(funarg) { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -498,9 +497,9 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -540,7 +539,7 @@ function Make(funarg) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -550,7 +549,7 @@ function Make(funarg) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -567,7 +566,7 @@ function Make(funarg) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -585,7 +584,7 @@ function Make(funarg) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -596,7 +595,7 @@ function Make(funarg) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -612,7 +611,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -682,7 +681,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -715,7 +714,7 @@ function Make(funarg) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -733,7 +732,7 @@ function Make(funarg) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -752,7 +751,7 @@ function Make(funarg) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -762,7 +761,7 @@ function Make(funarg) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -776,7 +775,7 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -800,7 +799,7 @@ function Make(funarg) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -850,11 +849,11 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -879,10 +878,10 @@ function Make(funarg) { if (typeof e2 !== "object") { return false; } - if (Curry._2(funarg.compare, e1._0, e2._0) !== 0) { + if (funarg.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/lib/es6/mapLabels.js b/lib/es6/mapLabels.js index 0706caa57b..d6fe21fdf5 100644 --- a/lib/es6/mapLabels.js +++ b/lib/es6/mapLabels.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(Ord) { @@ -121,7 +120,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -161,7 +160,7 @@ function Make(Ord) { } }); } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return param.d; } @@ -181,7 +180,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -202,7 +201,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, param.d, f, param.l); } _param = param.r; @@ -221,7 +220,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -238,7 +237,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, param.d, f, param.l); } _param = param.r; @@ -257,7 +256,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -278,7 +277,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, param.d, f, param.r); } _param = param.l; @@ -297,7 +296,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -314,7 +313,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, param.d, f, param.r); } _param = param.l; @@ -327,7 +326,7 @@ function Make(Ord) { if (typeof param !== "object") { return; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -341,7 +340,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return true; } @@ -459,7 +458,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return merge(l, r); } @@ -480,7 +479,7 @@ function Make(Ord) { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -498,9 +497,9 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -540,7 +539,7 @@ function Make(Ord) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -550,7 +549,7 @@ function Make(Ord) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -567,7 +566,7 @@ function Make(Ord) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -585,7 +584,7 @@ function Make(Ord) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -596,7 +595,7 @@ function Make(Ord) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -612,7 +611,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -682,7 +681,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -715,7 +714,7 @@ function Make(Ord) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -733,7 +732,7 @@ function Make(Ord) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -752,7 +751,7 @@ function Make(Ord) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -762,7 +761,7 @@ function Make(Ord) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -776,7 +775,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -800,7 +799,7 @@ function Make(Ord) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -850,11 +849,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -879,10 +878,10 @@ function Make(Ord) { if (typeof e2 !== "object") { return false; } - if (Curry._2(Ord.compare, e1._0, e2._0) !== 0) { + if (Ord.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/lib/es6/moreLabels.js b/lib/es6/moreLabels.js index 2e3a589459..d90e8d2957 100644 --- a/lib/es6/moreLabels.js +++ b/lib/es6/moreLabels.js @@ -1,7 +1,6 @@ import * as List from "./list.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as HashtblLabels from "./hashtblLabels.js"; @@ -151,7 +150,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -191,7 +190,7 @@ let $$Map = { } }); } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return param.d; } @@ -211,7 +210,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -232,7 +231,7 @@ let $$Map = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, param.d, f, param.l); } _param = param.r; @@ -251,7 +250,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -268,7 +267,7 @@ let $$Map = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, param.d, f, param.l); } _param = param.r; @@ -287,7 +286,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -308,7 +307,7 @@ let $$Map = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, param.d, f, param.r); } _param = param.l; @@ -327,7 +326,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -344,7 +343,7 @@ let $$Map = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, param.d, f, param.r); } _param = param.l; @@ -357,7 +356,7 @@ let $$Map = { if (typeof param !== "object") { return; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -371,7 +370,7 @@ let $$Map = { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -489,7 +488,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -510,7 +509,7 @@ let $$Map = { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -528,9 +527,9 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -570,7 +569,7 @@ let $$Map = { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -580,7 +579,7 @@ let $$Map = { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -597,7 +596,7 @@ let $$Map = { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -615,7 +614,7 @@ let $$Map = { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -626,7 +625,7 @@ let $$Map = { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -642,7 +641,7 @@ let $$Map = { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -712,7 +711,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -745,7 +744,7 @@ let $$Map = { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -763,7 +762,7 @@ let $$Map = { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -782,7 +781,7 @@ let $$Map = { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -792,7 +791,7 @@ let $$Map = { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -806,7 +805,7 @@ let $$Map = { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -830,7 +829,7 @@ let $$Map = { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -880,11 +879,11 @@ let $$Map = { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -909,10 +908,10 @@ let $$Map = { if (typeof e2 !== "object") { return false; } - if (Curry._2(funarg.compare, e1._0, e2._0) !== 0) { + if (funarg.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); @@ -1085,7 +1084,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return param; } @@ -1253,7 +1252,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -1289,7 +1288,7 @@ let $$Set = { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -1304,7 +1303,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -1414,7 +1413,7 @@ let $$Set = { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -1444,7 +1443,7 @@ let $$Set = { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(funarg.compare, v1, s2.v); + let c = funarg.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -1486,7 +1485,7 @@ let $$Set = { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -1498,7 +1497,7 @@ let $$Set = { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -1509,7 +1508,7 @@ let $$Set = { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -1525,7 +1524,7 @@ let $$Set = { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -1543,7 +1542,7 @@ let $$Set = { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -1566,7 +1565,7 @@ let $$Set = { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -1618,7 +1617,7 @@ let $$Set = { }); } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return v; } @@ -1634,7 +1633,7 @@ let $$Set = { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -1654,7 +1653,7 @@ let $$Set = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, f, param.l); } _param = param.r; @@ -1669,7 +1668,7 @@ let $$Set = { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -1685,7 +1684,7 @@ let $$Set = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, f, param.l); } _param = param.r; @@ -1700,7 +1699,7 @@ let $$Set = { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -1720,7 +1719,7 @@ let $$Set = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, f, param.r); } _param = param.l; @@ -1735,7 +1734,7 @@ let $$Set = { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -1751,7 +1750,7 @@ let $$Set = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, f, param.r); } _param = param.l; @@ -1765,7 +1764,7 @@ let $$Set = { return; } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -1774,7 +1773,7 @@ let $$Set = { }; }; let try_join = function (l, v, r) { - if ((l === "Empty" || Curry._2(funarg.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(funarg.compare, v, min_elt(r)) < 0)) { + if ((l === "Empty" || funarg.compare(max_elt(l), v) < 0) && (r === "Empty" || funarg.compare(v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); @@ -1788,7 +1787,7 @@ let $$Set = { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/lib/es6/parsing.js b/lib/es6/parsing.js index 5b44689bfc..a17af3f6e4 100644 --- a/lib/es6/parsing.js +++ b/lib/es6/parsing.js @@ -1,7 +1,6 @@ import * as $$Array from "./array.js"; -import * as Curry from "./curry.js"; import * as Lexing from "./lexing.js"; import * as Caml_obj from "./caml_obj.js"; import * as Caml_array from "./caml_array.js"; @@ -81,7 +80,7 @@ function yyparse(tables, start, lexer, lexbuf) { let match = Caml_parser.parse_engine(tables, env, cmd, arg); switch (match) { case "Read_token" : - let t = Curry._1(lexer, lexbuf); + let t = lexer(lexbuf); env.symb_start = lexbuf.lex_start_p; env.symb_end = lexbuf.lex_curr_p; _arg = t; @@ -108,7 +107,7 @@ function yyparse(tables, start, lexer, lexbuf) { try { match$1 = [ "Semantic_action_computed", - Curry._1(Caml_array.get(tables.actions, env.rule_number), env) + Caml_array.get(tables.actions, env.rule_number)(env) ]; } catch (raw_exn){ @@ -128,7 +127,7 @@ function yyparse(tables, start, lexer, lexbuf) { _cmd = match$1[0]; continue; case "Call_error_function" : - Curry._1(tables.error_function, "syntax error"); + tables.error_function("syntax error"); _arg = undefined; _cmd = "Error_detected"; continue; @@ -212,7 +211,7 @@ function rhs_end(n) { } function is_current_lookahead(tok) { - return Curry._1(current_lookahead_fun.contents, tok); + return current_lookahead_fun.contents(tok); } function parse_error(param) { diff --git a/lib/es6/pervasives.js b/lib/es6/pervasives.js index 40f92cebe8..255eeeffc4 100644 --- a/lib/es6/pervasives.js +++ b/lib/es6/pervasives.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_sys from "./caml_sys.js"; import * as Caml_format from "./caml_format.js"; import * as Caml_string from "./caml_string.js"; @@ -42,7 +41,7 @@ function lnot(x) { let min_int = -2147483648; function classify_float(x) { - if (Curry._1(isFinite, x)) { + if (isFinite(x)) { if (Math.abs(x) >= 2.22507385850720138e-308) { return "FP_normal"; } else if (x !== 0) { @@ -50,7 +49,7 @@ function classify_float(x) { } else { return "FP_zero"; } - } else if (Curry._1(isNaN, x)) { + } else if (isNaN(x)) { return "FP_nan"; } else { return "FP_infinite"; @@ -202,13 +201,13 @@ let exit_function = { function at_exit(f) { let g = exit_function.contents; exit_function.contents = (function () { - Curry._1(f, undefined); - Curry._1(g, undefined); + f(); + g(); }); } function exit(retcode) { - Curry._1(exit_function.contents, undefined); + exit_function.contents(); return Caml_sys.sys_exit(retcode); } diff --git a/lib/es6/queue.js b/lib/es6/queue.js index 5f54f6c08f..36d67dbb71 100644 --- a/lib/es6/queue.js +++ b/lib/es6/queue.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; import * as Caml_exceptions from "./caml_exceptions.js"; let Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); @@ -117,7 +116,7 @@ function iter(f, q) { return; } let next = cell.next; - Curry._1(f, cell.content); + f(cell.content); _cell = next; continue; }; @@ -133,7 +132,7 @@ function fold(f, accu, q) { return accu$1; } let next = cell.next; - let accu$2 = Curry._2(f, accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = next; _accu = accu$2; continue; diff --git a/lib/es6/set.js b/lib/es6/set.js index de5d2c054c..2808ee5d78 100644 --- a/lib/es6/set.js +++ b/lib/es6/set.js @@ -1,7 +1,6 @@ import * as List from "./list.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(funarg) { @@ -101,7 +100,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return param; } @@ -260,7 +259,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -296,7 +295,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -311,7 +310,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -429,7 +428,7 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -456,7 +455,7 @@ function Make(funarg) { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(funarg.compare, v1, s2.v); + let c = funarg.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -498,7 +497,7 @@ function Make(funarg) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -510,7 +509,7 @@ function Make(funarg) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -521,7 +520,7 @@ function Make(funarg) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -537,7 +536,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -555,7 +554,7 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -578,7 +577,7 @@ function Make(funarg) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -630,7 +629,7 @@ function Make(funarg) { }); } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return v; } @@ -649,7 +648,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -659,7 +658,7 @@ function Make(funarg) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -679,7 +678,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -689,7 +688,7 @@ function Make(funarg) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -713,7 +712,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -723,7 +722,7 @@ function Make(funarg) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -743,7 +742,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -753,7 +752,7 @@ function Make(funarg) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -773,7 +772,7 @@ function Make(funarg) { return; } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -789,11 +788,11 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; - } else if ((l$p === "Empty" || Curry._2(funarg.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(funarg.compare, v$p, min_elt(r$p)) < 0)) { + } else if ((l$p === "Empty" || funarg.compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || funarg.compare(v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { return union(l$p, add(v$p, r$p)); diff --git a/lib/es6/setLabels.js b/lib/es6/setLabels.js index 8900080d49..3097a1f8f3 100644 --- a/lib/es6/setLabels.js +++ b/lib/es6/setLabels.js @@ -1,7 +1,6 @@ import * as List from "./list.js"; -import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(Ord) { @@ -101,7 +100,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return param; } @@ -269,7 +268,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -305,7 +304,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return true; } @@ -320,7 +319,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return merge(l, r); } @@ -430,7 +429,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -460,7 +459,7 @@ function Make(Ord) { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(Ord.compare, v1, s2.v); + let c = Ord.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -502,7 +501,7 @@ function Make(Ord) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -514,7 +513,7 @@ function Make(Ord) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -525,7 +524,7 @@ function Make(Ord) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -541,7 +540,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -559,7 +558,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -582,7 +581,7 @@ function Make(Ord) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -634,7 +633,7 @@ function Make(Ord) { }); } let v = param.v; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return v; } @@ -650,7 +649,7 @@ function Make(Ord) { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -670,7 +669,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, f, param.l); } _param = param.r; @@ -685,7 +684,7 @@ function Make(Ord) { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -701,7 +700,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, f, param.l); } _param = param.r; @@ -716,7 +715,7 @@ function Make(Ord) { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -736,7 +735,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, f, param.r); } _param = param.l; @@ -751,7 +750,7 @@ function Make(Ord) { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -767,7 +766,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, f, param.r); } _param = param.l; @@ -781,7 +780,7 @@ function Make(Ord) { return; } let v = param.v; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -790,7 +789,7 @@ function Make(Ord) { }; }; let try_join = function (l, v, r) { - if ((l === "Empty" || Curry._2(Ord.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(Ord.compare, v, min_elt(r)) < 0)) { + if ((l === "Empty" || Ord.compare(max_elt(l), v) < 0) && (r === "Empty" || Ord.compare(v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); @@ -804,7 +803,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/lib/es6/sort.js b/lib/es6/sort.js index 00b5fec14a..64395cfd55 100644 --- a/lib/es6/sort.js +++ b/lib/es6/sort.js @@ -1,6 +1,5 @@ -import * as Curry from "./curry.js"; function merge(order, l1, l2) { if (!l1) { @@ -11,7 +10,7 @@ function merge(order, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(order, h1, h2)) { + if (order(h1, h2)) { return { hd: h1, tl: merge(order, l1.tl, l2) @@ -42,7 +41,7 @@ function list(order, l) { } let e2 = match.hd; return { - hd: Curry._2(order, e, e2) ? ({ + hd: order(e, e2) ? ({ hd: e, tl: { hd: e2, @@ -101,12 +100,12 @@ function array(cmp, arr) { return; } let mid = ((lo + hi | 0) >>> 1); - if (Curry._2(cmp, arr[mid], arr[lo])) { + if (cmp(arr[mid], arr[lo])) { swap(arr, mid, lo); } - if (Curry._2(cmp, arr[hi], arr[mid])) { + if (cmp(arr[hi], arr[mid])) { swap(arr, mid, hi); - if (Curry._2(cmp, arr[mid], arr[lo])) { + if (cmp(arr[mid], arr[lo])) { swap(arr, mid, lo); } @@ -114,7 +113,7 @@ function array(cmp, arr) { let pivot = arr[mid]; let i = lo + 1 | 0; let j = hi - 1 | 0; - if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) { + if (!cmp(pivot, arr[hi]) || !cmp(arr[lo], pivot)) { throw new Error("Invalid_argument", { cause: { RE_EXN_ID: "Invalid_argument", @@ -123,10 +122,10 @@ function array(cmp, arr) { }); } while(i < j) { - while(!Curry._2(cmp, pivot, arr[i])) { + while(!cmp(pivot, arr[i])) { i = i + 1 | 0; }; - while(!Curry._2(cmp, arr[j], pivot)) { + while(!cmp(arr[j], pivot)) { j = j - 1 | 0; }; if (i < j) { @@ -148,10 +147,10 @@ function array(cmp, arr) { qsort(0, arr.length - 1 | 0); for(let i = 1 ,i_finish = arr.length; i < i_finish; ++i){ let val_i = arr[i]; - if (!Curry._2(cmp, arr[i - 1 | 0], val_i)) { + if (!cmp(arr[i - 1 | 0], val_i)) { arr[i] = arr[i - 1 | 0]; let j = i - 1 | 0; - while(j >= 1 && !Curry._2(cmp, arr[j - 1 | 0], val_i)) { + while(j >= 1 && !cmp(arr[j - 1 | 0], val_i)) { arr[j] = arr[j - 1 | 0]; j = j - 1 | 0; }; diff --git a/lib/es6/stream.js b/lib/es6/stream.js index 057a31d5b6..5d6058b378 100644 --- a/lib/es6/stream.js +++ b/lib/es6/stream.js @@ -1,7 +1,6 @@ import * as List from "./list.js"; -import * as Curry from "./curry.js"; import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_option from "./caml_option.js"; import * as Caml_string from "./caml_string.js"; @@ -84,7 +83,7 @@ function get_data(count, _d) { return "Sempty"; } } - let a$1 = Curry._1(g.func, count); + let a$1 = g.func(count); if (a$1 !== undefined) { return { TAG: "Scons", @@ -137,7 +136,7 @@ function peek_data(s) { if (a !== undefined) { return Caml_option.valFromOption(a); } - let x = Curry._1(g.func, s.count); + let x = g.func(s.count); g.curr = Caml_option.some(x); return x; @@ -266,7 +265,7 @@ function iter(f, strm) { return; } junk(strm); - Curry._1(f, Caml_option.valFromOption(a)); + f(Caml_option.valFromOption(a)); _param = undefined; continue; }; @@ -365,7 +364,7 @@ function lapp(f, s) { let f$1 = function () { return { TAG: "Sapp", - _0: data(Curry._1(f, undefined)), + _0: data(f()), _1: data(s) }; }; @@ -384,7 +383,7 @@ function lcons(f, s) { let f$1 = function () { return { TAG: "Scons", - _0: Curry._1(f, undefined), + _0: f(), _1: data(s) }; }; @@ -407,7 +406,7 @@ function lsing(f) { _0: CamlinternalLazy.from_fun(function () { return { TAG: "Scons", - _0: Curry._1(f, undefined), + _0: f(), _1: "Sempty" }; }) @@ -421,7 +420,7 @@ function slazy(f) { data: { TAG: "Slazy", _0: CamlinternalLazy.from_fun(function () { - return data(Curry._1(f, undefined)); + return data(f()); }) } }; @@ -435,7 +434,7 @@ function dump_data(f, param) { switch (param.TAG) { case "Scons" : console.log("Scons ("); - Curry._1(f, param._0); + f(param._0); console.log(", "); dump_data(f, param._1); console.log(")"); diff --git a/lib/es6/string.js b/lib/es6/string.js index 9ac0eb8bab..80b4bd8637 100644 --- a/lib/es6/string.js +++ b/lib/es6/string.js @@ -3,7 +3,6 @@ import * as Caml from "./caml.js"; import * as $$Array from "./array.js"; import * as Bytes from "./bytes.js"; -import * as Curry from "./curry.js"; import * as Caml_string from "./caml_string.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; @@ -21,13 +20,13 @@ function concat(sep, xs) { function iter(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._1(f, s.codePointAt(i)); + f(s.codePointAt(i)); } } function iteri(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._2(f, i, s.codePointAt(i)); + f(i, s.codePointAt(i)); } } diff --git a/lib/es6/stringLabels.js b/lib/es6/stringLabels.js index 9df2847bb4..38232f9ba9 100644 --- a/lib/es6/stringLabels.js +++ b/lib/es6/stringLabels.js @@ -3,7 +3,6 @@ import * as Caml from "./caml.js"; import * as $$Array from "./array.js"; import * as Bytes from "./bytes.js"; -import * as Curry from "./curry.js"; import * as Caml_string from "./caml_string.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; @@ -23,13 +22,13 @@ function concat(sep, xs) { function iter(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._1(f, s.codePointAt(i)); + f(s.codePointAt(i)); } } function iteri(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._2(f, i, s.codePointAt(i)); + f(i, s.codePointAt(i)); } } diff --git a/lib/js/arg.js b/lib/js/arg.js index abc11a991a..192e936c98 100644 --- a/lib/js/arg.js +++ b/lib/js/arg.js @@ -4,7 +4,6 @@ let Sys = require("./sys.js"); let Caml = require("./caml.js"); let List = require("./list.js"); let $$Array = require("./array.js"); -let Curry = require("./curry.js"); let Buffer = require("./buffer.js"); let $$String = require("./string.js"); let Caml_obj = require("./caml_obj.js"); @@ -337,12 +336,12 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let treat_action = function (f) { switch (f.TAG) { case "Unit" : - return Curry._1(f._0, undefined); + return f._0(); case "Bool" : let arg = get_arg(); let s$1 = bool_of_string_opt(arg); if (s$1 !== undefined) { - Curry._1(f._0, s$1); + f._0(s$1); } else { throw new Error(Stop, { cause: { @@ -367,7 +366,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist return; case "String" : let arg$1 = get_arg(); - Curry._1(f._0, arg$1); + f._0(arg$1); return consume_arg(); case "Set_string" : f._0.contents = get_arg(); @@ -376,7 +375,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let arg$2 = get_arg(); let x = int_of_string_opt(arg$2); if (x !== undefined) { - Curry._1(f._0, x); + f._0(x); } else { throw new Error(Stop, { cause: { @@ -414,7 +413,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let arg$4 = get_arg(); let x$2 = float_of_string_opt(arg$4); if (x$2 !== undefined) { - Curry._1(f._0, x$2); + f._0(x$2); } else { throw new Error(Stop, { cause: { @@ -454,7 +453,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist let symb = f._0; let arg$6 = get_arg(); if (List.mem(arg$6, symb)) { - Curry._1(f._1, arg$6); + f._1(arg$6); return consume_arg(); } throw new Error(Stop, { @@ -471,7 +470,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist case "Rest" : let f$1 = f._0; while(current.contents < (argv.contents.length - 1 | 0)) { - Curry._1(f$1, Caml_array.get(argv.contents, current.contents + 1 | 0)); + f$1(Caml_array.get(argv.contents, current.contents + 1 | 0)); consume_arg(); }; return; @@ -485,7 +484,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }); } let arg$7 = get_arg(); - let newarg = Curry._1(f._0, arg$7); + let newarg = f._0(arg$7); consume_arg(); let before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); let after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); @@ -505,7 +504,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; treat_action(match[0]); } else { - Curry._1(anonfun, s); + anonfun(s); } } catch (raw_m){ diff --git a/lib/js/array.js b/lib/js/array.js index 7fc81c11d0..9407d2ffc0 100644 --- a/lib/js/array.js +++ b/lib/js/array.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_obj = require("./caml_obj.js"); let Caml_array = require("./caml_array.js"); let Caml_exceptions = require("./caml_exceptions.js"); @@ -22,9 +21,9 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f, 0)); + let res = Caml_array.make(l, f(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } @@ -97,7 +96,7 @@ function blit(a1, ofs1, a2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } @@ -111,7 +110,7 @@ function iter2(f, a, b) { }); } for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, a[i], b[i]); + f(a[i], b[i]); } } @@ -120,9 +119,9 @@ function map(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f, a[0])); + let r = Caml_array.make(l, f(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } @@ -141,16 +140,16 @@ function map2(f, a, b) { if (la === 0) { return []; } - let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + let r = Caml_array.make(la, f(a[0], b[0])); for(let i = 1; i < la; ++i){ - r[i] = Curry._2(f, a[i], b[i]); + r[i] = f(a[i], b[i]); } return r; } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -159,9 +158,9 @@ function mapi(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + let r = Caml_array.make(l, f(0, a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } @@ -220,7 +219,7 @@ function of_list(param) { function fold_left(f, x, a) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } @@ -228,7 +227,7 @@ function fold_left(f, x, a) { function fold_right(f, a, x) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, a[i], r); + r = f(a[i], r); } return r; } @@ -241,7 +240,7 @@ function exists(p, a) { if (i === n) { return false; } - if (Curry._1(p, a[i])) { + if (p(a[i])) { return true; } _i = i + 1 | 0; @@ -257,7 +256,7 @@ function for_all(p, a) { if (i === n) { return true; } - if (!Curry._1(p, a[i])) { + if (!p(a[i])) { return false; } _i = i + 1 | 0; @@ -304,15 +303,15 @@ function sort(cmp, a) { let i31 = ((i + i | 0) + i | 0) + 1 | 0; let x = i31; if ((i31 + 2 | 0) < l) { - if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if (cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; } - if (Curry._2(cmp, Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { + if (cmp(Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { x = i31 + 2 | 0; } return x; } - if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if ((i31 + 1 | 0) < l && cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { return i31 + 1 | 0; } if (i31 < l) { @@ -331,7 +330,7 @@ function sort(cmp, a) { while(true) { let i$1 = _i; let j = maxson(l, i$1); - if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { + if (cmp(Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } Caml_array.set(a, i$1, Caml_array.get(a, j)); @@ -386,7 +385,7 @@ function sort(cmp, a) { } }); } - if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) { + if (cmp(Caml_array.get(a, father), e) >= 0) { return Caml_array.set(a, i, e); } Caml_array.set(a, i, Caml_array.get(a, father)); @@ -429,7 +428,7 @@ function stable_sort(cmp, a) { let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { Caml_array.set(dst, d, s1); let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -455,7 +454,7 @@ function stable_sort(cmp, a) { for(let i = 0; i < len; ++i){ let e = Caml_array.get(a, srcofs + i | 0); let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { + while(j >= dstofs && cmp(Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; }; diff --git a/lib/js/arrayLabels.js b/lib/js/arrayLabels.js index b1dd65cc0f..c486cfe363 100644 --- a/lib/js/arrayLabels.js +++ b/lib/js/arrayLabels.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_obj = require("./caml_obj.js"); let Caml_array = require("./caml_array.js"); let Caml_exceptions = require("./caml_exceptions.js"); @@ -22,9 +21,9 @@ function init(l, f) { } }); } - let res = Caml_array.make(l, Curry._1(f, 0)); + let res = Caml_array.make(l, f(0)); for(let i = 1; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } @@ -97,7 +96,7 @@ function blit(a1, ofs1, a2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } @@ -111,7 +110,7 @@ function iter2(f, a, b) { }); } for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, a[i], b[i]); + f(a[i], b[i]); } } @@ -120,9 +119,9 @@ function map(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._1(f, a[0])); + let r = Caml_array.make(l, f(a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } @@ -141,16 +140,16 @@ function map2(f, a, b) { if (la === 0) { return []; } - let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + let r = Caml_array.make(la, f(a[0], b[0])); for(let i = 1; i < la; ++i){ - r[i] = Curry._2(f, a[i], b[i]); + r[i] = f(a[i], b[i]); } return r; } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -159,9 +158,9 @@ function mapi(f, a) { if (l === 0) { return []; } - let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + let r = Caml_array.make(l, f(0, a[0])); for(let i = 1; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } @@ -220,7 +219,7 @@ function of_list(param) { function fold_left(f, x, a) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } @@ -228,7 +227,7 @@ function fold_left(f, x, a) { function fold_right(f, a, x) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, a[i], r); + r = f(a[i], r); } return r; } @@ -241,7 +240,7 @@ function exists(p, a) { if (i === n) { return false; } - if (Curry._1(p, a[i])) { + if (p(a[i])) { return true; } _i = i + 1 | 0; @@ -257,7 +256,7 @@ function for_all(p, a) { if (i === n) { return true; } - if (!Curry._1(p, a[i])) { + if (!p(a[i])) { return false; } _i = i + 1 | 0; @@ -304,15 +303,15 @@ function sort(cmp, a) { let i31 = ((i + i | 0) + i | 0) + 1 | 0; let x = i31; if ((i31 + 2 | 0) < l) { - if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if (cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; } - if (Curry._2(cmp, Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { + if (cmp(Caml_array.get(a, x), Caml_array.get(a, i31 + 2 | 0)) < 0) { x = i31 + 2 | 0; } return x; } - if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { + if ((i31 + 1 | 0) < l && cmp(Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { return i31 + 1 | 0; } if (i31 < l) { @@ -331,7 +330,7 @@ function sort(cmp, a) { while(true) { let i$1 = _i; let j = maxson(l, i$1); - if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { + if (cmp(Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } Caml_array.set(a, i$1, Caml_array.get(a, j)); @@ -386,7 +385,7 @@ function sort(cmp, a) { } }); } - if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) { + if (cmp(Caml_array.get(a, father), e) >= 0) { return Caml_array.set(a, i, e); } Caml_array.set(a, i, Caml_array.get(a, father)); @@ -429,7 +428,7 @@ function stable_sort(cmp, a) { let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { Caml_array.set(dst, d, s1); let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -455,7 +454,7 @@ function stable_sort(cmp, a) { for(let i = 0; i < len; ++i){ let e = Caml_array.get(a, srcofs + i | 0); let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { + while(j >= dstofs && cmp(Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; }; diff --git a/lib/js/belt_Array.js b/lib/js/belt_Array.js index 9a82c7a3c8..596da5e5c6 100644 --- a/lib/js/belt_Array.js +++ b/lib/js/belt_Array.js @@ -1,7 +1,6 @@ 'use strict'; let Caml = require("./caml.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function get(arr, i) { @@ -108,13 +107,15 @@ function makeByU(l, f) { } let res = new Array(l); for(let i = 0; i < l; ++i){ - res[i] = Curry._1(f, i); + res[i] = f(i); } return res; } function makeBy(l, f) { - return makeByU(l, Curry.__1(f)); + return makeByU(l, (function (a) { + return f(a); + })); } function makeByAndShuffleU(l, f) { @@ -124,7 +125,9 @@ function makeByAndShuffleU(l, f) { } function makeByAndShuffle(l, f) { - return makeByAndShuffleU(l, Curry.__1(f)); + return makeByAndShuffleU(l, (function (a) { + return f(a); + })); } function range(start, finish) { @@ -174,13 +177,15 @@ function zipByU(xs, ys, f) { let len = lenx < leny ? lenx : leny; let s = new Array(len); for(let i = 0; i < len; ++i){ - s[i] = Curry._2(f, xs[i], ys[i]); + s[i] = f(xs[i], ys[i]); } return s; } function zipBy(xs, ys, f) { - return zipByU(xs, ys, Curry.__2(f)); + return zipByU(xs, ys, (function (a, b) { + return f(a, b); + })); } function concat(a1, a2) { @@ -290,25 +295,29 @@ function blit(a1, ofs1, a2, ofs2, len) { function forEachU(a, f) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function forEach(a, f) { - forEachU(a, Curry.__1(f)); + forEachU(a, (function (a) { + f(a); + })); } function mapU(a, f) { let l = a.length; let r = new Array(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, a[i]); + r[i] = f(a[i]); } return r; } function map(a, f) { - return mapU(a, Curry.__1(f)); + return mapU(a, (function (a) { + return f(a); + })); } function flatMapU(a, f) { @@ -316,7 +325,9 @@ function flatMapU(a, f) { } function flatMap(a, f) { - return concatMany(mapU(a, Curry.__1(f))); + return concatMany(mapU(a, (function (a) { + return f(a); + }))); } function getByU(a, p) { @@ -325,7 +336,7 @@ function getByU(a, p) { let r; while(r === undefined && i < l) { let v = a[i]; - if (Curry._1(p, v)) { + if (p(v)) { r = Caml_option.some(v); } i = i + 1 | 0; @@ -334,7 +345,9 @@ function getByU(a, p) { } function getBy(a, p) { - return getByU(a, Curry.__1(p)); + return getByU(a, (function (a) { + return p(a); + })); } function getIndexByU(a, p) { @@ -343,7 +356,7 @@ function getIndexByU(a, p) { let r; while(r === undefined && i < l) { let v = a[i]; - if (Curry._1(p, v)) { + if (p(v)) { r = i; } i = i + 1 | 0; @@ -352,7 +365,9 @@ function getIndexByU(a, p) { } function getIndexBy(a, p) { - return getIndexByU(a, Curry.__1(p)); + return getIndexByU(a, (function (a) { + return p(a); + })); } function keepU(a, f) { @@ -361,7 +376,7 @@ function keepU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - if (Curry._1(f, v)) { + if (f(v)) { r[j] = v; j = j + 1 | 0; } @@ -372,7 +387,9 @@ function keepU(a, f) { } function keep(a, f) { - return keepU(a, Curry.__1(f)); + return keepU(a, (function (a) { + return f(a); + })); } function keepWithIndexU(a, f) { @@ -381,7 +398,7 @@ function keepWithIndexU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - if (Curry._2(f, v, i)) { + if (f(v, i)) { r[j] = v; j = j + 1 | 0; } @@ -392,7 +409,9 @@ function keepWithIndexU(a, f) { } function keepWithIndex(a, f) { - return keepWithIndexU(a, Curry.__2(f)); + return keepWithIndexU(a, (function (a, i) { + return f(a, i); + })); } function keepMapU(a, f) { @@ -401,7 +420,7 @@ function keepMapU(a, f) { let j = 0; for(let i = 0; i < l; ++i){ let v = a[i]; - let v$1 = Curry._1(f, v); + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -413,79 +432,93 @@ function keepMapU(a, f) { } function keepMap(a, f) { - return keepMapU(a, Curry.__1(f)); + return keepMapU(a, (function (a) { + return f(a); + })); } function forEachWithIndexU(a, f) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } function forEachWithIndex(a, f) { - forEachWithIndexU(a, Curry.__2(f)); + forEachWithIndexU(a, (function (a, b) { + f(a, b); + })); } function mapWithIndexU(a, f) { let l = a.length; let r = new Array(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, a[i]); + r[i] = f(i, a[i]); } return r; } function mapWithIndex(a, f) { - return mapWithIndexU(a, Curry.__2(f)); + return mapWithIndexU(a, (function (a, b) { + return f(a, b); + })); } function reduceU(a, x, f) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } function reduce(a, x, f) { - return reduceU(a, x, Curry.__2(f)); + return reduceU(a, x, (function (a, b) { + return f(a, b); + })); } function reduceReverseU(a, x, f) { let r = x; for(let i = a.length - 1 | 0; i >= 0; --i){ - r = Curry._2(f, r, a[i]); + r = f(r, a[i]); } return r; } function reduceReverse(a, x, f) { - return reduceReverseU(a, x, Curry.__2(f)); + return reduceReverseU(a, x, (function (a, b) { + return f(a, b); + })); } function reduceReverse2U(a, b, x, f) { let r = x; let len = Caml.int_min(a.length, b.length); for(let i = len - 1 | 0; i >= 0; --i){ - r = Curry._3(f, r, a[i], b[i]); + r = f(r, a[i], b[i]); } return r; } function reduceReverse2(a, b, x, f) { - return reduceReverse2U(a, b, x, Curry.__3(f)); + return reduceReverse2U(a, b, x, (function (a, b, c) { + return f(a, b, c); + })); } function reduceWithIndexU(a, x, f) { let r = x; for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - r = Curry._3(f, r, a[i], i); + r = f(r, a[i], i); } return r; } function reduceWithIndex(a, x, f) { - return reduceWithIndexU(a, x, Curry.__3(f)); + return reduceWithIndexU(a, x, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(arr, b) { @@ -496,7 +529,7 @@ function everyU(arr, b) { if (i === len) { return true; } - if (!Curry._1(b, arr[i])) { + if (!b(arr[i])) { return false; } _i = i + 1 | 0; @@ -505,7 +538,9 @@ function everyU(arr, b) { } function every(arr, f) { - return everyU(arr, Curry.__1(f)); + return everyU(arr, (function (b) { + return f(b); + })); } function someU(arr, b) { @@ -516,7 +551,7 @@ function someU(arr, b) { if (i === len) { return false; } - if (Curry._1(b, arr[i])) { + if (b(arr[i])) { return true; } _i = i + 1 | 0; @@ -525,7 +560,9 @@ function someU(arr, b) { } function some(arr, f) { - return someU(arr, Curry.__1(f)); + return someU(arr, (function (b) { + return f(b); + })); } function everyAux2(arr1, arr2, _i, b, len) { @@ -534,7 +571,7 @@ function everyAux2(arr1, arr2, _i, b, len) { if (i === len) { return true; } - if (!Curry._2(b, arr1[i], arr2[i])) { + if (!b(arr1[i], arr2[i])) { return false; } _i = i + 1 | 0; @@ -547,7 +584,9 @@ function every2U(a, b, p) { } function every2(a, b, p) { - return every2U(a, b, Curry.__2(p)); + return every2U(a, b, (function (a, b) { + return p(a, b); + })); } function some2U(a, b, p) { @@ -558,7 +597,7 @@ function some2U(a, b, p) { if (i === len) { return false; } - if (Curry._2(p, a[i], b[i])) { + if (p(a[i], b[i])) { return true; } _i = i + 1 | 0; @@ -567,7 +606,9 @@ function some2U(a, b, p) { } function some2(a, b, p) { - return some2U(a, b, Curry.__2(p)); + return some2U(a, b, (function (a, b) { + return p(a, b); + })); } function eqU(a, b, p) { @@ -581,7 +622,9 @@ function eqU(a, b, p) { } function eq(a, b, p) { - return eqU(a, b, Curry.__2(p)); + return eqU(a, b, (function (a, b) { + return p(a, b); + })); } function cmpU(a, b, p) { @@ -598,7 +641,7 @@ function cmpU(a, b, p) { if (i === lena) { return 0; } - let c = Curry._2(p, a[i], b[i]); + let c = p(a[i], b[i]); if (c !== 0) { return c; } @@ -609,7 +652,9 @@ function cmpU(a, b, p) { } function cmp(a, b, p) { - return cmpU(a, b, Curry.__2(p)); + return cmpU(a, b, (function (a, b) { + return p(a, b); + })); } function partitionU(a, f) { @@ -620,7 +665,7 @@ function partitionU(a, f) { let a2 = new Array(l); for(let ii = 0; ii < l; ++ii){ let v = a[ii]; - if (Curry._1(f, v)) { + if (f(v)) { a1[i] = v; i = i + 1 | 0; } else { @@ -637,7 +682,9 @@ function partitionU(a, f) { } function partition(a, f) { - return partitionU(a, Curry.__1(f)); + return partitionU(a, (function (x) { + return f(x); + })); } function unzip(a) { @@ -667,28 +714,32 @@ function joinWithU(a, sep, toString) { let res = _res; let i = _i; if (i === lastIndex) { - return res + Curry._1(toString, a[i]); + return res + toString(a[i]); } - _res = res + (Curry._1(toString, a[i]) + sep); + _res = res + (toString(a[i]) + sep); _i = i + 1 | 0; continue; }; } function joinWith(a, sep, toString) { - return joinWithU(a, sep, Curry.__1(toString)); + return joinWithU(a, sep, (function (x) { + return toString(x); + })); } function initU(n, f) { let v = new Array(n); for(let i = 0; i < n; ++i){ - v[i] = Curry._1(f, i); + v[i] = f(i); } return v; } function init(n, f) { - return initU(n, Curry.__1(f)); + return initU(n, (function (i) { + return f(i); + })); } exports.get = get; diff --git a/lib/js/belt_HashMap.js b/lib/js/belt_HashMap.js index e2800f05bd..ba9697458a 100644 --- a/lib/js/belt_HashMap.js +++ b/lib/js/belt_HashMap.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalBuckets = require("./belt_internalBuckets.js"); let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); @@ -15,7 +14,7 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { if (old_bucket === undefined) { return; } - let nidx = Curry._1(hash, old_bucket.key) & (h_buckets.length - 1 | 0); + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; @@ -31,7 +30,7 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(eq, key, info, _cell) { while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { cell.value = info; return false; } @@ -47,7 +46,7 @@ function replaceInBucket(eq, key, info, _cell) { function set0(h, key, value, eq, hash) { let h_buckets = h.buckets; let buckets_len = h_buckets.length; - let i = Curry._1(hash, key) & (buckets_len - 1 | 0); + let i = hash(key) & (buckets_len - 1 | 0); let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(eq, key, value, l)) { @@ -98,13 +97,13 @@ function set(h, key, value) { function remove(h, key) { let h_buckets = h.buckets; - let i = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let i = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[i]; if (bucket === undefined) { return; } let eq = h.eq; - if (Curry._2(eq, bucket.key, key)) { + if (eq(bucket.key, key)) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; @@ -118,7 +117,7 @@ function remove(h, key) { return; } let cell_next = bucket$1.next; - if (Curry._2(eq, bucket$1.key, key)) { + if (eq(bucket$1.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; return; @@ -132,25 +131,25 @@ function remove(h, key) { function get(h, key) { let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } let eq = h.eq; - if (Curry._2(eq, key, cell1.key)) { + if (eq(key, cell1.key)) { return Caml_option.some(cell1.value); } let cell2 = cell1.next; if (cell2 === undefined) { return; } - if (Curry._2(eq, key, cell2.key)) { + if (eq(key, cell2.key)) { return Caml_option.some(cell2.value); } let cell3 = cell2.next; if (cell3 !== undefined) { - if (Curry._2(eq, key, cell3.key)) { + if (eq(key, cell3.key)) { return Caml_option.some(cell3.value); } else { let _buckets = cell3.next; @@ -159,7 +158,7 @@ function get(h, key) { if (buckets === undefined) { return; } - if (Curry._2(eq, key, buckets.key)) { + if (eq(key, buckets.key)) { return Caml_option.some(buckets.value); } _buckets = buckets.next; @@ -172,14 +171,14 @@ function get(h, key) { function has(h, key) { let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[nid]; if (bucket !== undefined) { let _cell = bucket; let eq = h.eq; while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return true; } let nextCell = cell.next; diff --git a/lib/js/belt_HashSet.js b/lib/js/belt_HashSet.js index 6a14a53214..eba89cbe96 100644 --- a/lib/js/belt_HashSet.js +++ b/lib/js/belt_HashSet.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); @@ -10,7 +9,7 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { if (old_bucket === undefined) { return; } - let nidx = Curry._1(hash, old_bucket.key) & (h_buckets.length - 1 | 0); + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; @@ -26,13 +25,13 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { function remove(h, key) { let eq = h.eq; let h_buckets = h.buckets; - let i = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let i = h.hash(key) & (h_buckets.length - 1 | 0); let l = h_buckets[i]; if (l === undefined) { return; } let next_cell = l.next; - if (Curry._2(eq, l.key, key)) { + if (eq(l.key, key)) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; @@ -43,7 +42,7 @@ function remove(h, key) { let cell = _cell; let prec = _prec; let cell_next = cell.next; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; return; @@ -63,7 +62,7 @@ function remove(h, key) { function addBucket(h, key, _cell, eq) { while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return; } let n = cell.next; @@ -83,7 +82,7 @@ function addBucket(h, key, _cell, eq) { function add0(h, key, hash, eq) { let h_buckets = h.buckets; let buckets_len = h_buckets.length; - let i = Curry._1(hash, key) & (buckets_len - 1 | 0); + let i = hash(key) & (buckets_len - 1 | 0); let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l, eq); @@ -126,13 +125,13 @@ function add(h, key) { function has(h, key) { let eq = h.eq; let h_buckets = h.buckets; - let nid = Curry._1(h.hash, key) & (h_buckets.length - 1 | 0); + let nid = h.hash(key) & (h_buckets.length - 1 | 0); let bucket = h_buckets[nid]; if (bucket !== undefined) { let _cell = bucket; while(true) { let cell = _cell; - if (Curry._2(eq, cell.key, key)) { + if (eq(cell.key, key)) { return true; } let nextCell = cell.next; diff --git a/lib/js/belt_Id.js b/lib/js/belt_Id.js index 2a855d8e40..04d2ce0b37 100644 --- a/lib/js/belt_Id.js +++ b/lib/js/belt_Id.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); function MakeComparableU(M) { return M; @@ -8,7 +7,9 @@ function MakeComparableU(M) { function MakeComparable(M) { let cmp = M.cmp; - let cmp$1 = Curry.__2(cmp); + let cmp$1 = function (a, b) { + return cmp(a, b); + }; return { cmp: cmp$1 }; @@ -21,7 +22,9 @@ function comparableU(cmp) { } function comparable(cmp) { - let cmp$1 = Curry.__2(cmp); + let cmp$1 = function (a, b) { + return cmp(a, b); + }; return { cmp: cmp$1 }; @@ -33,9 +36,13 @@ function MakeHashableU(M) { function MakeHashable(M) { let hash = M.hash; - let hash$1 = Curry.__1(hash); + let hash$1 = function (a) { + return hash(a); + }; let eq = M.eq; - let eq$1 = Curry.__2(eq); + let eq$1 = function (a, b) { + return eq(a, b); + }; return { hash: hash$1, eq: eq$1 @@ -50,8 +57,12 @@ function hashableU(hash, eq) { } function hashable(hash, eq) { - let hash$1 = Curry.__1(hash); - let eq$1 = Curry.__2(eq); + let hash$1 = function (a) { + return hash(a); + }; + let eq$1 = function (a, b) { + return eq(a, b); + }; return { hash: hash$1, eq: eq$1 diff --git a/lib/js/belt_List.js b/lib/js/belt_List.js index b96dc8ab5c..069df3dc72 100644 --- a/lib/js/belt_List.js +++ b/lib/js/belt_List.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_Array = require("./belt_Array.js"); let Caml_option = require("./caml_option.js"); let Belt_SortArray = require("./belt_SortArray.js"); @@ -113,7 +112,7 @@ function partitionAux(p, _cell, _precX, _precY) { hd: h, tl: /* [] */0 }; - if (Curry._1(p, h)) { + if (p(h)) { precX.tl = next; _precX = next; _cell = t; @@ -179,7 +178,7 @@ function copyAuxWitFilter(f, _cellX, _prec) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._1(f, h)) { + if (f(h)) { let next = { hd: h, tl: /* [] */0 @@ -204,7 +203,7 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(f, h, i)) { + if (f(h, i)) { let next = { hd: h, tl: /* [] */0 @@ -229,7 +228,7 @@ function copyAuxWitFilterMap(f, _cellX, _prec) { return; } let t = cellX.tl; - let h = Curry._1(f, cellX.hd); + let h = f(cellX.hd); if (h !== undefined) { let next = { hd: Caml_option.valFromOption(h), @@ -254,7 +253,7 @@ function removeAssocAuxWithMap(_cellX, x, _prec, f) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(f, h[0], x)) { + if (f(h[0], x)) { prec.tl = t; return true; } @@ -278,7 +277,7 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { } let t = cellX.tl; let h = cellX.hd; - if (Curry._2(eq, h[0], x)) { + if (eq(h[0], x)) { prec.tl = { hd: [ x, @@ -307,7 +306,7 @@ function copyAuxWithMap(_cellX, _prec, f) { return; } let next = { - hd: Curry._1(f, cellX.hd), + hd: f(cellX.hd), tl: /* [] */0 }; prec.tl = next; @@ -355,7 +354,7 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { return; } let next = { - hd: Curry._2(f, cellX.hd, cellY.hd), + hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; prec.tl = next; @@ -375,7 +374,7 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { return; } let next = { - hd: Curry._2(f, i, cellX.hd), + hd: f(i, cellX.hd), tl: /* [] */0 }; prec.tl = next; @@ -519,7 +518,7 @@ function mapU(xs, f) { return /* [] */0; } let cell = { - hd: Curry._1(f, xs.hd), + hd: f(xs.hd), tl: /* [] */0 }; copyAuxWithMap(xs.tl, cell, f); @@ -527,7 +526,9 @@ function mapU(xs, f) { } function map(xs, f) { - return mapU(xs, Curry.__1(f)); + return mapU(xs, (function (x) { + return f(x); + })); } function zipByU(l1, l2, f) { @@ -538,7 +539,7 @@ function zipByU(l1, l2, f) { return /* [] */0; } let cell = { - hd: Curry._2(f, l1.hd, l2.hd), + hd: f(l1.hd, l2.hd), tl: /* [] */0 }; copyAuxWithMap2(f, l1.tl, l2.tl, cell); @@ -546,7 +547,9 @@ function zipByU(l1, l2, f) { } function zipBy(l1, l2, f) { - return zipByU(l1, l2, Curry.__2(f)); + return zipByU(l1, l2, (function (x, y) { + return f(x, y); + })); } function mapWithIndexU(xs, f) { @@ -554,7 +557,7 @@ function mapWithIndexU(xs, f) { return /* [] */0; } let cell = { - hd: Curry._2(f, 0, xs.hd), + hd: f(0, xs.hd), tl: /* [] */0 }; copyAuxWithMapI(f, 1, xs.tl, cell); @@ -562,7 +565,9 @@ function mapWithIndexU(xs, f) { } function mapWithIndex(xs, f) { - return mapWithIndexU(xs, Curry.__2(f)); + return mapWithIndexU(xs, (function (i, x) { + return f(i, x); + })); } function makeByU(n, f) { @@ -570,14 +575,14 @@ function makeByU(n, f) { return /* [] */0; } let headX = { - hd: Curry._1(f, 0), + hd: f(0), tl: /* [] */0 }; let cur = headX; let i = 1; while(i < n) { let v = { - hd: Curry._1(f, i), + hd: f(i), tl: /* [] */0 }; cur.tl = v; @@ -588,7 +593,9 @@ function makeByU(n, f) { } function makeBy(n, f) { - return makeByU(n, Curry.__1(f)); + return makeByU(n, (function (x) { + return f(x); + })); } function make(n, v) { @@ -754,7 +761,7 @@ function mapReverseU(l, f) { } _xs = xs.tl; _accu = { - hd: Curry._1(f, xs.hd), + hd: f(xs.hd), tl: accu }; continue; @@ -762,7 +769,9 @@ function mapReverseU(l, f) { } function mapReverse(l, f) { - return mapReverseU(l, Curry.__1(f)); + return mapReverseU(l, (function (x) { + return f(x); + })); } function forEachU(_xs, f) { @@ -771,14 +780,16 @@ function forEachU(_xs, f) { if (!xs) { return; } - Curry._1(f, xs.hd); + f(xs.hd); _xs = xs.tl; continue; }; } function forEach(xs, f) { - forEachU(xs, Curry.__1(f)); + forEachU(xs, (function (x) { + return f(x); + })); } function forEachWithIndexU(l, f) { @@ -790,7 +801,7 @@ function forEachWithIndexU(l, f) { if (!xs) { return; } - Curry._2(f, i, xs.hd); + f(i, xs.hd); _i = i + 1 | 0; _xs = xs.tl; continue; @@ -798,7 +809,9 @@ function forEachWithIndexU(l, f) { } function forEachWithIndex(l, f) { - forEachWithIndexU(l, Curry.__2(f)); + forEachWithIndexU(l, (function (i, x) { + return f(i, x); + })); } function reduceU(_l, _accu, f) { @@ -808,19 +821,21 @@ function reduceU(_l, _accu, f) { if (!l) { return accu; } - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); _l = l.tl; continue; }; } function reduce(l, accu, f) { - return reduceU(l, accu, Curry.__2(f)); + return reduceU(l, accu, (function (acc, x) { + return f(acc, x); + })); } function reduceReverseUnsafeU(l, accu, f) { if (l) { - return Curry._2(f, reduceReverseUnsafeU(l.tl, accu, f), l.hd); + return f(reduceReverseUnsafeU(l.tl, accu, f), l.hd); } else { return accu; } @@ -836,7 +851,9 @@ function reduceReverseU(l, acc, f) { } function reduceReverse(l, accu, f) { - return reduceReverseU(l, accu, Curry.__2(f)); + return reduceReverseU(l, accu, (function (a, b) { + return f(a, b); + })); } function reduceWithIndexU(l, acc, f) { @@ -851,14 +868,16 @@ function reduceWithIndexU(l, acc, f) { return acc$1; } _i = i + 1 | 0; - _acc = Curry._3(f, acc$1, l$1.hd, i); + _acc = f(acc$1, l$1.hd, i); _l = l$1.tl; continue; }; } function reduceWithIndex(l, acc, f) { - return reduceWithIndexU(l, acc, Curry.__3(f)); + return reduceWithIndexU(l, acc, (function (acc, x, i) { + return f(acc, x, i); + })); } function mapReverse2U(l1, l2, f) { @@ -876,7 +895,7 @@ function mapReverse2U(l1, l2, f) { return accu; } _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; _l2 = l2$1.tl; @@ -886,7 +905,9 @@ function mapReverse2U(l1, l2, f) { } function mapReverse2(l1, l2, f) { - return mapReverse2U(l1, l2, Curry.__2(f)); + return mapReverse2U(l1, l2, (function (a, b) { + return f(a, b); + })); } function forEach2U(_l1, _l2, f) { @@ -899,7 +920,7 @@ function forEach2U(_l1, _l2, f) { if (!l2) { return; } - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -907,7 +928,9 @@ function forEach2U(_l1, _l2, f) { } function forEach2(l1, l2, f) { - forEach2U(l1, l2, Curry.__2(f)); + forEach2U(l1, l2, (function (a, b) { + return f(a, b); + })); } function reduce2U(_l1, _l2, _accu, f) { @@ -921,7 +944,7 @@ function reduce2U(_l1, _l2, _accu, f) { if (!l2) { return accu; } - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -929,12 +952,14 @@ function reduce2U(_l1, _l2, _accu, f) { } function reduce2(l1, l2, acc, f) { - return reduce2U(l1, l2, acc, Curry.__3(f)); + return reduce2U(l1, l2, acc, (function (a, b, c) { + return f(a, b, c); + })); } function reduceReverse2UnsafeU(l1, l2, accu, f) { if (l1 && l2) { - return Curry._3(f, reduceReverse2UnsafeU(l1.tl, l2.tl, accu, f), l1.hd, l2.hd); + return f(reduceReverse2UnsafeU(l1.tl, l2.tl, accu, f), l1.hd, l2.hd); } else { return accu; } @@ -950,7 +975,9 @@ function reduceReverse2U(l1, l2, acc, f) { } function reduceReverse2(l1, l2, acc, f) { - return reduceReverse2U(l1, l2, acc, Curry.__3(f)); + return reduceReverse2U(l1, l2, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(_xs, p) { @@ -959,7 +986,7 @@ function everyU(_xs, p) { if (!xs) { return true; } - if (!Curry._1(p, xs.hd)) { + if (!p(xs.hd)) { return false; } _xs = xs.tl; @@ -968,7 +995,9 @@ function everyU(_xs, p) { } function every(xs, p) { - return everyU(xs, Curry.__1(p)); + return everyU(xs, (function (x) { + return p(x); + })); } function someU(_xs, p) { @@ -977,7 +1006,7 @@ function someU(_xs, p) { if (!xs) { return false; } - if (Curry._1(p, xs.hd)) { + if (p(xs.hd)) { return true; } _xs = xs.tl; @@ -986,7 +1015,9 @@ function someU(_xs, p) { } function some(xs, p) { - return someU(xs, Curry.__1(p)); + return someU(xs, (function (x) { + return p(x); + })); } function every2U(_l1, _l2, p) { @@ -999,7 +1030,7 @@ function every2U(_l1, _l2, p) { if (!l2) { return true; } - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -1009,7 +1040,9 @@ function every2U(_l1, _l2, p) { } function every2(l1, l2, p) { - return every2U(l1, l2, Curry.__2(p)); + return every2U(l1, l2, (function (a, b) { + return p(a, b); + })); } function cmpByLength(_l1, _l2) { @@ -1046,7 +1079,7 @@ function cmpU(_l1, _l2, p) { if (!l2) { return 1; } - let c = Curry._2(p, l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } @@ -1057,7 +1090,9 @@ function cmpU(_l1, _l2, p) { } function cmp(l1, l2, f) { - return cmpU(l1, l2, Curry.__2(f)); + return cmpU(l1, l2, (function (x, y) { + return f(x, y); + })); } function eqU(_l1, _l2, p) { @@ -1074,7 +1109,7 @@ function eqU(_l1, _l2, p) { if (!l2) { return false; } - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -1084,7 +1119,9 @@ function eqU(_l1, _l2, p) { } function eq(l1, l2, f) { - return eqU(l1, l2, Curry.__2(f)); + return eqU(l1, l2, (function (x, y) { + return f(x, y); + })); } function some2U(_l1, _l2, p) { @@ -1097,7 +1134,7 @@ function some2U(_l1, _l2, p) { if (!l2) { return false; } - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -1107,7 +1144,9 @@ function some2U(_l1, _l2, p) { } function some2(l1, l2, p) { - return some2U(l1, l2, Curry.__2(p)); + return some2U(l1, l2, (function (a, b) { + return p(a, b); + })); } function hasU(_xs, x, eq) { @@ -1116,7 +1155,7 @@ function hasU(_xs, x, eq) { if (!xs) { return false; } - if (Curry._2(eq, xs.hd, x)) { + if (eq(xs.hd, x)) { return true; } _xs = xs.tl; @@ -1125,7 +1164,9 @@ function hasU(_xs, x, eq) { } function has(xs, x, eq) { - return hasU(xs, x, Curry.__2(eq)); + return hasU(xs, x, (function (a, b) { + return eq(a, b); + })); } function getAssocU(_xs, x, eq) { @@ -1135,7 +1176,7 @@ function getAssocU(_xs, x, eq) { return; } let match = xs.hd; - if (Curry._2(eq, match[0], x)) { + if (eq(match[0], x)) { return Caml_option.some(match[1]); } _xs = xs.tl; @@ -1144,7 +1185,9 @@ function getAssocU(_xs, x, eq) { } function getAssoc(xs, x, eq) { - return getAssocU(xs, x, Curry.__2(eq)); + return getAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function hasAssocU(_xs, x, eq) { @@ -1153,7 +1196,7 @@ function hasAssocU(_xs, x, eq) { if (!xs) { return false; } - if (Curry._2(eq, xs.hd[0], x)) { + if (eq(xs.hd[0], x)) { return true; } _xs = xs.tl; @@ -1162,7 +1205,9 @@ function hasAssocU(_xs, x, eq) { } function hasAssoc(xs, x, eq) { - return hasAssocU(xs, x, Curry.__2(eq)); + return hasAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function removeAssocU(xs, x, eq) { @@ -1171,7 +1216,7 @@ function removeAssocU(xs, x, eq) { } let l = xs.tl; let pair = xs.hd; - if (Curry._2(eq, pair[0], x)) { + if (eq(pair[0], x)) { return l; } let cell = { @@ -1187,7 +1232,9 @@ function removeAssocU(xs, x, eq) { } function removeAssoc(xs, x, eq) { - return removeAssocU(xs, x, Curry.__2(eq)); + return removeAssocU(xs, x, (function (a, b) { + return eq(a, b); + })); } function setAssocU(xs, x, k, eq) { @@ -1202,7 +1249,7 @@ function setAssocU(xs, x, k, eq) { } let l = xs.tl; let pair = xs.hd; - if (Curry._2(eq, pair[0], x)) { + if (eq(pair[0], x)) { return { hd: [ x, @@ -1230,7 +1277,9 @@ function setAssocU(xs, x, k, eq) { } function setAssoc(xs, x, k, eq) { - return setAssocU(xs, x, k, Curry.__2(eq)); + return setAssocU(xs, x, k, (function (a, b) { + return eq(a, b); + })); } function sortU(xs, cmp) { @@ -1240,7 +1289,9 @@ function sortU(xs, cmp) { } function sort(xs, cmp) { - return sortU(xs, Curry.__2(cmp)); + return sortU(xs, (function (x, y) { + return cmp(x, y); + })); } function getByU(_xs, p) { @@ -1250,7 +1301,7 @@ function getByU(_xs, p) { return; } let x = xs.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _xs = xs.tl; @@ -1259,7 +1310,9 @@ function getByU(_xs, p) { } function getBy(xs, p) { - return getByU(xs, Curry.__1(p)); + return getByU(xs, (function (a) { + return p(a); + })); } function keepU(_xs, p) { @@ -1270,7 +1323,7 @@ function keepU(_xs, p) { } let t = xs.tl; let h = xs.hd; - if (Curry._1(p, h)) { + if (p(h)) { let cell = { hd: h, tl: /* [] */0 @@ -1284,7 +1337,9 @@ function keepU(_xs, p) { } function keep(xs, p) { - return keepU(xs, Curry.__1(p)); + return keepU(xs, (function (x) { + return p(x); + })); } function keepWithIndexU(xs, p) { @@ -1298,7 +1353,7 @@ function keepWithIndexU(xs, p) { } let t = xs$1.tl; let h = xs$1.hd; - if (Curry._2(p, h, i)) { + if (p(h, i)) { let cell = { hd: h, tl: /* [] */0 @@ -1313,7 +1368,9 @@ function keepWithIndexU(xs, p) { } function keepWithIndex(xs, p) { - return keepWithIndexU(xs, Curry.__2(p)); + return keepWithIndexU(xs, (function (x, i) { + return p(x, i); + })); } function keepMapU(_xs, p) { @@ -1323,7 +1380,7 @@ function keepMapU(_xs, p) { return /* [] */0; } let t = xs.tl; - let h = Curry._1(p, xs.hd); + let h = p(xs.hd); if (h !== undefined) { let cell = { hd: Caml_option.valFromOption(h), @@ -1338,7 +1395,9 @@ function keepMapU(_xs, p) { } function keepMap(xs, p) { - return keepMapU(xs, Curry.__1(p)); + return keepMapU(xs, (function (x) { + return p(x); + })); } function partitionU(l, p) { @@ -1357,7 +1416,7 @@ function partitionU(l, p) { hd: h, tl: /* [] */0 }; - let b = Curry._1(p, h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { return [ @@ -1373,7 +1432,9 @@ function partitionU(l, p) { } function partition(l, p) { - return partitionU(l, Curry.__1(p)); + return partitionU(l, (function (x) { + return p(x); + })); } function unzip(xs) { diff --git a/lib/js/belt_Map.js b/lib/js/belt_Map.js index eb96116851..dfbf259132 100644 --- a/lib/js/belt_Map.js +++ b/lib/js/belt_Map.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_MapDict = require("./belt_MapDict.js"); function fromArray(data, id) { @@ -59,7 +58,9 @@ function updateU(m, key, f) { } function update(m, key, f) { - return updateU(m, key, Curry.__1(f)); + return updateU(m, key, (function (a) { + return f(a); + })); } function split(m, x) { @@ -90,7 +91,9 @@ function mergeU(s1, s2, f) { } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function make(id) { @@ -109,7 +112,9 @@ function findFirstByU(m, f) { } function findFirstBy(m, f) { - return Belt_MapDict.findFirstByU(m.data, Curry.__2(f)); + return Belt_MapDict.findFirstByU(m.data, (function (a, b) { + return f(a, b); + })); } function forEachU(m, f) { @@ -117,7 +122,9 @@ function forEachU(m, f) { } function forEach(m, f) { - Belt_MapDict.forEachU(m.data, Curry.__2(f)); + Belt_MapDict.forEachU(m.data, (function (a, b) { + f(a, b); + })); } function reduceU(m, acc, f) { @@ -125,7 +132,9 @@ function reduceU(m, acc, f) { } function reduce(m, acc, f) { - return reduceU(m, acc, Curry.__3(f)); + return reduceU(m, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(m, f) { @@ -133,7 +142,9 @@ function everyU(m, f) { } function every(m, f) { - return Belt_MapDict.everyU(m.data, Curry.__2(f)); + return Belt_MapDict.everyU(m.data, (function (a, b) { + return f(a, b); + })); } function someU(m, f) { @@ -141,7 +152,9 @@ function someU(m, f) { } function some(m, f) { - return Belt_MapDict.someU(m.data, Curry.__2(f)); + return Belt_MapDict.someU(m.data, (function (a, b) { + return f(a, b); + })); } function keepU(m, f) { @@ -152,7 +165,9 @@ function keepU(m, f) { } function keep(m, f) { - return keepU(m, Curry.__2(f)); + return keepU(m, (function (a, b) { + return f(a, b); + })); } function partitionU(m, p) { @@ -171,7 +186,9 @@ function partitionU(m, p) { } function partition(m, p) { - return partitionU(m, Curry.__2(p)); + return partitionU(m, (function (a, b) { + return p(a, b); + })); } function mapU(m, f) { @@ -182,7 +199,9 @@ function mapU(m, f) { } function map(m, f) { - return mapU(m, Curry.__1(f)); + return mapU(m, (function (a) { + return f(a); + })); } function mapWithKeyU(m, f) { @@ -193,7 +212,9 @@ function mapWithKeyU(m, f) { } function mapWithKey(m, f) { - return mapWithKeyU(m, Curry.__2(f)); + return mapWithKeyU(m, (function (a, b) { + return f(a, b); + })); } function size(map) { @@ -277,7 +298,9 @@ function eqU(m1, m2, veq) { } function eq(m1, m2, veq) { - return eqU(m1, m2, Curry.__2(veq)); + return eqU(m1, m2, (function (a, b) { + return veq(a, b); + })); } function cmpU(m1, m2, vcmp) { @@ -285,7 +308,9 @@ function cmpU(m1, m2, vcmp) { } function cmp(m1, m2, vcmp) { - return cmpU(m1, m2, Curry.__2(vcmp)); + return cmpU(m1, m2, (function (a, b) { + return vcmp(a, b); + })); } function getData(m) { diff --git a/lib/js/belt_MapDict.js b/lib/js/belt_MapDict.js index 9eabd568fa..f906153838 100644 --- a/lib/js/belt_MapDict.js +++ b/lib/js/belt_MapDict.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); @@ -9,7 +8,7 @@ function set(t, newK, newD, cmp) { return Belt_internalAVLtree.singleton(newK, newD); } let k = t.k; - let c = Curry._2(cmp, newK, k); + let c = cmp(newK, k); if (c === 0) { return Belt_internalAVLtree.updateValue(t, newD); } @@ -26,9 +25,9 @@ function set(t, newK, newD, cmp) { function updateU(t, newK, f, cmp) { if (t !== undefined) { let k = t.k; - let c = Curry._2(cmp, newK, k); + let c = cmp(newK, k); if (c === 0) { - let newD = Curry._1(f, Caml_option.some(t.v)); + let newD = f(Caml_option.some(t.v)); if (newD !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD)); } @@ -67,7 +66,7 @@ function updateU(t, newK, f, cmp) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let newD$1 = Curry._1(f, undefined); + let newD$1 = f(undefined); if (newD$1 !== undefined) { return Belt_internalAVLtree.singleton(newK, Caml_option.valFromOption(newD$1)); } else { @@ -76,14 +75,16 @@ function updateU(t, newK, f, cmp) { } function update(t, newK, f, cmp) { - return updateU(t, newK, Curry.__1(f), cmp); + return updateU(t, newK, (function (a) { + return f(a); + }), cmp); } function removeAux0(n, x, cmp) { let v = n.k; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -144,7 +145,7 @@ function splitAuxPivot(n, x, pres, cmp) { let d = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { pres.contents = Caml_option.some(d); return [ @@ -202,7 +203,7 @@ function mergeU(s1, s2, f, cmp) { if (s1 === undefined) { if (s2 !== undefined) { return Belt_internalAVLtree.keepMapU(s2, (function (k, v) { - return Curry._3(f, k, undefined, Caml_option.some(v)); + return f(k, undefined, Caml_option.some(v)); })); } else { return; @@ -210,7 +211,7 @@ function mergeU(s1, s2, f, cmp) { } if (s2 === undefined) { return Belt_internalAVLtree.keepMapU(s1, (function (k, v) { - return Curry._3(f, k, Caml_option.some(v), undefined); + return f(k, Caml_option.some(v), undefined); })); } if (s1.h >= s2.h) { @@ -224,7 +225,7 @@ function mergeU(s1, s2, f, cmp) { let match = splitAuxPivot(s2, v1, d2, cmp); let d2$1 = d2.contents; let newLeft = mergeU(l1, match[0], f, cmp); - let newD = Curry._3(f, v1, Caml_option.some(d1), d2$1); + let newD = f(v1, Caml_option.some(d1), d2$1); let newRight = mergeU(r1, match[1], f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight); } @@ -238,13 +239,15 @@ function mergeU(s1, s2, f, cmp) { let match$1 = splitAuxPivot(s1, v2, d1$1, cmp); let d1$2 = d1$1.contents; let newLeft$1 = mergeU(match$1[0], l2, f, cmp); - let newD$1 = Curry._3(f, v2, d1$2, Caml_option.some(d2$2)); + let newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); let newRight$1 = mergeU(match$1[1], r2, f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft$1, v2, newD$1, newRight$1); } function merge(s1, s2, f, cmp) { - return mergeU(s1, s2, Curry.__3(f), cmp); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + }), cmp); } function removeMany(t, keys, cmp) { diff --git a/lib/js/belt_MapInt.js b/lib/js/belt_MapInt.js index cece70b016..9143413026 100644 --- a/lib/js/belt_MapInt.js +++ b/lib/js/belt_MapInt.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalMapInt = require("./belt_internalMapInt.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); @@ -25,7 +24,7 @@ function updateU(t, x, f) { if (t !== undefined) { let k = t.k; if (x === k) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } @@ -64,7 +63,7 @@ function updateU(t, x, f) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,7 +72,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - return updateU(t, x, Curry.__1(f)); + return updateU(t, x, (function (a) { + return f(a); + })); } function removeAux(n, x) { diff --git a/lib/js/belt_MapString.js b/lib/js/belt_MapString.js index dc716a6924..d5f2530092 100644 --- a/lib/js/belt_MapString.js +++ b/lib/js/belt_MapString.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); let Belt_internalMapString = require("./belt_internalMapString.js"); @@ -25,7 +24,7 @@ function updateU(t, x, f) { if (t !== undefined) { let k = t.k; if (x === k) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } @@ -64,7 +63,7 @@ function updateU(t, x, f) { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,7 +72,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - return updateU(t, x, Curry.__1(f)); + return updateU(t, x, (function (a) { + return f(a); + })); } function removeAux(n, x) { diff --git a/lib/js/belt_MutableMap.js b/lib/js/belt_MutableMap.js index ba7bf2f94e..9da165b978 100644 --- a/lib/js/belt_MutableMap.js +++ b/lib/js/belt_MutableMap.js @@ -1,12 +1,11 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function removeMutateAux(nt, x, cmp) { let k = nt.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { let l = nt.l; let r = nt.r; @@ -89,9 +88,9 @@ function removeMany(d, xs) { function updateDone(t, x, f, cmp) { if (t !== undefined) { let k = t.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -118,7 +117,7 @@ function updateDone(t, x, f, cmp) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -137,7 +136,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function make(id) { @@ -193,7 +194,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function reduceU(d, acc, cb) { @@ -201,7 +204,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__3(cb)); + return reduceU(d, acc, (function (a, b, c) { + return cb(a, b, c); + })); } function everyU(d, p) { @@ -209,7 +214,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(p)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return p(a, b); + })); } function someU(d, p) { @@ -217,7 +224,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(p)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return p(a, b); + })); } function size(d) { @@ -249,7 +258,9 @@ function cmpU(m1, m2, cmp) { } function cmp(m1, m2, cmp$1) { - return cmpU(m1, m2, Curry.__2(cmp$1)); + return cmpU(m1, m2, (function (a, b) { + return cmp$1(a, b); + })); } function eqU(m1, m2, cmp) { @@ -257,7 +268,9 @@ function eqU(m1, m2, cmp) { } function eq(m1, m2, cmp) { - return eqU(m1, m2, Curry.__2(cmp)); + return eqU(m1, m2, (function (a, b) { + return cmp(a, b); + })); } function mapU(m, f) { @@ -268,7 +281,9 @@ function mapU(m, f) { } function map(m, f) { - return mapU(m, Curry.__1(f)); + return mapU(m, (function (a) { + return f(a); + })); } function mapWithKeyU(m, f) { @@ -279,7 +294,9 @@ function mapWithKeyU(m, f) { } function mapWithKey(m, f) { - return mapWithKeyU(m, Curry.__2(f)); + return mapWithKeyU(m, (function (a, b) { + return f(a, b); + })); } function get(m, x) { diff --git a/lib/js/belt_MutableMapInt.js b/lib/js/belt_MutableMapInt.js index 803f7a3fd0..fed12a58e2 100644 --- a/lib/js/belt_MutableMapInt.js +++ b/lib/js/belt_MutableMapInt.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalMapInt = require("./belt_internalMapInt.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); @@ -67,7 +66,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { @@ -77,7 +78,9 @@ function mapU(d, f) { } function map(d, f) { - return mapU(d, Curry.__1(f)); + return mapU(d, (function (a) { + return f(a); + })); } function mapWithKeyU(d, f) { @@ -87,7 +90,9 @@ function mapWithKeyU(d, f) { } function mapWithKey(d, f) { - return mapWithKeyU(d, Curry.__2(f)); + return mapWithKeyU(d, (function (a, b) { + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -95,7 +100,9 @@ function reduceU(d, acc, f) { } function reduce(d, acc, f) { - return reduceU(d, acc, Curry.__3(f)); + return reduceU(d, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(d, f) { @@ -103,7 +110,9 @@ function everyU(d, f) { } function every(d, f) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -111,7 +120,9 @@ function someU(d, f) { } function some(d, f) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -193,7 +204,7 @@ function updateDone(t, x, f) { if (t !== undefined) { let k = t.k; if (k === x) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -221,7 +232,7 @@ function updateDone(t, x, f) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,7 +251,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { @@ -286,7 +299,9 @@ function cmpU(d0, d1, f) { } function cmp(d0, d1, f) { - return cmpU(d0, d1, Curry.__2(f)); + return cmpU(d0, d1, (function (a, b) { + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -294,7 +309,9 @@ function eqU(d0, d1, f) { } function eq(d0, d1, f) { - return eqU(d0, d1, Curry.__2(f)); + return eqU(d0, d1, (function (a, b) { + return f(a, b); + })); } function get(d, x) { diff --git a/lib/js/belt_MutableMapString.js b/lib/js/belt_MutableMapString.js index 4c76e529d6..50346ce2ce 100644 --- a/lib/js/belt_MutableMapString.js +++ b/lib/js/belt_MutableMapString.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); let Belt_internalMapString = require("./belt_internalMapString.js"); @@ -67,7 +66,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLtree.forEachU(d.data, Curry.__2(f)); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { @@ -77,7 +78,9 @@ function mapU(d, f) { } function map(d, f) { - return mapU(d, Curry.__1(f)); + return mapU(d, (function (a) { + return f(a); + })); } function mapWithKeyU(d, f) { @@ -87,7 +90,9 @@ function mapWithKeyU(d, f) { } function mapWithKey(d, f) { - return mapWithKeyU(d, Curry.__2(f)); + return mapWithKeyU(d, (function (a, b) { + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -95,7 +100,9 @@ function reduceU(d, acc, f) { } function reduce(d, acc, f) { - return reduceU(d, acc, Curry.__3(f)); + return reduceU(d, acc, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(d, f) { @@ -103,7 +110,9 @@ function everyU(d, f) { } function every(d, f) { - return Belt_internalAVLtree.everyU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -111,7 +120,9 @@ function someU(d, f) { } function some(d, f) { - return Belt_internalAVLtree.someU(d.data, Curry.__2(f)); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -193,7 +204,7 @@ function updateDone(t, x, f) { if (t !== undefined) { let k = t.k; if (k === x) { - let data = Curry._1(f, Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; @@ -221,7 +232,7 @@ function updateDone(t, x, f) { } return Belt_internalAVLtree.balMutate(t); } - let data$1 = Curry._1(f, undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,7 +251,9 @@ function updateU(t, x, f) { } function update(t, x, f) { - updateU(t, x, Curry.__1(f)); + updateU(t, x, (function (a) { + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { @@ -286,7 +299,9 @@ function cmpU(d0, d1, f) { } function cmp(d0, d1, f) { - return cmpU(d0, d1, Curry.__2(f)); + return cmpU(d0, d1, (function (a, b) { + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -294,7 +309,9 @@ function eqU(d0, d1, f) { } function eq(d0, d1, f) { - return eqU(d0, d1, Curry.__2(f)); + return eqU(d0, d1, (function (a, b) { + return f(a, b); + })); } function get(d, x) { diff --git a/lib/js/belt_MutableQueue.js b/lib/js/belt_MutableQueue.js index 87d980c1b1..6f4af135ad 100644 --- a/lib/js/belt_MutableQueue.js +++ b/lib/js/belt_MutableQueue.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function make() { @@ -157,7 +156,7 @@ function mapU(q, f) { let cell = _cell; let prev = _prev; if (cell !== undefined) { - let content = Curry._1(f, cell.content); + let content = f(cell.content); let res = { content: content, next: undefined @@ -177,7 +176,9 @@ function mapU(q, f) { } function map(q, f) { - return mapU(q, Curry.__1(f)); + return mapU(q, (function (a) { + return f(a); + })); } function isEmpty(q) { @@ -195,14 +196,16 @@ function forEachU(q, f) { if (cell === undefined) { return; } - Curry._1(f, cell.content); + f(cell.content); _cell = cell.next; continue; }; } function forEach(q, f) { - forEachU(q, Curry.__1(f)); + forEachU(q, (function (a) { + f(a); + })); } function reduceU(q, accu, f) { @@ -214,7 +217,7 @@ function reduceU(q, accu, f) { if (cell === undefined) { return accu$1; } - let accu$2 = Curry._2(f, accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = cell.next; _accu = accu$2; continue; @@ -222,7 +225,9 @@ function reduceU(q, accu, f) { } function reduce(q, accu, f) { - return reduceU(q, accu, Curry.__2(f)); + return reduceU(q, accu, (function (a, b) { + return f(a, b); + })); } function transfer(q1, q2) { diff --git a/lib/js/belt_MutableSet.js b/lib/js/belt_MutableSet.js index d77074249b..bc44cafdd5 100644 --- a/lib/js/belt_MutableSet.js +++ b/lib/js/belt_MutableSet.js @@ -1,12 +1,11 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_SortArray = require("./belt_SortArray.js"); let Belt_internalAVLset = require("./belt_internalAVLset.js"); function remove0(nt, x, cmp) { let k = nt.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { let l = nt.l; let r = nt.r; @@ -81,7 +80,7 @@ function removeMany(d, xs) { function removeCheck0(nt, x, removed, cmp) { let k = nt.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { removed.contents = true; let l = nt.l; @@ -133,7 +132,7 @@ function removeCheck(d, v) { function addCheck0(t, x, added, cmp) { if (t !== undefined) { let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -218,7 +217,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -226,7 +227,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -234,7 +237,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -242,7 +247,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -340,7 +347,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -359,7 +368,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { @@ -388,7 +399,7 @@ function intersect(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(match, 0, tmp); Belt_internalAVLset.fillArray(match$1, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0 || Curry._2(cmp, tmp[totalSize - 1 | 0], tmp[0]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { cmp: cmp, data: undefined @@ -424,7 +435,7 @@ function diff(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(match, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0 || Curry._2(cmp, tmp[totalSize - 1 | 0], tmp[0]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { cmp: cmp, data: Belt_internalAVLset.copy(dataa) @@ -460,7 +471,7 @@ function union(a, b) { let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(datab, sizea, tmp); - if (Curry._2(cmp, tmp[sizea - 1 | 0], tmp[sizea]) < 0) { + if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) { return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) diff --git a/lib/js/belt_MutableSetInt.js b/lib/js/belt_MutableSetInt.js index e4c4240e39..830f3b4e26 100644 --- a/lib/js/belt_MutableSetInt.js +++ b/lib/js/belt_MutableSetInt.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_SortArrayInt = require("./belt_SortArrayInt.js"); let Belt_internalAVLset = require("./belt_internalAVLset.js"); let Belt_internalSetInt = require("./belt_internalSetInt.js"); @@ -215,7 +214,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -223,7 +224,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -231,7 +234,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -239,7 +244,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -328,7 +335,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -344,7 +353,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { diff --git a/lib/js/belt_MutableSetString.js b/lib/js/belt_MutableSetString.js index 5585530ff7..f7a1bbd568 100644 --- a/lib/js/belt_MutableSetString.js +++ b/lib/js/belt_MutableSetString.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_internalAVLset = require("./belt_internalAVLset.js"); let Belt_SortArrayString = require("./belt_SortArrayString.js"); let Belt_internalSetString = require("./belt_internalSetString.js"); @@ -215,7 +214,9 @@ function forEachU(d, f) { } function forEach(d, f) { - Belt_internalAVLset.forEachU(d.data, Curry.__1(f)); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -223,7 +224,9 @@ function reduceU(d, acc, cb) { } function reduce(d, acc, cb) { - return reduceU(d, acc, Curry.__2(cb)); + return reduceU(d, acc, (function (a, b) { + return cb(a, b); + })); } function everyU(d, p) { @@ -231,7 +234,9 @@ function everyU(d, p) { } function every(d, p) { - return Belt_internalAVLset.everyU(d.data, Curry.__1(p)); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -239,7 +244,9 @@ function someU(d, p) { } function some(d, p) { - return Belt_internalAVLset.someU(d.data, Curry.__1(p)); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -328,7 +335,9 @@ function keepU(d, p) { } function keep(d, p) { - return keepU(d, Curry.__1(p)); + return keepU(d, (function (a) { + return p(a); + })); } function partitionU(d, p) { @@ -344,7 +353,9 @@ function partitionU(d, p) { } function partition(d, p) { - return partitionU(d, Curry.__1(p)); + return partitionU(d, (function (a) { + return p(a); + })); } function subset(a, b) { diff --git a/lib/js/belt_MutableStack.js b/lib/js/belt_MutableStack.js index 77438f19de..aa95d97032 100644 --- a/lib/js/belt_MutableStack.js +++ b/lib/js/belt_MutableStack.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function make() { @@ -92,14 +91,16 @@ function forEachU(s, f) { if (s$1 === undefined) { return; } - Curry._1(f, s$1.head); + f(s$1.head); _s = s$1.tail; continue; }; } function forEach(s, f) { - forEachU(s, Curry.__1(f)); + forEachU(s, (function (x) { + f(x); + })); } function dynamicPopIterU(s, f) { @@ -109,13 +110,15 @@ function dynamicPopIterU(s, f) { return; } s.root = match.tail; - Curry._1(f, match.head); + f(match.head); continue; }; } function dynamicPopIter(s, f) { - dynamicPopIterU(s, Curry.__1(f)); + dynamicPopIterU(s, (function (x) { + f(x); + })); } exports.make = make; diff --git a/lib/js/belt_Option.js b/lib/js/belt_Option.js index 9b35ffba57..699dfdbf58 100644 --- a/lib/js/belt_Option.js +++ b/lib/js/belt_Option.js @@ -1,28 +1,31 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function keepU(opt, p) { - if (opt !== undefined && Curry._1(p, Caml_option.valFromOption(opt))) { + if (opt !== undefined && p(Caml_option.valFromOption(opt))) { return opt; } } function keep(opt, p) { - return keepU(opt, Curry.__1(p)); + return keepU(opt, (function (x) { + return p(x); + })); } function forEachU(opt, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } } function forEach(opt, f) { - forEachU(opt, Curry.__1(f)); + forEachU(opt, (function (x) { + f(x); + })); } function getExn(x) { @@ -38,36 +41,42 @@ function getExn(x) { function mapWithDefaultU(opt, $$default, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } else { return $$default; } } function mapWithDefault(opt, $$default, f) { - return mapWithDefaultU(opt, $$default, Curry.__1(f)); + return mapWithDefaultU(opt, $$default, (function (x) { + return f(x); + })); } function mapU(opt, f) { if (opt !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(opt))); + return Caml_option.some(f(Caml_option.valFromOption(opt))); } } function map(opt, f) { - return mapU(opt, Curry.__1(f)); + return mapU(opt, (function (x) { + return f(x); + })); } function flatMapU(opt, f) { if (opt !== undefined) { - return Curry._1(f, Caml_option.valFromOption(opt)); + return f(Caml_option.valFromOption(opt)); } } function flatMap(opt, f) { - return flatMapU(opt, Curry.__1(f)); + return flatMapU(opt, (function (x) { + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -97,7 +106,7 @@ function isNone(x) { function eqU(a, b, f) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(f, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return f(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return false; } @@ -107,13 +116,15 @@ function eqU(a, b, f) { } function eq(a, b, f) { - return eqU(a, b, Curry.__2(f)); + return eqU(a, b, (function (x, y) { + return f(x, y); + })); } function cmpU(a, b, f) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(f, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return f(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return 1; } @@ -125,7 +136,9 @@ function cmpU(a, b, f) { } function cmp(a, b, f) { - return cmpU(a, b, Curry.__2(f)); + return cmpU(a, b, (function (x, y) { + return f(x, y); + })); } exports.keepU = keepU; diff --git a/lib/js/belt_Range.js b/lib/js/belt_Range.js index 177cf3c146..f5b60d1289 100644 --- a/lib/js/belt_Range.js +++ b/lib/js/belt_Range.js @@ -1,15 +1,16 @@ 'use strict'; -let Curry = require("./curry.js"); function forEachU(s, f, action) { for(let i = s; i <= f; ++i){ - Curry._1(action, i); + action(i); } } function forEach(s, f, action) { - forEachU(s, f, Curry.__1(action)); + forEachU(s, f, (function (a) { + action(a); + })); } function everyU(_s, f, p) { @@ -18,7 +19,7 @@ function everyU(_s, f, p) { if (s > f) { return true; } - if (!Curry._1(p, s)) { + if (!p(s)) { return false; } _s = s + 1 | 0; @@ -27,7 +28,9 @@ function everyU(_s, f, p) { } function every(s, f, p) { - return everyU(s, f, Curry.__1(p)); + return everyU(s, f, (function (a) { + return p(a); + })); } function everyByU(s, f, step, p) { @@ -38,7 +41,7 @@ function everyByU(s, f, step, p) { if (s$1 > f) { return true; } - if (!Curry._1(p, s$1)) { + if (!p(s$1)) { return false; } _s = s$1 + step | 0; @@ -50,7 +53,9 @@ function everyByU(s, f, step, p) { } function everyBy(s, f, step, p) { - return everyByU(s, f, step, Curry.__1(p)); + return everyByU(s, f, step, (function (a) { + return p(a); + })); } function someU(_s, f, p) { @@ -59,7 +64,7 @@ function someU(_s, f, p) { if (s > f) { return false; } - if (Curry._1(p, s)) { + if (p(s)) { return true; } _s = s + 1 | 0; @@ -68,7 +73,9 @@ function someU(_s, f, p) { } function some(s, f, p) { - return someU(s, f, Curry.__1(p)); + return someU(s, f, (function (a) { + return p(a); + })); } function someByU(s, f, step, p) { @@ -79,7 +86,7 @@ function someByU(s, f, step, p) { if (s$1 > f) { return false; } - if (Curry._1(p, s$1)) { + if (p(s$1)) { return true; } _s = s$1 + step | 0; @@ -91,7 +98,9 @@ function someByU(s, f, step, p) { } function someBy(s, f, step, p) { - return someByU(s, f, step, Curry.__1(p)); + return someByU(s, f, step, (function (a) { + return p(a); + })); } exports.forEachU = forEachU; diff --git a/lib/js/belt_Result.js b/lib/js/belt_Result.js index d3ba2043d7..24ac6ac449 100644 --- a/lib/js/belt_Result.js +++ b/lib/js/belt_Result.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); function getExn(x) { if (x.TAG === "Ok") { @@ -15,21 +14,23 @@ function getExn(x) { function mapWithDefaultU(opt, $$default, f) { if (opt.TAG === "Ok") { - return Curry._1(f, opt._0); + return f(opt._0); } else { return $$default; } } function mapWithDefault(opt, $$default, f) { - return mapWithDefaultU(opt, $$default, Curry.__1(f)); + return mapWithDefaultU(opt, $$default, (function (x) { + return f(x); + })); } function mapU(opt, f) { if (opt.TAG === "Ok") { return { TAG: "Ok", - _0: Curry._1(f, opt._0) + _0: f(opt._0) }; } else { return { @@ -40,12 +41,14 @@ function mapU(opt, f) { } function map(opt, f) { - return mapU(opt, Curry.__1(f)); + return mapU(opt, (function (x) { + return f(x); + })); } function flatMapU(opt, f) { if (opt.TAG === "Ok") { - return Curry._1(f, opt._0); + return f(opt._0); } else { return { TAG: "Error", @@ -55,7 +58,9 @@ function flatMapU(opt, f) { } function flatMap(opt, f) { - return flatMapU(opt, Curry.__1(f)); + return flatMapU(opt, (function (x) { + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -85,7 +90,7 @@ function isError(x) { function eqU(a, b, f) { if (a.TAG === "Ok") { if (b.TAG === "Ok") { - return Curry._2(f, a._0, b._0); + return f(a._0, b._0); } else { return false; } @@ -97,13 +102,15 @@ function eqU(a, b, f) { } function eq(a, b, f) { - return eqU(a, b, Curry.__2(f)); + return eqU(a, b, (function (x, y) { + return f(x, y); + })); } function cmpU(a, b, f) { if (a.TAG === "Ok") { if (b.TAG === "Ok") { - return Curry._2(f, a._0, b._0); + return f(a._0, b._0); } else { return 1; } @@ -115,7 +122,9 @@ function cmpU(a, b, f) { } function cmp(a, b, f) { - return cmpU(a, b, Curry.__2(f)); + return cmpU(a, b, (function (x, y) { + return f(x, y); + })); } exports.getExn = getExn; diff --git a/lib/js/belt_Set.js b/lib/js/belt_Set.js index a48d9ad746..621ccdf2ef 100644 --- a/lib/js/belt_Set.js +++ b/lib/js/belt_Set.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_SetDict = require("./belt_SetDict.js"); function fromArray(data, id) { @@ -128,7 +127,9 @@ function forEachU(m, f) { } function forEach(m, f) { - Belt_SetDict.forEachU(m.data, Curry.__1(f)); + Belt_SetDict.forEachU(m.data, (function (a) { + f(a); + })); } function reduceU(m, acc, f) { @@ -136,7 +137,9 @@ function reduceU(m, acc, f) { } function reduce(m, acc, f) { - return reduceU(m, acc, Curry.__2(f)); + return reduceU(m, acc, (function (a, b) { + return f(a, b); + })); } function everyU(m, f) { @@ -144,7 +147,9 @@ function everyU(m, f) { } function every(m, f) { - return Belt_SetDict.everyU(m.data, Curry.__1(f)); + return Belt_SetDict.everyU(m.data, (function (a) { + return f(a); + })); } function someU(m, f) { @@ -152,7 +157,9 @@ function someU(m, f) { } function some(m, f) { - return Belt_SetDict.someU(m.data, Curry.__1(f)); + return Belt_SetDict.someU(m.data, (function (a) { + return f(a); + })); } function keepU(m, f) { @@ -163,7 +170,9 @@ function keepU(m, f) { } function keep(m, f) { - return keepU(m, Curry.__1(f)); + return keepU(m, (function (a) { + return f(a); + })); } function partitionU(m, f) { @@ -182,7 +191,9 @@ function partitionU(m, f) { } function partition(m, f) { - return partitionU(m, Curry.__1(f)); + return partitionU(m, (function (a) { + return f(a); + })); } function size(m) { diff --git a/lib/js/belt_SetDict.js b/lib/js/belt_SetDict.js index ac6aa23cde..f9fcded08d 100644 --- a/lib/js/belt_SetDict.js +++ b/lib/js/belt_SetDict.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_internalAVLset = require("./belt_internalAVLset.js"); function add(t, x, cmp) { @@ -8,7 +7,7 @@ function add(t, x, cmp) { return Belt_internalAVLset.singleton(x); } let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -37,7 +36,7 @@ function remove(t, x, cmp) { let v = t.v; let l = t.l; let r = t.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -91,7 +90,7 @@ function splitAuxNoPivot(cmp, n, x) { let v = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return [ l, @@ -128,7 +127,7 @@ function splitAuxPivot(cmp, n, x, pres) { let v = n.v; let l = n.l; let r = n.r; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { pres.contents = true; return [ diff --git a/lib/js/belt_SortArray.js b/lib/js/belt_SortArray.js index fedb451b62..2ae3650d58 100644 --- a/lib/js/belt_SortArray.js +++ b/lib/js/belt_SortArray.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_Array = require("./belt_Array.js"); function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { @@ -11,7 +10,7 @@ function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { return acc; } let v = xs[acc]; - if (!Curry._2(lt, v, prec)) { + if (!lt(v, prec)) { return acc; } _acc = acc + 1 | 0; @@ -27,7 +26,7 @@ function strictlySortedLengthU(xs, lt) { } let x0 = xs[0]; let x1 = xs[1]; - if (Curry._2(lt, x0, x1)) { + if (lt(x0, x1)) { let _prec = x1; let _acc = 2; while(true) { @@ -37,14 +36,14 @@ function strictlySortedLengthU(xs, lt) { return acc; } let v = xs[acc]; - if (!Curry._2(lt, prec, v)) { + if (!lt(prec, v)) { return acc; } _acc = acc + 1 | 0; _prec = v; continue; }; - } else if (Curry._2(lt, x1, x0)) { + } else if (lt(x1, x0)) { return -sortedLengthAuxMore(xs, x1, 2, len, lt) | 0; } else { return 1; @@ -52,7 +51,9 @@ function strictlySortedLengthU(xs, lt) { } function strictlySortedLength(xs, lt) { - return strictlySortedLengthU(xs, Curry.__2(lt)); + return strictlySortedLengthU(xs, (function (x, y) { + return lt(x, y); + })); } function isSortedU(a, cmp) { @@ -67,7 +68,7 @@ function isSortedU(a, cmp) { if (i === last_bound) { return true; } - if (Curry._2(cmp, a[i], a[i + 1 | 0]) > 0) { + if (cmp(a[i], a[i + 1 | 0]) > 0) { return false; } _i = i + 1 | 0; @@ -77,7 +78,9 @@ function isSortedU(a, cmp) { } function isSorted(a, cmp) { - return isSortedU(a, Curry.__2(cmp)); + return isSortedU(a, (function (x, y) { + return cmp(x, y); + })); } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -94,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - if (Curry._2(cmp, s1, s2) <= 0) { + if (cmp(s1, s2) <= 0) { dst[d] = s1; let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -131,7 +134,7 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; let i1$1 = i1 + 1 | 0; @@ -181,7 +184,9 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -198,7 +203,7 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { @@ -234,7 +239,9 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { @@ -251,7 +258,7 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) let i2 = _i2; let s1 = _s1; let i1 = _i1; - let c = Curry._2(cmp, s1, s2); + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; let d$1 = d + 1 | 0; @@ -293,14 +300,16 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - return diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, Curry.__2(cmp)); + return diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { + return cmp(x, y); + })); } function insertionSort(src, srcofs, dst, dstofs, len, cmp) { for(let i = 0; i < len; ++i){ let e = src[srcofs + i | 0]; let j = (dstofs + i | 0) - 1 | 0; - while(j >= dstofs && Curry._2(cmp, dst[j], e) > 0) { + while(j >= dstofs && cmp(dst[j], e) > 0) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; }; @@ -333,7 +342,9 @@ function stableSortInPlaceByU(a, cmp) { } function stableSortInPlaceBy(a, cmp) { - stableSortInPlaceByU(a, Curry.__2(cmp)); + stableSortInPlaceByU(a, (function (x, y) { + return cmp(x, y); + })); } function stableSortByU(a, cmp) { @@ -343,7 +354,9 @@ function stableSortByU(a, cmp) { } function stableSortBy(a, cmp) { - return stableSortByU(a, Curry.__2(cmp)); + return stableSortByU(a, (function (x, y) { + return cmp(x, y); + })); } function binarySearchByU(sorted, key, cmp) { @@ -352,12 +365,12 @@ function binarySearchByU(sorted, key, cmp) { return -1; } let lo = sorted[0]; - let c = Curry._2(cmp, key, lo); + let c = cmp(key, lo); if (c < 0) { return -1; } let hi = sorted[len - 1 | 0]; - let c2 = Curry._2(cmp, key, hi); + let c2 = cmp(key, hi); if (c2 > 0) { return -(len + 1 | 0) | 0; } else { @@ -368,13 +381,13 @@ function binarySearchByU(sorted, key, cmp) { let lo$1 = _lo; let mid = (lo$1 + hi$1 | 0) / 2 | 0; let midVal = sorted[mid]; - let c$1 = Curry._2(cmp, key, midVal); + let c$1 = cmp(key, midVal); if (c$1 === 0) { return mid; } if (c$1 < 0) { if (hi$1 === mid) { - if (Curry._2(cmp, sorted[lo$1], key) === 0) { + if (cmp(sorted[lo$1], key) === 0) { return lo$1; } else { return -(hi$1 + 1 | 0) | 0; @@ -384,7 +397,7 @@ function binarySearchByU(sorted, key, cmp) { continue; } if (lo$1 === mid) { - if (Curry._2(cmp, sorted[hi$1], key) === 0) { + if (cmp(sorted[hi$1], key) === 0) { return hi$1; } else { return -(hi$1 + 1 | 0) | 0; @@ -397,7 +410,9 @@ function binarySearchByU(sorted, key, cmp) { } function binarySearchBy(sorted, key, cmp) { - return binarySearchByU(sorted, key, Curry.__2(cmp)); + return binarySearchByU(sorted, key, (function (x, y) { + return cmp(x, y); + })); } let Int; diff --git a/lib/js/belt_internalAVLset.js b/lib/js/belt_internalAVLset.js index d9f2856adf..aa3c4de016 100644 --- a/lib/js/belt_internalAVLset.js +++ b/lib/js/belt_internalAVLset.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_SortArray = require("./belt_SortArray.js"); @@ -171,14 +170,16 @@ function forEachU(_n, f) { return; } forEachU(n.l, f); - Curry._1(f, n.v); + f(n.v); _n = n.r; continue; }; } function forEach(n, f) { - forEachU(n, Curry.__1(f)); + forEachU(n, (function (a) { + f(a); + })); } function reduceU(_s, _accu, f) { @@ -188,14 +189,16 @@ function reduceU(_s, _accu, f) { if (s === undefined) { return accu; } - _accu = Curry._2(f, reduceU(s.l, accu, f), s.v); + _accu = f(reduceU(s.l, accu, f), s.v); _s = s.r; continue; }; } function reduce(s, accu, f) { - return reduceU(s, accu, Curry.__2(f)); + return reduceU(s, accu, (function (a, b) { + return f(a, b); + })); } function everyU(_n, p) { @@ -204,7 +207,7 @@ function everyU(_n, p) { if (n === undefined) { return true; } - if (!Curry._1(p, n.v)) { + if (!p(n.v)) { return false; } if (!everyU(n.l, p)) { @@ -216,7 +219,9 @@ function everyU(_n, p) { } function every(n, p) { - return everyU(n, Curry.__1(p)); + return everyU(n, (function (a) { + return p(a); + })); } function someU(_n, p) { @@ -225,7 +230,7 @@ function someU(_n, p) { if (n === undefined) { return false; } - if (Curry._1(p, n.v)) { + if (p(n.v)) { return true; } if (someU(n.l, p)) { @@ -237,7 +242,9 @@ function someU(_n, p) { } function some(n, p) { - return someU(n, Curry.__1(p)); + return someU(n, (function (a) { + return p(a); + })); } function addMinElement(n, v) { @@ -299,7 +306,7 @@ function partitionSharedU(n, p) { let match = partitionSharedU(n.l, p); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, value); + let pv = p(value); let match$1 = partitionSharedU(n.r, p); let rf = match$1[1]; let rt = match$1[0]; @@ -317,7 +324,9 @@ function partitionSharedU(n, p) { } function partitionShared(n, p) { - return partitionSharedU(n, Curry.__1(p)); + return partitionSharedU(n, (function (a) { + return p(a); + })); } function lengthNode(n) { @@ -415,7 +424,7 @@ function fillArrayWithPartition(_n, cursor, arr, p) { if (l !== undefined) { fillArrayWithPartition(l, cursor, arr, p); } - if (Curry._1(p, v)) { + if (p(v)) { let c = cursor.forward; arr[c] = v; cursor.forward = c + 1 | 0; @@ -440,7 +449,7 @@ function fillArrayWithFilter(_n, _i, arr, p) { let l = n.l; let r = n.r; let next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; - let rnext = Curry._1(p, v) ? (arr[next] = v, next + 1 | 0) : next; + let rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; if (r === undefined) { return rnext; } @@ -540,7 +549,7 @@ function keepSharedU(n, p) { let l = n.l; let r = n.r; let newL = keepSharedU(l, p); - let pv = Curry._1(p, v); + let pv = p(v); let newR = keepSharedU(r, p); if (pv) { if (l === newL && r === newR) { @@ -554,7 +563,9 @@ function keepSharedU(n, p) { } function keepShared(n, p) { - return keepSharedU(n, Curry.__1(p)); + return keepSharedU(n, (function (a) { + return p(a); + })); } function keepCopyU(n, p) { @@ -568,7 +579,9 @@ function keepCopyU(n, p) { } function keepCopy(n, p) { - return keepCopyU(n, Curry.__1(p)); + return keepCopyU(n, (function (x) { + return p(x); + })); } function partitionCopyU(n, p) { @@ -594,7 +607,9 @@ function partitionCopyU(n, p) { } function partitionCopy(n, p) { - return partitionCopyU(n, Curry.__1(p)); + return partitionCopyU(n, (function (a) { + return p(a); + })); } function has(_t, x, cmp) { @@ -604,7 +619,7 @@ function has(_t, x, cmp) { return false; } let v = t.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return true; } @@ -630,7 +645,7 @@ function cmp(s1, s2, cmp$1) { } let h2 = e2.hd; let h1 = e1.hd; - let c = Curry._2(cmp$1, h1.v, h2.v); + let c = cmp$1(h1.v, h2.v); if (c !== 0) { return c; } @@ -665,7 +680,7 @@ function subset(_s1, _s2, cmp) { let v2 = s2.v; let l2 = s2.l; let r2 = s2.r; - let c = Curry._2(cmp, v1, v2); + let c = cmp(v1, v2); if (c === 0) { if (!subset(l1, l2, cmp)) { return false; @@ -696,7 +711,7 @@ function get(_n, x, cmp) { return; } let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return Caml_option.some(v); } @@ -712,7 +727,7 @@ function getUndefined(_n, x, cmp) { return; } let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return v; } @@ -726,7 +741,7 @@ function getExn(_n, x, cmp) { let n = _n; if (n !== undefined) { let v = n.v; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return v; } @@ -840,7 +855,7 @@ function addMutate(cmp, t, x) { return singleton(x); } let k = t.v; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { return t; } @@ -861,7 +876,7 @@ function fromArray(xs, cmp) { return; } let next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { - return Curry._2(cmp, x, y) < 0; + return cmp(x, y) < 0; })); let result; if (next >= 0) { diff --git a/lib/js/belt_internalAVLtree.js b/lib/js/belt_internalAVLtree.js index c06d5f31a5..70f0d5cc11 100644 --- a/lib/js/belt_internalAVLtree.js +++ b/lib/js/belt_internalAVLtree.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_SortArray = require("./belt_SortArray.js"); @@ -255,7 +254,7 @@ function findFirstByU(n, p) { } let v = n.k; let d = n.v; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); if (pvd) { return [ v, @@ -270,7 +269,9 @@ function findFirstByU(n, p) { } function findFirstBy(n, p) { - return findFirstByU(n, Curry.__2(p)); + return findFirstByU(n, (function (a, b) { + return p(a, b); + })); } function forEachU(_n, f) { @@ -280,14 +281,16 @@ function forEachU(_n, f) { return; } forEachU(n.l, f); - Curry._2(f, n.k, n.v); + f(n.k, n.v); _n = n.r; continue; }; } function forEach(n, f) { - forEachU(n, Curry.__2(f)); + forEachU(n, (function (a, b) { + f(a, b); + })); } function mapU(n, f) { @@ -295,7 +298,7 @@ function mapU(n, f) { return; } let newLeft = mapU(n.l, f); - let newD = Curry._1(f, n.v); + let newD = f(n.v); let newRight = mapU(n.r, f); return { k: n.k, @@ -307,7 +310,9 @@ function mapU(n, f) { } function map(n, f) { - return mapU(n, Curry.__1(f)); + return mapU(n, (function (a) { + return f(a); + })); } function mapWithKeyU(n, f) { @@ -316,7 +321,7 @@ function mapWithKeyU(n, f) { } let key = n.k; let newLeft = mapWithKeyU(n.l, f); - let newD = Curry._2(f, key, n.v); + let newD = f(key, n.v); let newRight = mapWithKeyU(n.r, f); return { k: key, @@ -328,7 +333,9 @@ function mapWithKeyU(n, f) { } function mapWithKey(n, f) { - return mapWithKeyU(n, Curry.__2(f)); + return mapWithKeyU(n, (function (a, b) { + return f(a, b); + })); } function reduceU(_m, _accu, f) { @@ -342,14 +349,16 @@ function reduceU(_m, _accu, f) { let d = m.v; let l = m.l; let r = m.r; - _accu = Curry._3(f, reduceU(l, accu, f), v, d); + _accu = f(reduceU(l, accu, f), v, d); _m = r; continue; }; } function reduce(m, accu, f) { - return reduceU(m, accu, Curry.__3(f)); + return reduceU(m, accu, (function (a, b, c) { + return f(a, b, c); + })); } function everyU(_n, p) { @@ -358,7 +367,7 @@ function everyU(_n, p) { if (n === undefined) { return true; } - if (!Curry._2(p, n.k, n.v)) { + if (!p(n.k, n.v)) { return false; } if (!everyU(n.l, p)) { @@ -370,7 +379,9 @@ function everyU(_n, p) { } function every(n, p) { - return everyU(n, Curry.__2(p)); + return everyU(n, (function (a, b) { + return p(a, b); + })); } function someU(_n, p) { @@ -379,7 +390,7 @@ function someU(_n, p) { if (n === undefined) { return false; } - if (Curry._2(p, n.k, n.v)) { + if (p(n.k, n.v)) { return true; } if (someU(n.l, p)) { @@ -391,7 +402,9 @@ function someU(_n, p) { } function some(n, p) { - return someU(n, Curry.__2(p)); + return someU(n, (function (a, b) { + return p(a, b); + })); } function addMinElement(n, k, v) { @@ -468,7 +481,7 @@ function keepSharedU(n, p) { let v = n.k; let d = n.v; let newLeft = keepSharedU(n.l, p); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let newRight = keepSharedU(n.r, p); if (pvd) { return join(newLeft, v, d, newRight); @@ -478,7 +491,9 @@ function keepSharedU(n, p) { } function keepShared(n, p) { - return keepSharedU(n, Curry.__2(p)); + return keepSharedU(n, (function (a, b) { + return p(a, b); + })); } function keepMapU(n, p) { @@ -488,7 +503,7 @@ function keepMapU(n, p) { let v = n.k; let d = n.v; let newLeft = keepMapU(n.l, p); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let newRight = keepMapU(n.r, p); if (pvd !== undefined) { return join(newLeft, v, Caml_option.valFromOption(pvd), newRight); @@ -498,7 +513,9 @@ function keepMapU(n, p) { } function keepMap(n, p) { - return keepMapU(n, Curry.__2(p)); + return keepMapU(n, (function (a, b) { + return p(a, b); + })); } function partitionSharedU(n, p) { @@ -513,7 +530,7 @@ function partitionSharedU(n, p) { let match = partitionSharedU(n.l, p); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, key, value); + let pvd = p(key, value); let match$1 = partitionSharedU(n.r, p); let rf = match$1[1]; let rt = match$1[0]; @@ -531,7 +548,9 @@ function partitionSharedU(n, p) { } function partitionShared(n, p) { - return partitionSharedU(n, Curry.__2(p)); + return partitionSharedU(n, (function (a, b) { + return p(a, b); + })); } function lengthNode(n) { @@ -798,11 +817,11 @@ function cmpU(s1, s2, kcmp, vcmp) { } let h2 = e2.hd; let h1 = e1.hd; - let c = Curry._2(kcmp, h1.k, h2.k); + let c = kcmp(h1.k, h2.k); if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -818,7 +837,9 @@ function cmpU(s1, s2, kcmp, vcmp) { } function cmp(s1, s2, kcmp, vcmp) { - return cmpU(s1, s2, kcmp, Curry.__2(vcmp)); + return cmpU(s1, s2, kcmp, (function (a, b) { + return vcmp(a, b); + })); } function eqU(s1, s2, kcmp, veq) { @@ -838,7 +859,7 @@ function eqU(s1, s2, kcmp, veq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(Curry._2(kcmp, h1.k, h2.k) === 0 && Curry._2(veq, h1.v, h2.v))) { + if (!(kcmp(h1.k, h2.k) === 0 && veq(h1.v, h2.v))) { return false; } _e2 = stackAllLeft(h2.r, e2.tl); @@ -851,7 +872,9 @@ function eqU(s1, s2, kcmp, veq) { } function eq(s1, s2, kcmp, veq) { - return eqU(s1, s2, kcmp, Curry.__2(veq)); + return eqU(s1, s2, kcmp, (function (a, b) { + return veq(a, b); + })); } function get(_n, x, cmp) { @@ -861,7 +884,7 @@ function get(_n, x, cmp) { return; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return Caml_option.some(n.v); } @@ -877,7 +900,7 @@ function getUndefined(_n, x, cmp) { return; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -891,7 +914,7 @@ function getExn(_n, x, cmp) { let n = _n; if (n !== undefined) { let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -913,7 +936,7 @@ function getWithDefault(_n, x, def, cmp) { return def; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -929,7 +952,7 @@ function has(_n, x, cmp) { return false; } let v = n.k; - let c = Curry._2(cmp, x, v); + let c = cmp(x, v); if (c === 0) { return true; } @@ -1029,7 +1052,7 @@ function updateMutate(t, x, data, cmp) { return singleton(x, data); } let k = t.k; - let c = Curry._2(cmp, x, k); + let c = cmp(x, k); if (c === 0) { t.v = data; return t; @@ -1051,7 +1074,7 @@ function fromArray(xs, cmp) { return; } let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { - return Curry._2(cmp, param[0], param$1[0]) < 0; + return cmp(param[0], param$1[0]) < 0; })); let result; if (next >= 0) { diff --git a/lib/js/belt_internalBuckets.js b/lib/js/belt_internalBuckets.js index 59cd19f347..bde6492a04 100644 --- a/lib/js/belt_internalBuckets.js +++ b/lib/js/belt_internalBuckets.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_Array = require("./belt_Array.js"); let Caml_option = require("./caml_option.js"); @@ -73,7 +72,7 @@ function do_bucket_iter(f, _buckets) { if (buckets === undefined) { return; } - Curry._2(f, buckets.key, buckets.value); + f(buckets.key, buckets.value); _buckets = buckets.next; continue; }; @@ -87,7 +86,9 @@ function forEachU(h, f) { } function forEach(h, f) { - forEachU(h, Curry.__2(f)); + forEachU(h, (function (a, b) { + return f(a, b); + })); } function do_bucket_fold(f, _b, _accu) { @@ -97,7 +98,7 @@ function do_bucket_fold(f, _b, _accu) { if (b === undefined) { return accu; } - _accu = Curry._3(f, accu, b.key, b.value); + _accu = f(accu, b.key, b.value); _b = b.next; continue; }; @@ -113,7 +114,9 @@ function reduceU(h, init, f) { } function reduce(h, init, f) { - return reduceU(h, init, Curry.__3(f)); + return reduceU(h, init, (function (a, b, c) { + return f(a, b, c); + })); } function getMaxBucketLength(h) { @@ -153,7 +156,7 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { let cell = _cell; let prec = _prec; let n = cell.next; - let data = Curry._2(f, cell.key, cell.value); + let data = f(cell.key, cell.value); if (data !== undefined) { if (prec !== undefined) { cell.next = cell; @@ -195,7 +198,9 @@ function keepMapInPlaceU(h, f) { } function keepMapInPlace(h, f) { - keepMapInPlaceU(h, Curry.__2(f)); + keepMapInPlaceU(h, (function (a, b) { + return f(a, b); + })); } function fillArray(_i, arr, _cell) { @@ -220,7 +225,7 @@ function fillArrayMap(_i, arr, _cell, f) { while(true) { let cell = _cell; let i = _i; - arr[i] = Curry._1(f, cell); + arr[i] = f(cell); let v = cell.next; if (v === undefined) { return i + 1 | 0; diff --git a/lib/js/belt_internalMapInt.js b/lib/js/belt_internalMapInt.js index f16606b2f4..4130367f1b 100644 --- a/lib/js/belt_internalMapInt.js +++ b/lib/js/belt_internalMapInt.js @@ -1,7 +1,6 @@ 'use strict'; let Caml = require("./caml.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_SortArray = require("./belt_SortArray.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); @@ -195,7 +194,7 @@ function mergeU(s1, s2, f) { let l1 = s1.l; let r1 = s1.r; let match = split(v1, s2); - return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, Curry._3(f, v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { @@ -206,11 +205,13 @@ function mergeU(s1, s2, f) { let l2 = s2.l; let r2 = s2.r; let match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, Curry._3(f, v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { @@ -229,7 +230,7 @@ function compareAux(_e1, _e2, vcmp) { if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -252,7 +253,9 @@ function cmpU(s1, s2, cmp) { } function cmp(s1, s2, f) { - return cmpU(s1, s2, Curry.__2(f)); + return cmpU(s1, s2, (function (a, b) { + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { @@ -267,7 +270,7 @@ function eqAux(_e1, _e2, eq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(h1.k === h2.k && Curry._2(eq, h1.v, h2.v))) { + if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); @@ -287,7 +290,9 @@ function eqU(s1, s2, eq) { } function eq(s1, s2, f) { - return eqU(s1, s2, Curry.__2(f)); + return eqU(s1, s2, (function (a, b) { + return f(a, b); + })); } function addMutate(t, x, data) { diff --git a/lib/js/belt_internalMapString.js b/lib/js/belt_internalMapString.js index e385576174..0397f66799 100644 --- a/lib/js/belt_internalMapString.js +++ b/lib/js/belt_internalMapString.js @@ -1,7 +1,6 @@ 'use strict'; let Caml = require("./caml.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let Belt_SortArray = require("./belt_SortArray.js"); let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); @@ -195,7 +194,7 @@ function mergeU(s1, s2, f) { let l1 = s1.l; let r1 = s1.r; let match = split(v1, s2); - return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, Curry._3(f, v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { @@ -206,11 +205,13 @@ function mergeU(s1, s2, f) { let l2 = s2.l; let r2 = s2.r; let match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, Curry._3(f, v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } function merge(s1, s2, f) { - return mergeU(s1, s2, Curry.__3(f)); + return mergeU(s1, s2, (function (a, b, c) { + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { @@ -229,7 +230,7 @@ function compareAux(_e1, _e2, vcmp) { if (c !== 0) { return c; } - let cx = Curry._2(vcmp, h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -252,7 +253,9 @@ function cmpU(s1, s2, cmp) { } function cmp(s1, s2, f) { - return cmpU(s1, s2, Curry.__2(f)); + return cmpU(s1, s2, (function (a, b) { + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { @@ -267,7 +270,7 @@ function eqAux(_e1, _e2, eq) { } let h2 = e2.hd; let h1 = e1.hd; - if (!(h1.k === h2.k && Curry._2(eq, h1.v, h2.v))) { + if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); @@ -287,7 +290,9 @@ function eqU(s1, s2, eq) { } function eq(s1, s2, f) { - return eqU(s1, s2, Curry.__2(f)); + return eqU(s1, s2, (function (a, b) { + return f(a, b); + })); } function addMutate(t, x, data) { diff --git a/lib/js/belt_internalSetBuckets.js b/lib/js/belt_internalSetBuckets.js index e0a390a6e1..95789558f2 100644 --- a/lib/js/belt_internalSetBuckets.js +++ b/lib/js/belt_internalSetBuckets.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Belt_Array = require("./belt_Array.js"); function copyAuxCont(_c, _prec) { @@ -70,7 +69,7 @@ function doBucketIter(f, _buckets) { if (buckets === undefined) { return; } - Curry._1(f, buckets.key); + f(buckets.key); _buckets = buckets.next; continue; }; @@ -84,7 +83,9 @@ function forEachU(h, f) { } function forEach(h, f) { - forEachU(h, Curry.__1(f)); + forEachU(h, (function (a) { + f(a); + })); } function fillArray(_i, arr, _cell) { @@ -123,7 +124,7 @@ function doBucketFold(f, _b, _accu) { if (b === undefined) { return accu; } - _accu = Curry._2(f, accu, b.key); + _accu = f(accu, b.key); _b = b.next; continue; }; @@ -139,7 +140,9 @@ function reduceU(h, init, f) { } function reduce(h, init, f) { - return reduceU(h, init, Curry.__2(f)); + return reduceU(h, init, (function (a, b) { + return f(a, b); + })); } function getMaxBucketLength(h) { diff --git a/lib/js/buffer.js b/lib/js/buffer.js index c1142a0832..1841872741 100644 --- a/lib/js/buffer.js +++ b/lib/js/buffer.js @@ -1,7 +1,6 @@ 'use strict'; let Bytes = require("./bytes.js"); -let Curry = require("./curry.js"); let $$String = require("./string.js"); let Caml_bytes = require("./caml_bytes.js"); let Caml_string = require("./caml_string.js"); @@ -447,7 +446,7 @@ function add_substitute(b, f, s) { } let j = i + 1 | 0; let match = find_ident(s, j, lim); - add_string(b, Curry._1(f, match[0])); + add_string(b, f(match[0])); _i = match[1]; _previous = /* ' ' */32; continue; diff --git a/lib/js/bytes.js b/lib/js/bytes.js index 0a846043cd..e1a49076b5 100644 --- a/lib/js/bytes.js +++ b/lib/js/bytes.js @@ -2,7 +2,6 @@ let Caml = require("./caml.js"); let Char = require("./char.js"); -let Curry = require("./curry.js"); let Caml_bytes = require("./caml_bytes.js"); let Caml_js_exceptions = require("./caml_js_exceptions.js"); @@ -64,7 +63,7 @@ function make(n, c) { function init(n, f) { let s = Caml_bytes.create(n); for(let i = 0; i < n; ++i){ - s[i] = Curry._1(f, i); + s[i] = f(i); } return s; } @@ -232,13 +231,13 @@ function blit_string(s1, ofs1, s2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -446,7 +445,7 @@ function map(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, s[i]); + r[i] = f(s[i]); } return r; } @@ -458,7 +457,7 @@ function mapi(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, s[i]); + r[i] = f(i, s[i]); } return r; } @@ -476,7 +475,7 @@ function apply1(f, s) { return s; } let r = copy(s); - r[0] = Curry._1(f, s[0]); + r[0] = f(s[0]); return r; } diff --git a/lib/js/bytesLabels.js b/lib/js/bytesLabels.js index 0a846043cd..e1a49076b5 100644 --- a/lib/js/bytesLabels.js +++ b/lib/js/bytesLabels.js @@ -2,7 +2,6 @@ let Caml = require("./caml.js"); let Char = require("./char.js"); -let Curry = require("./curry.js"); let Caml_bytes = require("./caml_bytes.js"); let Caml_js_exceptions = require("./caml_js_exceptions.js"); @@ -64,7 +63,7 @@ function make(n, c) { function init(n, f) { let s = Caml_bytes.create(n); for(let i = 0; i < n; ++i){ - s[i] = Curry._1(f, i); + s[i] = f(i); } return s; } @@ -232,13 +231,13 @@ function blit_string(s1, ofs1, s2, ofs2, len) { function iter(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._1(f, a[i]); + f(a[i]); } } function iteri(f, a) { for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ - Curry._2(f, i, a[i]); + f(i, a[i]); } } @@ -446,7 +445,7 @@ function map(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._1(f, s[i]); + r[i] = f(s[i]); } return r; } @@ -458,7 +457,7 @@ function mapi(f, s) { } let r = Caml_bytes.create(l); for(let i = 0; i < l; ++i){ - r[i] = Curry._2(f, i, s[i]); + r[i] = f(i, s[i]); } return r; } @@ -476,7 +475,7 @@ function apply1(f, s) { return s; } let r = copy(s); - r[0] = Curry._1(f, s[0]); + r[0] = f(s[0]); return r; } diff --git a/lib/js/camlinternalLazy.js b/lib/js/camlinternalLazy.js index a97091fe5d..4125262ab5 100644 --- a/lib/js/camlinternalLazy.js +++ b/lib/js/camlinternalLazy.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_exceptions = require("./caml_exceptions.js"); function is_val(l) { @@ -10,7 +9,7 @@ function is_val(l) { let Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); function forward_with_closure(blk, closure) { - let result = Curry._1(closure, undefined); + let result = closure(); blk.VAL = result; blk.LAZY_DONE = true; return result; diff --git a/lib/js/filename.js b/lib/js/filename.js index df025ea5f8..530e6fe8cf 100644 --- a/lib/js/filename.js +++ b/lib/js/filename.js @@ -2,7 +2,6 @@ let Sys = require("./sys.js"); let Bytes = require("./bytes.js"); -let Curry = require("./curry.js"); let Buffer = require("./buffer.js"); let $$String = require("./string.js"); let Caml_sys = require("./caml_sys.js"); @@ -19,7 +18,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n)) { + if (!is_dir_sep(name, n)) { let _n$1 = n; let p = n + 1 | 0; while(true) { @@ -27,7 +26,7 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (n$1 < 0) { return $$String.sub(name, 0, p); } - if (Curry._2(is_dir_sep, name, n$1)) { + if (is_dir_sep(name, n$1)) { return $$String.sub(name, n$1 + 1 | 0, (p - n$1 | 0) - 1 | 0); } _n$1 = n$1 - 1 | 0; @@ -50,21 +49,21 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { if (n < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n)) { + if (!is_dir_sep(name, n)) { let _n$1 = n; while(true) { let n$1 = _n$1; if (n$1 < 0) { return current_dir_name; } - if (Curry._2(is_dir_sep, name, n$1)) { + if (is_dir_sep(name, n$1)) { let _n$2 = n$1; while(true) { let n$2 = _n$2; if (n$2 < 0) { return $$String.sub(name, 0, 1); } - if (!Curry._2(is_dir_sep, name, n$2)) { + if (!is_dir_sep(name, n$2)) { return $$String.sub(name, 0, n$2 + 1 | 0); } _n$2 = n$2 - 1 | 0; @@ -375,7 +374,7 @@ let dir_sep = match[2]; function concat(dirname, filename) { let l = dirname.length; - if (l === 0 || Curry._2(is_dir_sep$2, dirname, l - 1 | 0)) { + if (l === 0 || is_dir_sep$2(dirname, l - 1 | 0)) { return dirname + filename; } else { return dirname + (dir_sep + filename); @@ -399,14 +398,14 @@ function extension_len(name) { let _i = name.length - 1 | 0; while(true) { let i = _i; - if (i < 0 || Curry._2(is_dir_sep$2, name, i)) { + if (i < 0 || is_dir_sep$2(name, i)) { return 0; } if (Caml_string.get(name, i) === /* '.' */46) { let _i$1 = i - 1 | 0; while(true) { let i$1 = _i$1; - if (i$1 < 0 || Curry._2(is_dir_sep$2, name, i$1)) { + if (i$1 < 0 || is_dir_sep$2(name, i$1)) { return 0; } if (Caml_string.get(name, i$1) !== /* '.' */46) { diff --git a/lib/js/hashtbl.js b/lib/js/hashtbl.js index b8f48938a0..e882bc97c2 100644 --- a/lib/js/hashtbl.js +++ b/lib/js/hashtbl.js @@ -2,7 +2,6 @@ let Caml = require("./caml.js"); let $$Array = require("./array.js"); -let Curry = require("./curry.js"); let Random = require("./random.js"); let Caml_obj = require("./caml_obj.js"); let Caml_hash = require("./caml_hash.js"); @@ -178,7 +177,7 @@ function resize(indexfun, h) { data: data, next: "Empty" }); - let nidx = Curry._2(indexfun, h, key); + let nidx = indexfun(h, key); let tail = Caml_array.get(ndata_tail, nidx); if (typeof tail !== "object") { Caml_array.set(ndata, nidx, cell); @@ -450,7 +449,7 @@ function iter(f, h) { let key = param.key; let data = param.data; let next = param.next; - Curry._2(f, key, data); + f(key, data); _param = next; continue; }; @@ -498,7 +497,7 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { let key = param.key; let data = param.data; let next = param.next; - let data$1 = Curry._2(f, key, data); + let data$1 = f(key, data); if (data$1 !== undefined) { if (typeof prec !== "object") { Caml_array.set(h.data, i, param); @@ -552,7 +551,7 @@ function fold(f, h, init) { let key = b.key; let data = b.data; let next = b.next; - _accu = Curry._3(f, key, data, accu); + _accu = f(key, data, accu); _b = next; continue; }; @@ -618,7 +617,7 @@ function stats(h) { function MakeSeeded(H) { let key_index = function (h, key) { - return Curry._2(H.hash, h.seed, key) & (h.data.length - 1 | 0); + return H.hash(h.seed, key) & (h.data.length - 1 | 0); }; let add = function (h, key, data) { let i = key_index(h, key); @@ -647,7 +646,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { return Caml_array.set(h.data, i, next); @@ -673,7 +672,7 @@ function MakeSeeded(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(H.equal, key, k1)) { + if (H.equal(key, k1)) { return d1; } if (typeof next1 !== "object") { @@ -686,7 +685,7 @@ function MakeSeeded(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(H.equal, key, k2)) { + if (H.equal(key, k2)) { return d2; } if (typeof next2 !== "object") { @@ -699,7 +698,7 @@ function MakeSeeded(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(H.equal, key, k3)) { + if (H.equal(key, k3)) { return d3; } else { let _param = next3; @@ -715,7 +714,7 @@ function MakeSeeded(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(H.equal, key, k)) { + if (H.equal(key, k)) { return data; } _param = next; @@ -731,7 +730,7 @@ function MakeSeeded(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(H.equal, key, k1)) { + if (H.equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { @@ -740,7 +739,7 @@ function MakeSeeded(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(H.equal, key, k2)) { + if (H.equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { @@ -749,7 +748,7 @@ function MakeSeeded(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(H.equal, key, k3)) { + if (H.equal(key, k3)) { return Caml_option.some(d3); } else { let _param = next3; @@ -761,7 +760,7 @@ function MakeSeeded(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(H.equal, key, k)) { + if (H.equal(key, k)) { return Caml_option.some(data); } _param = next; @@ -779,7 +778,7 @@ function MakeSeeded(H) { let k = param.key; let d = param.data; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { return { hd: d, tl: find_in_bucket(next) @@ -799,7 +798,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { param.key = key; param.data = data; return false; @@ -836,7 +835,7 @@ function MakeSeeded(H) { } let k = param.key; let next = param.next; - if (Curry._2(H.equal, k, key)) { + if (H.equal(k, key)) { return true; } _param = next; @@ -866,7 +865,7 @@ function MakeSeeded(H) { function Make(H) { let equal = H.equal; let key_index = function (h, key) { - return Curry._1(H.hash, key) & (h.data.length - 1 | 0); + return H.hash(key) & (h.data.length - 1 | 0); }; let add = function (h, key, data) { let i = key_index(h, key); @@ -895,7 +894,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { return Caml_array.set(h.data, i, next); @@ -921,7 +920,7 @@ function Make(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(equal, key, k1)) { + if (equal(key, k1)) { return d1; } if (typeof next1 !== "object") { @@ -934,7 +933,7 @@ function Make(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(equal, key, k2)) { + if (equal(key, k2)) { return d2; } if (typeof next2 !== "object") { @@ -947,7 +946,7 @@ function Make(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(equal, key, k3)) { + if (equal(key, k3)) { return d3; } else { let _param = next3; @@ -963,7 +962,7 @@ function Make(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(equal, key, k)) { + if (equal(key, k)) { return data; } _param = next; @@ -979,7 +978,7 @@ function Make(H) { let k1 = match.key; let d1 = match.data; let next1 = match.next; - if (Curry._2(equal, key, k1)) { + if (equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { @@ -988,7 +987,7 @@ function Make(H) { let k2 = next1.key; let d2 = next1.data; let next2 = next1.next; - if (Curry._2(equal, key, k2)) { + if (equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { @@ -997,7 +996,7 @@ function Make(H) { let k3 = next2.key; let d3 = next2.data; let next3 = next2.next; - if (Curry._2(equal, key, k3)) { + if (equal(key, k3)) { return Caml_option.some(d3); } else { let _param = next3; @@ -1009,7 +1008,7 @@ function Make(H) { let k = param.key; let data = param.data; let next = param.next; - if (Curry._2(equal, key, k)) { + if (equal(key, k)) { return Caml_option.some(data); } _param = next; @@ -1027,7 +1026,7 @@ function Make(H) { let k = param.key; let d = param.data; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { return { hd: d, tl: find_in_bucket(next) @@ -1047,7 +1046,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { param.key = key; param.data = data; return false; @@ -1084,7 +1083,7 @@ function Make(H) { } let k = param.key; let next = param.next; - if (Curry._2(equal, k, key)) { + if (equal(k, key)) { return true; } _param = next; diff --git a/lib/js/hashtblLabels.js b/lib/js/hashtblLabels.js index ea6f6504c1..6aa7894bbb 100644 --- a/lib/js/hashtblLabels.js +++ b/lib/js/hashtblLabels.js @@ -1,22 +1,31 @@ 'use strict'; -let Curry = require("./curry.js"); let Hashtbl = require("./hashtbl.js"); -let add = Hashtbl.add; +function add(tbl, key, data) { + Hashtbl.add(tbl, key, data); +} -let replace = Hashtbl.replace; +function replace(tbl, key, data) { + Hashtbl.replace(tbl, key, data); +} function iter(f, tbl) { - Hashtbl.iter(Curry.__2(f), tbl); + Hashtbl.iter((function (key, data) { + f(key, data); + }), tbl); } function filter_map_inplace(f, tbl) { - Hashtbl.filter_map_inplace(Curry.__2(f), tbl); + Hashtbl.filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); } function fold(f, tbl, init) { - return Hashtbl.fold(Curry.__3(f), tbl, init); + return Hashtbl.fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); } function MakeSeeded(H) { @@ -26,16 +35,26 @@ function MakeSeeded(H) { let iter = include.iter; let filter_map_inplace = include.filter_map_inplace; let fold = include.fold; - let add$1 = Curry.__3(add); - let replace$1 = Curry.__3(replace); + let add$1 = function (tbl, key, data) { + add(tbl, key, data); + }; + let replace$1 = function (tbl, key, data) { + replace(tbl, key, data); + }; let iter$1 = function (f, tbl) { - Curry._2(iter, Curry.__2(f), tbl); + iter((function (key, data) { + f(key, data); + }), tbl); }; let filter_map_inplace$1 = function (f, tbl) { - Curry._2(filter_map_inplace, Curry.__2(f), tbl); + filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); }; let fold$1 = function (f, tbl, init) { - return Curry._3(fold, Curry.__3(f), tbl, init); + return fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); }; return { create: include.create, @@ -59,7 +78,7 @@ function MakeSeeded(H) { function Make(H) { let hash = function (_seed, x) { - return Curry._1(H.hash, x); + return H.hash(x); }; let H_equal = H.equal; let H$1 = { @@ -73,19 +92,29 @@ function Make(H) { let iter = include.iter; let filter_map_inplace = include.filter_map_inplace; let fold = include.fold; - let add$1 = Curry.__3(add); - let replace$1 = Curry.__3(replace); + let add$1 = function (tbl, key, data) { + add(tbl, key, data); + }; + let replace$1 = function (tbl, key, data) { + replace(tbl, key, data); + }; let iter$1 = function (f, tbl) { - Curry._2(iter, Curry.__2(f), tbl); + iter((function (key, data) { + f(key, data); + }), tbl); }; let filter_map_inplace$1 = function (f, tbl) { - Curry._2(filter_map_inplace, Curry.__2(f), tbl); + filter_map_inplace((function (key, data) { + return f(key, data); + }), tbl); }; let fold$1 = function (f, tbl, init) { - return Curry._3(fold, Curry.__3(f), tbl, init); + return fold((function (key, data, acc) { + return f(key, data, acc); + }), tbl, init); }; let create$1 = function (sz) { - return Curry._2(create, false, sz); + return create(false, sz); }; return { create: create$1, diff --git a/lib/js/js_dict.js b/lib/js/js_dict.js index 6042a9a2d4..4ee3231c38 100644 --- a/lib/js/js_dict.js +++ b/lib/js/js_dict.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function get(dict, k) { @@ -69,7 +68,7 @@ function map(f, source) { let l = keys.length; for(let i = 0; i < l; ++i){ let key = keys[i]; - target[key] = Curry._1(f, source[key]); + target[key] = f(source[key]); } return target; } diff --git a/lib/js/js_null.js b/lib/js/js_null.js index 1ef3498370..73f42da3cf 100644 --- a/lib/js/js_null.js +++ b/lib/js/js_null.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function test(x) { @@ -18,7 +17,7 @@ function getExn(f) { function bind(x, f) { if (x !== null) { - return Curry._1(f, x); + return f(x); } else { return null; } @@ -26,7 +25,7 @@ function bind(x, f) { function iter(x, f) { if (x !== null) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/js/js_null_undefined.js b/lib/js/js_null_undefined.js index aa47b04228..334fe5e479 100644 --- a/lib/js/js_null_undefined.js +++ b/lib/js/js_null_undefined.js @@ -1,19 +1,18 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function bind(x, f) { if (x == null) { return x; } else { - return Curry._1(f, x); + return f(x); } } function iter(x, f) { if (!(x == null)) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/js/js_option.js b/lib/js/js_option.js index 39d0f19069..bdd59b6389 100644 --- a/lib/js/js_option.js +++ b/lib/js/js_option.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function some(x) { @@ -13,7 +12,7 @@ function isSome(x) { function isSomeValue(eq, v, x) { if (x !== undefined) { - return Curry._2(eq, v, Caml_option.valFromOption(x)); + return eq(v, Caml_option.valFromOption(x)); } else { return false; } @@ -35,7 +34,7 @@ function getExn(x) { function equal(eq, a, b) { if (a !== undefined) { if (b !== undefined) { - return Curry._2(eq, Caml_option.valFromOption(a), Caml_option.valFromOption(b)); + return eq(Caml_option.valFromOption(a), Caml_option.valFromOption(b)); } else { return false; } @@ -46,14 +45,14 @@ function equal(eq, a, b) { function andThen(f, x) { if (x !== undefined) { - return Curry._1(f, Caml_option.valFromOption(x)); + return f(Caml_option.valFromOption(x)); } } function map(f, x) { if (x !== undefined) { - return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x))); + return Caml_option.some(f(Caml_option.valFromOption(x))); } } @@ -71,7 +70,7 @@ function filter(f, x) { return; } let x$1 = Caml_option.valFromOption(x); - if (Curry._1(f, x$1)) { + if (f(x$1)) { return Caml_option.some(x$1); } diff --git a/lib/js/js_undefined.js b/lib/js/js_undefined.js index e0d4948a54..fcbfb19305 100644 --- a/lib/js/js_undefined.js +++ b/lib/js/js_undefined.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function test(x) { @@ -22,14 +21,14 @@ function getExn(f) { function bind(x, f) { if (x !== undefined) { - return Curry._1(f, x); + return f(x); } } function iter(x, f) { if (x !== undefined) { - return Curry._1(f, x); + return f(x); } } diff --git a/lib/js/lazy.js b/lib/js/lazy.js index 4172877d98..fe1b4b9d8b 100644 --- a/lib/js/lazy.js +++ b/lib/js/lazy.js @@ -1,11 +1,10 @@ 'use strict'; -let Curry = require("./curry.js"); let CamlinternalLazy = require("./camlinternalLazy.js"); function from_fun(f) { return CamlinternalLazy.from_fun(function () { - return Curry._1(f, undefined); + return f(); }); } diff --git a/lib/js/lexing.js b/lib/js/lexing.js index bb9e821aac..fc24dc97ac 100644 --- a/lib/js/lexing.js +++ b/lib/js/lexing.js @@ -1,7 +1,6 @@ 'use strict'; let Bytes = require("./bytes.js"); -let Curry = require("./curry.js"); let Caml_array = require("./caml_array.js"); let Caml_bytes = require("./caml_bytes.js"); let Caml_lexer = require("./caml_lexer.js"); @@ -47,7 +46,7 @@ function from_function(f) { return { refill_buff: (function (x) { let aux_buffer = Caml_bytes.create(512); - let read = Curry._2(f, aux_buffer, aux_buffer.length); + let read = f(aux_buffer, aux_buffer.length); let n = read > 0 ? read : (x.lex_eof_reached = true, 0); if ((x.lex_buffer_len + n | 0) > x.lex_buffer.length) { if (((x.lex_buffer_len - x.lex_start_pos | 0) + n | 0) <= x.lex_buffer.length) { diff --git a/lib/js/list.js b/lib/js/list.js index 29e7ac19f9..033c5376c2 100644 --- a/lib/js/list.js +++ b/lib/js/list.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_obj = require("./caml_obj.js"); let Pervasives = require("./pervasives.js"); let Caml_option = require("./caml_option.js"); @@ -137,7 +136,7 @@ function init_tailrec_aux(_acc, _i, n, f) { } _i = i + 1 | 0; _acc = { - hd: Curry._1(f, i), + hd: f(i), tl: acc }; continue; @@ -148,7 +147,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - let r = Curry._1(f, i); + let r = f(i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -183,7 +182,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - let r = Curry._1(f, param.hd); + let r = f(param.hd); return { hd: r, tl: map(f, param.tl) @@ -194,7 +193,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - let r = Curry._2(f, i, param.hd); + let r = f(i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -216,7 +215,7 @@ function rev_map(f, l) { } _param = param.tl; _accu = { - hd: Curry._1(f, param.hd), + hd: f(param.hd), tl: accu }; continue; @@ -229,7 +228,7 @@ function iter(f, _param) { if (!param) { return; } - Curry._1(f, param.hd); + f(param.hd); _param = param.tl; continue; }; @@ -244,7 +243,7 @@ function iteri(f, l) { if (!param) { return; } - Curry._2(f, i, param.hd); + f(i, param.hd); _param = param.tl; _i = i + 1 | 0; continue; @@ -259,14 +258,14 @@ function fold_left(f, _accu, _l) { return accu; } _l = l.tl; - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); continue; }; } function fold_right(f, l, accu) { if (l) { - return Curry._2(f, l.hd, fold_right(f, l.tl, accu)); + return f(l.hd, fold_right(f, l.tl, accu)); } else { return accu; } @@ -275,7 +274,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - let r = Curry._2(f, l1.hd, l2.hd); + let r = f(l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -312,7 +311,7 @@ function rev_map2(f, l1, l2) { _l2 = l2$1.tl; _l1 = l1$1.tl; _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; continue; @@ -342,7 +341,7 @@ function iter2(f, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -375,7 +374,7 @@ function fold_left2(f, _accu, _l1, _l2) { if (l2) { _l2 = l2.tl; _l1 = l1.tl; - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); continue; } throw new Error("Invalid_argument", { @@ -400,7 +399,7 @@ function fold_left2(f, _accu, _l1, _l2) { function fold_right2(f, l1, l2, accu) { if (l1) { if (l2) { - return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); + return f(l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -426,7 +425,7 @@ function for_all(p, _param) { if (!param) { return true; } - if (!Curry._1(p, param.hd)) { + if (!p(param.hd)) { return false; } _param = param.tl; @@ -440,7 +439,7 @@ function exists(p, _param) { if (!param) { return false; } - if (Curry._1(p, param.hd)) { + if (p(param.hd)) { return true; } _param = param.tl; @@ -454,7 +453,7 @@ function for_all2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -486,7 +485,7 @@ function exists2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -673,7 +672,7 @@ function find(p, _param) { let param = _param; if (param) { let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return x; } _param = param.tl; @@ -694,7 +693,7 @@ function find_opt(p, _param) { return; } let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _param = param.tl; @@ -713,7 +712,7 @@ function find_all(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _accu = { hd: x, @@ -742,7 +741,7 @@ function partition(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _yes = { hd: x, @@ -818,7 +817,7 @@ function merge(cmp, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { return { hd: h1, tl: merge(cmp, l1.tl, l2) @@ -867,8 +866,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) <= 0) { - if (Curry._2(cmp, x2, x3) <= 0) { + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { return { hd: x1, tl: { @@ -879,7 +878,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x1, tl: { @@ -902,7 +901,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x2, tl: { @@ -913,7 +912,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) <= 0) { + } else if (cmp(x2, x3) <= 0) { return { hd: x2, tl: { @@ -947,7 +946,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) <= 0) { + if (cmp(x1$1, x2$1) <= 0) { return { hd: x1$1, tl: { @@ -987,7 +986,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) > 0) { + if (cmp(h1, h2) > 0) { _accu = { hd: h1, tl: accu @@ -1013,8 +1012,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) > 0) { - if (Curry._2(cmp, x2, x3) > 0) { + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { return { hd: x1, tl: { @@ -1025,7 +1024,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x1, tl: { @@ -1048,7 +1047,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x2, tl: { @@ -1059,7 +1058,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) > 0) { + } else if (cmp(x2, x3) > 0) { return { hd: x2, tl: { @@ -1093,7 +1092,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) > 0) { + if (cmp(x1$1, x2$1) > 0) { return { hd: x1$1, tl: { @@ -1133,7 +1132,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { _accu = { hd: h1, tl: accu @@ -1168,9 +1167,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1195,7 +1194,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1217,7 +1216,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1250,7 +1249,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1272,7 +1271,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1315,7 +1314,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1363,7 +1362,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1399,9 +1398,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1426,7 +1425,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1448,7 +1447,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1481,7 +1480,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1503,7 +1502,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1546,7 +1545,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1594,7 +1593,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, diff --git a/lib/js/listLabels.js b/lib/js/listLabels.js index f63f6bb629..287a2c0f3a 100644 --- a/lib/js/listLabels.js +++ b/lib/js/listLabels.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_obj = require("./caml_obj.js"); let Pervasives = require("./pervasives.js"); let Caml_option = require("./caml_option.js"); @@ -137,7 +136,7 @@ function init_tailrec_aux(_acc, _i, n, f) { } _i = i + 1 | 0; _acc = { - hd: Curry._1(f, i), + hd: f(i), tl: acc }; continue; @@ -148,7 +147,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - let r = Curry._1(f, i); + let r = f(i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -183,7 +182,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - let r = Curry._1(f, param.hd); + let r = f(param.hd); return { hd: r, tl: map(f, param.tl) @@ -194,7 +193,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - let r = Curry._2(f, i, param.hd); + let r = f(i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -216,7 +215,7 @@ function rev_map(f, l) { } _param = param.tl; _accu = { - hd: Curry._1(f, param.hd), + hd: f(param.hd), tl: accu }; continue; @@ -229,7 +228,7 @@ function iter(f, _param) { if (!param) { return; } - Curry._1(f, param.hd); + f(param.hd); _param = param.tl; continue; }; @@ -244,7 +243,7 @@ function iteri(f, l) { if (!param) { return; } - Curry._2(f, i, param.hd); + f(i, param.hd); _param = param.tl; _i = i + 1 | 0; continue; @@ -259,14 +258,14 @@ function fold_left(f, _accu, _l) { return accu; } _l = l.tl; - _accu = Curry._2(f, accu, l.hd); + _accu = f(accu, l.hd); continue; }; } function fold_right(f, l, accu) { if (l) { - return Curry._2(f, l.hd, fold_right(f, l.tl, accu)); + return f(l.hd, fold_right(f, l.tl, accu)); } else { return accu; } @@ -275,7 +274,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - let r = Curry._2(f, l1.hd, l2.hd); + let r = f(l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -312,7 +311,7 @@ function rev_map2(f, l1, l2) { _l2 = l2$1.tl; _l1 = l1$1.tl; _accu = { - hd: Curry._2(f, l1$1.hd, l2$1.hd), + hd: f(l1$1.hd, l2$1.hd), tl: accu }; continue; @@ -342,7 +341,7 @@ function iter2(f, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - Curry._2(f, l1.hd, l2.hd); + f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; continue; @@ -375,7 +374,7 @@ function fold_left2(f, _accu, _l1, _l2) { if (l2) { _l2 = l2.tl; _l1 = l1.tl; - _accu = Curry._3(f, accu, l1.hd, l2.hd); + _accu = f(accu, l1.hd, l2.hd); continue; } throw new Error("Invalid_argument", { @@ -400,7 +399,7 @@ function fold_left2(f, _accu, _l1, _l2) { function fold_right2(f, l1, l2, accu) { if (l1) { if (l2) { - return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); + return f(l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu)); } throw new Error("Invalid_argument", { cause: { @@ -426,7 +425,7 @@ function for_all(p, _param) { if (!param) { return true; } - if (!Curry._1(p, param.hd)) { + if (!p(param.hd)) { return false; } _param = param.tl; @@ -440,7 +439,7 @@ function exists(p, _param) { if (!param) { return false; } - if (Curry._1(p, param.hd)) { + if (p(param.hd)) { return true; } _param = param.tl; @@ -454,7 +453,7 @@ function for_all2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (!Curry._2(p, l1.hd, l2.hd)) { + if (!p(l1.hd, l2.hd)) { return false; } _l2 = l2.tl; @@ -486,7 +485,7 @@ function exists2(p, _l1, _l2) { let l1 = _l1; if (l1) { if (l2) { - if (Curry._2(p, l1.hd, l2.hd)) { + if (p(l1.hd, l2.hd)) { return true; } _l2 = l2.tl; @@ -673,7 +672,7 @@ function find(p, _param) { let param = _param; if (param) { let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return x; } _param = param.tl; @@ -694,7 +693,7 @@ function find_opt(p, _param) { return; } let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { return Caml_option.some(x); } _param = param.tl; @@ -713,7 +712,7 @@ function find_all(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _accu = { hd: x, @@ -742,7 +741,7 @@ function partition(p, l) { } let l$1 = param.tl; let x = param.hd; - if (Curry._1(p, x)) { + if (p(x)) { _param = l$1; _yes = { hd: x, @@ -818,7 +817,7 @@ function merge(cmp, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { return { hd: h1, tl: merge(cmp, l1.tl, l2) @@ -867,8 +866,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) <= 0) { - if (Curry._2(cmp, x2, x3) <= 0) { + if (cmp(x1, x2) <= 0) { + if (cmp(x2, x3) <= 0) { return { hd: x1, tl: { @@ -879,7 +878,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x1, tl: { @@ -902,7 +901,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) <= 0) { + } else if (cmp(x1, x3) <= 0) { return { hd: x2, tl: { @@ -913,7 +912,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) <= 0) { + } else if (cmp(x2, x3) <= 0) { return { hd: x2, tl: { @@ -947,7 +946,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) <= 0) { + if (cmp(x1$1, x2$1) <= 0) { return { hd: x1$1, tl: { @@ -987,7 +986,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) > 0) { + if (cmp(h1, h2) > 0) { _accu = { hd: h1, tl: accu @@ -1013,8 +1012,8 @@ function stable_sort(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - if (Curry._2(cmp, x1, x2) > 0) { - if (Curry._2(cmp, x2, x3) > 0) { + if (cmp(x1, x2) > 0) { + if (cmp(x2, x3) > 0) { return { hd: x1, tl: { @@ -1025,7 +1024,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x1, tl: { @@ -1048,7 +1047,7 @@ function stable_sort(cmp, l) { } }; } - } else if (Curry._2(cmp, x1, x3) > 0) { + } else if (cmp(x1, x3) > 0) { return { hd: x2, tl: { @@ -1059,7 +1058,7 @@ function stable_sort(cmp, l) { } } }; - } else if (Curry._2(cmp, x2, x3) > 0) { + } else if (cmp(x2, x3) > 0) { return { hd: x2, tl: { @@ -1093,7 +1092,7 @@ function stable_sort(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - if (Curry._2(cmp, x1$1, x2$1) > 0) { + if (cmp(x1$1, x2$1) > 0) { return { hd: x1$1, tl: { @@ -1133,7 +1132,7 @@ function stable_sort(cmp, l) { } let h2 = l2$1.hd; let h1 = l1.hd; - if (Curry._2(cmp, h1, h2) <= 0) { + if (cmp(h1, h2) <= 0) { _accu = { hd: h1, tl: accu @@ -1168,9 +1167,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1195,7 +1194,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1217,7 +1216,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1250,7 +1249,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1272,7 +1271,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1315,7 +1314,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1363,7 +1362,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1399,9 +1398,9 @@ function sort_uniq(cmp, l) { let x3 = match$1.hd; let x2 = match.hd; let x1 = l.hd; - let c = Curry._2(cmp, x1, x2); + let c = cmp(x1, x2); if (c === 0) { - let c$1 = Curry._2(cmp, x2, x3); + let c$1 = cmp(x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1426,7 +1425,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - let c$2 = Curry._2(cmp, x2, x3); + let c$2 = cmp(x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1448,7 +1447,7 @@ function sort_uniq(cmp, l) { } }; } - let c$3 = Curry._2(cmp, x1, x3); + let c$3 = cmp(x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1481,7 +1480,7 @@ function sort_uniq(cmp, l) { }; } } - let c$4 = Curry._2(cmp, x1, x3); + let c$4 = cmp(x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1503,7 +1502,7 @@ function sort_uniq(cmp, l) { } }; } - let c$5 = Curry._2(cmp, x2, x3); + let c$5 = cmp(x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1546,7 +1545,7 @@ function sort_uniq(cmp, l) { if (match$2) { let x2$1 = match$2.hd; let x1$1 = l.hd; - let c$6 = Curry._2(cmp, x1$1, x2$1); + let c$6 = cmp(x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1594,7 +1593,7 @@ function sort_uniq(cmp, l) { let h2 = l2$1.hd; let t1 = l1.tl; let h1 = l1.hd; - let c$7 = Curry._2(cmp, h1, h2); + let c$7 = cmp(h1, h2); if (c$7 === 0) { _accu = { hd: h1, diff --git a/lib/js/map.js b/lib/js/map.js index 5e0b1e1da3..cd35da063b 100644 --- a/lib/js/map.js +++ b/lib/js/map.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function Make(funarg) { @@ -121,7 +120,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -161,7 +160,7 @@ function Make(funarg) { } }); } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return param.d; } @@ -180,7 +179,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -195,7 +194,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -216,7 +215,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.l; @@ -231,7 +230,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _d0 = param$1.d; _v0 = v$1; @@ -256,7 +255,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -271,7 +270,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -292,7 +291,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _d0 = param.d; let _param$1 = param.r; @@ -307,7 +306,7 @@ function Make(funarg) { ]; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _d0 = param$1.d; _v0 = v$1; @@ -327,7 +326,7 @@ function Make(funarg) { if (typeof param !== "object") { return; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -341,7 +340,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -459,7 +458,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -480,7 +479,7 @@ function Make(funarg) { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -498,9 +497,9 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -540,7 +539,7 @@ function Make(funarg) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -550,7 +549,7 @@ function Make(funarg) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -567,7 +566,7 @@ function Make(funarg) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -585,7 +584,7 @@ function Make(funarg) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -596,7 +595,7 @@ function Make(funarg) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -612,7 +611,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -682,7 +681,7 @@ function Make(funarg) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -715,7 +714,7 @@ function Make(funarg) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -733,7 +732,7 @@ function Make(funarg) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -752,7 +751,7 @@ function Make(funarg) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -762,7 +761,7 @@ function Make(funarg) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -776,7 +775,7 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -800,7 +799,7 @@ function Make(funarg) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -850,11 +849,11 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -879,10 +878,10 @@ function Make(funarg) { if (typeof e2 !== "object") { return false; } - if (Curry._2(funarg.compare, e1._0, e2._0) !== 0) { + if (funarg.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/lib/js/mapLabels.js b/lib/js/mapLabels.js index 8949bd1ae3..466d54c7fa 100644 --- a/lib/js/mapLabels.js +++ b/lib/js/mapLabels.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function Make(Ord) { @@ -121,7 +120,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -161,7 +160,7 @@ function Make(Ord) { } }); } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return param.d; } @@ -181,7 +180,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -202,7 +201,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, param.d, f, param.l); } _param = param.r; @@ -221,7 +220,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -238,7 +237,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, param.d, f, param.l); } _param = param.r; @@ -257,7 +256,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -278,7 +277,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, param.d, f, param.r); } _param = param.l; @@ -297,7 +296,7 @@ function Make(Ord) { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -314,7 +313,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, param.d, f, param.r); } _param = param.l; @@ -327,7 +326,7 @@ function Make(Ord) { if (typeof param !== "object") { return; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -341,7 +340,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return true; } @@ -459,7 +458,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return merge(l, r); } @@ -480,7 +479,7 @@ function Make(Ord) { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -498,9 +497,9 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -540,7 +539,7 @@ function Make(Ord) { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -550,7 +549,7 @@ function Make(Ord) { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -567,7 +566,7 @@ function Make(Ord) { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -585,7 +584,7 @@ function Make(Ord) { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -596,7 +595,7 @@ function Make(Ord) { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -612,7 +611,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -682,7 +681,7 @@ function Make(Ord) { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -715,7 +714,7 @@ function Make(Ord) { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -733,7 +732,7 @@ function Make(Ord) { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -752,7 +751,7 @@ function Make(Ord) { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -762,7 +761,7 @@ function Make(Ord) { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -776,7 +775,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -800,7 +799,7 @@ function Make(Ord) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -850,11 +849,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -879,10 +878,10 @@ function Make(Ord) { if (typeof e2 !== "object") { return false; } - if (Curry._2(Ord.compare, e1._0, e2._0) !== 0) { + if (Ord.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); diff --git a/lib/js/moreLabels.js b/lib/js/moreLabels.js index 2fb37caea2..baee384c01 100644 --- a/lib/js/moreLabels.js +++ b/lib/js/moreLabels.js @@ -1,7 +1,6 @@ 'use strict'; let List = require("./list.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); let HashtblLabels = require("./hashtblLabels.js"); @@ -151,7 +150,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -191,7 +190,7 @@ let $$Map = { } }); } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return param.d; } @@ -211,7 +210,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -232,7 +231,7 @@ let $$Map = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, param.d, f, param.l); } _param = param.r; @@ -251,7 +250,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _d0 = param.d; _v0 = v; @@ -268,7 +267,7 @@ let $$Map = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, param.d, f, param.l); } _param = param.r; @@ -287,7 +286,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -308,7 +307,7 @@ let $$Map = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, param.d, f, param.r); } _param = param.l; @@ -327,7 +326,7 @@ let $$Map = { ]; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _d0 = param.d; _v0 = v; @@ -344,7 +343,7 @@ let $$Map = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, param.d, f, param.r); } _param = param.l; @@ -357,7 +356,7 @@ let $$Map = { if (typeof param !== "object") { return; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -371,7 +370,7 @@ let $$Map = { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -489,7 +488,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -510,7 +509,7 @@ let $$Map = { }; let update = function (x, f, param) { if (typeof param !== "object") { - let data = Curry._1(f, undefined); + let data = f(undefined); if (data !== undefined) { return { TAG: "Node", @@ -528,9 +527,9 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { - let data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = f(Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } @@ -570,7 +569,7 @@ let $$Map = { return; } iter(f, param.l); - Curry._2(f, param.v, param.d); + f(param.v, param.d); _param = param.r; continue; }; @@ -580,7 +579,7 @@ let $$Map = { return "Empty"; } let l$p = map(f, param.l); - let d$p = Curry._1(f, param.d); + let d$p = f(param.d); let r$p = map(f, param.r); return { TAG: "Node", @@ -597,7 +596,7 @@ let $$Map = { } let v = param.v; let l$p = mapi(f, param.l); - let d$p = Curry._2(f, v, param.d); + let d$p = f(v, param.d); let r$p = mapi(f, param.r); return { TAG: "Node", @@ -615,7 +614,7 @@ let $$Map = { if (typeof m !== "object") { return accu; } - _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu)); + _accu = f(m.v, m.d, fold(f, m.l, accu)); _m = m.r; continue; }; @@ -626,7 +625,7 @@ let $$Map = { if (typeof param !== "object") { return true; } - if (!Curry._2(p, param.v, param.d)) { + if (!p(param.v, param.d)) { return false; } if (!for_all(p, param.l)) { @@ -642,7 +641,7 @@ let $$Map = { if (typeof param !== "object") { return false; } - if (Curry._2(p, param.v, param.d)) { + if (p(param.v, param.d)) { return true; } if (exists(p, param.l)) { @@ -712,7 +711,7 @@ let $$Map = { let d = param.d; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -745,7 +744,7 @@ let $$Map = { let v1 = s1.v; if (s1.h >= height(s2)) { let match = split(v1, s2); - return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); + return concat_or_join(merge$1(f, s1.l, match[0]), v1, f(v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } } @@ -763,7 +762,7 @@ let $$Map = { } let v2 = s2.v; let match$1 = split(v2, s1); - return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); + return concat_or_join(merge$1(f, match$1[0], s2.l), v2, f(v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; let union = function (f, s1, s2) { if (typeof s1 !== "object") { @@ -782,7 +781,7 @@ let $$Map = { let l = union(f, s1.l, match[0]); let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { - return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); + return concat_or_join(l, v1, f(v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } @@ -792,7 +791,7 @@ let $$Map = { let l$1 = union(f, match$1[0], s2.l); let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { - return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); + return concat_or_join(l$1, v2, f(v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } @@ -806,7 +805,7 @@ let $$Map = { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { @@ -830,7 +829,7 @@ let $$Map = { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pvd = Curry._2(p, v, d); + let pvd = p(v, d); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -880,11 +879,11 @@ let $$Map = { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } - let c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = cmp(e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -909,10 +908,10 @@ let $$Map = { if (typeof e2 !== "object") { return false; } - if (Curry._2(funarg.compare, e1._0, e2._0) !== 0) { + if (funarg.compare(e1._0, e2._0) !== 0) { return false; } - if (!Curry._2(cmp, e1._1, e2._1)) { + if (!cmp(e1._1, e2._1)) { return false; } _e2 = cons_enum(e2._2, e2._3); @@ -1085,7 +1084,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return param; } @@ -1253,7 +1252,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -1289,7 +1288,7 @@ let $$Set = { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -1304,7 +1303,7 @@ let $$Set = { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return merge(l, r); } @@ -1414,7 +1413,7 @@ let $$Set = { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -1444,7 +1443,7 @@ let $$Set = { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(funarg.compare, v1, s2.v); + let c = funarg.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -1486,7 +1485,7 @@ let $$Set = { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -1498,7 +1497,7 @@ let $$Set = { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -1509,7 +1508,7 @@ let $$Set = { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -1525,7 +1524,7 @@ let $$Set = { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -1543,7 +1542,7 @@ let $$Set = { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -1566,7 +1565,7 @@ let $$Set = { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -1618,7 +1617,7 @@ let $$Set = { }); } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return v; } @@ -1634,7 +1633,7 @@ let $$Set = { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -1654,7 +1653,7 @@ let $$Set = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, f, param.l); } _param = param.r; @@ -1669,7 +1668,7 @@ let $$Set = { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -1685,7 +1684,7 @@ let $$Set = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, f, param.l); } _param = param.r; @@ -1700,7 +1699,7 @@ let $$Set = { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -1720,7 +1719,7 @@ let $$Set = { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, f, param.r); } _param = param.l; @@ -1735,7 +1734,7 @@ let $$Set = { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -1751,7 +1750,7 @@ let $$Set = { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, f, param.r); } _param = param.l; @@ -1765,7 +1764,7 @@ let $$Set = { return; } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -1774,7 +1773,7 @@ let $$Set = { }; }; let try_join = function (l, v, r) { - if ((l === "Empty" || Curry._2(funarg.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(funarg.compare, v, min_elt(r)) < 0)) { + if ((l === "Empty" || funarg.compare(max_elt(l), v) < 0) && (r === "Empty" || funarg.compare(v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); @@ -1788,7 +1787,7 @@ let $$Set = { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/lib/js/parsing.js b/lib/js/parsing.js index 7c9f805da6..a5da32f420 100644 --- a/lib/js/parsing.js +++ b/lib/js/parsing.js @@ -1,7 +1,6 @@ 'use strict'; let $$Array = require("./array.js"); -let Curry = require("./curry.js"); let Lexing = require("./lexing.js"); let Caml_obj = require("./caml_obj.js"); let Caml_array = require("./caml_array.js"); @@ -81,7 +80,7 @@ function yyparse(tables, start, lexer, lexbuf) { let match = Caml_parser.parse_engine(tables, env, cmd, arg); switch (match) { case "Read_token" : - let t = Curry._1(lexer, lexbuf); + let t = lexer(lexbuf); env.symb_start = lexbuf.lex_start_p; env.symb_end = lexbuf.lex_curr_p; _arg = t; @@ -108,7 +107,7 @@ function yyparse(tables, start, lexer, lexbuf) { try { match$1 = [ "Semantic_action_computed", - Curry._1(Caml_array.get(tables.actions, env.rule_number), env) + Caml_array.get(tables.actions, env.rule_number)(env) ]; } catch (raw_exn){ @@ -128,7 +127,7 @@ function yyparse(tables, start, lexer, lexbuf) { _cmd = match$1[0]; continue; case "Call_error_function" : - Curry._1(tables.error_function, "syntax error"); + tables.error_function("syntax error"); _arg = undefined; _cmd = "Error_detected"; continue; @@ -212,7 +211,7 @@ function rhs_end(n) { } function is_current_lookahead(tok) { - return Curry._1(current_lookahead_fun.contents, tok); + return current_lookahead_fun.contents(tok); } function parse_error(param) { diff --git a/lib/js/pervasives.js b/lib/js/pervasives.js index 9a01509278..f849b7806a 100644 --- a/lib/js/pervasives.js +++ b/lib/js/pervasives.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_sys = require("./caml_sys.js"); let Caml_format = require("./caml_format.js"); let Caml_string = require("./caml_string.js"); @@ -42,7 +41,7 @@ function lnot(x) { let min_int = -2147483648; function classify_float(x) { - if (Curry._1(isFinite, x)) { + if (isFinite(x)) { if (Math.abs(x) >= 2.22507385850720138e-308) { return "FP_normal"; } else if (x !== 0) { @@ -50,7 +49,7 @@ function classify_float(x) { } else { return "FP_zero"; } - } else if (Curry._1(isNaN, x)) { + } else if (isNaN(x)) { return "FP_nan"; } else { return "FP_infinite"; @@ -202,13 +201,13 @@ let exit_function = { function at_exit(f) { let g = exit_function.contents; exit_function.contents = (function () { - Curry._1(f, undefined); - Curry._1(g, undefined); + f(); + g(); }); } function exit(retcode) { - Curry._1(exit_function.contents, undefined); + exit_function.contents(); return Caml_sys.sys_exit(retcode); } diff --git a/lib/js/queue.js b/lib/js/queue.js index 477ae6ec33..ca975f36f1 100644 --- a/lib/js/queue.js +++ b/lib/js/queue.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); let Caml_exceptions = require("./caml_exceptions.js"); let Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); @@ -117,7 +116,7 @@ function iter(f, q) { return; } let next = cell.next; - Curry._1(f, cell.content); + f(cell.content); _cell = next; continue; }; @@ -133,7 +132,7 @@ function fold(f, accu, q) { return accu$1; } let next = cell.next; - let accu$2 = Curry._2(f, accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = next; _accu = accu$2; continue; diff --git a/lib/js/set.js b/lib/js/set.js index c7d617b2e5..de2d6b2629 100644 --- a/lib/js/set.js +++ b/lib/js/set.js @@ -1,7 +1,6 @@ 'use strict'; let List = require("./list.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function Make(funarg) { @@ -101,7 +100,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return param; } @@ -260,7 +259,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return [ l, @@ -296,7 +295,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - let c = Curry._2(funarg.compare, x, param.v); + let c = funarg.compare(x, param.v); if (c === 0) { return true; } @@ -311,7 +310,7 @@ function Make(funarg) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -429,7 +428,7 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(funarg.compare, e1._0, e2._0); + let c = funarg.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -456,7 +455,7 @@ function Make(funarg) { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(funarg.compare, v1, s2.v); + let c = funarg.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -498,7 +497,7 @@ function Make(funarg) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -510,7 +509,7 @@ function Make(funarg) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -521,7 +520,7 @@ function Make(funarg) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -537,7 +536,7 @@ function Make(funarg) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -555,7 +554,7 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -578,7 +577,7 @@ function Make(funarg) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -630,7 +629,7 @@ function Make(funarg) { }); } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return v; } @@ -649,7 +648,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -659,7 +658,7 @@ function Make(funarg) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -679,7 +678,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.l; while(true) { @@ -689,7 +688,7 @@ function Make(funarg) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.l; _v0 = v$1; continue; @@ -713,7 +712,7 @@ function Make(funarg) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -723,7 +722,7 @@ function Make(funarg) { return v0; } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -743,7 +742,7 @@ function Make(funarg) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { let _v0 = v; let _param$1 = param.r; while(true) { @@ -753,7 +752,7 @@ function Make(funarg) { return Caml_option.some(v0); } let v$1 = param$1.v; - if (Curry._1(f, v$1)) { + if (f(v$1)) { _param$1 = param$1.r; _v0 = v$1; continue; @@ -773,7 +772,7 @@ function Make(funarg) { return; } let v = param.v; - let c = Curry._2(funarg.compare, x, v); + let c = funarg.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -789,11 +788,11 @@ function Make(funarg) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; - } else if ((l$p === "Empty" || Curry._2(funarg.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(funarg.compare, v$p, min_elt(r$p)) < 0)) { + } else if ((l$p === "Empty" || funarg.compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || funarg.compare(v$p, min_elt(r$p)) < 0)) { return join(l$p, v$p, r$p); } else { return union(l$p, add(v$p, r$p)); diff --git a/lib/js/setLabels.js b/lib/js/setLabels.js index aa0a8f097b..9cbf5ee04b 100644 --- a/lib/js/setLabels.js +++ b/lib/js/setLabels.js @@ -1,7 +1,6 @@ 'use strict'; let List = require("./list.js"); -let Curry = require("./curry.js"); let Caml_option = require("./caml_option.js"); function Make(Ord) { @@ -101,7 +100,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return param; } @@ -269,7 +268,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return [ l, @@ -305,7 +304,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - let c = Curry._2(Ord.compare, x, param.v); + let c = Ord.compare(x, param.v); if (c === 0) { return true; } @@ -320,7 +319,7 @@ function Make(Ord) { let r = param.r; let v = param.v; let l = param.l; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return merge(l, r); } @@ -430,7 +429,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - let c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Ord.compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -460,7 +459,7 @@ function Make(Ord) { } let r2 = s2.r; let l2 = s2.l; - let c = Curry._2(Ord.compare, v1, s2.v); + let c = Ord.compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -502,7 +501,7 @@ function Make(Ord) { return; } iter(f, param.l); - Curry._1(f, param.v); + f(param.v); _param = param.r; continue; }; @@ -514,7 +513,7 @@ function Make(Ord) { if (typeof s !== "object") { return accu; } - _accu = Curry._2(f, s.v, fold(f, s.l, accu)); + _accu = f(s.v, fold(f, s.l, accu)); _s = s.r; continue; }; @@ -525,7 +524,7 @@ function Make(Ord) { if (typeof param !== "object") { return true; } - if (!Curry._1(p, param.v)) { + if (!p(param.v)) { return false; } if (!for_all(p, param.l)) { @@ -541,7 +540,7 @@ function Make(Ord) { if (typeof param !== "object") { return false; } - if (Curry._1(p, param.v)) { + if (p(param.v)) { return true; } if (exists(p, param.l)) { @@ -559,7 +558,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = filter(p, l); - let pv = Curry._1(p, v); + let pv = p(v); let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { @@ -582,7 +581,7 @@ function Make(Ord) { let match = partition(p, param.l); let lf = match[1]; let lt = match[0]; - let pv = Curry._1(p, v); + let pv = p(v); let match$1 = partition(p, param.r); let rf = match$1[1]; let rt = match$1[0]; @@ -634,7 +633,7 @@ function Make(Ord) { }); } let v = param.v; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return v; } @@ -650,7 +649,7 @@ function Make(Ord) { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -670,7 +669,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_aux(v, f, param.l); } _param = param.r; @@ -685,7 +684,7 @@ function Make(Ord) { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.l; _v0 = v; continue; @@ -701,7 +700,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_first_opt_aux(v, f, param.l); } _param = param.r; @@ -716,7 +715,7 @@ function Make(Ord) { return v0; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -736,7 +735,7 @@ function Make(Ord) { }); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_aux(v, f, param.r); } _param = param.l; @@ -751,7 +750,7 @@ function Make(Ord) { return Caml_option.some(v0); } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { _param = param.r; _v0 = v; continue; @@ -767,7 +766,7 @@ function Make(Ord) { return; } let v = param.v; - if (Curry._1(f, v)) { + if (f(v)) { return find_last_opt_aux(v, f, param.r); } _param = param.l; @@ -781,7 +780,7 @@ function Make(Ord) { return; } let v = param.v; - let c = Curry._2(Ord.compare, x, v); + let c = Ord.compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -790,7 +789,7 @@ function Make(Ord) { }; }; let try_join = function (l, v, r) { - if ((l === "Empty" || Curry._2(Ord.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(Ord.compare, v, min_elt(r)) < 0)) { + if ((l === "Empty" || Ord.compare(max_elt(l), v) < 0) && (r === "Empty" || Ord.compare(v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); @@ -804,7 +803,7 @@ function Make(Ord) { let v = param.v; let l = param.l; let l$p = map(f, l); - let v$p = Curry._1(f, v); + let v$p = f(v); let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; diff --git a/lib/js/sort.js b/lib/js/sort.js index fe40df1d29..b67fc300e9 100644 --- a/lib/js/sort.js +++ b/lib/js/sort.js @@ -1,6 +1,5 @@ 'use strict'; -let Curry = require("./curry.js"); function merge(order, l1, l2) { if (!l1) { @@ -11,7 +10,7 @@ function merge(order, l1, l2) { } let h2 = l2.hd; let h1 = l1.hd; - if (Curry._2(order, h1, h2)) { + if (order(h1, h2)) { return { hd: h1, tl: merge(order, l1.tl, l2) @@ -42,7 +41,7 @@ function list(order, l) { } let e2 = match.hd; return { - hd: Curry._2(order, e, e2) ? ({ + hd: order(e, e2) ? ({ hd: e, tl: { hd: e2, @@ -101,12 +100,12 @@ function array(cmp, arr) { return; } let mid = ((lo + hi | 0) >>> 1); - if (Curry._2(cmp, arr[mid], arr[lo])) { + if (cmp(arr[mid], arr[lo])) { swap(arr, mid, lo); } - if (Curry._2(cmp, arr[hi], arr[mid])) { + if (cmp(arr[hi], arr[mid])) { swap(arr, mid, hi); - if (Curry._2(cmp, arr[mid], arr[lo])) { + if (cmp(arr[mid], arr[lo])) { swap(arr, mid, lo); } @@ -114,7 +113,7 @@ function array(cmp, arr) { let pivot = arr[mid]; let i = lo + 1 | 0; let j = hi - 1 | 0; - if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) { + if (!cmp(pivot, arr[hi]) || !cmp(arr[lo], pivot)) { throw new Error("Invalid_argument", { cause: { RE_EXN_ID: "Invalid_argument", @@ -123,10 +122,10 @@ function array(cmp, arr) { }); } while(i < j) { - while(!Curry._2(cmp, pivot, arr[i])) { + while(!cmp(pivot, arr[i])) { i = i + 1 | 0; }; - while(!Curry._2(cmp, arr[j], pivot)) { + while(!cmp(arr[j], pivot)) { j = j - 1 | 0; }; if (i < j) { @@ -148,10 +147,10 @@ function array(cmp, arr) { qsort(0, arr.length - 1 | 0); for(let i = 1 ,i_finish = arr.length; i < i_finish; ++i){ let val_i = arr[i]; - if (!Curry._2(cmp, arr[i - 1 | 0], val_i)) { + if (!cmp(arr[i - 1 | 0], val_i)) { arr[i] = arr[i - 1 | 0]; let j = i - 1 | 0; - while(j >= 1 && !Curry._2(cmp, arr[j - 1 | 0], val_i)) { + while(j >= 1 && !cmp(arr[j - 1 | 0], val_i)) { arr[j] = arr[j - 1 | 0]; j = j - 1 | 0; }; diff --git a/lib/js/stream.js b/lib/js/stream.js index b7f56e1336..2ee0c6b4be 100644 --- a/lib/js/stream.js +++ b/lib/js/stream.js @@ -1,7 +1,6 @@ 'use strict'; let List = require("./list.js"); -let Curry = require("./curry.js"); let Caml_bytes = require("./caml_bytes.js"); let Caml_option = require("./caml_option.js"); let Caml_string = require("./caml_string.js"); @@ -84,7 +83,7 @@ function get_data(count, _d) { return "Sempty"; } } - let a$1 = Curry._1(g.func, count); + let a$1 = g.func(count); if (a$1 !== undefined) { return { TAG: "Scons", @@ -137,7 +136,7 @@ function peek_data(s) { if (a !== undefined) { return Caml_option.valFromOption(a); } - let x = Curry._1(g.func, s.count); + let x = g.func(s.count); g.curr = Caml_option.some(x); return x; @@ -266,7 +265,7 @@ function iter(f, strm) { return; } junk(strm); - Curry._1(f, Caml_option.valFromOption(a)); + f(Caml_option.valFromOption(a)); _param = undefined; continue; }; @@ -365,7 +364,7 @@ function lapp(f, s) { let f$1 = function () { return { TAG: "Sapp", - _0: data(Curry._1(f, undefined)), + _0: data(f()), _1: data(s) }; }; @@ -384,7 +383,7 @@ function lcons(f, s) { let f$1 = function () { return { TAG: "Scons", - _0: Curry._1(f, undefined), + _0: f(), _1: data(s) }; }; @@ -407,7 +406,7 @@ function lsing(f) { _0: CamlinternalLazy.from_fun(function () { return { TAG: "Scons", - _0: Curry._1(f, undefined), + _0: f(), _1: "Sempty" }; }) @@ -421,7 +420,7 @@ function slazy(f) { data: { TAG: "Slazy", _0: CamlinternalLazy.from_fun(function () { - return data(Curry._1(f, undefined)); + return data(f()); }) } }; @@ -435,7 +434,7 @@ function dump_data(f, param) { switch (param.TAG) { case "Scons" : console.log("Scons ("); - Curry._1(f, param._0); + f(param._0); console.log(", "); dump_data(f, param._1); console.log(")"); diff --git a/lib/js/string.js b/lib/js/string.js index aa7d5dc456..e26e35272b 100644 --- a/lib/js/string.js +++ b/lib/js/string.js @@ -3,7 +3,6 @@ let Caml = require("./caml.js"); let $$Array = require("./array.js"); let Bytes = require("./bytes.js"); -let Curry = require("./curry.js"); let Caml_string = require("./caml_string.js"); let Caml_js_exceptions = require("./caml_js_exceptions.js"); @@ -21,13 +20,13 @@ function concat(sep, xs) { function iter(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._1(f, s.codePointAt(i)); + f(s.codePointAt(i)); } } function iteri(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._2(f, i, s.codePointAt(i)); + f(i, s.codePointAt(i)); } } diff --git a/lib/js/stringLabels.js b/lib/js/stringLabels.js index d1b13c3144..66077dc73c 100644 --- a/lib/js/stringLabels.js +++ b/lib/js/stringLabels.js @@ -3,7 +3,6 @@ let Caml = require("./caml.js"); let $$Array = require("./array.js"); let Bytes = require("./bytes.js"); -let Curry = require("./curry.js"); let Caml_string = require("./caml_string.js"); let Caml_js_exceptions = require("./caml_js_exceptions.js"); @@ -23,13 +22,13 @@ function concat(sep, xs) { function iter(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._1(f, s.codePointAt(i)); + f(s.codePointAt(i)); } } function iteri(f, s) { for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ - Curry._2(f, i, s.codePointAt(i)); + f(i, s.codePointAt(i)); } }