this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

cue: rename RequireConcrete to Concrete

This is more consistent and also allows it to be used
for Syntax to select less evaluation.

Change-Id: I0103c7edd3d523c33df0d0575299b02e2d38adfe
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/1922
Reviewed-by: Marcel van Lohuizen <mpvl@google.com>

authored by

Marcel van Lohuizen and committed by
Marcel van Lohuizen
c47539e6 46103919

+12 -8
+2 -2
cmd/cue/cmd/eval.go
··· 68 68 cue.Optional(*all || *optional), 69 69 } 70 70 if *compile { 71 - syn = append(syn, cue.RequireConcrete()) 71 + syn = append(syn, cue.Concrete(true)) 72 72 } 73 73 if *hidden || *all { 74 74 syn = append(syn, cue.Hidden(true)) ··· 80 80 if exprs == nil { 81 81 v := inst.Value() 82 82 if *compile { 83 - err := v.Validate(cue.RequireConcrete()) 83 + err := v.Validate(cue.Concrete(true)) 84 84 exitIfErr(cmd, inst, err, false) 85 85 continue 86 86 }
+1 -1
cmd/cue/cmd/vet.go
··· 59 59 opt := []cue.Option{ 60 60 cue.Attributes(true), 61 61 cue.Optional(true), 62 - cue.RequireConcrete(), 62 + cue.Concrete(true), 63 63 cue.Hidden(true), 64 64 } 65 65 err := inst.Value().Validate(opt...)
+9 -5
cue/types.go
··· 1006 1006 1007 1007 // TODO: could also be used for subsumption. 1008 1008 1009 - // RequireConcrete ensures that all values are concrete. 1009 + // Concrete ensures that all values are concrete. 1010 1010 // 1011 1011 // For Validate this means it returns an error if this is not the case. 1012 1012 // In other cases a non-concrete value will be replaced with an error. 1013 - func RequireConcrete() Option { 1013 + func Concrete(concrete bool) Option { 1014 1014 return func(p *options) { 1015 - p.concrete = true 1016 - if !p.hasHidden { 1017 - p.omitHidden = true 1015 + if concrete { 1016 + p.concrete = true 1017 + if !p.hasHidden { 1018 + p.omitHidden = true 1019 + } 1020 + } else { 1021 + p.raw = true 1018 1022 } 1019 1023 } 1020 1024 }