[] and [<-] are again syntactic sugar for set and get

another birthday gift for François

drivers/alt_ergo_trunk.drv

 import "alt_ergo.drv"
 
 theory map.Map
-  syntax type  map    "(%1,%2) farray"
-  syntax logic ([])   "(%1[%2])"
-  syntax logic ([<-]) "(%1[%2 <- %3])"
+  syntax type  map "(%1,%2) farray"
+  syntax logic get "(%1[%2])"
+  syntax logic set "(%1[%2 <- %3])"
 end
 
 (*

drivers/cvc3_bare.drv

@@ -134,11 +134,11 @@ end
 
 theory map.Map
   syntax type map "(ARRAY %1 OF %2)"
-  meta "encoding : lskept" logic ([])
-  meta "encoding : lskept" logic ([<-])
+  meta "encoding : lskept" logic get
+  meta "encoding : lskept" logic set
 
-  syntax logic ([])   "(%1[%2])"
-  syntax logic ([<-]) "(%1 WITH [%2] := %3)"
+  syntax logic get "(%1[%2])"
+  syntax logic set "(%1 WITH [%2] := %3)"
 end
 
 (*

drivers/z3_bare.drv

@@ -150,13 +150,13 @@ end
 
 theory map.Map
   syntax type map "(Array %1 %2)"
-  meta "encoding : lskept" logic ([])
-  meta "encoding : lskept" logic ([<-])
+  meta "encoding : lskept" logic get
+  meta "encoding : lskept" logic set
   meta "encoding : lskept" logic const
 
-  syntax logic ([])   "(select %1 %2)"
-  syntax logic ([<-]) "(store %1 %2 %3)"
-  syntax logic const  "(const[%t0] %1)"
+  syntax logic get   "(select %1 %2)"
+  syntax logic set   "(store %1 %2 %3)"
+  syntax logic const "(const[%t0] %1)"
 end
 
 

modules/array.mlw

@@ -8,15 +8,20 @@ module Array
 
   type array 'a model {| length : int; mutable elts : map int 'a |}
 
-  logic ([]) (a: array 'a) (i :int) : 'a = M.([]) a.elts i
-  logic ([<-]) (a: array 'a) (i :int) (v: 'a) : array 'a =
-    {| a with elts = M.([<-]) a.elts i v |}
+  logic get (a: array 'a) (i: int) : 'a = M.get a.elts i
+
+  logic set (a: array 'a) (i: int) (v: 'a) : array 'a =
+    {| a with elts = M.set a.elts i v |}
+
+  (* syntactic sugar *)
+  logic ([]) (a: array 'a) (i: int) : 'a = get a i
+  logic ([<-]) (a: array 'a) (i: int) (v: 'a) : array 'a = set a i v
 
   parameter ([]) : a:array 'a -> i:int ->
     { 0 <= i < length a } 'a reads a { result = a[i] }
 
   parameter ([]<-) : a:array 'a -> i:int -> v:'a ->
-    { 0 <= i < length a } unit writes a { a.elts = M.([<-]) (old a.elts) i v }
+    { 0 <= i < length a } unit writes a { a.elts = M.set (old a.elts) i v }
 
   (* unsafe get/set operations with no precondition *)
   exception OutOfBounds

theories/map.why

@@ -3,12 +3,12 @@ theory Map "Theory of maps"
 
   type map 'a 'b
 
-  logic ([]) (map 'a 'b) 'a : 'b
-  logic ([<-]) (map 'a 'b) 'a 'b : map 'a 'b
+  logic get (map 'a 'b) 'a : 'b
+  logic set (map 'a 'b) 'a 'b : map 'a 'b
 
-  (* aliases to use under qualifiers *)
-  logic get (a : map 'a 'b) (i : 'a) : 'b = a[i]
-  logic set (a : map 'a 'b) (i : 'a) (v : 'b) : map 'a 'b = a[i <- v]
+  (* syntactic sugar *)
+  logic ([])   (a : map 'a 'b) (i : 'a) : 'b = get a i
+  logic ([<-]) (a : map 'a 'b) (i : 'a) (v : 'b) : map 'a 'b = set a i v
 
   axiom Select_eq :
     forall m : map 'a 'b. forall a1 a2 : 'a.
@@ -67,7 +67,7 @@ theory MapPermut
 
   inductive permut_sub (map int 'a) (map int 'a) int int =
   | permut_refl :
-      forall a1 a2 : map int 'a. forall l u : int. 
+      forall a1 a2 : map int 'a. forall l u : int.
       map_eq_sub a1 a2 l u -> permut_sub a1 a2 l u
   | permut_sym :
       forall a1 a2 : map int 'a. forall l u : int.