Merge branch 'master' into jsx-ast

Author: nojaf

CHANGELOG.md

@@ -10,7 +10,17 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
-# 12.0.0-alpha.9 (Unreleased)
+# 12.0.0-alpha.10 (Unreleased)
+
+#### :rocket: New Feature
+
+- Add popover attributes to JsxDOM.domProps. https://github.com/rescript-lang/rescript/pull/7317
+
+#### :house: Internal
+
+- Clean up legacy tags handling. https://github.com/rescript-lang/rescript/pull/7309
+
+# 12.0.0-alpha.9
 
 #### :boom: Breaking Change
 
@@ -36,14 +46,14 @@
 - Fix runtime type check for Object in untagged variants when one variant case is `null`. https://github.com/rescript-lang/rescript/pull/7303
 - Fix files that were being truncated when sent to the CDN over FTP. https://github.com/rescript-lang/rescript/pull/7306
 - Fix better editor completion for applications. https://github.com/rescript-lang/rescript/pull/7291
-- Fix @react.componentWithProps no longer works with @directive("'use memo'"). https://github.com/rescript-lang/rescript/pull/7300
+- Fix `@react.componentWithProps` no longer works with `@directive("'use memo'")`. https://github.com/rescript-lang/rescript/pull/7300
 
 #### :house: Internal
 
-- Remove ignore in res_scanner.ml . https://github.com/rescript-lang/rescript/pull/7280
+- Remove `ignore` in `res_scanner.ml`. https://github.com/rescript-lang/rescript/pull/7280
 - Use the new stdlib modules in the analysis tests. https://github.com/rescript-lang/rescript/pull/7295
 - Build with OCaml 5.3.0. https://github.com/rescript-lang/rescript/pull/7294
-- Simplify JSON.Decode implementation. https://github.com/rescript-lang/rescript/pull/7304
+- Simplify `JSON.Decode` implementation. https://github.com/rescript-lang/rescript/pull/7304
 
 # 12.0.0-alpha.8
 

CONTRIBUTING.md

@@ -47,7 +47,10 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on
 opam init
 
 # Any recent OCaml version works as a development compiler
-opam switch create 5.3.0 # can also create local switch with opam switch create
+# Can also create local switch with opam switch create
+# If you get "No compiler matching `5.3.0' found" error,
+# then you need to run `opam update && opam upgrade` first
+opam switch create 5.3.0
 
 # Install dev dependencies from OPAM
 opam install . --deps-only --with-test --with-dev-setup -y

compiler/common/bs_version.ml

@@ -21,6 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "12.0.0-alpha.9"
+let version = "12.0.0-alpha.10"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

compiler/core/js_exp_make.ml

@@ -338,9 +338,6 @@ let eight_int_literal : t =
 let nine_int_literal : t =
   {expression_desc = Number (Int {i = 9l; c = None}); comment = None}
 
-let obj_int_tag_literal : t =
-  {expression_desc = Number (Int {i = 248l; c = None}); comment = None}
-
 let int ?comment ?c i : t = {expression_desc = Number (Int {i; c}); comment}
 
 let bigint ?comment sign i : t =
@@ -364,7 +361,6 @@ let small_int i : t =
   | 7 -> seven_int_literal
   | 8 -> eight_int_literal
   | 9 -> nine_int_literal
-  | 248 -> obj_int_tag_literal
   | i -> int (Int32.of_int i)
 
 let true_ : t = {comment = None; expression_desc = Bool true}

compiler/core/js_exp_make.mli

@@ -132,7 +132,6 @@ val zero_int_literal : t
 
 (* val one_int_literal : t *)
 val zero_float_lit : t
-(* val obj_int_tag_literal : t *)
 
 val zero_bigint_literal : t
 

compiler/core/js_of_lam_block.ml

@@ -33,7 +33,7 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args =
 
 let field (field_info : Lam_compat.field_dbg_info) e (i : int32) =
   match field_info with
-  | Fld_tuple | Fld_array ->
+  | Fld_tuple ->
     E.array_index_by_int ?comment:(Lam_compat.str_of_field_info field_info) e i
   | Fld_poly_var_content -> E.poly_var_value_access e
   | Fld_poly_var_tag -> E.poly_var_tag_access e

compiler/core/lam_analysis.ml

@@ -97,8 +97,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
     (* TODO *)
     | Praw_js_code _
     (* byte swap *)
-    | Parraysets | Parraysetu | Poffsetref _ | Praise | Plazyforce | Psetfield _
-      ->
+    | Parraysets | Parraysetu | Poffsetref _ | Praise | Psetfield _ ->
       false)
   | Llet (_, _, arg, body) -> no_side_effects arg && no_side_effects body
   | Lswitch (_, _) -> false

compiler/core/lam_compat.ml

@@ -73,11 +73,10 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_extension
   | Fld_variant
   | Fld_cons
-  | Fld_array
 
 let str_of_field_info (x : field_dbg_info) : string option =
   match x with
-  | Fld_array | Fld_extension | Fld_variant | Fld_cons | Fld_poly_var_tag
+  | Fld_extension | Fld_variant | Fld_cons | Fld_poly_var_tag
   | Fld_poly_var_content | Fld_tuple ->
     None
   | Fld_record {name; _}

compiler/core/lam_compat.mli

@@ -37,7 +37,6 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_extension
   | Fld_variant
   | Fld_cons
-  | Fld_array
 
 val str_of_field_info : field_dbg_info -> string option
 

compiler/core/lam_compile_primitive.ml

@@ -605,13 +605,3 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
     match args with
     | [e1] -> E.runtime_call Primitive_modules.hash "hash_final_mix" args
     | _ -> assert false)
-  | Plazyforce
-  (* FIXME: we don't inline lazy force or at least
-     let buckle handle it
-  *)
-  (* let parm = Ident.create "prim" in
-     Lfunction(Curried, [parm],
-               Matching.inline_lazy_force (Lvar parm) Location.none)
-     It is inlined, this should not appear here *)
-    ->
-    assert false