From 3a49a1db0e61a31b217ef89119681aa4040e7965 Mon Sep 17 00:00:00 2001 From: Paul Pogonyshev Date: Sat, 6 Dec 2008 19:31:37 +0000 Subject: Revert 2008-10-31 changes by John Finlay: should only go to 2.17 development. svn path=/branches/pygobject-2-16/; revision=978 --- codegen/h2def.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'codegen/h2def.py') diff --git a/codegen/h2def.py b/codegen/h2def.py index 7669fd4..8cbe24e 100755 --- a/codegen/h2def.py +++ b/codegen/h2def.py @@ -174,10 +174,6 @@ def find_enum_defs(buf, enums=[]): # bulk comments buf = strip_comments(buf) - # strip # directives - pat = re.compile(r"""^[#].*?$""", re.MULTILINE) - buf = pat.sub('', buf) - buf = re.sub('\n', ' ', buf) enum_pat = re.compile(r'enum\s*{([^}]*)}\s*([A-Z][A-Za-z]*)(\s|;)') @@ -248,7 +244,6 @@ def clean_func(buf): buf = pat.sub(r'[] \1', buf) # make return types that are const work. - buf = re.sub(r'\s*\*\s*G_CONST_RETURN\s*\*\s*', '** ', buf) buf = string.replace(buf, 'G_CONST_RETURN ', 'const-') buf = string.replace(buf, 'const ', 'const-') @@ -331,8 +326,7 @@ class DefsWriter: for ent in entries: # shorten prefix til we get a match ... # and handle GDK_FONT_FONT, GDK_FONT_FONTSET case - while (prefix[-1] != '_' or ent[:len(prefix)] != prefix - or len(prefix) >= len(ent)): + while ent[:len(prefix)] != prefix or len(prefix) >= len(ent): prefix = prefix[:-1] prefix_len = len(prefix) fp.write(' (values\n') -- cgit