WIP

Author: hhugo

compiler/lib/js_output.ml

@@ -741,8 +741,9 @@ struct
         let n =
           match k with
           | { async = false; generator = false } -> n
-          | { async = false; generator = true } -> n ^ "*"
-          | { async = true; generator = true | false } -> assert false
+          | { async = false; generator = true } -> "*" ^ n
+          | { async = true; generator = false } -> "async " ^ n
+          | { async = true; generator = true } -> "async* " ^ n
         in
         function_declaration f "" PP.string (Some n) l b loc'
     | PropertySpread e ->

compiler/lib/js_parser.mly

@@ -787,8 +787,12 @@ property_name_and_value:
  | T_SET name=id args=call_signature "{" b=function_body "}" { PropertySet(name,args,b) }
  | name=id args=call_signature "{" b=function_body "}" {
       PropertyMethod(name, (None, {async = false; generator = false}, args, b, p $symbolstartpos)) }
- | name=id "*" args=call_signature "{" b=function_body "}" {
+ | T_ASYNC name=id args=call_signature "{" b=function_body "}" {
+      PropertyMethod(name, (None, {async = true; generator = false}, args, b, p $symbolstartpos)) }
+ | "*" name=id args=call_signature "{" b=function_body "}" {
       PropertyMethod(name, (None, {async = false; generator = true}, args, b, p $symbolstartpos)) }
+ | T_ASYNC "*" name=id args=call_signature "{" b=function_body "}" {
+      PropertyMethod(name, (None, {async = true; generator = true}, args, b, p $symbolstartpos)) }
  | "[" p=assignment_expr "]" ":" e=assignment_expr { PropertyComputed (p,e) }
 (*----------------------------*)
 (* function call *)

compiler/tests-compiler/js_parser_printer.ml

@@ -20,7 +20,12 @@
 open Js_of_ocaml_compiler.Stdlib
 open Js_of_ocaml_compiler
 
-let print ?(report = false) ~compact source =
+let print ?(report = false) ?(invalid = false) ~compact source =
+  let stdout = Util.check_javascript_source source in
+  (match invalid, stdout with
+  | false, _ -> print_endline stdout
+  | true, "" -> print_endline "invalid file but node --check didn't complain"
+  | true, _ -> ());
   let buffer = Buffer.create (String.length source) in
   let pp = Pretty_print.to_buffer buffer in
   Pretty_print.set_compact pp compact;
@@ -29,7 +34,14 @@ let print ?(report = false) ~compact source =
     let parsed = Parse_js.parse lexed in
     Config.Flag.enable "debuginfo";
     let _ = Js_output.program pp parsed in
-    print_endline (Buffer.contents buffer)
+    let s = Buffer.contents buffer in
+    print_endline s;
+    let stdout = Util.check_javascript_source s in
+    (match invalid, stdout with
+    | false, _ -> print_endline stdout
+    | true, "" -> print_endline "invalid file but node --check didn't complain"
+    | true, _ -> ());
+    print_endline stdout
   with Parse_js.Parsing_error pi as e ->
     if report
     then
@@ -132,7 +144,7 @@ let%expect_test "ops" =
     ~compact:false
     {|
     a += a;
-    b ||= b;
+    b ||= true;
     c **= b ** 2;
     1 ** 2;
     (-1) ** 2;
@@ -154,7 +166,7 @@ let%expect_test "ops" =
   [%expect
     {|
     /*<< 2 4>>*/ a += a;
-    /*<< 3 4>>*/ b ||= b;
+    /*<< 3 4>>*/ b ||= true;
     /*<< 4 4>>*/ c **= b ** 2;
     /*<< 5 4>>*/ 1 ** 2;
     /*<< 6 4>>*/ (- 1) ** 2;
@@ -308,7 +320,9 @@ let%expect_test "get/set property" =
        set prop(x) { return x == 2 },
        a : 4,
        b() { return 5},
-       e*() { return 5},
+       *e() { return 5},
+       async e() { return 5},
+       async* e() { return 5},
        ["field" + 1]: 3
      };
 
@@ -322,11 +336,14 @@ let%expect_test "get/set property" =
       set prop(x){ /*<< 4 21>>*/ return x == 2},
       a:4,
       b(){ /*<< 6 13>>*/ return 5 /*<< 6 7>>*/ },
-      e*(){ /*<< 7 14>>*/ return 5 /*<< 7 7>>*/ },
+      *e(){ /*<< 7 14>>*/ return 5 /*<< 7 7>>*/ },
+      async e(){ /*<< 8 19>>*/ return 5 /*<< 8 7>>*/ },
+      async* e(){ /*<< 9 20>>*/ return 5 /*<< 9 7>>*/ },
       ["field" + 1]:3}; |}]
 
 let%expect_test "error reporting" =
-  (try print ~compact:false {|
+  (try
+     print ~invalid:true ~compact:false {|
     var x = 2;
     {
     var = 5;
@@ -404,7 +421,12 @@ let check_vs_string s toks =
   in
   loop 0 0 toks
 
-let parse_print_token ?(extra = false) s =
+let parse_print_token ?(invalid = false) ?(extra = false) s =
+  let stdout = Util.check_javascript_source s in
+  (match invalid, stdout with
+  | false, _ -> print_endline stdout
+  | true, "" -> print_endline "invalid file but node --check didn't complain"
+  | true, _ -> ());
   let lex = Parse_js.Lexer.of_string s in
   let _p, tokens =
     try Parse_js.parse' lex
@@ -446,6 +468,7 @@ let%expect_test "tokens" =
 
 let%expect_test "invalid ident" =
   parse_print_token
+    ~invalid:true
     {|
     var \uD83B\uDE62 = 42; // invalid surrogate escape sequence
     var \u{1F42B} = 2; // U+1F42B is not a valid id
@@ -473,7 +496,7 @@ let%expect_test "string" =
     5: 4:var, 8:a, 10:=, 12:"munpi\207\128\207\128\207\128qtex", 26:;, |}]
 
 let%expect_test "multiline string" =
-  parse_print_token {|
+  parse_print_token ~invalid:true {|
     42;
     "
     ";
@@ -497,7 +520,7 @@ let%expect_test "multiline string" =
     3: 4:"    ",
     4: 5:;,
     5: 4:42, 0:;, |}];
-  parse_print_token {|
+  parse_print_token ~invalid:true {|
     42;
     "
 
@@ -588,7 +611,7 @@ let%expect_test "virtual semicolon" =
     return 2
     return
     2
-
+a:while(true){
     continue;
     continue a
     continue
@@ -598,7 +621,7 @@ let%expect_test "virtual semicolon" =
     break a
     break
     a
-
+}
     throw 2;
     throw 2
 
@@ -618,6 +641,7 @@ let%expect_test "virtual semicolon" =
      3: 4:return, 11:2, 0:; (virtual),
      4: 4:return, 0:; (virtual),
      5: 4:2, 0:; (virtual),
+     6: 0:a (identifier), 1::, 2:while, 7:(, 8:true, 12:), 13:{,
      7: 4:continue, 12:;,
      8: 4:continue, 13:a (identifier), 0:; (virtual),
      9: 4:continue, 0:; (virtual),
@@ -626,6 +650,7 @@ let%expect_test "virtual semicolon" =
     13: 4:break, 10:a (identifier), 0:; (virtual),
     14: 4:break, 0:; (virtual),
     15: 4:a (identifier), 0:; (virtual),
+    16: 0:},
     17: 4:throw, 10:2, 11:;,
     18: 4:throw, 10:2, 0:; (virtual),
     20: 4:{, 6:1, 0:; (virtual),

compiler/tests-compiler/util/util.ml

@@ -172,7 +172,7 @@ let channel_to_string c_in =
   (try loop () with End_of_file -> ());
   Buffer.contents buffer
 
-let exec_to_string_exn ~fail ~cmd =
+let exec_to_string_exn ?input ~fail ~cmd () =
   let build_path_prefix_map = "BUILD_PATH_PREFIX_MAP=" in
   let cwd = Sys.getcwd () in
   let build_path =
@@ -204,7 +204,12 @@ let exec_to_string_exn ~fail ~cmd =
     | WSTOPPED i ->
         Format.sprintf "%s\nprocess stopped with signal number %d\n %s\n" std_out i cmd
   in
-  let ((proc_in, _, proc_err) as proc_full) = Unix.open_process_full cmd env in
+  let ((proc_in, oc, proc_err) as proc_full) = Unix.open_process_full cmd env in
+  (match input with
+  | None -> ()
+  | Some s ->
+      output_string oc s;
+      close_out oc);
   let results = channel_to_string proc_in in
   let results' = channel_to_string proc_err in
   let exit_status = Unix.close_process_full proc_full in
@@ -229,11 +234,22 @@ let run_javascript file =
   exec_to_string_exn
     ~fail:false
     ~cmd:(Format.sprintf "%s %s" node (Filetype.path_of_js_file file))
+    ()
+
+let check_javascript file =
+  exec_to_string_exn
+    ~fail:false
+    ~cmd:(Format.sprintf "%s --check %s" node (Filetype.path_of_js_file file))
+    ()
+
+let check_javascript_source source =
+  exec_to_string_exn ~input:source ~fail:false ~cmd:(Format.sprintf "%s --check" node) ()
 
 let run_bytecode file =
   exec_to_string_exn
     ~fail:false
     ~cmd:(Format.sprintf "%s %s" ocamlrun (Filetype.path_of_bc_file file))
+    ()
 
 let swap_extention filename ~ext =
   Format.sprintf "%s.%s" (Filename.remove_extension filename) ext
@@ -296,11 +312,16 @@ let compile_to_javascript
   in
   let cmd = Format.sprintf "%s %s %s -o %s" compiler_location extra_args file out_file in
 
-  let stdout = exec_to_string_exn ~fail:true ~cmd in
+  let stdout = exec_to_string_exn ~fail:true ~cmd () in
   print_string stdout;
   (* this print shouldn't do anything, so if
      something weird happens, we'll get the results here *)
-  Filetype.js_file_of_path out_file
+  let jsfile = Filetype.js_file_of_path out_file in
+  let stdout = check_javascript jsfile in
+  print_string stdout;
+  (* this print shouldn't do anything, so if
+     something weird happens, we'll get the results here *)
+  jsfile
 
 let jsoo_minify ?(flags = []) ~pretty file =
   let file = Filetype.path_of_js_file file in
@@ -312,7 +333,7 @@ let jsoo_minify ?(flags = []) ~pretty file =
   in
   let cmd = Format.sprintf "%s %s %s -o %s" compiler_location extra_args file out_file in
 
-  let stdout = exec_to_string_exn ~fail:true ~cmd in
+  let stdout = exec_to_string_exn ~fail:true ~cmd () in
   print_string stdout;
   (* this print shouldn't do anything, so if
      something weird happens, we'll get the results here *)
@@ -356,6 +377,7 @@ let compile_ocaml_to_cmo ?(debug = true) file =
            (if debug then "-g" else "")
            file
            out_file)
+      ()
   in
   print_string stdout;
   Filetype.cmo_file_of_path out_file
@@ -374,6 +396,7 @@ let compile_ocaml_to_bc ?(debug = true) ?(unix = false) file =
            (if unix then "-I +unix unix.cma" else "")
            file
            out_file)
+      ()
   in
   print_string stdout;
   Filetype.bc_file_of_path out_file
@@ -389,6 +412,7 @@ let compile_lib list name =
            ocamlc
            (String.concat ~sep:" " (List.map ~f:Filetype.path_of_cmo_file list))
            out_file)
+      ()
   in
   print_string stdout;
   Filetype.cmo_file_of_path out_file

compiler/tests-compiler/util/util.mli

@@ -57,6 +57,10 @@ val extract_sourcemap : Filetype.js_file -> Js_of_ocaml_compiler.Source_map.t op
 
 val run_javascript : Filetype.js_file -> string
 
+val check_javascript : Filetype.js_file -> string
+
+val check_javascript_source : string -> string
+
 val expression_to_string : ?compact:bool -> Javascript.expression -> string
 
 val print_file : string -> unit