From b01ee33071f0ec0d1bc3fbfc71d8d46feac3df02 Mon Sep 17 00:00:00 2001 From: "fergus.henderson@gmail.com" Date: Mon, 9 Apr 2012 22:20:35 +0000 Subject: Fix issue 104 : handle header file names containing commas. git-svn-id: http://distcc.googlecode.com/svn/trunk@764 01de4be4-8c4a-0410-9132-4925637da917 --- include_server/parse_file.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include_server') diff --git a/include_server/parse_file.py b/include_server/parse_file.py index bc6374e..ac9720f 100755 --- a/include_server/parse_file.py +++ b/include_server/parse_file.py @@ -92,8 +92,8 @@ DIRECTIVE_RE = re.compile(r""" ( ((?P include_next | include | import) \s* - ( "(?P (\w|[_/.+-])*)" | # "bar/foo.h" - <(?P (\w|[_/.+-])*)> | # + ( "(?P (\w|[_/.,+-])*)" | # "bar/foo.h" + <(?P (\w|[_/.,+-])*)> | # (?P .*?)) # expr, match . minimally ) | @@ -111,8 +111,8 @@ DIRECTIVE_RE = re.compile(r""" INCLUDE_STRING_RE = re.compile(r""" ^ \s* - ( "\s*(?P (\w|[\\_/.+-])*)\s*" | - <\s*(?P (\w|[\\_/.+-])*)\s*> + ( "\s*(?P (\w|[\\_/.,+-])*)\s*" | + <\s*(?P (\w|[\\_/.,+-])*)\s*> ) \s* $ -- cgit v1.2.1