Removed ArrayScalar node

stringify.ml

@@ -146,8 +146,6 @@ and node2str node =
     "<use:" ^ node2str (FunCall (nameof dec, params, [])) ^ ">"
   | Dim (name, _)                when args.verbose >= 3 ->
     "<dim:" ^ name ^ ">"
-  | ArrayScalar value            when args.verbose >= 3 ->
-    "<scalar:" ^ str value ^ ">"
   | Arg node                     when args.verbose >= 3 ->
     "<arg:" ^ str node ^ ">"
   | VarDecs nodes                when args.verbose >= 3 ->
@@ -162,7 +160,6 @@ and node2str node =
   | FunUse (dec, args, _) ->
     node2str (FunCall (nameof dec, args, []))
   | Dim (name, _) -> name
-  | ArrayScalar node
   | ArrayInit (node, _)
   | Arg node -> str node
 

types.mli

@@ -124,14 +124,14 @@ and node =
     (** Replacement for [FunCall] with declaration. *)
   | VarLet of node * node list option * node * ann
     (** Replacement for [Assign] with declaration. *)
-  | ArrayScalar of node                      (* TODO: remove *)
   | ArrayInit of node * node list
     (** Wrapper for array initalisation with dimensions, used by {!Desug}. *)
   | Cond of node * node * node * ann
     (** cond, true_expr, false_expr [<cond> ? <true_expr> : <false_expr>]
         Used for short-circuit evaluation. *)
   | DummyNode
-    (** Null node, pruned by traversals. *)
+    (** Null node, pruned by {!Util.flatten_blocks}, which is called by
+        {!Util.transform_children} in a traversal. *)
 
 (** {2 Assembly instructions} *)
 

util.ml

@@ -144,8 +144,6 @@ let transform_children trav node =
 
   | ArrayInit (value, dims) ->
     ArrayInit (trav value, dims)
-  | ArrayScalar value ->
-    ArrayScalar (trav value)
   | Var (dec, Some dims, ann) ->
     Var (dec, Some (trav_all dims), ann)
   | VarUse (dec, Some dims, ann) ->
@@ -251,7 +249,6 @@ let rec annof = function
   | FunCall (_, _, ann) -> ann
 
   | ArrayInit (value, _)
-  | ArrayScalar value
   | Expr value
   | Arg value -> annof value