Restore ast ppx test.

Author: cristianoc

compiler/ml/ast_mapper_from0.ml

@@ -295,11 +295,30 @@ end
 module E = struct
   (* Value expressions for the core language *)
 
-  let map sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
+  let has_await_attribute attrs =
+    List.exists
+      (function
+        | {Location.txt = "res.await"}, _ -> true
+        | _ -> false)
+      attrs
+
+  let remove_await_attribute attrs =
+    List.filter
+      (function
+        | {Location.txt = "res.await"}, _ -> false
+        | _ -> true)
+      attrs
+
+  let map sub ({pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} as e)
+      =
     let open Exp in
     let loc = sub.location sub loc in
     let attrs = sub.attributes sub attrs in
     match desc with
+    | _ when has_await_attribute attrs ->
+      let attrs = remove_await_attribute e.pexp_attributes in
+      let e = sub.expr sub {e with pexp_attributes = attrs} in
+      await ~loc e
     | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
     | Pexp_constant x -> constant ~loc ~attrs (map_constant x)
     | Pexp_let (r, vbs, e) ->

compiler/ml/ast_mapper_to0.ml

@@ -407,7 +407,13 @@ module E = struct
     | Pexp_open (ovf, lid, e) ->
       open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
     | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pexp_await _ -> (* TODO *) assert false
+    | Pexp_await e ->
+      let e = sub.expr sub e in
+      {
+        e with
+        pexp_attributes =
+          (Location.mknoloc "res.await", Pt.PStr []) :: e.pexp_attributes;
+      }
 end
 
 module P = struct

tests/tools_tests/src/expected/TestPpx.res.jsout

@@ -0,0 +1,117 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+'use strict';
+
+let React = require("react");
+
+console.log("ppx test");
+
+console.log("ppx test");
+
+let M = {
+  v: 10
+};
+
+let OptionalFields = {
+  r: {
+    y: 1.0
+  }
+};
+
+function one(x) {
+  return x;
+}
+
+function two(x, y) {
+  return x + y | 0;
+}
+
+let n = 6;
+
+let Arity = {
+  one: one,
+  two: two,
+  n: n
+};
+
+React.useState(() => 0);
+
+async function fpromise(promise, _x) {
+  return await promise;
+}
+
+let Uncurried = {};
+
+async function async_succ(x) {
+  return x + 1 | 0;
+}
+
+async function async_foo(x, y) {
+  let a = async_succ(x);
+  let b = async_succ(y);
+  return await a + await b | 0;
+}
+
+function add(x, y) {
+  return x + y | 0;
+}
+
+function partial_add(extra) {
+  return 3 + extra | 0;
+}
+
+function plus(x, y) {
+  return x + y | 0;
+}
+
+let z = 3;
+
+let Pipe = {
+  plus: plus,
+  z: z
+};
+
+let concat = "ab";
+
+async function test() {
+  return 12;
+}
+
+async function f() {
+  return await test() + 1 | 0;
+}
+
+let a = "A";
+
+let b = "B";
+
+let vv = 10;
+
+let neq = false;
+
+let neq2 = false;
+
+let eq = true;
+
+let eq2 = true;
+
+exports.a = a;
+exports.b = b;
+exports.M = M;
+exports.vv = vv;
+exports.OptionalFields = OptionalFields;
+exports.Arity = Arity;
+exports.fpromise = fpromise;
+exports.Uncurried = Uncurried;
+exports.async_succ = async_succ;
+exports.async_foo = async_foo;
+exports.add = add;
+exports.partial_add = partial_add;
+exports.Pipe = Pipe;
+exports.concat = concat;
+exports.neq = neq;
+exports.neq2 = neq2;
+exports.eq = eq;
+exports.eq2 = eq2;
+exports.test = test;
+exports.f = f;
+/*  Not a pure module */

tests/tools_tests/test.sh

@@ -9,7 +9,7 @@ done
 
 for file in ppx/*.res; do
   output="src/expected/$(basename $file).jsout"
-  ../../cli/bsc -ppx "../../_build/install/default/bin/rescript-tools ppx" $file > $output
+  node ../../cli/bsc.js -ppx "../../_build/install/default/bin/rescript-tools ppx" $file > $output
   # # CI. We use LF, and the CI OCaml fork prints CRLF. Convert.
   if [ "$RUNNER_OS" == "Windows" ]; then
     perl -pi -e 's/\r\n/\n/g' -- $output