move ocaml_pack tools into normal source distribution

Author: Hongbo Zhang

.gitignore

@@ -33,11 +33,11 @@ _build
 *.zip
 *.gz
 # special file 
-ocaml_pack
+
 bsc
 bscc
-ocaml_pack0.ml
-ocaml_pack1.ml
+jscomp/tools/ocamlpack*
+
 .idea
 exports.js
 node_modules

jscomp/Makefile

@@ -36,13 +36,16 @@ release:snapshot
 # TODO: should be done after we do the build
 # Carefully check the stored data if it is platform independent
 
-./bin/ocaml_pack: ./bin/ocaml_pack.mli ./bin/ocaml_pack.ml 
+./bin/ocamlpack: ./bin/ocamlpack.mli ./bin/ocamlpack.ml 
 	$(NATIVE) -w -a -I bin -I +compiler-libs ocamlcommon.cmxa unix.cmxa  $^ -o $@
 
-snapshot: ./bin/ocaml_pack snapshotcmj
+_build/ocamlpack: _build/ext/ext.cmxa _build/syntax/pack.cmxa _build/syntax/ocaml_pack_main.cmx
+	$(NATIVE) -I +compiler-libs ocamlcommon.cmxa unix.cmxa $^ -o $@
+
+snapshot: ./bin/ocamlpack snapshotcmj
 	$(MAKE) snapshotml
 
-snapshotml:./bin/ocaml_pack ./bin/compiler.mllib
+snapshotml:./bin/ocamlpack ./bin/compiler.mllib
 	@echo "Snapshot ml"
 	$< bin/compiler.mllib > bin/compiler.ml
 snapshotcmj:
@@ -85,14 +88,14 @@ world-test:
 	cd test && $(MAKE) all
 	@echo "Making test finsihed"
 
-travis-world-test:./bin/ocaml_pack
+travis-world-test:./bin/ocamlpack
 	@echo "Generating the compiler"
 	rm -f bin/compiler.ml 	
-	./bin/ocaml_pack ./bin/compiler.mllib > bin/compiler.ml
+	./bin/ocamlpack ./bin/compiler.mllib > bin/compiler.ml
 	@echo "Generating the compiler finished"	
 	$(MAKE) world-test
 
-# no depend on ./bin/ocaml_pack ./bin/bsc
+# no depend on ./bin/ocamlpack ./bin/bsc
 # since in npm mode, they are generated from a single file
 install:
 	cp  ./bin/bsc ../bin/

jscomp/bin/.gitignore

@@ -1,3 +1,3 @@
 ppx_metaquot
-ocaml_pack
+ocamlpack
 bsc

jscomp/bin/ocaml_pack.ml renamed to jscomp/bin/ocamlpack.ml

@@ -1,4 +1,4 @@
-(** Bundled by ocaml_pack 06/20-16:36 *)
+(** Bundled by ocamlpack 08/10-10:46 *)
 module Ext_bytes : sig 
 #1 "ext_bytes.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -452,6 +452,11 @@ val invalid_argf : ('a, unit, string, 'b) format4 -> 'a
 
 val bad_argf : ('a, unit, string, 'b) format4 -> 'a
 
+
+
+val dump : 'a -> string 
+
+
 end = struct
 #1 "ext_pervasives.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -525,6 +530,88 @@ let invalid_argf fmt = Format.ksprintf invalid_arg fmt
 let bad_argf fmt = Format.ksprintf (fun x -> raise (Arg.Bad x ) ) fmt
 
 
+let rec dump r =
+  if Obj.is_int r then
+    string_of_int (Obj.magic r : int)
+  else (* Block. *)
+    let rec get_fields acc = function
+      | 0 -> acc
+      | n -> let n = n-1 in get_fields (Obj.field r n :: acc) n
+    in
+    let rec is_list r =
+      if Obj.is_int r then
+        r = Obj.repr 0 (* [] *)
+      else
+        let s = Obj.size r and t = Obj.tag r in
+        t = 0 && s = 2 && is_list (Obj.field r 1) (* h :: t *)
+    in
+    let rec get_list r =
+      if Obj.is_int r then
+        []
+      else
+        let h = Obj.field r 0 and t = get_list (Obj.field r 1) in
+        h :: t
+    in
+    let opaque name =
+      (* XXX In future, print the address of value 'r'.  Not possible
+       * in pure OCaml at the moment.  *)
+      "<" ^ name ^ ">"
+    in
+    let s = Obj.size r and t = Obj.tag r in
+    (* From the tag, determine the type of block. *)
+    match t with
+    | _ when is_list r ->
+      let fields = get_list r in
+      "[" ^ String.concat "; " (List.map dump fields) ^ "]"
+    | 0 ->
+      let fields = get_fields [] s in
+      "(" ^ String.concat ", " (List.map dump fields) ^ ")"
+    | x when x = Obj.lazy_tag ->
+      (* Note that [lazy_tag .. forward_tag] are < no_scan_tag.  Not
+         * clear if very large constructed values could have the same
+         * tag. XXX *)
+      opaque "lazy"
+    | x when x = Obj.closure_tag ->
+      opaque "closure"
+    | x when x = Obj.object_tag ->
+      let fields = get_fields [] s in
+      let _clasz, id, slots =
+        match fields with
+        | h::h'::t -> h, h', t
+        | _ -> assert false
+      in
+      (* No information on decoding the class (first field).  So just print
+         * out the ID and the slots. *)
+      "Object #" ^ dump id ^ " (" ^ String.concat ", " (List.map dump slots) ^ ")"
+    | x when x = Obj.infix_tag ->
+      opaque "infix"
+    | x when x = Obj.forward_tag ->
+      opaque "forward"
+    | x when x < Obj.no_scan_tag ->
+      let fields = get_fields [] s in
+      "Tag" ^ string_of_int t ^
+      " (" ^ String.concat ", " (List.map dump fields) ^ ")"
+    | x when x = Obj.string_tag ->
+      "\"" ^ String.escaped (Obj.magic r : string) ^ "\""
+    | x when x = Obj.double_tag ->
+      string_of_float (Obj.magic r : float)
+    | x when x = Obj.abstract_tag ->
+      opaque "abstract"
+    | x when x = Obj.custom_tag ->
+      opaque "custom"
+    | x when x = Obj.custom_tag ->
+      opaque "final"
+    | x when x = Obj.double_array_tag ->
+      "[|"^
+      String.concat ";"
+        (Array.to_list (Array.map string_of_float (Obj.magic r : float array))) ^
+      "|]"
+    | _ ->
+      opaque (Printf.sprintf "unknown: tag %d size %d" t s)
+
+let dump v = dump (Obj.repr v)
+
+
 end
 module Line_process : sig 
 #1 "line_process.mli"
@@ -1413,7 +1500,7 @@ let _ =
   begin 
     let local_time = Unix.(localtime (gettimeofday ())) in 
     output_string stdout 
-      (Printf.sprintf {|(** Bundled by ocaml_pack %02d/%02d-%02d:%02d *)|}
+      (Printf.sprintf {|(** Bundled by ocamlpack %02d/%02d-%02d:%02d *)|}
          (local_time.tm_mon + 1) local_time.tm_mday 
          local_time.tm_hour local_time.tm_min 
                          );

jscomp/bin/ocaml_pack.mli renamed to jscomp/bin/ocamlpack.mli

@@ -1,7 +1,7 @@
 [
     "trigger", ".", {
         "name": "build",
-        "expression": ["pcre", "(\\.(ml|mlp|mll|mly|mli|sh|mk|sh|mllib)$|bsc$|Makefile)"],
+        "expression": ["pcre", "(\\.(ml|mlp|mll|mly|mli|sh|itarget|mk|sh|mllib)$|bsc$|Makefile)"],
         "command": ["./build.sh"],
         "append_files" : true
     }

jscomp/build.json

@@ -1,4 +1,6 @@
 common/common.cmxa
 ext/ext.cmxa
 syntax/syntax.cmxa
-core.cmxa
+core.cmxa
+syntax/pack.cmxa
+syntax/ocaml_pack_main.cmx