Skip to content

Commit f7d3973

Browse files
mpvlmvdan
authored andcommitted
internal/core/adt: simplify code
We know that group should always be set after a call to getKeyedCC, so simplify the code. Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: I12de7c5c3434474a4ce4c4bad83bc453e95f6a57 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202776 Reviewed-by: Matthew Sackman <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
1 parent 4c7ee01 commit f7d3973

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

internal/core/adt/fields.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -457,26 +457,18 @@ func (cc *closeContext) assignConjunct(ctx *OpContext, root *closeContext, c Con
457457

458458
c.CloseInfo.cc = nil
459459

460-
var group ConjunctGroup
461-
if arc.group != nil {
462-
group = *arc.group
463-
}
464-
pos = len(group)
460+
group := arc.group
461+
pos = len(*group)
465462

466-
added = !check || !hasConjunct(group, c)
463+
added = !check || !hasConjunct(*group, c)
467464
if added {
468465
c.CloseInfo.cc = arc
469466

470467
if c.CloseInfo.cc.src != arc.src {
471468
panic("Inconsistent src")
472469
}
473470

474-
group = append(group, c)
475-
if arc.group == nil {
476-
arc.group = &group
477-
} else {
478-
*arc.group = group
479-
}
471+
*group = append(*group, c)
480472
}
481473

482474
return arc, pos, added

0 commit comments

Comments
 (0)