diff options
| author | Kathy Gray | 2015-08-06 16:24:28 +0100 |
|---|---|---|
| committer | Kathy Gray | 2015-08-06 16:24:28 +0100 |
| commit | d4d2e262f96a8eef543c017c8df08c25f2715118 (patch) | |
| tree | b768f8818157caf1389d782d4f3070a2f80eab4d /language | |
| parent | 43427019f9f2c1e64a07ec6ee3caef8bd1a5c165 (diff) | |
Update analysis to merge states and values after branches taken due to unknown conditions.
Does not merge if one path has resulted in an exit
Diffstat (limited to 'language')
| -rw-r--r-- | language/l2.lem | 2 | ||||
| -rw-r--r-- | language/l2_typ.ott | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/language/l2.lem b/language/l2.lem index 7ee69d5e..63869068 100644 --- a/language/l2.lem +++ b/language/l2.lem @@ -544,7 +544,7 @@ type tag = (* Data indicating where the identifier arises and thus information | Tag_spec | Tag_enum of integer | Tag_alias - | Tag_unknown (* Tag to distinguish an unknown path from a non-analysis non deterministic path *) + | Tag_unknown of maybe string (* Tag to distinguish an unknown path from a non-analysis non deterministic path *) type tinf = (* Type variables, type, and constraints, bound to an identifier *) diff --git a/language/l2_typ.ott b/language/l2_typ.ott index 54c41c4e..b2ac1d5d 100644 --- a/language/l2_typ.ott +++ b/language/l2_typ.ott @@ -72,12 +72,12 @@ tag :: 'Tag_' ::= | None :: :: empty | Global :: :: global {{ com Globally let-bound or enumeration based value/variable }} | Ctor :: :: ctor {{ com Data constructor from a type union }} - | Extern optx :: :: extern {{ com External function, specied only with a val statement }} + | Extern optx :: :: extern {{ com External function, specied only with a val statement }} | Default :: :: default {{ com Type has come from default declaration, identifier may not be bound locally }} | Spec :: :: spec | Enum num :: :: enum | Alias :: :: alias - | Unknown_path :: :: unknown {{ com Tag to distinguish an unknown path from a non-analysis non deterministic path}} + | Unknown_path optx :: :: unknown {{ com Tag to distinguish an unknown path from a non-analysis non deterministic path}} ne :: 'Ne_' ::= {{ com internal numeric expressions }} |