reorganize mem

fmlab-iis · Aug 8, 2024 · 293bea0 · 293bea0
1 parent 42dea0a
commit 293bea0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/ocaml/parser/common.ml b/ocaml/parser/common.ml
@@ -20,6 +20,7 @@ let string_of_access_pat pats : string =
 
 let rec string_of_type typ =
   match typ with
+  | CharRefAll -> "char * {ref-all}"
   | Void -> "void"
   | Bool -> "_Bool"
   | Char -> "char"

diff --git a/ocaml/parser/gimpleParser.mly b/ocaml/parser/gimpleParser.mly
@@ -84,6 +84,7 @@ var_decl:
 ;
 
 ground_typ:
+| CHAR_REF_ALL                            { CharRefAll }
 | VOID                                    { Void }
 | BOOL                                    { Bool }
 | CHAR                                    { Char }
@@ -203,10 +204,6 @@ mem:
 | MULOP loc                               { Deref (Mem (Void, $2)) }
 | MEM LANGLE typ RANGLE LSQUARE loc RSQUARE
                                           { Mem ($3, $6) }
-| MEM LANGLE typ RANGLE LSQUARE LPAREN CHAR_REF_ALL RPAREN ANDOP loc RSQUARE
-                                          { Ref (Mem ($3, $10)) }
-| MEM LANGLE typ RANGLE LSQUARE LPAREN CHAR_REF_ALL RPAREN loc RSQUARE
-                                          { Mem ($3, $9) }
 ;
 
 loc:

diff --git a/ocaml/parser/syntax.ml b/ocaml/parser/syntax.ml
@@ -4,7 +4,7 @@ type access_t = string
 type attribute_t = access_t list
 
 type type_t = Void | Bool | Char | Uchar | Short | Ushort | Int | Uint
-              | Long | Ulong | Llong | Ullong
+              | Long | Ulong | Llong | Ullong | CharRefAll
               | Sword of int | Uword of int | Bools of int | Ubools of int
               | Const of type_t | Pointer of type_t | Struct of string
               | Vector of Z.t * type_t | Array of Z.t * type_t

diff --git a/ocaml/parser/syntax.mli b/ocaml/parser/syntax.mli
@@ -4,7 +4,7 @@ type access_t = string
 type attribute_t = access_t list
 
 type type_t = Void | Bool | Char | Uchar | Short | Ushort | Int | Uint
-              | Long | Ulong | Llong | Ullong
+              | Long | Ulong | Llong | Ullong | CharRefAll
               | Sword of int | Uword of int | Bools of int | Ubools of int
               | Const of type_t | Pointer of type_t | Struct of string
               | Vector of Z.t * type_t | Array of Z.t * type_t