wip: await AST

Author: cristianoc

analysis/src/CompletionFrontEnd.ml

@@ -312,11 +312,12 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
     if List.length exprs = List.length exprsAsContextPaths then
       Some (CTuple exprsAsContextPaths)
     else None
+  | Pexp_await e -> exprToContextPathInner ~inJsxContext e
   | _ -> None
 
 and exprToContextPath ~(inJsxContext : bool) (e : Parsetree.expression) =
   match
-    ( Res_parsetree_viewer.has_await_attribute e.pexp_attributes,
+    ( Res_parsetree_viewer.has_await_attribute e,
       exprToContextPathInner ~inJsxContext e )
   with
   | true, Some ctxPath -> Some (CPAwait ctxPath)

analysis/src/Utils.ml

@@ -111,6 +111,7 @@ let identifyPexp pexp =
   | Pexp_pack _ -> "Pexp_pack"
   | Pexp_extension _ -> "Pexp_extension"
   | Pexp_open _ -> "Pexp_open"
+  | Pexp_await _ -> "Pexp_await"
 
 let identifyPpat pat =
   match pat with

compiler/frontend/bs_ast_mapper.ml

@@ -366,6 +366,7 @@ 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 e -> await ~loc ~attrs (sub.expr sub e)
 end
 
 module P = struct

compiler/frontend/bs_builtin_ppx.ml

@@ -177,7 +177,7 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
   (* module M = await Belt.List *)
   | Pexp_letmodule
       (lid, ({pmod_desc = Pmod_ident {txt}; pmod_attributes} as me), expr)
-    when Res_parsetree_viewer.has_await_attribute pmod_attributes ->
+    when Res_parsetree_viewer.has_await_attribute2 pmod_attributes ->
     let safe_module_type_lid : Ast_helper.lid =
       {txt = Lident (local_module_type_name txt); loc = me.pmod_loc}
     in
@@ -201,8 +201,8 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
            pmod_attributes = attrs2;
          } as me),
         expr )
-    when Res_parsetree_viewer.has_await_attribute attrs1
-         || Res_parsetree_viewer.has_await_attribute attrs2 ->
+    when Res_parsetree_viewer.has_await_attribute2 attrs1
+         || Res_parsetree_viewer.has_await_attribute2 attrs2 ->
     {
       e with
       pexp_desc =
@@ -242,10 +242,12 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
          || Ast_attributes.has_await_payload attrs2 ->
     check_await ();
     result
-  | _ when Ast_attributes.has_await_payload e.pexp_attributes ->
-    check_await ();
-    Ast_await.create_await_expression result
-  | _ -> result
+  | _ -> (
+    match result.pexp_desc with
+    | Pexp_await e ->
+      check_await ();
+      Ast_await.create_await_expression e
+    | _ -> result)
 
 let typ_mapper (self : mapper) (typ : Parsetree.core_type) =
   Ast_core_type_class_type.typ_mapper self typ
@@ -493,7 +495,7 @@ let rec structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t)
     | Pstr_module
         ({pmb_expr = {pmod_desc = Pmod_ident {txt; loc}; pmod_attributes} as me}
          as mb)
-      when Res_parsetree_viewer.has_await_attribute pmod_attributes ->
+      when Res_parsetree_viewer.has_await_attribute2 pmod_attributes ->
       let item = self.structure_item self item in
       let safe_module_type_name = local_module_type_name txt in
       let has_local_module_name =
@@ -544,7 +546,8 @@ let rec structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t)
                 ( _,
                   ({pmod_desc = Pmod_ident {txt; loc}; pmod_attributes} as me),
                   expr )
-              when Res_parsetree_viewer.has_await_attribute pmod_attributes -> (
+              when Res_parsetree_viewer.has_await_attribute2 pmod_attributes
+              -> (
               let safe_module_type_name = local_module_type_name txt in
               let has_local_module_name =
                 Hashtbl.find_opt !await_context safe_module_type_name

compiler/ml/ast_helper.ml

@@ -180,7 +180,7 @@ module Exp = struct
   let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
   let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_open (a, b, c))
   let extension ?loc ?attrs a = mk ?loc ?attrs (Pexp_extension a)
-
+  let await ?loc ?attrs a = mk ?loc ?attrs (Pexp_await a)
   let case lhs ?guard rhs = {pc_lhs = lhs; pc_guard = guard; pc_rhs = rhs}
 end
 

compiler/ml/ast_helper.mli

@@ -210,6 +210,7 @@ module Exp : sig
   val extension : ?loc:loc -> ?attrs:attrs -> extension -> expression
 
   val case : pattern -> ?guard:expression -> expression -> case
+  val await : ?loc:loc -> ?attrs:attrs -> expression -> expression
 end
 
 (** Value declarations *)

compiler/ml/ast_iterator.ml

@@ -344,6 +344,7 @@ module E = struct
       iter_loc sub lid;
       sub.expr sub e
     | Pexp_extension x -> sub.extension sub x
+    | Pexp_await e -> sub.expr sub e
 end
 
 module P = struct

compiler/ml/ast_mapper.ml

@@ -329,6 +329,7 @@ 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 e -> await ~loc ~attrs (sub.expr sub e)
 end
 
 module P = struct

compiler/ml/ast_mapper_to0.ml

@@ -407,6 +407,7 @@ 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
 end
 
 module P = struct

compiler/ml/depend.ml

@@ -289,6 +289,7 @@ let rec add_expr bv exp =
     | Pstr_eval ({pexp_desc = Pexp_construct (c, None)}, _) -> add bv c
     | _ -> handle_extension e)
   | Pexp_extension e -> handle_extension e
+  | Pexp_await e -> add_expr bv e
 
 and add_cases bv cases = List.iter (add_case bv) cases