luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-mkenums: fix parsing of /*< flags >*/ annotation

Browse Source 
Fixes get_type function generation for:

 - GMountMountFlags
 - GDriveStartFlags
 - GResourceLookupFlags
 - GSocketMsgFlags
 - GTlsDatabaseVerifyFlags
 - GTestDBusFlags

which were registered as enum types before, which broke
some unit tests.

Problem is that the flags annotation has no value, so
options.get('flags') would always return None even if
it was present.

https://bugzilla.gnome.org/show_bug.cgi?id=779332
This commit is contained in:
Tim-Philipp Müller 2017-05-13 14:56:29 +01:00 committed by Matthias Clasen
parent 03eac5fac5
commit 1672678bc4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gobject/glib-mkenums.in
View File

@ -19,7 +19,7 @@ version = '@GLIB_VERSION@'
# glib-mkenums.py # glib-mkenums.py
# Information about the current enumeration # Information about the current enumeration
flags = None # Is enumeration a bitmask? flags = False # Is enumeration a bitmask?
option_underscore_name = '' # Overriden underscore variant of the enum name option_underscore_name = '' # Overriden underscore variant of the enum name
# for example to fix the cases we don't get the # for example to fix the cases we don't get the
# mixed-case -> underscorized transform right. # mixed-case -> underscorized transform right.
@ -126,7 +126,7 @@ def parse_entries(file, file_name):
value = groups[1] value = groups[1]
if len(groups) > 2: if len(groups) > 2:
options = groups[2] options = groups[2]
if flags is None and value is not None and '<<' in value: if not flags and value is not None and '<<' in value:
seenbitshift = 1 seenbitshift = 1
if options is not None: if options is not None:
@ -339,12 +339,12 @@ def process_file(curfilename):
if 'skip' in options: if 'skip' in options:
continue continue
enum_prefix = options.get('prefix', None) enum_prefix = options.get('prefix', None)
flags = options.get('flags', None) flags = 'flags' in options
option_lowercase_name = options.get('lowercase_name', None) option_lowercase_name = options.get('lowercase_name', None)
option_underscore_name = options.get('underscore_name', None) option_underscore_name = options.get('underscore_name', None)
else: else:
enum_prefix = None enum_prefix = None
flags = None flags = False
option_lowercase_name = None option_lowercase_name = None
option_underscore_name = None option_underscore_name = None
@ -369,7 +369,7 @@ def process_file(curfilename):
parse_entries(curfile, curfilename); parse_entries(curfile, curfilename);
# figure out if this was a flags or enums enumeration # figure out if this was a flags or enums enumeration
if flags is None: if not flags:
flags = seenbitshift flags = seenbitshift
# Autogenerate a prefix # Autogenerate a prefix