Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for slices to non-pointers, use non-nullable AnyValue #2192

Merged
merged 3 commits into from
Nov 30, 2020
Merged

Add support for slices to non-pointers, use non-nullable AnyValue #2192

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b612068
Add support for slices to non-pointers, use non-nullable AnyValue
bogdandrutu Nov 20, 2020
6ed2e73
Resolve comments
bogdandrutu Nov 30, 2020
39367ee
Update slice pdatagen names
bogdandrutu Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cmd/pdatagen/internal/base_fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,21 +123,21 @@ type baseField interface {
generateCopyToValue(sb *strings.Builder)
}

type sliceField struct {
type slicePtrField struct {
bogdandrutu marked this conversation as resolved.
Show resolved Hide resolved
fieldName string
originFieldName string
returnSlice *sliceStruct
returnSlice baseSlice
}

func (sf *sliceField) generateAccessors(ms baseStruct, sb *strings.Builder) {
func (sf *slicePtrField) generateAccessors(ms baseStruct, sb *strings.Builder) {
sb.WriteString(os.Expand(accessorSliceTemplate, func(name string) string {
switch name {
case "structName":
return ms.getName()
case "fieldName":
return sf.fieldName
case "returnType":
return sf.returnSlice.structName
return sf.returnSlice.getName()
case "originFieldName":
return sf.originFieldName
default:
Expand All @@ -146,30 +146,30 @@ func (sf *sliceField) generateAccessors(ms baseStruct, sb *strings.Builder) {
}))
}

func (sf *sliceField) generateAccessorsTest(ms baseStruct, sb *strings.Builder) {
func (sf *slicePtrField) generateAccessorsTest(ms baseStruct, sb *strings.Builder) {
sb.WriteString(os.Expand(accessorsSliceTestTemplate, func(name string) string {
switch name {
case "structName":
return ms.getName()
case "fieldName":
return sf.fieldName
case "returnType":
return sf.returnSlice.structName
return sf.returnSlice.getName()
default:
panic(name)
}
}))
}

func (sf *sliceField) generateSetWithTestValue(sb *strings.Builder) {
sb.WriteString("\tfillTest" + sf.returnSlice.structName + "(tv." + sf.fieldName + "())")
func (sf *slicePtrField) generateSetWithTestValue(sb *strings.Builder) {
sb.WriteString("\tfillTest" + sf.returnSlice.getName() + "(tv." + sf.fieldName + "())")
}

func (sf *sliceField) generateCopyToValue(sb *strings.Builder) {
func (sf *slicePtrField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\tms." + sf.fieldName + "().CopyTo(dest." + sf.fieldName + "())")
}

var _ baseField = (*sliceField)(nil)
var _ baseField = (*slicePtrField)(nil)

type messagePtrField struct {
fieldName string
Expand Down
Loading