From aa2374c5a2dda4041e4c2a5ded02f682e5800e34 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 19 Dec 2012 15:23:29 +0100
Subject: [PATCH] Cosmetics.

* src/sanity/style.test: Catch extra space around operator declarations.
* src/ltlast/automatop.hh, src/ltlast/multop.hh,
src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh,
src/tgbaalgos/simulation.cc: Fix them.
---
 src/ltlast/automatop.hh     |  2 +-
 src/ltlast/multop.hh        |  2 +-
 src/sanity/style.test       | 18 ++++++++++++++----
 src/tgba/tgbabddcoredata.cc |  6 +++---
 src/tgba/tgbabddcoredata.hh |  6 +++---
 src/tgbaalgos/simulation.cc |  2 +-
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/ltlast/automatop.hh b/src/ltlast/automatop.hh
index 31272de14..addfb2451 100644
--- a/src/ltlast/automatop.hh
+++ b/src/ltlast/automatop.hh
@@ -81,7 +81,7 @@ namespace spot
       struct tripletcmp
       {
 	bool
-	operator () (const triplet& p1, const triplet& p2) const
+	operator()(const triplet& p1, const triplet& p2) const
 	{
 	  if (p1.first.first != p2.first.first)
 	    return p1.first.first < p2.first.first;
diff --git a/src/ltlast/multop.hh b/src/ltlast/multop.hh
index a8f072024..b11fa6e5a 100644
--- a/src/ltlast/multop.hh
+++ b/src/ltlast/multop.hh
@@ -157,7 +157,7 @@ namespace spot
       struct paircmp
       {
 	bool
-	operator () (const pair& p1, const pair& p2) const
+	operator()(const pair& p1, const pair& p2) const
 	{
 	  if (p1.first != p2.first)
 	    return p1.first < p2.first;
diff --git a/src/sanity/style.test b/src/sanity/style.test
index 316f831c1..12e4f776b 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -131,15 +131,25 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
 
       # The 'r' allows operator&&
       grep '[^	 r]&&[^	 ]' $tmp &&
-	diag 'Space arround binary operators.'
+	diag 'Space around binary operators.'
 
       # The 'r' allows operator||
       grep '[^	 r]||[^	 ]' $tmp &&
-	diag 'Space arround binary operators.'
+	diag 'Space around binary operators.'
 
       # The 'r' allows operator==
-      grep '[^	 r][!<>=]=[^	 ]' $tmp &&
-	diag 'Space arround binary operators.'
+      grep '[^	 r<>][!<>=]=[^	 ]' $tmp &&
+	diag 'Space around binary operators.'
+
+      # The 'r' allows operator<<=
+      grep '[^	 r][<>][<>]=[^	 ]' $tmp &&
+	diag 'Space around binary operators.'
+
+      grep 'operator[^a-zA-Z0-9_(]*[	 ][^a-zA-Z0-9_(]*(' $tmp &&
+        diag 'Write operatorXX(...) without spaces around XX.'
+
+      grep 'operator[^(]* (' $tmp &&
+        diag 'No space before ('
 
       grep '[	 ]default:[^:].*;' $tmp &&
 	diag 'Label should be on their own line.'
diff --git a/src/tgba/tgbabddcoredata.cc b/src/tgba/tgbabddcoredata.cc
index 086018372..8dd362cf6 100644
--- a/src/tgba/tgbabddcoredata.cc
+++ b/src/tgba/tgbabddcoredata.cc
@@ -1,5 +1,5 @@
-// Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement de
-// l'Epita (LRDE).
+// Copyright (C) 2009, 2011, 2012 Laboratoire de Recherche et
+// Développement de l'Epita (LRDE).
 // Copyright (C) 2003  Laboratoire d'Informatique de Paris 6 (LIP6),
 // département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
@@ -91,7 +91,7 @@ namespace spot
   }
 
   const tgba_bdd_core_data&
-  tgba_bdd_core_data::operator= (const tgba_bdd_core_data& copy)
+  tgba_bdd_core_data::operator=(const tgba_bdd_core_data& copy)
   {
     if (this != &copy)
       {
diff --git a/src/tgba/tgbabddcoredata.hh b/src/tgba/tgbabddcoredata.hh
index 6e046954f..e612f61a5 100644
--- a/src/tgba/tgbabddcoredata.hh
+++ b/src/tgba/tgbabddcoredata.hh
@@ -1,5 +1,5 @@
-// Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement de
-// l'Epita (LRDE).
+// Copyright (C) 2009, 2011, 2012 Laboratoire de Recherche et
+// Développement de l'Epita (LRDE).
 // Copyright (C) 2003, 2005  Laboratoire d'Informatique de Paris 6 (LIP6),
 // département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
@@ -134,7 +134,7 @@ namespace spot
     tgba_bdd_core_data(const tgba_bdd_core_data& left,
 		       const tgba_bdd_core_data& right);
 
-    const tgba_bdd_core_data& operator= (const tgba_bdd_core_data& copy);
+    const tgba_bdd_core_data& operator=(const tgba_bdd_core_data& copy);
 
     /// \brief Update the variable sets to take a new pair of variables into
     /// account.
diff --git a/src/tgbaalgos/simulation.cc b/src/tgbaalgos/simulation.cc
index 95b354cb3..1875b8421 100644
--- a/src/tgbaalgos/simulation.cc
+++ b/src/tgbaalgos/simulation.cc
@@ -112,7 +112,7 @@ namespace spot
       {
       }
 
-      inline bool operator!= (const automaton_size& r)
+      inline bool operator!=(const automaton_size& r)
       {
         return transitions != r.transitions || states != r.states;
       }