summaryrefslogtreecommitdiff
path: root/language/l2_typ.ott
diff options
context:
space:
mode:
authorChristopher Pulte2016-09-25 15:14:25 +0100
committerChristopher Pulte2016-09-25 15:14:25 +0100
commit1cc29db33dd0f03d70314204f5d29a21a31857e4 (patch)
treef54cd47521c61f7d0d9bc1419325af93af112e0a /language/l2_typ.ott
parentdd052bfc3e00a1ae988044ae81dd1624332dd899 (diff)
parentd68d1e959091b186ebb5cbecf53992307b852f0d (diff)
Merge branch 'master' of https://bitbucket.org/Peter_Sewell/sail
Diffstat (limited to 'language/l2_typ.ott')
-rw-r--r--language/l2_typ.ott15
1 files changed, 15 insertions, 0 deletions
diff --git a/language/l2_typ.ott b/language/l2_typ.ott
index c4c6d0b2..43077d60 100644
--- a/language/l2_typ.ott
+++ b/language/l2_typ.ott
@@ -84,6 +84,7 @@ tag :: 'Tag_' ::=
ne :: 'Ne_' ::=
{{ com internal numeric expressions }}
+ | x :: :: id
| ' x :: :: var
| num :: :: const
| infinity :: :: inf
@@ -214,6 +215,20 @@ conformsto :: 'conformsto_' ::=
| full :: :: full
| parm :: :: parm
+widenvec :: 'widenvec_' ::=
+ | vectors :: :: widen
+ | none :: :: dont
+ | _ :: :: dontcare
+
+widennum :: 'widennum_' ::=
+ | nums :: :: widen
+ | none :: :: dont
+ | _ :: :: dontcare
+
+widening :: 'widening_' ::=
+ {{ com Should we widen vector start locations, should we widen atoms and ranges }}
+ | ( widennum , widenvec ) :: :: w
+
E_a {{ tex \ottnt{E}^{\textsc{a} } }} :: 'E_a_' ::= {{ phantom }}
{{ hol tid |-> tinf}}
{{ lem map tid tinf }}