luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 18:16:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1672678bc4.

A more comprehensive fix will follow.
This commit is contained in:
Emmanuele Bassi
2017-08-01 10:11:09 +01:00
parent 867b5e6f90
commit ca69df0f16
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gobject/glib-mkenums.in
View File

@@ -83,7 +83,7 @@ def write_output(output):
# glib-mkenums.py # glib-mkenums.py
# Information about the current enumeration # Information about the current enumeration
flags = False # Is enumeration a bitmask? flags = None # 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.
@@ -196,7 +196,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 not flags and value is not None and '<<' in value: if flags is None and value is not None and '<<' in value:
seenbitshift = 1 seenbitshift = 1
if options is not None: if options is not None:
@@ -449,12 +449,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 = 'flags' in options flags = options.get('flags', None)
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 = False flags = None
option_lowercase_name = None option_lowercase_name = None
option_underscore_name = None option_underscore_name = None
@@ -479,7 +479,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 not flags: if flags is None:
flags = seenbitshift flags = seenbitshift
# Autogenerate a prefix # Autogenerate a prefix