p/haven
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Updated to work with new xproto XML files.

Browse Source 
Namely, the "doc" element is ignored. Also, I've sorted everything
before output so that diff isn't completely useless.
This commit is contained in:
Andrew Gallant
2013-08-11 20:42:36 -04:00
committed by Přemysl Janouch
parent 5d96993ee1
commit 4b20ffaf4f
5 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nexgb/xgbgen/translation.go
View File

@@ -137,10 +137,13 @@ func (x *XMLEvent) Translate() *Event {
xmlName: x.Name,
Number: x.Number,
NoSequence: x.NoSequence,
Fields: make([]Field, len(x.Fields)),
Fields: make([]Field, 0, len(x.Fields)),
}
for i, field := range x.Fields {
ev.Fields[i] = field.Translate(ev)
for _, field := range x.Fields {
if field.XMLName.Local == "doc" {
continue
}
ev.Fields = append(ev.Fields, field.Translate(ev))
}
return ev
}
@@ -200,11 +203,14 @@ func (x *XMLRequest) Translate() *Request {
xmlName: x.Name,
Opcode: x.Opcode,
Combine: x.Combine,
Fields: make([]Field, len(x.Fields)),
Fields: make([]Field, 0, len(x.Fields)),
Reply: x.Reply.Translate(),
}
for i, field := range x.Fields {
r.Fields[i] = field.Translate(r)
for _, field := range x.Fields {
if field.XMLName.Local == "doc" {
continue
}
r.Fields = append(r.Fields, field.Translate(r))
}
// Address bug (or legacy code) in QueryTextExtents.
@@ -229,10 +235,13 @@ func (x *XMLReply) Translate() *Reply {
}
r := &Reply{
Fields: make([]Field, len(x.Fields)),
Fields: make([]Field, 0, len(x.Fields)),
}
for i, field := range x.Fields {
r.Fields[i] = field.Translate(r)
for _, field := range x.Fields {
if field.XMLName.Local == "doc" {
continue
}
r.Fields = append(r.Fields, field.Translate(r))
}
return r
}
@@ -380,7 +389,6 @@ func SrcName(p *Protocol, name string) string {
if newn, ok := NameMap[name]; ok {
return newn
}
return splitAndTitle(name)
}