Merge pull request #4978 from rescript-lang/support_rescript_synatx

[internal] add support for rescript syntax testing, add -as-pp for native, fix #4977

Author: bobzhang

jscomp/common/js_config.ml

@@ -92,4 +92,6 @@ let as_ppx = ref false
 
 let mono_empty_array = ref true
 
-let customize_runtime = ref None 
+let customize_runtime = ref None 
+
+let as_pp = ref false

jscomp/common/js_config.mli

@@ -100,4 +100,5 @@ val no_export: bool ref
 val as_ppx : bool ref 
 
 val mono_empty_array : bool ref
-val customize_runtime : string option ref 
+val customize_runtime : string option ref 
+val as_pp: bool ref

jscomp/core/js_implementation.ml

@@ -67,7 +67,12 @@ let after_parsing_sig ppf  outputprefix ast  =
         ast 
 
     end;
-  if !Js_config.syntax_only then 
+  if !Js_config.as_pp then begin 
+      output_string stdout Config.ast_intf_magic_number;
+      output_value stdout (!Location.input_name : string);
+      output_value stdout ast;
+  end; 
+  if !Js_config.syntax_only then
     Warnings.check_fatal()
   else 
     begin 
@@ -170,6 +175,11 @@ let after_parsing_impl ppf  outputprefix (ast : Parsetree.structure) =
       Ml ~output:(outputprefix ^ Literals.suffix_ast)
       ast
   end ;
+  if !Js_config.as_pp then begin 
+    output_string stdout Config.ast_impl_magic_number;
+    output_value stdout (!Location.input_name : string);
+    output_value stdout ast;
+  end; 
   if !Js_config.syntax_only then 
     Warnings.check_fatal ()
   else 

jscomp/main/js_main.ml

@@ -287,7 +287,8 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
 
     "-as-ppx", set Js_config.as_ppx, 
     "*internal*As ppx for editor integration";
-
+    "-as-pp", unit_call(fun _ ->  Js_config.as_pp := true ; Js_config.syntax_only := true),
+    "*internal*As pp to interact with native tools";
     "-no-alias-deps", set Clflags.transparent_modules, 
     "*internal*Do not record dependencies for module aliases";
 

jscomp/test/build.ninja

@@ -338,6 +338,8 @@ o test/hash_collision_test.cmi test/hash_collision_test.cmj : cc test/hash_colli
 o test/hash_test.cmi test/hash_test.cmj : cc test/hash_test.ml | test/mt.cmj test/mt_global.cmj $stdlib
 o test/hashtbl_test.cmi test/hashtbl_test.cmj : cc test/hashtbl_test.ml | test/mt.cmj $stdlib
 o test/hello.foo.cmi test/hello.foo.cmj : cc test/hello.foo.ml | $stdlib
+o test/hello_res.cmj : cc_cmi test/hello_res.res | test/hello_res.cmi $stdlib
+o test/hello_res.cmi : cc test/hello_res.resi | $stdlib
 o test/http_types.cmi test/http_types.cmj : cc test/http_types.ml | $stdlib
 o test/ignore_test.cmi test/ignore_test.cmj : cc test/ignore_test.ml | test/mt.cmj $stdlib
 o test/imm_map_bench.cmi test/imm_map_bench.cmj : cc test/imm_map_bench.ml | $stdlib

jscomp/test/hello_res.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var List = require("../../lib/js/list.js");
+
+var b = List.length({
+      hd: 1,
+      tl: {
+        hd: 2,
+        tl: {
+          hd: 3,
+          tl: /* [] */0
+        }
+      }
+    });
+
+var a = b - 1 | 0;
+
+console.log("hello, res");
+
+exports.a = a;
+/* b Not a pure module */

jscomp/test/hello_res.res

@@ -0,0 +1,4 @@
+
+let b = List.length(list{1,2,3})
+let a = b - 1
+Js.log ("hello, res")

jscomp/test/hello_res.resi

@@ -0,0 +1 @@
+let a : int

lib/4.06.1/unstable/bspack.ml

@@ -11958,6 +11958,7 @@ val as_ppx : bool ref
 
 val mono_empty_array : bool ref
 val customize_runtime : string option ref 
+val as_pp: bool ref
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -12053,6 +12054,8 @@ let as_ppx = ref false
 let mono_empty_array = ref true
 
 let customize_runtime = ref None 
+
+let as_pp = ref false
 end
 module Map_gen : sig 
 #1 "map_gen.mli"

lib/4.06.1/unstable/js_compiler.ml

@@ -17802,6 +17802,7 @@ val as_ppx : bool ref
 
 val mono_empty_array : bool ref
 val customize_runtime : string option ref 
+val as_pp: bool ref
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -17897,6 +17898,8 @@ let as_ppx = ref false
 let mono_empty_array = ref true
 
 let customize_runtime = ref None 
+
+let as_pp = ref false
 end
 module Bs_cmi_load
 = struct