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

mkenums: trivial style fixes

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
This commit is contained in:
Igor Gnatenko 2017-07-15 15:22:20 +02:00
parent 112908d9e4
commit d753a411c0
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gobject/glib-mkenums.in
View File

@ -9,7 +9,11 @@
# #
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import os, sys, re, argparse, tempfile import argparse
import os
import re
import sys
import tempfile
output_stream = sys.stdout output_stream = sys.stdout
@ -49,7 +53,7 @@ def parse_trigraph(opts):
opt = re.sub(r'^\s*', '', opt) opt = re.sub(r'^\s*', '', opt)
opt = re.sub(r'\s*$', '', opt) opt = re.sub(r'\s*$', '', opt)
m = re.search(r'(\w+)(?:=(.+))?', opt) m = re.search(r'(\w+)(?:=(.+))?', opt)
assert(m is not None) assert m is not None
groups = m.groups() groups = m.groups()
key = groups[0] key = groups[0]
if len(groups) > 1: if len(groups) > 1:
@ -82,7 +86,7 @@ def parse_entries(file, file_name):
if looking_for_name: if looking_for_name:
m = re.match('\s*(\w+)', line) m = re.match('\s*(\w+)', line)
if m: if m:
enumname = m.group(1); enumname = m.group(1)
return True return True
# Handle include files # Handle include files
@ -99,12 +103,12 @@ def parse_entries(file, file_name):
m = re.match(r'\s*\}\s*(\w+)', line) m = re.match(r'\s*\}\s*(\w+)', line)
if m: if m:
enumname = m.group(1) enumname = m.group(1)
enumindex+=1; enumindex += 1
return 1; return 1
m = re.match(r'\s*\}', line) m = re.match(r'\s*\}', line)
if m: if m:
enumindex+=1; enumindex += 1
looking_for_name = True looking_for_name = True
continue continue
@ -134,7 +138,7 @@ def parse_entries(file, file_name):
if options is not None: if options is not None:
options = parse_trigraph(options) options = parse_trigraph(options)
if 'skip' not in options: if 'skip' not in options:
entries.append((name, value, options['nick'])); entries.append((name, value, options['nick']))
else: else:
entries.append((name, value)) entries.append((name, value))
elif re.match('s*\#', line): elif re.match('s*\#', line):
@ -191,7 +195,7 @@ def read_template_file(file):
'value-production': vprod, 'value-production': vprod,
'value-tail': vtail, 'value-tail': vtail,
'comment': comment_tmpl, 'comment': comment_tmpl,
} }
in_ = 'junk' in_ = 'junk'
ifile = open(file) ifile = open(file)
@ -205,7 +209,7 @@ def read_template_file(file):
in_ = 'junk' in_ = 'junk'
continue continue
else: else:
sys.exit("Malformed template file " + file); sys.exit("Malformed template file " + file)
if in_ != 'junk': if in_ != 'junk':
tmpl[in_] += line tmpl[in_] += line
@ -304,7 +308,7 @@ def replace_specials(prod):
return prod return prod
if len(fhead) > 0: if len(fhead) > 0:
prod = fhead; prod = fhead
base = os.path.basename(options.args[0]) base = os.path.basename(options.args[0])
prod = prod.replace('\u0040filename\u0040', options.args[0]) prod = prod.replace('\u0040filename\u0040', options.args[0])
@ -339,7 +343,7 @@ def process_file(curfilename):
if m: if m:
groups = m.groups() groups = m.groups()
if len(groups) >= 2 and groups[1] is not None: if len(groups) >= 2 and groups[1] is not None:
options = parse_trigraph(groups[1]); options = parse_trigraph(groups[1])
if 'skip' in options: if 'skip' in options:
continue continue
enum_prefix = options.get('prefix', None) enum_prefix = options.get('prefix', None)
@ -366,11 +370,11 @@ def process_file(curfilename):
if re.match(r'\s*\{', line): if re.match(r'\s*\{', line):
break break
seenbitshift = 0; seenbitshift = 0
entries = []; entries = []
# Now parse the entries # Now parse the entries
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 not flags:
@ -380,11 +384,11 @@ def process_file(curfilename):
if enum_prefix is None: if enum_prefix is None:
for entry in entries: for entry in entries:
if len(entry) < 3 or entry[2] is None: if len(entry) < 3 or entry[2] is None:
name = entry[0]; name = entry[0]
if enum_prefix is not None: if enum_prefix is not None:
enum_prefix = os.path.commonprefix([name, enum_prefix]) enum_prefix = os.path.commonprefix([name, enum_prefix])
else: else:
enum_prefix = name; enum_prefix = name
if enum_prefix is None: if enum_prefix is None:
enum_prefix = "" enum_prefix = ""
else: else:
@ -429,9 +433,9 @@ def process_file(curfilename):
enumsym = enspace.lower() + "_" + enumshort.lower() enumsym = enspace.lower() + "_" + enumshort.lower()
if option_lowercase_name is not None: if option_lowercase_name is not None:
enumsym = option_lowercase_name; enumsym = option_lowercase_name
else: else:
enumshort = enumname; enumshort = enumname
if idprefix: if idprefix:
enumshort = re.sub(r'^' + idprefix, '', enumshort) enumshort = re.sub(r'^' + idprefix, '', enumshort)
else: else:
@ -439,7 +443,7 @@ def process_file(curfilename):
enumshort = re.sub(r'([^A-Z])([A-Z])', r'\1_\2', enumshort) enumshort = re.sub(r'([^A-Z])([A-Z])', r'\1_\2', enumshort)
enumshort = re.sub(r'([A-Z][A-Z])([A-Z][0-9a-z])', r'\1_\2', enumshort) enumshort = re.sub(r'([A-Z][A-Z])([A-Z][0-9a-z])', r'\1_\2', enumshort)
enumshort = enumshort.upper(); enumshort = enumshort.upper()
if symprefix is not None: if symprefix is not None:
enumname_prefix = symprefix.upper() enumname_prefix = symprefix.upper()
@ -453,8 +457,8 @@ def process_file(curfilename):
firstenum = False firstenum = False
if len(fprod) > 0: if len(fprod) > 0:
prod = fprod; prod = fprod
base = os.path.basename(curfilename); base = os.path.basename(curfilename)
prod = prod.replace('\u0040filename\u0040', curfilename) prod = prod.replace('\u0040filename\u0040', curfilename)
prod = prod.replace('\u0040basename\u0040', base) prod = prod.replace('\u0040basename\u0040', base)
@ -463,7 +467,7 @@ def process_file(curfilename):
write_output(prod) write_output(prod)
if len(eprod) > 0: if len(eprod) > 0:
prod = eprod; prod = eprod
prod = prod.replace('\u0040enum_name\u0040', enumsym) prod = prod.replace('\u0040enum_name\u0040', enumsym)
prod = prod.replace('\u0040EnumName\u0040', enumname) prod = prod.replace('\u0040EnumName\u0040', enumname)
@ -471,7 +475,7 @@ def process_file(curfilename):
prod = prod.replace('\u0040ENUMNAME\u0040', enumlong) prod = prod.replace('\u0040ENUMNAME\u0040', enumlong)
prod = prod.replace('\u0040ENUMPREFIX\u0040', enumname_prefix) prod = prod.replace('\u0040ENUMPREFIX\u0040', enumname_prefix)
if flags: if flags:
prod =~ prod.replace('\u0040type\u0040', 'flags') prod = ~prod.replace('\u0040type\u0040', 'flags')
else: else:
prod = prod.replace('\u0040type\u0040', 'enum') prod = prod.replace('\u0040type\u0040', 'enum')
if flags: if flags:
@ -486,7 +490,7 @@ def process_file(curfilename):
write_output(prod) write_output(prod)
if len(vhead) > 0: if len(vhead) > 0:
prod = vhead; prod = vhead
prod = prod.replace('\u0040enum_name\u0040', enumsym) prod = prod.replace('\u0040enum_name\u0040', enumsym)
prod = prod.replace('\u0040EnumName\u0040', enumname) prod = prod.replace('\u0040EnumName\u0040', enumname)
prod = prod.replace('\u0040ENUMSHORT\u0040', enumshort) prod = prod.replace('\u0040ENUMSHORT\u0040', enumshort)
@ -508,7 +512,7 @@ def process_file(curfilename):
write_output(prod) write_output(prod)
if len(vprod) > 0: if len(vprod) > 0:
prod = vprod; prod = vprod
next_num = 0 next_num = 0
prod = replace_specials(prod) prod = replace_specials(prod)
@ -521,7 +525,7 @@ def process_file(curfilename):
if num is not None: if num is not None:
# use sandboxed evaluation as a reasonable # use sandboxed evaluation as a reasonable
# approximation to C constant folding # approximation to C constant folding
inum = eval(num, {}, {}); inum = eval(num, {}, {})
# make sure it parsed to an integer # make sure it parsed to an integer
if not isinstance(inum, int): if not isinstance(inum, int):
@ -586,7 +590,7 @@ if len(ftail) > 0:
write_output(prod) write_output(prod)
# put auto-generation comment # put auto-generation comment
comment = comment_tmpl; comment = comment_tmpl
comment = comment.replace('\u0040comment\u0040', 'Generated data ends here') comment = comment.replace('\u0040comment\u0040', 'Generated data ends here')
write_output("\n" + comment + "\n") write_output("\n" + comment + "\n")