Merge pull request #6 from cknitt/feature/refmt-api

Upgrade to Reason 3.2.0 and directly use Reason parser api

Author: cknitt

.travis.yml

@@ -6,8 +6,6 @@ os:
 - osx
 install:
 - npm install --global esy
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm install --global reason-cli@3.1.0-linux; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm install --global reason-cli@3.1.0-darwin; fi
 - esy install
 script:
 - esy build

bin/Extract.re

@@ -20,27 +20,19 @@ let iterator =
 
 let extractMessages = ast => iterator.structure(iterator, Obj.magic(ast));
 
-let readMessagesFromChannel = channel =>
-  switch (Ast_io.from_channel(channel)) {
-  | Result.Ok((_, Ast_io.Impl((module Version), ast))) =>
-    module Convert = Convert(Version, OCaml_406);
-    let converted = Obj.magic(Convert.copy_structure(ast));
-    extractMessages(converted);
-  | Result.Ok((_, Ast_io.Intf(_, _))) => Printf.eprintf("Interface AST not supported, only implementation AST\n")
-  | Result.Error(Not_a_binary_ast(_)) => Printf.eprintf("Error: input is not a binary AST\n")
-  | Result.Error(Unknown_version(v)) => Printf.eprintf("Error: unknown AST version: %s\n", v)
-  };
-
 let processReasonFile = filename => {
-  let channel = Unix.open_process_in("refmt -p binary " ++ filename);
-  readMessagesFromChannel(channel);
-  Unix.close_process_in(channel) |> ignore;
+  let channel = open_in_bin(filename);
+  let lexbuf = Lexing.from_channel(channel);
+  let ast = Reason_toolchain.RE.implementation(lexbuf);
+  close_in(channel);
+  extractMessages(ast);
 };
 
 let rec processDirectory = dir =>
   Sys.readdir(dir)
   |> Array.iter(filename => {
        let path = Filename.concat(dir, filename);
+
        if (Sys.is_directory(path)) {
          processDirectory(path);
        } else if (Filename.extension(filename) == ".re") {
@@ -55,6 +47,7 @@ let outputJson = () => {
     |> List.map(((_id, message)) => message)
     |> List.sort(Message.compare)
     |> List.map(Message.toJson);
+
   Yojson.Basic.pretty_to_channel(stdout, `List(sortedJsonObjects));
   print_newline();
 };

esy.lock

@@ -4,4 +4,4 @@
  ((name lib)
   (flags (-w -40 -w +26))
   (public_name bs-react-intl-extractor)
-  (libraries (ocaml-migrate-parsetree yojson unix))))
+  (libraries (reason yojson unix))))

lib/jbuild

@@ -14,9 +14,8 @@
   },
   "dependencies": {
     "@esy-ocaml/esy-installer": "^0.0.0",
+    "@esy-ocaml/reason": "^3.2.0",
     "@opam/jbuilder": "^1.0.0-beta14",
-    "@opam/ocaml-migrate-parsetree": "^1.0.10",
-    "@opam/reason": "^3.0.0",
     "@opam/yojson": "^1.4.1",
     "refmterr": "^3.0.4"
   },