[refact] rename Caml_curry into Curry for cosmetic reasons (rescript-lang#281)

Author: bobzhang

jscomp/js_config.ml

@@ -121,54 +121,50 @@ let stdlib_set = String_set.of_list [
     "pervasives"
 ]
 
-let runtime_set = String_set.of_list [
-    "caml_array";
-    "caml_float";
-    "caml_obj";
-    "caml_bigarray";
-    "caml_format";		
-    "caml_oo";		
-    "caml_int64";
-    "caml_primitive";
-    "caml_utils";
-    "caml_builtin_exceptions";
-    "caml_exceptions";
-    "caml_curry";
-    "caml_lexer";
-    "caml_parser";
-    "caml_string"
-    (* "caml_sys"; *)
-    (* "caml_unix"; *)
-    (* "caml_io"; *)
-]
-
-
-let prim = "Caml_primitive" 
 
+let prim               = "Caml_primitive" 
 let builtin_exceptions = "Caml_builtin_exceptions"
-let exceptions = "Caml_exceptions"
-
-let io = "Caml_io"
-
-let sys = "Caml_sys"
-
-let lexer = "Caml_lexer"
-let parser = "Caml_parser"
-let obj_runtime = "Caml_obj"
-
-let array = "Caml_array"
-
-let format = "Caml_format"
-
-let string = "Caml_string"
-
-let float = "Caml_float"
-let hash = "Caml_hash"
-let oo = "Caml_oo"
-let curry = "Caml_curry"
-let internalMod = "Caml_internalMod"
-let bigarray = "Caml_bigarray"
-let unix = "Caml_unix"
-let int64 = "Caml_int64"
-let md5 = "Caml_md5"
-let weak = "Caml_weak"
+let exceptions         = "Caml_exceptions"
+let io                 = "Caml_io"
+let sys                = "Caml_sys"
+let lexer              = "Caml_lexer"
+let parser             = "Caml_parser"
+let obj_runtime        = "Caml_obj"
+let array              = "Caml_array"
+let format             = "Caml_format"
+let string             = "Caml_string"
+let float              = "Caml_float"
+let hash               = "Caml_hash"
+let oo                 = "Caml_oo"
+let curry              = "Curry"
+let internalMod        = "Caml_internalMod"
+let bigarray           = "Caml_bigarray"
+let unix               = "Caml_unix"
+let int64              = "Caml_int64"
+let md5                = "Caml_md5"
+let weak               = "Caml_weak"
+
+let runtime_set = 
+  [
+  prim;               
+  builtin_exceptions ;
+  exceptions ; 
+  io ;
+  sys ;
+  lexer ;
+  parser ;
+  obj_runtime ;
+  array ;
+  format ;
+  string ;
+  float ;
+  hash ;
+  oo ;
+  curry ;
+  internalMod ;
+  bigarray ;
+  unix ;
+  int64 ;
+  md5 ;
+  weak ] |> 
+  List.fold_left (fun acc x -> String_set.add (String.uncapitalize x) acc ) String_set.empty

jscomp/js_dump.ml

@@ -93,7 +93,8 @@ module L = struct
   let strict_directive = "'use strict';"
   let true_ = "true"
   let false_ = "false"
-  let curry = "app" (* curry arbitrary args *)
+  let app = Literals.app (* curry arbitrary args *)
+  let app_array = Literals.app_array
   let tag = "tag"
   let bind = "bind"
   let math = "Math"
@@ -487,12 +488,13 @@ and
             let len = List.length el in
             if 1 <= len && len <= 8 then  
               begin
-                P.string f (Printf.sprintf "app%d" len);
+                P.string f L.app;
+                P.string f (Printf.sprintf "%d" len);
                 P.paren_group f 1 (fun _ -> arguments cxt f (e::el))
               end
             else 
               begin 
-                P.string f  L.curry;                
+                P.string f  L.app_array;                
                 P.paren_group f 1 (fun _ -> arguments cxt f [ e ; E.arr Mutable el])
               end)
     in

jscomp/js_exp_make.ml

@@ -778,10 +778,10 @@ let public_method_call meth_name obj label cache args =
         *)
       else if len <=8 then 
         let len_str = string_of_int len in
-        runtime_call Js_config.curry ("app"^len_str) 
+        runtime_call Js_config.curry (Literals.app ^len_str) 
           (fn ::  args)
       else 
-        runtime_call Js_config.curry "app"           
+        runtime_call Js_config.curry Literals.app_array           
           [fn  ; arr NA args ]            
     )
 

jscomp/js_output.mli

@@ -57,10 +57,15 @@ val dummy : t
 
 
 val handle_name_tail :
-    Lam_compile_defs.st -> Lam_compile_defs.return_type -> Lambda.lambda ->  J.expression -> t
+    Lam_compile_defs.st ->
+    Lam_compile_defs.return_type ->
+    Lambda.lambda ->  J.expression -> t
 
 val handle_block_return : 
-    Lam_compile_defs.st -> Lam_compile_defs.return_type -> Lambda.lambda -> J.block -> J.expression -> t
+    Lam_compile_defs.st ->
+    Lam_compile_defs.return_type ->
+    Lambda.lambda ->
+    J.block -> J.expression -> t
 
 val concat : t list -> t
 

jscomp/js_program_loader.ml

@@ -55,7 +55,8 @@ let string_of_module_id (x : Lam_module_ident.t) : string =
         "./stdlib/" ^ Filename.chop_extension target 
     | AmdJS
     | NodeJS -> 
-      if Ext_string.starts_with id.name "Caml_" then 
+      let filename = String.uncapitalize id.name in
+      if String_set.mem filename Js_config.runtime_set  then 
         let path = 
           (* For the runtime, only [JS] files are needed, and 
              unlike the stdlib, [bsc] have some pre-built knowledge 
@@ -69,7 +70,7 @@ let string_of_module_id (x : Lam_module_ident.t) : string =
               "runtime"
           | f ->  f  in
         Ext_filename.node_relative_path !Location.input_name
-          (Filename.concat path (String.uncapitalize id.name))        
+          (Filename.concat path filename)        
       else 
         begin match Config_util.find file with   
           (* for some primitive files, no cmj support *)

jscomp/lib/Makefile

@@ -5,6 +5,8 @@ CAMLC=../bin/bsc
 SOURCE_LIST := $(shell cat lib.mllib)
 
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST))
+
+INCLUDES := -I ../runtime
 # COMPFLAGS += -js-module goog:buckle.js
 
 $(RUNTIME): $(CAMLC)

jscomp/lib/bench.js

@@ -1,8 +1,8 @@
 // Generated CODE, PLEASE EDIT WITH CARE
 'use strict';
 
-var Bench      = require("benchmark");
-var Caml_curry = require("../runtime/caml_curry");
+var Bench = require("benchmark");
+var Curry = require("../runtime/curry");
 
 var suite = new Bench.Suite();
 
@@ -14,22 +14,22 @@ suite.add("first", function () {
       }
     });
 
-Caml_curry.app3(suite.add.bind(suite), "second", function () {
+Curry._3(suite.add.bind(suite), "second", function () {
       return /* () */0;
     }, {
       "onComplete": function () {
         return /* () */0;
       }
     });
 
-Caml_curry.app2(suite.on.bind(suite), "complete", function () {
+Curry._2(suite.on.bind(suite), "complete", function () {
       for(var i = 0 ,i_finish = suite.length - 1 | 0; i<= i_finish; ++i){
         console.log(suite[i]);
       }
       return /* () */0;
     });
 
-Caml_curry.app1(suite.run.bind(suite), /* () */0);
+Curry._1(suite.run.bind(suite), /* () */0);
 
 exports.suite = suite;
 /* suite Not a pure module */

jscomp/literals.ml

@@ -32,3 +32,10 @@ let partial_arg = "partial_arg"
 let tmp = "tmp"
 
 let create = "create" (* {!Caml_exceptions.create}*)
+
+let app = "_"
+let app_array = "app" (* arguments are an array*)
+
+let runtime = "runtime" (* runtime directory *)
+
+let stdlib = "stdlib"

jscomp/literals.mli

@@ -33,3 +33,9 @@ val prim : string
 val tmp : string 
 
 val create : string 
+
+val app : string
+val app_array : string
+
+val runtime : string
+val stdlib : string

jscomp/runtime/.depend

@@ -22,8 +22,6 @@ caml_bigarray.cmo : caml_bigarray.cmi
 caml_bigarray.cmx : caml_bigarray.cmi
 caml_builtin_exceptions.cmo : caml_builtin_exceptions.cmi
 caml_builtin_exceptions.cmx : caml_builtin_exceptions.cmi
-caml_curry.cmo : js.cmo caml_oo.cmi
-caml_curry.cmx : js.cmx caml_oo.cmx
 caml_exceptions.cmo : caml_builtin_exceptions.cmi caml_exceptions.cmi
 caml_exceptions.cmx : caml_builtin_exceptions.cmx caml_exceptions.cmi
 caml_float.cmo : typed_array.cmo js.cmo caml_float.cmi
@@ -56,6 +54,8 @@ caml_sys.cmo : js.cmo caml_sys.cmi
 caml_sys.cmx : js.cmx caml_sys.cmi
 caml_utils.cmo : caml_utils.cmi
 caml_utils.cmx : caml_utils.cmi
+curry.cmo : js.cmo caml_oo.cmi
+curry.cmx : js.cmx caml_oo.cmx
 fn.cmo :
 fn.cmx :
 js.cmo :
@@ -70,8 +70,6 @@ caml_bigarray.cmo : caml_bigarray.cmi
 caml_bigarray.cmj : caml_bigarray.cmi
 caml_builtin_exceptions.cmo : caml_builtin_exceptions.cmi
 caml_builtin_exceptions.cmj : caml_builtin_exceptions.cmi
-caml_curry.cmo : js.cmo caml_oo.cmi
-caml_curry.cmj : js.cmj caml_oo.cmj
 caml_exceptions.cmo : caml_builtin_exceptions.cmi caml_exceptions.cmi
 caml_exceptions.cmj : caml_builtin_exceptions.cmj caml_exceptions.cmi
 caml_float.cmo : typed_array.cmo js.cmo caml_float.cmi
@@ -104,6 +102,8 @@ caml_sys.cmo : js.cmo caml_sys.cmi
 caml_sys.cmj : js.cmj caml_sys.cmi
 caml_utils.cmo : caml_utils.cmi
 caml_utils.cmj : caml_utils.cmi
+curry.cmo : js.cmo caml_oo.cmi
+curry.cmj : js.cmj caml_oo.cmj
 fn.cmo :
 fn.cmj :
 js.cmo :

jscomp/runtime/caml_format.js

@@ -3,9 +3,9 @@
 
 var Caml_int64              = require("./caml_int64");
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");
+var Curry                   = require("./curry");
 var Caml_primitive          = require("./caml_primitive");
 var Caml_utils              = require("./caml_utils");
-var Caml_curry              = require("./caml_curry");
 var Caml_string             = require("./caml_string");
 
 function caml_failwith(s) {
@@ -822,7 +822,7 @@ var float_of_string = (
 );
 
 function caml_float_of_string(s) {
-  return Caml_curry.app2(float_of_string, s, caml_failwith);
+  return Curry._2(float_of_string, s, caml_failwith);
 }
 
 var caml_nativeint_format = caml_format_int;

jscomp/runtime/caml_io.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");
-var Caml_curry              = require("./caml_curry");
+var Curry                   = require("./curry");
 
 var stdin = undefined;
 
@@ -55,7 +55,7 @@ function caml_ml_open_descriptor_out() {
 
 function caml_ml_flush(oc) {
   if (oc[/* buffer */0] !== "") {
-    Caml_curry.app2(oc[/* output */1], oc, oc[/* buffer */0]);
+    Curry._2(oc[/* output */1], oc, oc[/* buffer */0]);
     oc[/* buffer */0] = "";
     return /* () */0;
   }