class AnnotateSize(XMLFilterBase):
types = {
- 'BYTE': 1,
- 'BOOL': 1,
- 'CARD8': 1,
- 'CARD16': 2,
- 'CARD32': 4,
- 'INT8': 1,
- 'INT16': 2,
- 'INT32': 4,
- 'float': 4,
- 'double': 8,
+ 'BYTE': 1, 'BOOL': 1,
+ 'CARD8': 1, 'CARD16': 2, 'CARD32': 4,
+ 'INT8': 1, 'INT16': 2, 'INT32': 4,
+ 'char': 1, 'void': 1,
+ 'float': 4, 'double': 8,
+ 'XID': 4,
}
header = []
def setTypeSize(self, name, size):
+ assert not self.types.has_key(name), "size of " + name + " declared as both " + str(size) + " and " + str(self.types[name])
self.types[name] = size
- self.types[self.header[0] + ':' + name] = size
struct = None
union = None
elif self.union is not None:
self.totalsize = max(self.totalsize, size)
attrs = AttributesUnion(attrs, bytes=str(size))
+ elif name == 'pad':
+ assert self.union is None
+ if self.struct is not None:
+ self.totalsize += int(attrs['bytes'])
elif name == 'xidtype':
self.setTypeSize(attrs['name'], 4)
elif name == 'typedef':
setattr(self, name, attrs['name'])
self.totalsize = 0
- if len(self.header) == 1:
+ if len(self.header) == 1 or name == 'xcb':
XMLFilterBase.startElement(self, name, attrs)
def characters(self, content):
XMLFilterBase.characters(self, content)
def endElement(self, name):
- if len(self.header) == 1:
+ if len(self.header) == 1 or name == 'xcb':
XMLFilterBase.endElement(self, name)
if name == 'xcb':