Skip to content

Commit 00fa80a

Browse files
committed
internal/core/adt: revert recent change
Was not ready to submit this and it is causing trouble. https://review.gerrithub.io/c/cue-lang/cue/+/1202776 Signed-off-by: Marcel van Lohuizen <mpvl@gmail.com> Change-Id: I232180342c058ab70f526ba3ab45bc19cdab8b1d Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1205394 Reviewed-by: Daniel Martí <mvdan@mvdan.cc> Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
1 parent f1ea2ff commit 00fa80a

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

internal/core/adt/fields.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,20 +463,27 @@ func (cc *closeContext) assignConjunct(ctx *OpContext, root *closeContext, c Con
463463

464464
c.CloseInfo.cc = nil
465465

466-
group := arc.group
467-
pos = len(*group)
466+
var group ConjunctGroup
467+
if arc.group != nil {
468+
group = *arc.group
469+
}
470+
pos = len(group)
468471

469-
added = !check || !hasConjunct(*group, c)
472+
added = !check || !hasConjunct(group, c)
470473
if added {
471474
c.CloseInfo.cc = arc
472475

473476
if c.CloseInfo.cc.src != arc.src {
474477
panic("Inconsistent src")
475478
}
476479

477-
*group = append(*group, c)
480+
group = append(group, c)
481+
if arc.group == nil {
482+
arc.group = &group
483+
} else {
484+
*arc.group = group
485+
}
478486
}
479-
480487
return arc, pos, added
481488
}
482489

0 commit comments

Comments
 (0)