[fix] fix playground issues and add missing caml_weak (#283)

Author: bobzhang

jscomp/Makefile.shared

@@ -5,6 +5,7 @@ CAMLOPT=ocamlopt.opt
 
 
 
+
 .SUFFIXES: .mli .ml .cmi .cmo .cmx .p.cmx .cmj .js
 
 print-%  : ; @echo $* = $($*)

jscomp/js_config.ml

@@ -137,7 +137,6 @@ 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"
@@ -161,7 +160,6 @@ let runtime_set =
   hash ;
   oo ;
   curry ;
-  internalMod ;
   bigarray ;
   unix ;
   int64 ;

jscomp/js_config.mli

@@ -35,31 +35,19 @@ val runtime_set : String_set.t
 val stdlib_set : String_set.t
 
 val prim : string 
-
 val builtin_exceptions : string
 val exceptions : string
 val io : string
-
 val oo : string
-
 val sys : string
-
 val lexer : string 
 val parser : string
 val obj_runtime : string
-
 val array : string
-
 val format : string
-
 val string : string 
-
 val float : string 
-
 val curry : string 
-
-val internalMod : string
-
 val bigarray : string
 val unix : string
 val int64 : string

jscomp/js_dump.ml

@@ -1287,7 +1287,7 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
                    P.string f " ";
                    let id = Ext_ident.create (Ident.name id ^ "_finish") in
                    let cxt = ident cxt f id in
-                   P.string f " = ";
+                   P.string f " = "; (* FIXME: space *)
                    expression 15 cxt f finish, Some id
                 ) in
               semi f ; 
@@ -1585,7 +1585,6 @@ let amd_program f
     ) in
   P.string f ")";
   v
-;;
 
 let pp_deps_program ( program  : J.deps_program) (f : Ext_pp.t) = 
   begin

jscomp/js_dump.mli

@@ -26,7 +26,7 @@
 
 
 
-
+val pp_deps_program : J.deps_program -> Ext_pp.t -> unit
 
 val dump_deps_program : J.deps_program -> out_channel -> unit
 

jscomp/js_program_loader.ml

@@ -48,11 +48,11 @@ let string_of_module_id (x : Lam_module_ident.t) : string =
     | Browser 
       (* In browser *)
       ->  
-      let target = String.uncapitalize file in
+      let target = Filename.chop_extension @@ String.uncapitalize file in
       if String_set.mem target Js_config.runtime_set   then
-        "./runtime/" ^ Filename.chop_extension target
+        "./runtime/" ^  target
       else
-        "./stdlib/" ^ Filename.chop_extension target 
+        "./stdlib/" ^ target 
     | AmdJS
     | NodeJS -> 
       let filename = String.uncapitalize id.name in

jscomp/jsoo_driver.ml

@@ -50,7 +50,7 @@ let implementation non_export ppf  str  =
   |>  Translmod.transl_implementation modulename
   |> (* Printlambda.lambda ppf *) (fun lam -> 
       let buffer = Buffer.create 1000 in 
-      let () = Js_dump.(pp_program 
+      let () = Js_dump.(pp_deps_program 
                           (Lam_compile_group.compile ~filename:"" non_export
                              !finalenv !types_signature lam)
                           (Ext_pp.from_buffer buffer)) in

jscomp/lib/Makefile

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

jscomp/runtime/.depend

@@ -16,6 +16,7 @@ caml_queue.cmi :
 caml_string.cmi :
 caml_sys.cmi :
 caml_utils.cmi :
+caml_weak.cmi :
 caml_array.cmo : js.cmo caml_array.cmi
 caml_array.cmx : js.cmx caml_array.cmi
 caml_bigarray.cmo : caml_bigarray.cmi
@@ -54,6 +55,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
+caml_weak.cmo : js.cmo caml_array.cmi caml_weak.cmi
+caml_weak.cmx : js.cmx caml_array.cmx caml_weak.cmi
 curry.cmo : js.cmo caml_oo.cmi
 curry.cmx : js.cmx caml_oo.cmx
 fn.cmo :
@@ -102,6 +105,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
+caml_weak.cmo : js.cmo caml_array.cmi caml_weak.cmi
+caml_weak.cmj : js.cmj caml_array.cmj caml_weak.cmi
 curry.cmo : js.cmo caml_oo.cmi
 curry.cmj : js.cmj caml_oo.cmj
 fn.cmo :

jscomp/runtime/Makefile

@@ -5,9 +5,12 @@ CAMLC=../bin/bsc
 SOURCE_LIST := $(shell cat runtime.mllib)
 
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST))
-COMPFLAGS := -w -40 -safe-string 
+
+# COMPFLAGS := -js-module amdjs
+COMPFLAGS += -w -40 -safe-string 
 # COMPFLAGS += -js-module goog:buckle.runtime
 
+
 $(RUNTIME): $(CAMLC)
 
 all: $(RUNTIME)

jscomp/runtime/caml_weak.js

@@ -0,0 +1,53 @@
+// Generated CODE, PLEASE EDIT WITH CARE
+'use strict';
+
+var Caml_obj   = require("./caml_obj");
+var Caml_array = require("./caml_array");
+
+function caml_weak_create(n) {
+  return new Array(n);
+}
+
+function caml_weak_set(xs, i, v) {
+  if (v) {
+    xs[i] = v[0];
+    return /* () */0;
+  }
+  else {
+    return /* () */0;
+  }
+}
+
+function caml_weak_get(xs, i) {
+  v = xs[i];
+  if (v === undefined) {
+    return /* None */0;
+  }
+  else {
+    return [v];
+  }
+}
+
+function caml_weak_get_copy(xs, i) {
+  var match = xs[i];
+  if (match === undefined) {
+    return /* None */0;
+  }
+  else {
+    return /* Some */[Caml_obj.caml_obj_dup(match)];
+  }
+}
+
+function caml_weak_check(xs, i) {
+  return xs[i] !== undefined;
+}
+
+var caml_weak_blit = Caml_array.caml_array_blit;
+
+exports.caml_weak_create   = caml_weak_create;
+exports.caml_weak_set      = caml_weak_set;
+exports.caml_weak_get      = caml_weak_get;
+exports.caml_weak_get_copy = caml_weak_get_copy;
+exports.caml_weak_check    = caml_weak_check;
+exports.caml_weak_blit     = caml_weak_blit;
+/* No side effect */

jscomp/runtime/caml_weak.ml

@@ -0,0 +1,42 @@
+(* BuckleScript compiler
+ * Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, with linking exception;
+ * either version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *)
+
+(* Author: Hongbo Zhang  *)
+
+type 'a t = 'a Js.def array
+
+let caml_weak_create n =
+  Js.Array.new_uninitialized n 
+
+let caml_weak_set xs i v = 
+  match v with 
+  | Some x -> xs.(i) <- Js.to_def x 
+  | None -> ()
+
+let caml_weak_get  xs i = 
+  Js.from_def xs.(i) 
+
+let caml_weak_get_copy  xs i = 
+  match Js.from_def xs.(i) with 
+  | None -> None 
+  | Some x -> Some (Obj.magic (Obj.dup (Obj.repr x) ))
+
+let caml_weak_check xs i = 
+  not @@ Js.is_undef xs.(i)
+
+let caml_weak_blit = Caml_array.caml_array_blit

jscomp/runtime/caml_weak.mli

@@ -0,0 +1,29 @@
+(* BuckleScript compiler
+ * Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, with linking exception;
+ * either version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *)
+
+(* Author: Hongbo Zhang  *)
+
+
+type 'a t 
+
+val caml_weak_create : int -> 'a t 
+val caml_weak_set : 'a t -> int -> 'a option -> unit 
+val caml_weak_get : 'a t -> int -> 'a option 
+val caml_weak_get_copy : 'a t -> int -> 'a option 
+val caml_weak_check : 'a t -> int -> bool 
+val caml_weak_blit : 'a t -> int -> 'a t -> int -> int -> unit

jscomp/stdlib/Makefile.shared

@@ -23,6 +23,8 @@ CAMLC=$(CAMLRUN) $(COMPILER)
 #          -safe-string
 COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A  -nostdlib \
           -safe-string 
+
+# COMPFLAGS += -js-module amdjs
 # COMPFLAGS+= -js-module goog:buckle.std
 
 # OPTCOMPILER=ocamlopt.opt