luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow whitespace between marshallers list tokens

Browse Source 
Some (older) list files use whitespace, and we need to take that into
account when splitting off the various tokens.
This commit is contained in:
Emmanuele Bassi
2017-07-11 18:23:38 +01:00
parent cf7ee86b97
commit c6793d1cfb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/glib-genmarshal.in
View File

@@ -962,7 +962,7 @@ if __name__ == '__main__':
if line == '\n' or line.startswith('#'): if line == '\n' or line.startswith('#'):
continue continue
matches = re.match(r'^([A-Z0-9]+):([A-Z0-9,]+)$', line.strip()) matches = re.match(r'^([A-Z0-9]+)\s?:\s?([A-Z0-9,\s]+)$', line.strip())
if not matches or len(matches.groups()) != 2: if not matches or len(matches.groups()) != 2:
print_warning('Invalid entry: "{}"'.format(line.strip()), args.fatal_warnings) print_warning('Invalid entry: "{}"'.format(line.strip()), args.fatal_warnings)
continue continue
@@ -972,8 +972,8 @@ if __name__ == '__main__':
else: else:
location = None location = None
retval = matches.group(1) retval = matches.group(1).strip()
params = matches.group(2).split(',') params = [x.strip() for x in matches.group(2).split(',')]
check_args(retval, params, args.fatal_warnings) check_args(retval, params, args.fatal_warnings)
raw_marshaller = generate_marshaller_name(args.prefix, retval, params, False) raw_marshaller = generate_marshaller_name(args.prefix, retval, params, False)