diff options
| author | Thomas Bauereiss | 2019-01-09 13:05:24 +0000 |
|---|---|---|
| committer | Thomas Bauereiss | 2019-01-09 13:05:24 +0000 |
| commit | def64efa7620f6cce2b58d4158ce6df3a1d9847d (patch) | |
| tree | f0bf4252f8cc3baba406117acf343a285a633dd3 /src/parser.mly | |
| parent | 886cff213039c034bc78408ea52689514e0c9a69 (diff) | |
| parent | 5aa29f88c1e31bb9435929f86325f499dccf6d50 (diff) | |
Merge sail2 into monads
Diffstat (limited to 'src/parser.mly')
| -rw-r--r-- | src/parser.mly | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/parser.mly b/src/parser.mly index 66902953..3ad0931a 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -183,7 +183,7 @@ let rec desugar_rchain chain s e = %token Pure Register Return Scattered Sizeof Struct Then True TwoCaret TYPE Typedef %token Undefined Union Newtype With Val Constant Constraint Throw Try Catch Exit Bitfield %token Barr Depend Rreg Wreg Rmem Rmemt Wmem Wmv Wmvt Eamem Exmem Undef Unspec Nondet Escape -%token Repeat Until While Do Mutual Var Ref Configuration +%token Repeat Until While Do Mutual Var Ref Configuration TerminationMeasure %nonassoc Then %nonassoc Else @@ -1430,6 +1430,8 @@ def: { DEF_internal_mutrec $3 } | Pragma { DEF_pragma (fst $1, snd $1, loc $startpos $endpos) } + | TerminationMeasure id pat Eq exp + { DEF_measure ($2, $3, $5) } defs_list: | def |