Skip to content

v1.1.6 - fixed code generation with slices and maps using imported benc schemas #10

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

Merged
deneonet merged 2 commits into from
Jan 29, 2025
Merged

v1.1.6 - fixed code generation with slices and maps using imported benc schemas #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a48bd
fixed code generation with slices and maps using imported benc schemas
deneonet Jan 29, 2025
305ea54
Update go.mod
deneonet Jan 29, 2025
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
13 changes: 10 additions & 3 deletions cmd/bencgen/codegens/golang-gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,13 @@ func (g *GoGen) getSizeFunc() string {
}
}

func makeExternalStructureUpperOrNot(externalStructure string) string {
if strings.Contains(externalStructure, ".") {
return externalStructure
}
return utils.ToUpper(externalStructure)
}

func (g *GoGen) getElemSizeFunc(t *parser.Type) string {
switch {
case t.IsArray:
Expand All @@ -399,7 +406,7 @@ func (g *GoGen) getElemSizeFunc(t *parser.Type) string {
}

return fmt.Sprintf("func (s %s) int { return s.SizePlain() }",
utils.ToUpper(t.ExternalStructure))
makeExternalStructureUpperOrNot(t.ExternalStructure))
default:
return "bstd.Size" + t.TokenType.String()
}
Expand Down Expand Up @@ -497,7 +504,7 @@ func (g *GoGen) getElemMarshalFunc(t *parser.Type) string {
}

return fmt.Sprintf("func (n int, b []byte, s %s) int { return s.MarshalPlain(n, b) }",
utils.ToUpper(t.ExternalStructure))
makeExternalStructureUpperOrNot(t.ExternalStructure))
default:
return "bstd.Marshal" + t.AppendUnsafeIfPresent() + t.TokenType.String()
}
Expand Down Expand Up @@ -601,7 +608,7 @@ func (g *GoGen) getElemUnmarshalFunc(t *parser.Type) string {
return "bgenimpl.UnmarshalEnum"
}
return fmt.Sprintf("func (n int, b []byte, s *%s) (int, error) { return s.UnmarshalPlain(n, b) }",
utils.ToUpper(t.ExternalStructure))
makeExternalStructureUpperOrNot(t.ExternalStructure))
default:
return "bstd.Unmarshal" + t.AppendUnsafeIfPresent() + t.TokenType.String()
}
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ retract (
v1.1.0 // Undefined behavior vulnerability
v1.1.1 // Broken varint skip
v1.1.2 // Undefined Uint methods after code generation
v1.1.5 // Broken code generation with slices and maps using imported benc schemas
)

module github.com/deneonet/benc
Expand Down
23 changes: 16 additions & 7 deletions testing/others/others.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions testing/schemas/others.benc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ ctr OthersTest {
ExampleEnum2 exampleEnum2 = 8;

person.Person person = 9;
person.2.test.defines.Person2 person2 = 10;
[][][]person.2.test.defines.Person2 person2 = 10;
}

# DO NOT EDIT.
# [meta_s] eyJtc2dzIjp7Ik90aGVyc1Rlc3QiOnsicklkcyI6bnVsbCwiZmllbGRzIjp7IjEiOnsiaWQiOjEsIk5hbWUiOiJ1aSIsIlR5cGUiOnsiVG9rZW5UeXBlIjoxOCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjEwIjp7ImlkIjoxMCwiTmFtZSI6InBlcnNvbjIiLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoicGVyc29uLlBlcnNvbjIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6ZmFsc2V9fSwiMiI6eyJpZCI6MiwiTmFtZSI6InVpNjQiLCJUeXBlIjp7IlRva2VuVHlwZSI6MTUsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX19LCIzIjp7ImlkIjozLCJOYW1lIjoidWk2NEFyciIsIlR5cGUiOnsiVG9rZW5UeXBlIjowLCJNYXBLZXlUeXBlIjpudWxsLCJDaGlsZFR5cGUiOnsiVG9rZW5UeXBlIjoxNSwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfSwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6dHJ1ZSwiSXNNYXAiOmZhbHNlfX0sIjQiOnsiaWQiOjQsIk5hbWUiOiJ1aTY0TWFwIiwiVHlwZSI6eyJUb2tlblR5cGUiOjAsIk1hcEtleVR5cGUiOnsiVG9rZW5UeXBlIjoxNSwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfSwiQ2hpbGRUeXBlIjp7IlRva2VuVHlwZSI6MTYsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX0sImN0ck5hbWUiOiIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6dHJ1ZX19LCI1Ijp7ImlkIjo1LCJOYW1lIjoidWkzMiIsIlR5cGUiOnsiVG9rZW5UeXBlIjoxNiwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjYiOnsiaWQiOjYsIk5hbWUiOiJ1aTE2IiwiVHlwZSI6eyJUb2tlblR5cGUiOjE3LCJNYXBLZXlUeXBlIjpudWxsLCJDaGlsZFR5cGUiOm51bGwsImN0ck5hbWUiOiIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6ZmFsc2V9fSwiNyI6eyJpZCI6NywiTmFtZSI6ImV4YW1wbGVFbnVtIiwiVHlwZSI6eyJUb2tlblR5cGUiOjAsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IkV4YW1wbGVFbnVtIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjgiOnsiaWQiOjgsIk5hbWUiOiJleGFtcGxlRW51bTIiLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiRXhhbXBsZUVudW0yIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjkiOnsiaWQiOjksIk5hbWUiOiJwZXJzb24iLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoicGVyc29uLlBlcnNvbiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX19fX19fQ== [meta_e]
# [meta_s] eyJtc2dzIjp7Ik90aGVyc1Rlc3QiOnsicklkcyI6bnVsbCwiZmllbGRzIjp7IjEiOnsiaWQiOjEsIk5hbWUiOiJ1aSIsIlR5cGUiOnsiVG9rZW5UeXBlIjoxOCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjEwIjp7ImlkIjoxMCwiTmFtZSI6InBlcnNvbjIiLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoicGVyc29uLlBlcnNvbjIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6ZmFsc2V9LCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5Ijp0cnVlLCJJc01hcCI6ZmFsc2V9LCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5Ijp0cnVlLCJJc01hcCI6ZmFsc2V9LCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5Ijp0cnVlLCJJc01hcCI6ZmFsc2V9fSwiMiI6eyJpZCI6MiwiTmFtZSI6InVpNjQiLCJUeXBlIjp7IlRva2VuVHlwZSI6MTUsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX19LCIzIjp7ImlkIjozLCJOYW1lIjoidWk2NEFyciIsIlR5cGUiOnsiVG9rZW5UeXBlIjowLCJNYXBLZXlUeXBlIjpudWxsLCJDaGlsZFR5cGUiOnsiVG9rZW5UeXBlIjoxNSwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfSwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6dHJ1ZSwiSXNNYXAiOmZhbHNlfX0sIjQiOnsiaWQiOjQsIk5hbWUiOiJ1aTY0TWFwIiwiVHlwZSI6eyJUb2tlblR5cGUiOjAsIk1hcEtleVR5cGUiOnsiVG9rZW5UeXBlIjoxNSwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfSwiQ2hpbGRUeXBlIjp7IlRva2VuVHlwZSI6MTYsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX0sImN0ck5hbWUiOiIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6dHJ1ZX19LCI1Ijp7ImlkIjo1LCJOYW1lIjoidWkzMiIsIlR5cGUiOnsiVG9rZW5UeXBlIjoxNiwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjYiOnsiaWQiOjYsIk5hbWUiOiJ1aTE2IiwiVHlwZSI6eyJUb2tlblR5cGUiOjE3LCJNYXBLZXlUeXBlIjpudWxsLCJDaGlsZFR5cGUiOm51bGwsImN0ck5hbWUiOiIiLCJJc1Vuc2FmZSI6ZmFsc2UsIklzQXJyYXkiOmZhbHNlLCJJc01hcCI6ZmFsc2V9fSwiNyI6eyJpZCI6NywiTmFtZSI6ImV4YW1wbGVFbnVtIiwiVHlwZSI6eyJUb2tlblR5cGUiOjAsIk1hcEtleVR5cGUiOm51bGwsIkNoaWxkVHlwZSI6bnVsbCwiY3RyTmFtZSI6IkV4YW1wbGVFbnVtIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjgiOnsiaWQiOjgsIk5hbWUiOiJleGFtcGxlRW51bTIiLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoiRXhhbXBsZUVudW0yIiwiSXNVbnNhZmUiOmZhbHNlLCJJc0FycmF5IjpmYWxzZSwiSXNNYXAiOmZhbHNlfX0sIjkiOnsiaWQiOjksIk5hbWUiOiJwZXJzb24iLCJUeXBlIjp7IlRva2VuVHlwZSI6MCwiTWFwS2V5VHlwZSI6bnVsbCwiQ2hpbGRUeXBlIjpudWxsLCJjdHJOYW1lIjoicGVyc29uLlBlcnNvbiIsIklzVW5zYWZlIjpmYWxzZSwiSXNBcnJheSI6ZmFsc2UsIklzTWFwIjpmYWxzZX19fX19fQ== [meta_e]
Loading