better bs.raw printing

Author: bobzhang

jscomp/all.depend

@@ -671,9 +671,9 @@ core/js_dump.cmx : core/js_stmt_make.cmx core/js_runtime_modules.cmx \
     core/js_op_util.cmx core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \
     core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump_string.cmx \
     core/js_dump_property.cmx core/js_dump_lit.cmx common/js_config.cmx \
-    core/js_closure.cmx core/j.cmx ext/ident_set.cmx ext/ext_pp_scope.cmx \
-    ext/ext_pp.cmx ext/ext_list.cmx ext/ext_ident.cmx ext/ext_array.cmx \
-    core/js_dump.cmi
+    core/js_closure.cmx core/j.cmx ext/ident_set.cmx ext/ext_string.cmx \
+    ext/ext_pp_scope.cmx ext/ext_pp.cmx ext/ext_list.cmx ext/ext_ident.cmx \
+    ext/ext_array.cmx core/js_dump.cmi
 core/js_name_of_module_id.cmx : core/lam_compile_env.cmx \
     core/js_packages_state.cmx core/js_packages_info.cmx \
     core/js_name_of_module_id.cmi

jscomp/bin/all_ounit_tests.ml

@@ -1931,7 +1931,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 
@@ -2177,7 +2180,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
@@ -13890,12 +13893,12 @@ let suites =
        Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
        end; *)
     __LOC__ >:: begin fun _ -> 
-      Ext_string.for_all (function '_' -> true | _ -> false)
-        "____" =~ true;
-      Ext_string.for_all (function '_' -> true | _ -> false)
-        "___-" =~ false;
-      Ext_string.for_all (function '_' -> true | _ -> false)        
-        "" =~ true
+      Ext_string.for_all "____" (function '_' -> true | _ -> false)
+        =~ true;
+      Ext_string.for_all "___-" (function '_' -> true | _ -> false)
+        =~ false;
+      Ext_string.for_all ""  (function '_' -> true | _ -> false)        
+        =~ true
     end;
     __LOC__ >:: begin fun _ -> 
       Ext_string.tail_from "ghsogh" 1 =~ "hsogh";

jscomp/core/js_dump.ml

@@ -95,7 +95,12 @@ let rec iter_lst cxt (f : P.t) ls element inter =
     inter f; 
     iter_lst acxt f r element inter
 
-
+let raw_snippet_exp_simple_enough (s : string) =
+  Ext_string.for_all s (fun c -> 
+  match c with 
+  | 'a' .. 'z' | 'A' .. 'Z' | '_' -> true 
+  | _ -> false
+  )
 (* Parentheses are required when the expression
    starts syntactically with "{" or "function"
    TODO:  be more conservative, since Google Closure will handle
@@ -618,9 +623,13 @@ and expression_desc cxt (level:int) f x : cxt  =
   | Raw_js_code (s,info) ->
     (match info with
      | Exp ->
-       P.string f L.lparen;
-       P.string f s ;
-       P.string f L.rparen;
+       if raw_snippet_exp_simple_enough s then 
+         P.string f s        
+       else begin 
+         P.string f L.lparen;
+         P.string f s ;
+         P.string f L.rparen;
+       end;
        cxt
      | Stmt ->
        P.newline f  ;

jscomp/ext/ext_string.ml

@@ -162,7 +162,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0

jscomp/ext/ext_string.mli

@@ -83,7 +83,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 

jscomp/ounit_tests/ounit_string_tests.ml

@@ -115,12 +115,12 @@ let suites =
        Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
        end; *)
     __LOC__ >:: begin fun _ -> 
-      Ext_string.for_all (function '_' -> true | _ -> false)
-        "____" =~ true;
-      Ext_string.for_all (function '_' -> true | _ -> false)
-        "___-" =~ false;
-      Ext_string.for_all (function '_' -> true | _ -> false)        
-        "" =~ true
+      Ext_string.for_all "____" (function '_' -> true | _ -> false)
+        =~ true;
+      Ext_string.for_all "___-" (function '_' -> true | _ -> false)
+        =~ false;
+      Ext_string.for_all ""  (function '_' -> true | _ -> false)        
+        =~ true
     end;
     __LOC__ >:: begin fun _ -> 
       Ext_string.tail_from "ghsogh" 1 =~ "hsogh";

jscomp/test/app_root_finder.js

@@ -23,7 +23,7 @@ function find_package_json(_dir) {
   };
 }
 
-var match = typeof (__dirname) === "undefined" ? undefined : (__dirname);
+var match = typeof __dirname === "undefined" ? undefined : __dirname;
 
 if (match !== undefined) {
   console.log(find_package_json(match));

jscomp/test/flow_parser_reg_test.js

@@ -13628,7 +13628,7 @@ var array = (function (x) {return x;});
 
 var number$1 = (function (x) {return x;});
 
-var $$null = (null);
+var $$null = null;
 
 function regexp$1(loc, pattern, flags) {
   try {
@@ -16072,7 +16072,7 @@ function eq(loc, x, y) {
   return /* () */0;
 }
 
-var match = typeof (__dirname) === "undefined" ? undefined : (__dirname);
+var match = typeof __dirname === "undefined" ? undefined : __dirname;
 
 if (match !== undefined) {
   var f = Path.join(match, "flow_parser_sample.js");

jscomp/test/fs_test.js

@@ -28,11 +28,11 @@ function eq(loc, param) {
   return /* () */0;
 }
 
-var match = typeof (__filename) === "undefined" ? undefined : (__filename);
+var match = typeof __filename === "undefined" ? undefined : __filename;
 
 var current_file = match !== undefined ? match : "<Not Node JS>";
 
-var match$1 = typeof (__dirname) === "undefined" ? undefined : (__dirname);
+var match$1 = typeof __dirname === "undefined" ? undefined : __dirname;
 
 var current_dir_name = match$1 !== undefined ? match$1 : "<Not Node Js>";
 
@@ -42,7 +42,7 @@ Fs.readdirSync(current_dir_name);
 
 var pathobj = Path.parse(current_dir_name);
 
-var match$2 = typeof (module) === "undefined" ? undefined : (module);
+var match$2 = typeof module === "undefined" ? undefined : module;
 
 if (match$2 !== undefined) {
   console.log(/* tuple */[

jscomp/test/installation_test.js

@@ -29,7 +29,7 @@ function eq(loc, x, y) {
   return /* () */0;
 }
 
-var match = typeof (__dirname) === "undefined" ? undefined : (__dirname);
+var match = typeof __dirname === "undefined" ? undefined : __dirname;
 
 if (match !== undefined) {
   var root = App_root_finder.find_package_json(match);

jscomp/test/js_bool_test.js

@@ -57,7 +57,7 @@ var suites_001 = /* :: */[
       (function (param) {
           return /* Eq */Block.__(0, [
                     true,
-                    true === (true)
+                    true === true
                   ]);
         })
     ],

jscomp/test/js_nullable_test.js

@@ -43,7 +43,7 @@ eq("File \"js_nullable_test.ml\", line 26, characters 7-14", false, false);
 
 eq("File \"js_nullable_test.ml\", line 28, characters 7-14", (f(1, 2) == null), false);
 
-eq("File \"js_nullable_test.ml\", line 30, characters 6-13", ((null) == null), true);
+eq("File \"js_nullable_test.ml\", line 30, characters 6-13", (null == null), true);
 
 eq("File \"js_nullable_test.ml\", line 34, characters 3-10", false, false);
 

jscomp/test/node_fs_test.js

@@ -2,7 +2,7 @@
 
 var Fs = require("fs");
 
-var match = typeof (__filename) === "undefined" ? undefined : (__filename);
+var match = typeof __filename === "undefined" ? undefined : __filename;
 
 if (match !== undefined) {
   console.log(Fs.readFileSync(match, "utf8"));

jscomp/test/test_require.js

@@ -1,11 +1,11 @@
 'use strict';
 
 
-var match = typeof (require) === "undefined" ? undefined : (require);
+var match = typeof require === "undefined" ? undefined : require;
 
 if (match !== undefined) {
   console.log(match.resolve("./test_require.js"));
-  var match$1 = typeof (module) === "undefined" ? undefined : (module);
+  var match$1 = typeof module === "undefined" ? undefined : module;
   var match$2 = match.main;
   if (match$1 !== undefined) {
     if (match$2 !== undefined && match$1 === match$2) {

jscomp/test/test_zero_nullable.js

@@ -281,17 +281,17 @@ var Test_null_def = /* module */[
 
 eq("File \"test_zero_nullable.ml\", line 227, characters 7-14", f1$2(0), 1);
 
-eq("File \"test_zero_nullable.ml\", line 228, characters 7-14", f1$2((null)), 3);
+eq("File \"test_zero_nullable.ml\", line 228, characters 7-14", f1$2(null), 3);
 
-eq("File \"test_zero_nullable.ml\", line 229, characters 7-14", f1$2((undefined)), 3);
+eq("File \"test_zero_nullable.ml\", line 229, characters 7-14", f1$2(undefined), 3);
 
 eq("File \"test_zero_nullable.ml\", line 231, characters 7-14", f1(0), 1);
 
-eq("File \"test_zero_nullable.ml\", line 232, characters 7-14", f1((null)), 3);
+eq("File \"test_zero_nullable.ml\", line 232, characters 7-14", f1(null), 3);
 
 eq("File \"test_zero_nullable.ml\", line 234, characters 7-14", f1$1(0), 1);
 
-eq("File \"test_zero_nullable.ml\", line 235, characters 7-14", f1$1((undefined)), 3);
+eq("File \"test_zero_nullable.ml\", line 235, characters 7-14", f1$1(undefined), 3);
 
 Mt.from_pair_suites("test_zero_nullable.ml", suites[0]);
 

jscomp/test/undef_regression2_test.js

@@ -39,12 +39,12 @@ function ok(loc, x) {
   return /* () */0;
 }
 
-var match = typeof (___undefined_value) === "undefined" ? undefined : (___undefined_value);
+var match = typeof ___undefined_value === "undefined" ? undefined : ___undefined_value;
 
 var a = match !== undefined ? 2 : 1;
 
 function test(param) {
-  var match = typeof (__DEV__) === "undefined" ? undefined : (__DEV__);
+  var match = typeof __DEV__ === "undefined" ? undefined : __DEV__;
   if (match !== undefined) {
     console.log("dev mode");
     return /* () */0;
@@ -55,7 +55,7 @@ function test(param) {
 }
 
 function test2(param) {
-  var match = typeof (__filename) === "undefined" ? undefined : (__filename);
+  var match = typeof __filename === "undefined" ? undefined : __filename;
   if (match !== undefined) {
     console.log(match);
     return /* () */0;
@@ -66,7 +66,7 @@ function test2(param) {
 }
 
 function test3(param) {
-  if (Js_primitive.undefined_to_opt(typeof (__DEV__) === "undefined" ? undefined : (__DEV__)) === undefined) {
+  if (Js_primitive.undefined_to_opt(typeof __DEV__ === "undefined" ? undefined : __DEV__) === undefined) {
     console.log("production mode");
     return /* () */0;
   } else {

jscomp/xwatcher/xwatcher.js

@@ -15,7 +15,7 @@ var events = Xwatcher_util.makeEventObj(/* () */0);
 
 var watchers = /* array */[];
 
-var source_dirname = Js_option.getExn(Js_primitive.undefined_to_opt(typeof (__dirname) === "undefined" ? undefined : (__dirname)));
+var source_dirname = Js_option.getExn(Js_primitive.undefined_to_opt(typeof __dirname === "undefined" ? undefined : __dirname));
 
 var bsb = Path.join(source_dirname, "bsb.exe");
 

jscomp/xwatcher/xwatcher_current.js

@@ -10,7 +10,7 @@ import * as Node_process from "../../lib/es6/node_process.js";
 import * as Xwatcher_util from "./xwatcher_util.js";
 import * as Child_process from "child_process";
 
-Js_option.getExn(Js_primitive.undefined_to_opt(typeof (__dirname) === "undefined" ? undefined : (__dirname)));
+Js_option.getExn(Js_primitive.undefined_to_opt(typeof __dirname === "undefined" ? undefined : __dirname));
 
 var cwd = Process.cwd();
 

lib/bsb.ml

@@ -830,7 +830,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 
@@ -1076,7 +1079,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0

lib/bsb_helper.ml

@@ -867,7 +867,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 
@@ -1113,7 +1116,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0

lib/bsdep.ml

@@ -23259,7 +23259,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 
@@ -23505,7 +23508,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0

lib/bsppx.ml

@@ -5197,7 +5197,10 @@ val for_all_from:
   (char -> bool) -> 
   bool 
 
-val for_all : (char -> bool) -> string -> bool
+val for_all : 
+  string -> 
+  (char -> bool) -> 
+  bool
 
 val is_empty : string -> bool
 
@@ -5443,7 +5446,7 @@ let for_all_from s start  p =
   else unsafe_for_all_range s ~start ~finish:(len - 1) p 
 
 
-let for_all (p : char -> bool) s =   
+let for_all s (p : char -> bool)  =   
   unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0

lib/js/caml_obj.js

@@ -308,7 +308,7 @@ function caml_equal(_a, _b) {
       return true;
     } else {
       var a_type = typeof a;
-      if (a_type === "string" || a_type === "number" || a_type === "boolean" || a_type === "undefined" || a === (null)) {
+      if (a_type === "string" || a_type === "number" || a_type === "boolean" || a_type === "undefined" || a === null) {
         return false;
       } else {
         var b_type = typeof b;
@@ -317,7 +317,7 @@ function caml_equal(_a, _b) {
                 Caml_builtin_exceptions.invalid_argument,
                 "equal: functional value"
               ];
-        } else if (b_type === "number" || b_type === "undefined" || b === (null)) {
+        } else if (b_type === "number" || b_type === "undefined" || b === null) {
           return false;
         } else {
           var tag_a = a.tag | 0;