luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib-mkenums: feature use of previous symbols in evaluation

Browse Source 
Enum symbols can be defined with a value computed from previously
defined enum symbols. The current evaluator does not support this and
requires a literal integer expression.

This commit introduces a C symbol namespace that is filled along
code generation and provided as a local namespace for new symbols
evaluation, effectively allowing definitions such as:

	typedef enum {
	  a = 4;
	  b = a + 2;
	}  myenum;

to be successfully processed.
This commit is contained in:
Patrick Monnerat 2022-11-01 02:12:26 +01:00
parent cbf17c9422
commit 0120cd772a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gobject/glib-mkenums.in
View File

@ -143,7 +143,7 @@ enumname_prefix = '' # prefix of $enumname
enumindex = 0 # Global enum counter enumindex = 0 # Global enum counter
firstenum = 1 # Is this the first enumeration per file? firstenum = 1 # Is this the first enumeration per file?
entries = [] # [ name, val ] for each entry entries = [] # [ name, val ] for each entry
sandbox = None # sandbox for safe evaluation of expressions c_namespace = {} # C symbols namespace.
output = '' # Filename to write result into output = '' # Filename to write result into
@ -489,7 +489,7 @@ if len(fhead) > 0:
write_output(prod) write_output(prod)
def process_file(curfilename): def process_file(curfilename):
global entries, flags, seenbitshift, seenprivate, enum_prefix global entries, flags, seenbitshift, seenprivate, enum_prefix, c_namespace
firstenum = True firstenum = True
try: try:
@ -729,7 +729,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, {}, c_namespace)
# make sure it parsed to an integer # make sure it parsed to an integer
if not isinstance(inum, int): if not isinstance(inum, int):
@ -738,6 +738,7 @@ def process_file(curfilename):
else: else:
num = next_num num = next_num
c_namespace[name] = num
tmp_prod = tmp_prod.replace('\u0040valuenum\u0040', str(num)) tmp_prod = tmp_prod.replace('\u0040valuenum\u0040', str(num))
next_num = int(num) + 1 next_num = int(num) + 1