From: Keith OHara <k-ohara5a5a@oco.net>
Date: Mon, 1 Aug 2011 04:11:17 +0000 (-0700)
Subject: scripts/auxiliar/fixcc.py: remove annoyances
X-Git-Tag: release/2.15.8-1~6
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=c5db77ed501402965ff47ad3a4462aa79c674bf6;p=lilypond.git

scripts/auxiliar/fixcc.py: remove annoyances

Don't touch an operator that lies alone on a line
Let the C++ nit-picking rules see the open double quote of strings
---

diff --git a/scripts/auxiliar/fixcc.py b/scripts/auxiliar/fixcc.py
index ca7806fe58..4449a45b47 100755
--- a/scripts/auxiliar/fixcc.py
+++ b/scripts/auxiliar/fixcc.py
@@ -67,7 +67,7 @@ rules = {
     ('([\w\(\)\]]) +(&&|\|\||<=|>=|!=|\|=|==|\+=|-=|\*=|/=|\?|<|>|\+|-|=|/|:|&|\||\*) +([\w\(\)])', '\\1 \\2 \\3'),
 
     # trailing operator, but don't un-trail close angle-braces > nor pointer *, and not before a preprocessor line
-    (' (::|&&|\|\||<=|>=|!=|\|=|==|\+=|-=|\*=|/=|\?|<|\+|-|=|/|:|&XXX|\||\*XXX) *\n( *)([^\s#])', '\n\\2\\1 \\3'),
+    ('(?<!\s) (::|&&|\|\||<=|>=|!=|\|=|==|\+=|-=|\*=|/=|\?|<|\+|-|=|/|:|&XXX|\||\*XXX) *\n( *)([^\s#])', '\n\\2\\1 \\3'),
     # space after `operator'
     ('(\Woperator) *([^\w\s])', '\\1 \\2'),
     # trailing parenthesis open
@@ -133,9 +133,10 @@ snippet_res = {
 
     'string':
     r'''(?x)
+    "      # leave the leading " character visible to CXX rules
     (?P<match>
     (?P<code>
-    "([^"\n]|\\")*"))''',
+    ([^"\n]|\\")*"))''',
     
     'char':
     r'''(?x)