X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xcbgen%2Fexpr.py;h=79ad8f6a0211cb3be2badfb4a2d25be476359567;hb=70e270182fd523a6ea2270d8cf9ad21960dd0f74;hp=ed4b975cab3b31f140716df1b1c9c3b083b28471;hpb=dae6b32d78f1a4ee30229d7f944ca6528aa50a7d;p=free-sw%2Fxcb%2Fproto diff --git a/xcbgen/expr.py b/xcbgen/expr.py index ed4b975..79ad8f6 100644 --- a/xcbgen/expr.py +++ b/xcbgen/expr.py @@ -26,7 +26,7 @@ class Expression(object): Represents a mathematical expression for a list length or exprfield. Public fields: - op is the operation (text +,*,/,<<) or None. + op is the operation (text +,*,/,<<,~) or None. lhs and rhs are the sub-Expressions if op is set. lenfield_name is the name of the length field, or None for request lists. lenfield is the Field object for the length field, or None. @@ -75,6 +75,13 @@ class Expression(object): if self.lenfield_name == None: self.lenfield_name = self.rhs.lenfield_name + elif elt.tag == 'unop': + # Op field. Need to recurse. + self.op = elt.get('op') + self.rhs = Expression(list(elt)[0], parent) + + self.lenfield_name = self.rhs.lenfield_name + elif elt.tag == 'value': # Constant expression self.nmemb = int(elt.text, 0)