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/initial_check.ml | |
| 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/initial_check.ml')
| -rw-r--r-- | src/initial_check.ml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/initial_check.ml b/src/initial_check.ml index a0d4d312..0e37b418 100644 --- a/src/initial_check.ml +++ b/src/initial_check.ml @@ -277,8 +277,10 @@ and to_ast_effects (k_env : kind Envmap.t) (e : Parse_ast.atyp) : Ast.effect = | Parse_ast.BE_rreg -> BE_rreg | Parse_ast.BE_wreg -> BE_wreg | Parse_ast.BE_rmem -> BE_rmem + | Parse_ast.BE_rmemt -> BE_rmemt | Parse_ast.BE_wmem -> BE_wmem | Parse_ast.BE_wmv -> BE_wmv + | Parse_ast.BE_wmvt -> BE_wmvt | Parse_ast.BE_eamem -> BE_eamem | Parse_ast.BE_exmem -> BE_exmem | Parse_ast.BE_depend -> BE_depend |