contrib/check-code.py
changeset 36957 a8d540d2628c
parent 36949 35d814fe2f30
child 37241 79af9ae46a78
--- a/contrib/check-code.py	Tue Mar 13 17:55:03 2018 -0400
+++ b/contrib/check-code.py	Wed Mar 14 14:05:45 2018 -0400
@@ -542,8 +542,11 @@
             for i, pseq in enumerate(pats):
                 # fix-up regexes for multi-line searches
                 p = pseq[0]
-                # \s doesn't match \n
-                p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p)
+                # \s doesn't match \n (done in two steps)
+                # first, we replace \s that appears in a set already
+                p = re.sub(r'\[\\s', r'[ \\t', p)
+                # now we replace other \s instances.
+                p = re.sub(r'(?<!(\\|\[))\\s', r'[ \\t]', p)
                 # [^...] doesn't match newline
                 p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p)