Fix build errors

Author: shulhi

analysis/src/Utils.ml

@@ -95,6 +95,7 @@ let identifyPexp pexp =
   | Pexp_record _ -> "Pexp_record"
   | Pexp_field _ -> "Pexp_field"
   | Pexp_setfield _ -> "Pexp_setfield"
+  | Pexp_index _ -> "Pexp_index"
   | Pexp_array _ -> "Pexp_array"
   | Pexp_ifthenelse _ -> "Pexp_ifthenelse"
   | Pexp_sequence _ -> "Pexp_sequence"

compiler/frontend/bs_ast_mapper.ml

@@ -350,6 +350,9 @@ module E = struct
       field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
     | Pexp_setfield (e1, lid, e2) ->
       setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
+    | Pexp_index (e1, e2, e3) ->
+      index ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+        (map_opt (sub.expr sub) e3)
     | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
     | Pexp_ifthenelse (e1, e2, e3) ->
       ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)

compiler/ml/ast_mapper_to0.ml

@@ -439,6 +439,27 @@ module E = struct
       field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
     | Pexp_setfield (e1, lid, e2) ->
       setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
+    | Pexp_index (e1, e2, e3) -> (
+      (* Map back to Array.get/Array.set for parsetree0 compatibility *)
+      let container = sub.expr sub e1 in
+      let index = sub.expr sub e2 in
+      match e3 with
+      | None ->
+        (* Read: Array.get(container, index) *)
+        let array_get =
+          ident ~loc
+            (mknoloc (Longident.Ldot (Longident.Lident "Array", "get")))
+        in
+        apply ~loc ~attrs array_get [(Nolabel, container); (Nolabel, index)]
+      | Some value ->
+        (* Write: Array.set(container, index, value) *)
+        let array_set =
+          ident ~loc
+            (mknoloc (Longident.Ldot (Longident.Lident "Array", "set")))
+        in
+        let value_expr = sub.expr sub value in
+        apply ~loc ~attrs array_set
+          [(Nolabel, container); (Nolabel, index); (Nolabel, value_expr)])
     | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
     | Pexp_ifthenelse (e1, e2, e3) ->
       ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)

compiler/ml/depend.ml

@@ -248,6 +248,10 @@ let rec add_expr bv exp =
     add_expr bv e1;
     add bv fld;
     add_expr bv e2
+  | Pexp_index (e1, e2, e3) ->
+    add_expr bv e1;
+    add_expr bv e2;
+    add_opt add_expr bv e3
   | Pexp_array el -> List.iter (add_expr bv) el
   | Pexp_ifthenelse (e1, e2, opte3) ->
     add_expr bv e1;

compiler/ml/printtyped.ml

@@ -329,6 +329,16 @@ and expression i ppf x =
     expression i ppf e1;
     longident i ppf li;
     expression i ppf e2
+  | Texp_index (e1, e2, e3) -> (
+    line i ppf "Texp_index\n";
+    expression i ppf e1;
+    line i ppf "index:\n";
+    expression i ppf e2;
+    match e3 with
+    | None -> line i ppf "read access\n"
+    | Some e ->
+      line i ppf "write access:\n";
+      expression i ppf e)
   | Texp_array l ->
     line i ppf "Texp_array\n";
     list i expression ppf l

compiler/ml/rec_check.ml

@@ -196,8 +196,8 @@ let rec classify_expression : Typedtree.expression -> sd =
     classify_expression e
   | Texp_ident _ | Texp_for _ | Texp_constant _ | Texp_tuple _ | Texp_array _
   | Texp_construct _ | Texp_variant _ | Texp_record _ | Texp_setfield _
-  | Texp_while _ | Texp_pack _ | Texp_function _ | Texp_extension_constructor _
-    ->
+  | Texp_index _ | Texp_while _ | Texp_pack _ | Texp_function _
+  | Texp_extension_constructor _ ->
     Static
   | Texp_apply {funct = {exp_desc = Texp_ident (_, _, vd)}} when is_ref vd ->
     Static
@@ -273,6 +273,11 @@ let rec expression : Env.env -> Typedtree.expression -> Use.t =
         (join (expression env ifso) (option expression env ifnot)))
   | Texp_setfield (e1, _, _, e2) ->
     Use.(join (inspect (expression env e1)) (inspect (expression env e2)))
+  | Texp_index (e1, e2, e3) ->
+    Use.(
+      join
+        (join (inspect (expression env e1)) (inspect (expression env e2)))
+        (inspect (option expression env e3)))
   | Texp_sequence (e1, e2) ->
     Use.(join (discard (expression env e1)) (expression env e2))
   | Texp_while (e1, e2) ->

compiler/ml/typedtreeIter.ml

@@ -261,6 +261,12 @@ end = struct
     | Texp_setfield (exp1, _, _label, exp2) ->
       iter_expression exp1;
       iter_expression exp2
+    | Texp_index (exp1, exp2, expo) -> (
+      iter_expression exp1;
+      iter_expression exp2;
+      match expo with
+      | None -> ()
+      | Some exp -> iter_expression exp)
     | Texp_array list -> List.iter iter_expression list
     | Texp_ifthenelse (exp1, exp2, expo) -> (
       iter_expression exp1;