diff options
| author | Jon French | 2019-02-13 12:27:48 +0000 |
|---|---|---|
| committer | Jon French | 2019-02-13 12:27:48 +0000 |
| commit | ea39b3c674570ce5eea34067c36d5196ca201f83 (patch) | |
| tree | 516e7491bc32797a4d0ac397ea47387f2b16cf1b /src/scattered.ml | |
| parent | ab3f3671d4dd682b2aee922d5a05e9455afd5849 (diff) | |
| parent | 24fc989891ad266eae642815646294279e2485ca (diff) | |
Merge branch 'sail2' into rmem_interpreter
Diffstat (limited to 'src/scattered.ml')
| -rw-r--r-- | src/scattered.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scattered.ml b/src/scattered.ml index be304dc8..de286e3f 100644 --- a/src/scattered.ml +++ b/src/scattered.ml @@ -126,9 +126,9 @@ let rec descatter' funcls mapcls = function (* For scattered unions, when we find a union declaration we immediately grab all the future clauses and turn it into a regular union declaration. *) - | DEF_scattered (SD_aux (SD_variant (id, namescm, typq), (l, _))) :: defs -> + | DEF_scattered (SD_aux (SD_variant (id, typq), (l, _))) :: defs -> let tus = get_union_clauses id defs in - DEF_type (TD_aux (TD_variant (id, namescm, typq, tus, false), (gen_loc l, Type_check.empty_tannot))) + DEF_type (TD_aux (TD_variant (id, typq, tus, false), (gen_loc l, Type_check.empty_tannot))) :: descatter' funcls mapcls (filter_union_clauses id defs) (* Therefore we should never see SD_unioncl... *) |