[Boost-commit] svn:boost r49745 - trunk/boost/spirit/home/support/detail/lexer/partition

Subject: [Boost-commit] svn:boost r49745 - trunk/boost/spirit/home/support/detail/lexer/partition
From: jamin.hanson_at_[hidden]
Date: 2008-11-14 10:09:46

Author: ben_hanson
Date: 2008-11-14 10:09:45 EST (Fri, 14 Nov 2008)
New Revision: 49745
URL: http://svn.boost.org/trac/boost/changeset/49745

Log:
Copyright message change, removed redundant if statement.
Text files modified: 
   trunk/boost/spirit/home/support/detail/lexer/partition/equivset.hpp |    16 +++-------------                        
   1 files changed, 3 insertions(+), 13 deletions(-)

Modified: trunk/boost/spirit/home/support/detail/lexer/partition/equivset.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/partition/equivset.hpp	(original)
+++ trunk/boost/spirit/home/support/detail/lexer/partition/equivset.hpp	2008-11-14 10:09:45 EST (Fri, 14 Nov 2008)
@@ -1,5 +1,5 @@
 // equivset.hpp
-// Copyright (c) 2007 Ben Hanson (http://www.benhanson.net/)
+// Copyright (c) 2007-2008 Ben Hanson (http://www.benhanson.net/)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -61,20 +61,10 @@
 
         if (!overlap_._index_vector.empty ())
         {
-            overlap_._id = _id;
-
-            // LHS abstemious transitions have priority.
-            if (_greedy < rhs_._greedy)
-            {
-                overlap_._greedy = _greedy;
-            }
-            else
-            {
-                overlap_._greedy = _greedy;
-            }
-
             // Note that the LHS takes priority in order to
             // respect rule ordering priority in the lex spec.
+            overlap_._id = _id;
+            overlap_._greedy = _greedy;
             overlap_._followpos = _followpos;
 
             node_vector::const_iterator overlap_begin_ =