Message ID | 1379678070-14346-2-git-send-email-kwolf@redhat.com |
---|---|
State | New |
Headers | show |
On 2013-09-20 13:54, Kevin Wolf wrote: > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > scripts/qapi-types.py | 11 ++++++++--- > scripts/qapi-visit.py | 8 ++++++-- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py > index 5222463..566fe5e 100644 > --- a/scripts/qapi-types.py > +++ b/scripts/qapi-types.py > @@ -71,7 +71,7 @@ def generate_struct_fields(members): > c_name=c_var(argname)) > if structured: > push_indent() > - ret += generate_struct("", argname, argentry) > + ret += generate_struct({ "field": argname, "data": argentry}) > pop_indent() > else: > ret += mcgen(''' > @@ -81,7 +81,12 @@ def generate_struct_fields(members): > > return ret > > -def generate_struct(structname, fieldname, members): > +def generate_struct(expr): > + > + structname = expr.get('type', "") > + fieldname = expr.get('field', "") > + members = expr['data'] > + > ret = mcgen(''' > struct %(name)s > { > @@ -417,7 +422,7 @@ if do_builtins: > for expr in exprs: > ret = "\n" > if expr.has_key('type'): > - ret += generate_struct(expr['type'], "", expr['data']) + "\n" > + ret += generate_struct(expr) + "\n" This change passes expr['filter'] to generate_struct, if that field is set (in contrast to before, where an empty string was passed). This doesn't really make a difference, since defining the "field" key now results in linking errors (multiple definitions of that variable) where it was just ignored before (however, the behavior was undefined anyway). I just thought I'd say it. ;) Max > ret += generate_type_cleanup_decl(expr['type'] + "List") > fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n") > ret += generate_type_cleanup_decl(expr['type']) > diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py > index 597cca4..1e44004 100644 > --- a/scripts/qapi-visit.py > +++ b/scripts/qapi-visit.py > @@ -120,7 +120,11 @@ if (!err) { > ''') > return ret > > -def generate_visit_struct(name, members): > +def generate_visit_struct(expr): > + > + name = expr['type'] > + members = expr['data'] > + > ret = generate_visit_struct_fields(name, "", "", members) > > ret += mcgen(''' > @@ -472,7 +476,7 @@ if do_builtins: > > for expr in exprs: > if expr.has_key('type'): > - ret = generate_visit_struct(expr['type'], expr['data']) > + ret = generate_visit_struct(expr) > ret += generate_visit_list(expr['type'], expr['data']) > fdef.write(ret) >
On 09/20/2013 05:54 AM, Kevin Wolf wrote: > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > scripts/qapi-types.py | 11 ++++++++--- > scripts/qapi-visit.py | 8 ++++++-- > 2 files changed, 14 insertions(+), 5 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5222463..566fe5e 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -71,7 +71,7 @@ def generate_struct_fields(members): c_name=c_var(argname)) if structured: push_indent() - ret += generate_struct("", argname, argentry) + ret += generate_struct({ "field": argname, "data": argentry}) pop_indent() else: ret += mcgen(''' @@ -81,7 +81,12 @@ def generate_struct_fields(members): return ret -def generate_struct(structname, fieldname, members): +def generate_struct(expr): + + structname = expr.get('type', "") + fieldname = expr.get('field', "") + members = expr['data'] + ret = mcgen(''' struct %(name)s { @@ -417,7 +422,7 @@ if do_builtins: for expr in exprs: ret = "\n" if expr.has_key('type'): - ret += generate_struct(expr['type'], "", expr['data']) + "\n" + ret += generate_struct(expr) + "\n" ret += generate_type_cleanup_decl(expr['type'] + "List") fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n") ret += generate_type_cleanup_decl(expr['type']) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 597cca4..1e44004 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -120,7 +120,11 @@ if (!err) { ''') return ret -def generate_visit_struct(name, members): +def generate_visit_struct(expr): + + name = expr['type'] + members = expr['data'] + ret = generate_visit_struct_fields(name, "", "", members) ret += mcgen(''' @@ -472,7 +476,7 @@ if do_builtins: for expr in exprs: if expr.has_key('type'): - ret = generate_visit_struct(expr['type'], expr['data']) + ret = generate_visit_struct(expr) ret += generate_visit_list(expr['type'], expr['data']) fdef.write(ret)
Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- scripts/qapi-types.py | 11 ++++++++--- scripts/qapi-visit.py | 8 ++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)