Implement new syntax for importing values from JavaScript modules

.depend

@@ -14,7 +14,7 @@ src/res_comment.cmi :
 src/res_comments_table.cmx : src/res_parsetree_viewer.cmx src/res_doc.cmx \
     src/res_comment.cmx
 src/res_core.cmx : src/res_token.cmx src/res_scanner.cmx src/res_printer.cmx \
-    src/res_parser.cmx src/res_js_ffi.cmx src/res_grammar.cmx src/res_doc.cmx \
+    src/res_parser.cmx src/res_grammar.cmx src/res_doc.cmx \
     src/res_diagnostics.cmx src/res_comments_table.cmx \
     src/res_character_codes.cmx src/res_core.cmi
 src/res_core.cmi : src/res_parser.cmi
@@ -41,7 +41,6 @@ src/res_driver_reason_binary.cmi : src/res_token.cmx src/res_driver.cmi
 src/res_grammar.cmx : src/res_token.cmx
 src/res_io.cmx : src/res_io.cmi
 src/res_io.cmi :
-src/res_js_ffi.cmx :
 src/res_minibuffer.cmx : src/res_minibuffer.cmi
 src/res_minibuffer.cmi :
 src/res_multi_printer.cmx : src/res_printer.cmx src/res_io.cmx \

Makefile

@@ -27,7 +27,6 @@ API_FILES = \
 	src/res_comments_table.cmx\
 	src/res_printer.cmx\
 	src/res_scanner.cmx\
-	src/res_js_ffi.cmx\
 	src/res_parser.cmx\
 	src/res_core.cmx\
 	src/res_driver.cmx \

src/res_ast_conversion.ml

@@ -332,6 +332,11 @@ let normalize =
           )}, _) -> false
         | _ ->true
       )
+      |> List.map (fun attr -> match attr with
+        | ({Location.txt = "bs.module"} as loc, payload) ->
+          ({loc with txt = "module"}, payload)
+        | attr -> attr
+      )
       |> default_mapper.attributes mapper
     );
     pat = begin fun mapper p ->