diff options
| author | Shaked Flur | 2017-05-24 16:45:22 +0100 |
|---|---|---|
| committer | Shaked Flur | 2017-05-24 16:45:22 +0100 |
| commit | b400be4ea3917ace2237149e11dd5e1ab4e35078 (patch) | |
| tree | 2baa7860e625b180c26f61acbc44db347fccfb6b /src/parser.mly | |
| parent | 9cffd54c6170f8a5cdcc6e54cb9077b62bf6a284 (diff) | |
| parent | e9b40edcc325bfe5a0e3566c61ee12a236c5ddf8 (diff) | |
Merge branch 'master' of bitbucket.org:Peter_Sewell/sail
# Conflicts:
# src/lem_interp/interp.lem
# src/lem_interp/interp_inter_imp.lem
# src/lem_interp/interp_interface.lem
# src/parser.mly
# src/pretty_print_lem.ml
Diffstat (limited to 'src/parser.mly')
| -rw-r--r-- | src/parser.mly | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/parser.mly b/src/parser.mly index fce6ff9d..bd68cfdc 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -132,7 +132,7 @@ let make_vector_sugar order_set is_inc typ typ1 = %token Enumerate Else Exit Extern False Forall Foreach Function_ If_ In IN Inc Let_ Member Nat Order %token Pure Rec Register Return Scattered Sizeof Struct Switch Then True TwoStarStar Type TYPE Typedef %token Undefined Union With Val -%token Barr Depend Rreg Wreg Rmem Wmem Wmv Eamem Exmem Undef Unspec Nondet Escape +%token Barr Depend Rreg Wreg Rmem Rmemt Wmem Wmv Wmvt Eamem Exmem Undef Unspec Nondet Escape /* Avoid shift/reduce conflict - see right_atomic_exp rule */ @@ -309,10 +309,14 @@ effect: { efl BE_wreg } | Rmem { efl BE_rmem } + | Rmemt + { efl BE_rmemt } | Wmem { efl BE_wmem } | Wmv { efl BE_wmv } + | Wmvt + { efl BE_wmvt } | Eamem { efl BE_eamem } | Exmem |