From b4d11afc0138699cefa0a7cfcc99039853fc4fae Mon Sep 17 00:00:00 2001 From: John Finlay Date: Sat, 1 Nov 2008 01:06:49 +0000 Subject: Add defsgen to __all__ list. Strip out # directives from enum defintions. * codegen/__init__.py (__all__): Add defsgen to __all__ list. * codegen/h2def.py (find_enum_defs): Strip out # directives from enum defintions. (clean_func): Change ' * G_CONST_RETURN * ' to '** ' svn path=/trunk/; revision=974 --- codegen/__init__.py | 1 + codegen/h2def.py | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'codegen') diff --git a/codegen/__init__.py b/codegen/__init__.py index cfa896e..86188f9 100644 --- a/codegen/__init__.py +++ b/codegen/__init__.py @@ -8,6 +8,7 @@ __all__ = [ 'docextract', 'docgen', 'h2def', + 'defsgen' 'mergedefs', 'mkskel', 'override', diff --git a/codegen/h2def.py b/codegen/h2def.py index 0af30f5..7669fd4 100755 --- a/codegen/h2def.py +++ b/codegen/h2def.py @@ -174,6 +174,10 @@ 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|;)') @@ -244,6 +248,7 @@ 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-') -- cgit