From 5152f8c73bf379dc7d35f9d55a2f26108bff117d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Mar 2005 20:26:58 +0000 Subject: [PATCH] (rules): Leave space after operator. --- ChangeLog | 5 +++++ buildscripts/fixcc.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5a0468c021..db229c8f0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-14 Jan Nieuwenhuizen + + * buildscripts/fixcc.py (rules): Leave space after operator. + 2005-03-14 Werner Lemberg * 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 * ly/titling-init.ly (bookTitleMarkup): Refinements. diff --git a/buildscripts/fixcc.py b/buildscripts/fixcc.py index 82a8eb60bf..2fbf5f4193 100644 --- 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() -- 2.39.2