Skip to content

This closes #88, simpleType causing issues in the generated code #89

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
xuri merged 2 commits into from
Jun 9, 2025
Merged

This closes #88, simpleType causing issues in the generated code #89

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
4b04b40
Change position of opt.CurrentEle = opt.InElement
GiovanePS Mar 7, 2025
3f0bfd5
Add element existence verification in EndRestriction
GiovanePS Mar 9, 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
5 changes: 5 additions & 0 deletions xmlRestriction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ func (opt *Options) OnRestriction(ele xml.StartElement, protoTree []interface{})
return
}
if opt.SimpleType.Peek() != nil {
if opt.Element.Len() > 0 {
opt.Element.Peek().(*Element).Type, err = opt.GetValueType(valueType, protoTree)
return
}

opt.SimpleType.Peek().(*SimpleType).Base, err = opt.GetValueType(valueType, protoTree)
if err != nil {
return
Expand Down
2 changes: 1 addition & 1 deletion xmlSimpleType.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ func (opt *Options) OnSimpleType(ele xml.StartElement, protoTree []interface{})
if opt.CurrentEle == "attributeGroup" {
// return
}
opt.CurrentEle = opt.InElement
for _, attr := range ele.Attr {
if attr.Name.Local == "name" {
opt.CurrentEle = opt.InElement
opt.SimpleType.Peek().(*SimpleType).Name = attr.Value
}
}
Expand Down