-
Notifications
You must be signed in to change notification settings - Fork 294
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
internal/core/path: package for Selector to Feature conversion
The reodering of label types results in slightly nicer presentation for type strings and results in faster code. Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: I1f208d70c0f208df7e7f0f490c612d87bd4c2cc0 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/542924 Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Paul Jolly <[email protected]>
- Loading branch information
Showing
5 changed files
with
224 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Copyright 2022 CUE Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Package path provides utilities for converting cue.Selectors and cue.Paths to | ||
| // internal equivalents. | ||
| package path | ||
|
|
||
| import ( | ||
| "math/bits" | ||
|
|
||
| "cuelang.org/go/cue" | ||
| "cuelang.org/go/internal/core/adt" | ||
| "cuelang.org/go/internal/core/runtime" | ||
| ) | ||
|
|
||
| // ToFeatureType converts a SelectorType constant to a FeatureType. It assumes a single label bit is set. | ||
| func ToFeatureType(t cue.SelectorType) adt.FeatureType { | ||
| t = t.LabelType() | ||
| return adt.FeatureType(bits.Len16(uint16(t))) | ||
| } | ||
|
|
||
| // MakeFeature converts a cue.Selector to an adt.Feature for a given runtime. | ||
| func MakeFeature(r *runtime.Runtime, s cue.Selector) adt.Feature { | ||
| constraintType := s.ConstraintType() | ||
| labelType := s.LabelType() | ||
|
|
||
| if constraintType == cue.PatternConstraint { | ||
| switch labelType { | ||
| case cue.StringLabel: | ||
| return adt.AnyString | ||
| case cue.IndexLabel: | ||
| return adt.AnyIndex | ||
|
|
||
| // These are not really a thing at the moment: | ||
| case cue.DefinitionLabel: | ||
| return adt.AnyDefinition | ||
| case cue.HiddenLabel: | ||
| return adt.AnyHidden // TODO: fix | ||
| case cue.HiddenDefinitionLabel: | ||
| return adt.AnyHidden // TODO: fix | ||
| default: | ||
| panic("unreachable") | ||
| } | ||
| } | ||
|
|
||
| switch labelType { | ||
| case cue.StringLabel: | ||
| return adt.MakeStringLabel(r, s.Unquoted()) | ||
|
|
||
| case cue.IndexLabel: | ||
| return adt.MakeIntLabel(adt.IntLabel, int64(s.Index())) | ||
|
|
||
| case cue.DefinitionLabel: | ||
| return adt.MakeNamedLabel(r, adt.DefinitionLabel, s.String()) | ||
|
|
||
| case cue.HiddenLabel: | ||
| str := adt.HiddenKey(s.String(), s.PkgPath()) | ||
| return adt.MakeNamedLabel(r, adt.HiddenLabel, str) | ||
|
|
||
| case cue.HiddenDefinitionLabel: | ||
| str := adt.HiddenKey(s.String(), s.PkgPath()) | ||
| return adt.MakeNamedLabel(r, adt.HiddenDefinitionLabel, str) | ||
|
|
||
| default: | ||
| return adt.InvalidLabel | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| // Copyright 2022 CUE Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package path | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "cuelang.org/go/cue" | ||
| "cuelang.org/go/internal/core/adt" | ||
| "cuelang.org/go/internal/core/runtime" | ||
| ) | ||
|
|
||
| // TestToFeatureType also tests that SelectorType and FeatureType are in sync. | ||
| func TestToFeatureType(t *testing.T) { | ||
| testCases := []struct { | ||
| s cue.SelectorType | ||
| f adt.FeatureType | ||
| }{{ | ||
| cue.InvalidSelectorType, | ||
| adt.InvalidLabelType, | ||
| }, { | ||
| cue.StringLabel, | ||
| adt.StringLabel, | ||
| }, { | ||
| cue.IndexLabel, | ||
| adt.IntLabel, | ||
| }, { | ||
| cue.DefinitionLabel, | ||
| adt.DefinitionLabel, | ||
| }, { | ||
| cue.HiddenLabel, | ||
| adt.HiddenLabel, | ||
| }, { | ||
| cue.HiddenDefinitionLabel, | ||
| adt.HiddenDefinitionLabel, | ||
| }, { | ||
| cue.StringLabel | cue.OptionalConstraint, | ||
| adt.StringLabel, | ||
| }, { | ||
| cue.OptionalConstraint, | ||
| adt.InvalidLabelType, | ||
| }} | ||
| for _, tc := range testCases { | ||
| t.Run(tc.s.String(), func(t *testing.T) { | ||
| if got := ToFeatureType(tc.s); got != tc.f { | ||
| t.Errorf("got %v, want %v", got, tc.f) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestMakeFeature(t *testing.T) { | ||
| testCases := []struct { | ||
| sel cue.Selector | ||
| str string | ||
| }{{ | ||
| sel: cue.Str("s-t"), | ||
| str: `"s-t"`, | ||
| }, { | ||
| // Optional should be disregarded, as it is not part of a Feature. | ||
| sel: cue.Str("s-t").Optional(), | ||
| str: `"s-t"`, | ||
| }, { | ||
| sel: cue.Index(5), | ||
| str: "5", | ||
| }, { | ||
| sel: cue.Def("#Foo"), | ||
| str: "#Foo", | ||
| }, { | ||
| sel: cue.Hid("_foo", "pkg"), | ||
| str: "_foo", | ||
| }, { | ||
| sel: cue.Hid("_#foo", "pkg"), | ||
| str: "_#foo", | ||
| }, { | ||
| sel: cue.AnyString, | ||
| str: `_`, | ||
| }} | ||
| for _, tc := range testCases { | ||
| r := runtime.New() | ||
| t.Run(tc.sel.String(), func(t *testing.T) { | ||
| got := MakeFeature(r, tc.sel).SelectorString(r) | ||
| if got != tc.str { | ||
| t.Errorf("got %v, want %v", got, tc.str) | ||
| } | ||
| }) | ||
| } | ||
| } |