[feature] rename -js-options into -bs-options and add -bs-diagnose

rescript-lang · May 27, 2016 · 49e9f02 · 49e9f02
1 parent ed7facd
commit 49e9f02
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -127,9 +127,9 @@ See http://bloomberg.github.io/bucklescript/, if you want to contribute document
 
 
   ```sh
-  MODULE_FLAGS='-js-module amdjs' make world
-  MODULE_FLAGS='-js-module commonjs' make world
-  MODULE_FLAGS='-js-module goog:buckle' make world
+  MODULE_FLAGS='-bs-module amdjs' make world
+  MODULE_FLAGS='-bs-module commonjs' make world
+  MODULE_FLAGS='-bs-module goog:buckle' make world
   ```
 
 4. Test

diff --git a/docs/Compiler-options.md b/docs/Compiler-options.md
@@ -1,22 +1,22 @@
 BuckleScript inherits the command line arguments of the [OCaml compiler](http://caml.inria.fr/pub/docs/manual-ocaml/comp.html). It also adds several flags:
 
-* -js-module
+* -bs-module
 
 Specify the JavaScript module system to use in the generated JavaScript code. Supported values are `commonjs`, `amdjs` and `goog:<namespace>`
 
 When you want to use `goog` module system, you can do things like this:
 
 ```bash
-bsc -js-module goog xx.ml 
+bsc -bs-module goog xx.ml 
   # no namespace
 
-bsc -js-module goog:bloomberg.buckle.test xx.ml 
+bsc -bs-module goog:bloomberg.buckle.test xx.ml 
   # namespace is bloomberg.buckle.test
 ```
 
 You would then need a bundler for different the different module systems: `webpack` supports `commonjs` and `amdjs` while `google closure compiler` supports all.
 
-*  -js-gen-tds
+*  -bs-gen-tds
 
 Trigger the generation of TypeScript `.d.ts` files.
 
@@ -39,4 +39,4 @@ If everything goes well, you should have `hello.js`
 
 ```
 console.log('hello world')
-```
+```
diff --git a/docs/Installation.md b/docs/Installation.md
@@ -66,9 +66,9 @@ Note that by default, `bsc` will generate `commonjs` modules, you can
 override such behavior by picking up your own module system:
 
 ```sh
-MODULE_FLAGS='-js-module amdjs' make world
-MODULE_FLAGS='-js-module commonjs' make world
-MODULE_FLAGS='-js-module goog:buckle' make world
+MODULE_FLAGS='-bs-module amdjs' make world
+MODULE_FLAGS='-bs-module commonjs' make world
+MODULE_FLAGS='-bs-module goog:buckle' make world
 ```
 
 Also see [Create a simple example with npm](./Create-a-simple-example-with-NPM.md)
diff --git a/docs/NPM-Support.md b/docs/NPM-Support.md
@@ -12,7 +12,7 @@ Since CommonJS has no namespaces, to allow JS files live in different
 directories, we have a flag
 
 ```sh
-bsc -js-npm-output-path $npm_package_name:path/to/your/js/dir -c a.ml
+bsc -bs-npm-output-path $npm_package_name:path/to/your/js/dir -c a.ml
 ```
 
 By passing this flag, `bsc` will store your `package_name` and
@@ -37,7 +37,7 @@ If you follow the layout convention above, use ocaml package is pretty
 straightforward
 
 ```
-bsc -js-npm-package-include ocaml-library -c a.ml
+bsc -bs-npm-package-include ocaml-library -c a.ml
 ```
 
 
@@ -47,6 +47,6 @@ bsc -js-npm-package-include ocaml-library -c a.ml
 Your command line would be like this
 
 ```
-bsc -js-npm-package-include ocaml-library1 -js-npm-package-include
-ocaml-library2 -js-npm-output-path $npm_package_name:lib/js/ -c a.ml
+bsc -bs-npm-package-include ocaml-library1 -bs-npm-package-include
+ocaml-library2 -bs-npm-output-path $npm_package_name:lib/js/ -c a.ml
 ```
diff --git a/jscomp/Makefile b/jscomp/Makefile
@@ -61,9 +61,9 @@ stdlib:
 
 
 # Example:
-# MODULE_FLAGS='-js-module amdjs' make world
-# MODULE_FLAGS='-js-module commonjs' make world
-# MODULE_FLAGS='-js-module goog:buckle' make world
+# MODULE_FLAGS='-bs-module amdjs' make world
+# MODULE_FLAGS='-bs-module commonjs' make world
+# MODULE_FLAGS='-bs-module goog:buckle' make world
 
 world:
 	@echo "Making compiler"		

diff --git a/jscomp/bin/compiler.ml b/jscomp/bin/compiler.ml
@@ -26668,18 +26668,18 @@ let add_include_path s =
 
 
 let buckle_script_flags = 
-  ("-js-npm-output-path", Arg.String Js_config.set_npm_package_path, 
+  ("-bs-npm-output-path", Arg.String Js_config.set_npm_package_path, 
    " set npm-output-path: package-name:path, for example `bs-platform:lib/js`")
   ::
-  ("-js-npm-package-include", Arg.String add_include_path, 
+  ("-bs-npm-package-include", Arg.String add_include_path, 
    " set package names, for example bs-platform "  )
-  :: ("-js-module", Arg.String Js_config.cmd_set_module, 
+  :: ("-bs-module", Arg.String Js_config.cmd_set_module, 
     " set module system: commonjs (default), amdjs, google:package_name")
-  :: ("-js-no-builtin-ppx-ml", Arg.Set Js_config.no_builtin_ppx_ml,
+  :: ("-bs-no-builtin-ppx-ml", Arg.Set Js_config.no_builtin_ppx_ml,
       "disable built-in ppx for ml files (internal use)")
-  :: ("-js-no-builtin-ppx-mli", Arg.Set Js_config.no_builtin_ppx_mli,
+  :: ("-bs-no-builtin-ppx-mli", Arg.Set Js_config.no_builtin_ppx_mli,
       "disable built-in ppx for mli files (internal use)")
-  :: ("-js-gen-tds", Arg.Set Js_config.default_gen_tds, 
+  :: ("-bs-gen-tds", Arg.Set Js_config.default_gen_tds, 
     " set will generate `.d.ts` file for typescript (experimental)")
   :: (
     let module F = struct

diff --git a/jscomp/js_config.ml b/jscomp/js_config.ml
@@ -98,6 +98,11 @@ let get_cross_module_inline () = !cross_module_inline
 let set_cross_module_inline b = 
   cross_module_inline := b
 
+
+let diagnose = ref false 
+let get_diagnose () = !diagnose
+let set_diagnose b = diagnose := b 
+
 let (//) = Filename.concat 
 (* for a single pass compilation, [output_dir] 
    can be cached 

diff --git a/jscomp/js_config.mli b/jscomp/js_config.mli
@@ -48,6 +48,10 @@ val cross_module_inline : bool ref
 val set_cross_module_inline : bool -> unit
 val get_cross_module_inline : unit -> bool
 
+val diagnose : bool ref 
+val get_diagnose : unit -> bool 
+val set_diagnose : bool -> unit 
+
 val set_env : env -> unit
 val cmd_set_module : string -> unit  
 val default_gen_tds : bool ref

diff --git a/jscomp/js_main.ml b/jscomp/js_main.ml
@@ -311,21 +311,23 @@ let add_include_path s =
 
 
 let buckle_script_flags = 
-  ("-js-npm-output-path", Arg.String Js_config.set_npm_package_path, 
+  ("-bs-npm-output-path", Arg.String Js_config.set_npm_package_path, 
    " set npm-output-path: package-name:path, for example `bs-platform:lib/js`")
   ::
-  ("-js-npm-package-include", Arg.String add_include_path, 
+  ("-bs-npm-package-include", Arg.String add_include_path, 
    " set package names, for example bs-platform "  )
-  :: ("-js-module", Arg.String Js_config.cmd_set_module, 
+  :: ("-bs-module", Arg.String Js_config.cmd_set_module, 
     " set module system: commonjs (default), amdjs, google:package_name")
-  :: ("-js-no-builtin-ppx-ml", Arg.Set Js_config.no_builtin_ppx_ml,
+  :: ("-bs-no-builtin-ppx-ml", Arg.Set Js_config.no_builtin_ppx_ml,
       "disable built-in ppx for ml files (internal use)")
-  :: ("-js-no-builtin-ppx-mli", Arg.Set Js_config.no_builtin_ppx_mli,
+  :: ("-bs-no-builtin-ppx-mli", Arg.Set Js_config.no_builtin_ppx_mli,
       "disable built-in ppx for mli files (internal use)")
-  :: ("-js-cross-module-opt", Arg.Set Js_config.cross_module_inline, 
-      "enable cross module inlining, default(false)")
-  :: ("-js-gen-tds", Arg.Set Js_config.default_gen_tds, 
+  :: ("-bs-cross-module-opt", Arg.Set Js_config.cross_module_inline, 
+      "enable cross module inlining(experimental), default(false)")
+  :: ("-bs-gen-tds", Arg.Set Js_config.default_gen_tds, 
     " set will generate `.d.ts` file for typescript (experimental)")
+  :: ("-bs-diagnose", Arg.Set Js_config.diagnose, 
+      " More verbose output")
   :: (
     let module F = struct
       let set r () = r := true

diff --git a/jscomp/js_pass_flatten_and_mark_dead.ml b/jscomp/js_pass_flatten_and_mark_dead.ml
@@ -97,6 +97,7 @@ let mark_dead = object (self)
         (** check [camlinternlFormat,box_type] inlined twice 
             FIXME: seems we have redeclared identifiers
          *)
+      if Js_config.get_diagnose () then 
         Ext_log.warn __LOC__ "@[%s$%d in %s@]" ident.name ident.stamp name
         (* assert false *)
     | exception Not_found ->  (* First time *)

diff --git a/jscomp/runtime/Makefile b/jscomp/runtime/Makefile
@@ -21,7 +21,7 @@ $(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj  block.cmj js.cmj
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) 
 
 
-COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -js-npm-output-path $(npm_package_name):lib/js -js-cross-module-opt
+COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -bs-npm-output-path $(npm_package_name):lib/js -bs-cross-module-opt -bs-diagnose
 
 
 

diff --git a/jscomp/stdlib/Makefile.shared b/jscomp/stdlib/Makefile.shared
@@ -22,7 +22,7 @@ CAMLC=$(CAMLRUN) $(COMPILER)
 #COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib \
 #          -safe-string
 COMPFLAGS= $(MODULE_FLAGS) -strict-sequence -w +33..39 -g -warn-error A  -nostdlib \
-          -safe-string -I ../runtime -js-npm-output-path $(npm_package_name):lib/js -js-no-builtin-ppx-ml -js-no-builtin-ppx-mli -js-cross-module-opt
+          -safe-string -I ../runtime -bs-npm-output-path $(npm_package_name):lib/js -bs-no-builtin-ppx-ml -bs-no-builtin-ppx-mli -bs-cross-module-opt -bs-diagnose
 
 
 # OPTCOMPILER=ocamlopt.opt

diff --git a/jscomp/test/Makefile b/jscomp/test/Makefile
@@ -8,7 +8,7 @@ SOURCE_LIST := $(shell cat test.mllib)
 TESTS := $(addsuffix .cmj, $(SOURCE_LIST) )
 
 COMPFLAGS+=  $(MODULE_FLAGS) -w -40 
-COMPFLAGS+=  -js-cross-module-opt -js-npm-output-path $(npm_package_name):lib/js/test/
+COMPFLAGS+=  -bs-diagnose -bs-cross-module-opt -bs-npm-output-path $(npm_package_name):lib/js/test/
 
 
 $(TESTS): $(CAMLC)