projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spv-writer: Consistently use label from output_item.
[pspp]
/
src
/
output
/
spv
/
xml-parser-generator
diff --git
a/src/output/spv/xml-parser-generator
b/src/output/spv/xml-parser-generator
index e85be59171075480749c53ef72937da38f71e156..9109d56f95ad3ce98a4e6d83bf8971f44f331214 100644
(file)
--- a/
src/output/spv/xml-parser-generator
+++ b/
src/output/spv/xml-parser-generator
@@
-295,7
+295,7
@@
used_enums = set()
def print_members(attributes, rhs, indent):
attrs = []
new_enums = set()
def print_members(attributes, rhs, indent):
attrs = []
new_enums = set()
- for unique_name, (xml_name, value, required) in
attributes.items(
):
+ for unique_name, (xml_name, value, required) in
sorted(attributes.items()
):
c_name = name_to_id(unique_name)
if type(value) is set:
if len(value) <= 1:
c_name = name_to_id(unique_name)
if type(value) is set:
if len(value) <= 1:
@@
-342,7
+342,7
@@
def print_members(attributes, rhs, indent):
else:
assert False
else:
assert False
- for enum_name in
new_enums
:
+ for enum_name in
sorted(new_enums)
:
used_enums.add(enum_name)
c_name = name_to_id(enum_name)
print('\nenum %s%s {' % (prefix, c_name))
used_enums.add(enum_name)
c_name = name_to_id(enum_name)
print('\nenum %s%s {' % (prefix, c_name))
@@
-617,7
+617,7
@@
def generate_content_parser(nonterminal, rhs, function, ctx, state, seq_name):
function.code += [
'p->%s = xrealloc (p->%s, sizeof *p->%s * (p->n_%s + 1));'
% (member, member, member, member),
function.code += [
'p->%s = xrealloc (p->%s, sizeof *p->%s * (p->n_%s + 1));'
% (member, member, member, member),
- 'p->%s[p->n_%s++] = %s;' % (member, member,
+ 'p->%s[p->n_%s++] = %s;' % (member, member,
'&%s->node_' % member
if state == STATE_GENERAL
else member)]
'&%s->node_' % member
if state == STATE_GENERAL
else member)]
@@
-900,7
+900,7
@@
void
name += '%d' % i
if type(value[1]) is set:
print(' static const struct spvxml_node_class *const %s[] = {' % name)
name += '%d' % i
if type(value[1]) is set:
print(' static const struct spvxml_node_class *const %s[] = {' % name)
- for ref_type in
value[1]
:
+ for ref_type in
sorted(value[1])
:
print(' &%(prefix)s%(ref_type)s_class,'
% {'prefix': prefix,
'ref_type': name_to_id(ref_type)})
print(' &%(prefix)s%(ref_type)s_class,'
% {'prefix': prefix,
'ref_type': name_to_id(ref_type)})
@@
-924,7
+924,7
@@
void
'prefix': prefix,
'name': name,
'ref_type': name_to_id(value[1])})
'prefix': prefix,
'name': name,
'ref_type': name_to_id(value[1])})
-
+
print_recurse_members(attributes, rhs, 'resolve_refs')
print_recurse_members(attributes, rhs, 'resolve_refs')