Merge pull request #4202 from rickyvetter/ref_ppx_fix

allow forward ref with any name

Author: bobzhang

jscomp/runtime/release.ninja

@@ -37,7 +37,7 @@ build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml |
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 build runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_char.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_primitive.cmj runtime/caml_string_extern.cmj runtime/caml_utils.cmj runtime/js.cmj
+build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_primitive.cmj runtime/caml_string_extern.cmj runtime/caml_utils.cmj runtime/js.cmj
 build runtime/caml_int64.cmi : cc runtime/caml_int64.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/curry.cmj runtime/js.cmj
 build runtime/caml_io.cmi : cc runtime/caml_io.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -59,7 +59,7 @@ build runtime/caml_primitive.cmj : cc_cmi runtime/caml_primitive.ml | runtime/ca
 build runtime/caml_primitive.cmi : cc runtime/caml_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_splice_call.cmj : cc_cmi runtime/caml_splice_call.ml | runtime/caml_obj_extern.cmj runtime/caml_splice_call.cmi
 build runtime/caml_splice_call.cmi : cc runtime/caml_splice_call.mli | runtime/bs_stdlib_mini.cmi runtime/caml_obj_extern.cmj runtime/js.cmi runtime/js.cmj
-build runtime/caml_string.cmj : cc_cmi runtime/caml_string.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_char.cmj runtime/caml_string.cmi runtime/caml_string_extern.cmj
+build runtime/caml_string.cmj : cc_cmi runtime/caml_string.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_string.cmi runtime/caml_string_extern.cmj
 build runtime/caml_string.cmi : cc runtime/caml_string.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.ml | runtime/caml_array_extern.cmj runtime/caml_builtin_exceptions.cmj runtime/caml_nativeint_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_sys.cmi : cc runtime/caml_sys.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj

jscomp/syntax/reactjs_jsx_ppx.cppo.ml

@@ -744,7 +744,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =

lib/4.06.1/unstable/js_compiler.ml

@@ -410211,7 +410211,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =
@@ -411309,7 +411309,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -410211,7 +410211,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =
@@ -411309,7 +411309,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =

lib/4.06.1/whole_compiler.ml

@@ -413950,7 +413950,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =
@@ -415048,7 +415048,7 @@ let jsxMapper () =
         | None -> namedArgListWithKeyAndRef
         in
         let namedArgListWithKeyAndRefForNew = match forwardRef with
-        | Some(_) -> namedArgList @ [(nolabel, None, Pat.var {txt = "ref"; loc = emptyLoc}, "ref", emptyLoc, None)]
+        | Some(txt) -> namedArgList @ [(nolabel, None, Pat.var {txt; loc = emptyLoc}, txt, emptyLoc, None)]
         | None -> namedArgList
         in
         let pluckArg (label, _, _, alias, loc, _) =