Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorPhil Nash2014-07-11 07:45:41 +0100
committerPhil Nash2014-07-11 07:45:41 +0100
commit785db43bb2cd64bfe795ba1c6adef8b82b85430d (patch)
treea4634f761468ccdaab4e7cae7e7df9db35ada057 /scripts
parentca42b2c585e0c02aeaed0c884ccba5f7e6c1d11f (diff)
downloadcatch3-785db43bb2cd64bfe795ba1c6adef8b82b85430d.tar.gz
Fixed issue with single include generator
- well, partially. The problem is it is matching /* … */ comments by assuming the intervening lines begin with whitespace followed by a *. This avoids it having to maintain extra state, but makes it brittle. It was matching *it = " " + *it; as a comment! It now matches on a single space followed by a * and this seems to work for now - but it probably needs to move to proper stateful comment handling.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/generateSingleHeader.py2
1 files changed, 1 insertions, 1 deletions
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/' )