]> granicus.if.org Git - python/commitdiff
Issue #23330: h2py now supports arbitrary filenames in #include.
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 3 May 2015 12:35:02 +0000 (15:35 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 3 May 2015 12:35:02 +0000 (15:35 +0300)
Misc/NEWS
Tools/scripts/h2py.py

index ad958d8b72724f4d4be470349425814a53c15ee7..99ed86025ec7cc135beef6cb466c57a85586f910 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -210,6 +210,8 @@ Documentation
 Tools/Demos
 -----------
 
+- Issue #23330: h2py now supports arbitrary filenames in #include.
+
 - Issue #6639: Module-level turtle functions no longer raise TclError after
   closing the window.
 
index c64501e604d76123fc66a8c2c2b888f82313cbfe..40b1bce8cd39f2643eb2dbcdfb184cf77b476994 100755 (executable)
@@ -29,7 +29,7 @@ p_macro = re.compile(
   '^[\t ]*#[\t ]*define[\t ]+'
   '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
 
-p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
+p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>')
 
 p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
 p_cpp_comment = re.compile('//.*')