Author: Armin Rigo <[email protected]>
Branch:
Changeset: r187:31b44d824886
Date: 2014-12-06 18:03 +0100
http://bitbucket.org/cffi/creflect/changeset/31b44d824886/
Log: tweak the regexp to recognize also "#define FOO" with no value
specified.
diff --git a/creflect/cparser.py b/creflect/cparser.py
--- a/creflect/cparser.py
+++ b/creflect/cparser.py
@@ -31,7 +31,7 @@
r_empty_braces = re.compile(r"{(\s*)}") # after comments have been removed
r_typedef_dotdodot = re.compile(r"\btypedef(\s*)[.][.][.]")
r_define_var = re.compile(
- r"^[ \t]*#[ \t]*define[ \t]+([A-Za-z_][A-Za-z0-9_]+)[ \t][^\n]+",
+ r"^[ \t]*#[ \t]*define[ \t]+([A-Za-z_][A-Za-z0-9_]+)([ \t].*)?$",
re.MULTILINE)
def remove_comments(csource):
diff --git a/creflect/test/codegen/macro-001.c
b/creflect/test/codegen/macro-001.c
--- a/creflect/test/codegen/macro-001.c
+++ b/creflect/test/codegen/macro-001.c
@@ -1,5 +1,10 @@
+#define FOO
+#define BAR (40U + 2)
+
+# ____________________________________________________________
+
+#undef FOO
#define FOO 42
-#define BAR (40U + 2)
# ____________________________________________________________
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
