cleanup

Author: cristianoc

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Remove `Stdlib_Char` module for now. https://github.com/rescript-lang/rescript/pull/7367
 - Convert internal JavaScript codebase into ESM, ReScript package itself is now ESM (`"type": "module"`). https://github.com/rescript-lang/rescript/pull/6899
 - Add built-in support for the JavaScript `in` operator. https://github.com/rescript-lang/rescript/pull/7342
+- AST cleanup: add `Pexp_await` ast node instead of `res.await` attribute. (The attribute is still used for await on modules currently).
 
 #### :nail_care: Polish
 

analysis/src/CompletionFrontEnd.ml

@@ -317,7 +317,7 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
 
 and exprToContextPath ~(inJsxContext : bool) (e : Parsetree.expression) =
   match
-    ( Res_parsetree_viewer.has_await_attribute e,
+    ( Res_parsetree_viewer.expr_is_await e,
       exprToContextPathInner ~inJsxContext e )
   with
   | true, Some ctxPath -> Some (CPAwait ctxPath)

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_attribute2 pmod_attributes ->
+    when Res_parsetree_viewer.has_await_attribute 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_attribute2 attrs1
-         || Res_parsetree_viewer.has_await_attribute2 attrs2 ->
+    when Res_parsetree_viewer.has_await_attribute attrs1
+         || Res_parsetree_viewer.has_await_attribute attrs2 ->
     {
       e with
       pexp_desc =
@@ -495,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_attribute2 pmod_attributes ->
+      when Res_parsetree_viewer.has_await_attribute 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 =
@@ -546,8 +546,7 @@ 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_attribute2 pmod_attributes
-              -> (
+              when Res_parsetree_viewer.has_await_attribute 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_uncurried.ml

@@ -19,8 +19,3 @@ let expr_is_uncurried_fun (expr : Parsetree.expression) =
   match expr.pexp_desc with
   | Pexp_fun {arity = Some _} -> true
   | _ -> false
-
-let expr_extract_uncurried_fun (expr : Parsetree.expression) =
-  match expr.pexp_desc with
-  | Pexp_fun {arity = Some _} -> expr
-  | _ -> assert false

compiler/syntax/src/res_parens.ml

@@ -56,7 +56,7 @@ let call_expr expr =
     } ->
       Parenthesized
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
-    | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | _ -> Nothing)
 
 let structure_expr expr =
@@ -108,7 +108,7 @@ let unary_expr_operand expr =
        | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
-    | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | _ -> Nothing)
 
 let binary_expr_operand ~is_lhs expr =
@@ -131,7 +131,7 @@ let binary_expr_operand ~is_lhs expr =
     | expr when ParsetreeViewer.is_binary_expression expr -> Parenthesized
     | expr when ParsetreeViewer.is_ternary_expr expr -> Parenthesized
     | {pexp_desc = Pexp_lazy _ | Pexp_assert _} when is_lhs -> Parenthesized
-    | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | {Parsetree.pexp_attributes = attrs} ->
       if ParsetreeViewer.has_printable_attributes attrs then Parenthesized
       else Nothing)
@@ -226,7 +226,7 @@ let lazy_or_assert_or_await_expr_rhs ?(in_await = false) expr =
        | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
-    | _ when (not in_await) && ParsetreeViewer.has_await_attribute expr ->
+    | _ when (not in_await) && ParsetreeViewer.expr_is_await expr ->
       Parenthesized
     | _ -> Nothing)
 
@@ -272,7 +272,7 @@ let field_expr expr =
        | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
-    | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | _ -> Nothing)
 
 let set_field_expr_rhs expr =
@@ -333,7 +333,7 @@ let jsx_prop_expr expr =
       }
         when starts_with_minus x ->
         Parenthesized
-      | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+      | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
       | {
        Parsetree.pexp_desc =
          ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
@@ -370,7 +370,7 @@ let jsx_child_expr expr =
       }
         when starts_with_minus x ->
         Parenthesized
-      | _ when ParsetreeViewer.has_await_attribute expr -> Parenthesized
+      | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
       | {
        Parsetree.pexp_desc =
          ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _

compiler/syntax/src/res_parsetree_viewer.ml

@@ -65,22 +65,17 @@ let functor_type modtype =
   in
   process [] modtype
 
-let has_await_attribute2 attrs =
+let has_await_attribute attrs =
   List.exists
     (function
       | {Location.txt = "res.await"}, _ -> true
       | _ -> false)
     attrs
 
-let has_await_attribute e =
-  (match e.pexp_desc with
+let expr_is_await e =
+  match e.pexp_desc with
   | Pexp_await _ -> true
-  | _ -> false)
-  || List.exists
-       (function
-         | {Location.txt = "res.await"}, _ -> true
-         | _ -> false)
-       e.pexp_attributes
+  | _ -> false
 
 let has_inline_record_definition_attribute attrs =
   List.exists
@@ -121,12 +116,7 @@ let collect_list_expressions expr =
 
 (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
 let rewrite_underscore_apply expr =
-  let expr_fun =
-    if Ast_uncurried.expr_is_uncurried_fun expr then
-      Ast_uncurried.expr_extract_uncurried_fun expr
-    else expr
-  in
-  match expr_fun.pexp_desc with
+  match expr.pexp_desc with
   | Pexp_fun
       {
         arg_label = Nolabel;

compiler/syntax/src/res_parsetree_viewer.mli

@@ -14,8 +14,8 @@ val functor_type :
   list
   * Parsetree.module_type
 
-val has_await_attribute : Parsetree.expression -> bool
-val has_await_attribute2 : Parsetree.attributes -> bool
+val expr_is_await : Parsetree.expression -> bool
+val has_await_attribute : Parsetree.attributes -> bool
 val has_inline_record_definition_attribute : Parsetree.attributes -> bool
 val has_res_pat_variant_spread_attribute : Parsetree.attributes -> bool
 val has_dict_pattern_attribute : Parsetree.attributes -> bool

compiler/syntax/src/res_printer.ml

@@ -700,7 +700,7 @@ and print_module_binding ~state ~is_rec module_binding cmt_tbl i =
     match module_binding.pmb_expr with
     | {pmod_desc = Pmod_constraint (mod_expr, mod_type)}
       when not
-             (ParsetreeViewer.has_await_attribute2
+             (ParsetreeViewer.has_await_attribute
                 module_binding.pmb_expr.pmod_attributes) ->
       ( print_mod_expr ~state mod_expr cmt_tbl,
         Doc.concat [Doc.text ": "; print_mod_type ~state mod_type cmt_tbl] )
@@ -2810,12 +2810,8 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
            return_expr_doc;
          ])
   in
-  let uncurried = Ast_uncurried.expr_is_uncurried_fun e in
-  let e_fun =
-    if uncurried then Ast_uncurried.expr_extract_uncurried_fun e else e
-  in
   let printed_expression =
-    match e_fun.pexp_desc with
+    match e.pexp_desc with
     | Pexp_fun
         {
           arg_label = Nolabel;
@@ -2825,7 +2821,7 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
         } ->
       (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
       print_expression_with_comments ~state
-        (ParsetreeViewer.rewrite_underscore_apply e_fun)
+        (ParsetreeViewer.rewrite_underscore_apply e)
         cmt_tbl
     | Pexp_fun _ | Pexp_newtype _ -> print_arrow e
     | Parsetree.Pexp_constant c ->
@@ -3764,7 +3760,7 @@ and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
               (match expr.pexp_desc with
               | Pexp_await _ -> true
               | _ -> false)
-              || ParsetreeViewer.has_await_attribute expr
+              || ParsetreeViewer.expr_is_await expr
             in
             let doc =
               if is_await then
@@ -5301,7 +5297,7 @@ and print_expression_block ~state ~braces expr cmt_tbl =
         match mod_expr.pmod_desc with
         | Pmod_constraint (mod_expr2, mod_type)
           when not
-                 (ParsetreeViewer.has_await_attribute2 mod_expr.pmod_attributes)
+                 (ParsetreeViewer.has_await_attribute mod_expr.pmod_attributes)
           ->
           let name =
             Doc.concat
@@ -5795,7 +5791,7 @@ and print_mod_expr ~state mod_expr cmt_tbl =
     | Pmod_functor _ -> print_mod_functor ~state mod_expr cmt_tbl
   in
   let doc =
-    if ParsetreeViewer.has_await_attribute2 mod_expr.pmod_attributes then
+    if ParsetreeViewer.has_await_attribute mod_expr.pmod_attributes then
       match mod_expr.pmod_desc with
       | Pmod_constraint _ ->
         Doc.concat [Doc.text "await "; Doc.lparen; doc; Doc.rparen]