From 785db43bb2cd64bfe795ba1c6adef8b82b85430d Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Fri, 11 Jul 2014 07:45:41 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20issue=20with=20single=20include=20gener?= =?UTF-8?q?ator=20-=20well,=20partially.=20The=20problem=20is=20it=20is=20?= =?UTF-8?q?matching=20/*=20=E2=80=A6=20*/=20comments=20by=20assuming=20the?= =?UTF-8?q?=20intervening=20lines=20begin=20with=20whitespace=20followed?= =?UTF-8?q?=20by=20a=20*.=20This=20avoids=20it=20having=20to=20maintain=20?= =?UTF-8?q?extra=20state,=20but=20makes=20it=20brittle.=20It=20was=20match?= =?UTF-8?q?ing=20*it=20=3D=20"=20"=20+=20*it;=20as=20a=20comment!=20It=20n?= =?UTF-8?q?ow=20matches=20on=20a=20single=20space=20followed=20by=20a=20?= =?UTF-8?q?=20*=20and=20this=20seems=20to=20work=20for=20now=20-=20but=20i?= =?UTF-8?q?t=20probably=20needs=20to=20move=20to=20proper=20stateful=20com?= =?UTF-8?q?ment=20handling.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/generateSingleHeader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generateSingleHeader.py b/scripts/generateSingleHeader.py index 9f5ddcb0..cd97010f 100644 --- a/scripts/generateSingleHeader.py +++ b/scripts/generateSingleHeader.py @@ -16,7 +16,7 @@ ifParser = re.compile( r'\s*#ifndef TWOBLUECUBES_CATCH_.*_INCLUDED') endIfParser = re.compile( r'\s*#endif // TWOBLUECUBES_CATCH_.*_INCLUDED') ifImplParser = re.compile( r'\s*#ifdef CATCH_CONFIG_RUNNER' ) commentParser1 = re.compile( r'^\s*/\*') -commentParser2 = re.compile( r'^\s*\*') +commentParser2 = re.compile( r'^ \*') blankParser = re.compile( r'^\s*$') seenHeaders = set([]) rootPath = os.path.join( catchPath, 'include/' )