diff options
| author | Alasdair Armstrong | 2019-02-12 18:18:05 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2019-02-12 18:18:05 +0000 |
| commit | 24fc989891ad266eae642815646294279e2485ca (patch) | |
| tree | d533fc26b5980d1144ee4d7849d3dd0f2a1b0e95 /src/scattered.ml | |
| parent | b847a472a1f853d783d1af5f8eb033b97f33be5b (diff) | |
| parent | 974494b1dda38c1ee5c1502cc6e448e67a7374ac (diff) | |
Merge remote-tracking branch 'origin/asl_flow2' into sail2
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... *) |