Adapt ppx ast conversion that was still missing.

Author: cristianoc

compiler/ml/ast_mapper_from0.ml

@@ -319,16 +319,11 @@ module E = struct
           | [] -> assert false
         in
         match arg1 with
-        | Some ({pexp_desc = Pexp_fun (l, eo, p, e, _)} as e1) ->
+        | Some
+            ({pexp_desc = Pexp_fun (l, eo, p, e, _); pexp_attributes = attrs} as
+             e1) ->
           let arity = attributes_to_arity attrs in
-          {
-            e1 with
-            pexp_desc =
-              Pexp_construct
-                ( lid1,
-                  Some {e with pexp_desc = Pexp_fun (l, eo, p, e, Some arity)}
-                );
-          }
+          {e1 with pexp_desc = Pexp_fun (l, eo, p, e, Some arity)}
         | _ -> exp1)
       | _ -> exp1)
     | Pexp_variant (lab, eo) ->

compiler/ml/ast_mapper_to0.ml

@@ -283,41 +283,43 @@ module E = struct
     | Pexp_constant x -> constant ~loc ~attrs (map_constant x)
     | Pexp_let (r, vbs, e) ->
       let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
-    | Pexp_fun (lab, def, p, e, _) ->
-      fun_ ~loc ~attrs lab
-        (map_opt (sub.expr sub) def)
-        (sub.pat sub p) (sub.expr sub e)
+    | Pexp_fun (lab, def, p, e, arity) -> (
+      let e =
+        fun_ ~loc ~attrs lab
+          (map_opt (sub.expr sub) def)
+          (sub.pat sub p) (sub.expr sub e)
+      in
+      match arity with
+      | None -> e
+      | Some arity ->
+        let arity_to_attributes arity =
+          [
+            ( Location.mknoloc "res.arity",
+              Parsetree0.PStr
+                [
+                  Ast_helper0.Str.eval
+                    (Ast_helper0.Exp.constant
+                       (Pconst_integer (string_of_int arity, None)));
+                ] );
+          ]
+        in
+        let e =
+          {
+            e with
+            pexp_attributes = arity_to_attributes arity @ e.pexp_attributes;
+          }
+        in
+        Ast_helper0.Exp.construct
+          (Location.mkloc (Longident.Lident "Function$") e.pexp_loc)
+          (Some e))
     | Pexp_apply (e, l) ->
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
     | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
     | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
-    | Pexp_construct (lid, arg) -> (
-      let exp0 =
-        construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
-      in
-      match lid.txt with
-      | Lident "Function$" -> (
-        match arg with
-        | Some {pexp_desc = Pexp_fun (_, _, _, _, Some arity)} ->
-          let arity_to_attributes arity =
-            [
-              ( Location.mknoloc "res.arity",
-                Parsetree0.PStr
-                  [
-                    Ast_helper0.Str.eval
-                      (Ast_helper0.Exp.constant
-                         (Pconst_integer (string_of_int arity, None)));
-                  ] );
-            ]
-          in
-          {
-            exp0 with
-            pexp_attributes = arity_to_attributes arity @ exp0.pexp_attributes;
-          }
-        | _ -> assert false)
-      | _ -> exp0)
+    | Pexp_construct (lid, arg) ->
+      construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
     | Pexp_variant (lab, eo) ->
       variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
     | Pexp_record (l, eo) ->

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

@@ -0,0 +1,50 @@
+// 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);
+
+let a = "A";
+
+let b = "B";
+
+let vv = 10;
+
+exports.a = a;
+exports.b = b;
+exports.M = M;
+exports.vv = vv;
+exports.OptionalFields = OptionalFields;
+exports.Arity = Arity;
+/*  Not a pure module */