(rules): Leave space after operator.

diff --git a/ChangeLog b/ChangeLog
index 5a0468c021da229e01a4b7fad6a9df3aa2a03dca..db229c8f0e81f9781d51c9815c899b4cc221e0cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * buildscripts/fixcc.py (rules): Leave space after operator.
+
 2005-03-14  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-klef.mf (draw_gclef): Replace `simple_serif' for
@@ -44,6 +48,7 @@
        * scm/paper.scm (layout-set-staff-size): increase blotdiameter to
        0.4pt.
 
+>>>>>>> 1.3297
 2005-03-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ly/titling-init.ly (bookTitleMarkup): Refinements.

diff --git a/buildscripts/fixcc.py b/buildscripts/fixcc.py
index 82a8eb60bf63cd015b60113f353f9ee83087e26b..2fbf5f41937c05033ddff0476c45f0f2c7d36f4f 100644 (file)
--- a/buildscripts/fixcc.py
+++ b/buildscripts/fixcc.py
@@ -55,8 +55,10 @@ rules = {
         '\\1 \\3'),
        # unary pointer, minus, not
        ('(return|=) (\*|&|-|!) ([\w\(])', '\\1 \\2\\3'),
+       # delete space after `operator'
+       #('(\Woperator) (\W)', '\\1\\2'),
        # space after `operator'
-       ('(\Woperator) (\W)', '\\1\\2'),
+       ('(\Woperator) *(\W)', '\\1 \\2'),
        # dangling newline
        ('\n[ \t]*\n[ \t]*\n', '\n\n'),
        # dangling parenthesis open
@@ -87,6 +89,7 @@ rules = {
 
        ## Massage code that gets broken by rules above.
        # delete spaces around template brackets
+       # Note that this does not work for PQueue_event.  Fix C++ name?
        ('(dynamic_cast|template|([A-Z]\w*))[ \t]*<[ \t]*((bool|char|int|unsigned|void|(class[ \t]+\w*)|([A-Z]\w*)))[ \t]*?(| \*)[ \t]*>',
         '\\1<\\3\\7>'),
        # delete space before #define x()