Merge pull request #23611 from Dr15Jones/newBoostCutParser

Handle any trailing white space
cms-sw · Jun 20, 2018 · 8b5484a · 8b5484a
2 parents e6fef05 + 95894c5
commit 8b5484a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CommonTools/Utils/src/MethodArgumentSetter.h b/CommonTools/Utils/src/MethodArgumentSetter.h
@@ -22,6 +22,11 @@ namespace reco {
       }
       void operator()(const char *begin, const char *end) const {
         assert(begin+1 <= end-1); // the quotes are included in [begin,end[ range.        
+        //in boost 1.67, the parser appends any extra white space to the
+        // end
+        if(*(end-1) != *begin) {
+          --end;
+        }
         stack_.push_back( AnyMethodArgument(std::string(begin+1,end-1)) );
       }
     private:

diff --git a/CommonTools/Utils/test/testCutParser.cc b/CommonTools/Utils/test/testCutParser.cc
@@ -187,6 +187,9 @@ void testCutParser::checkAll() {
   check("quality('goodIterative')", true);
   check("quality('looseSetWithPV')", false);
   check("quality('highPuritySetWithPV')", false);
+  check("quality('highPuritySetWithPV' )", false);
+  check("quality( 'highPuritySetWithPV')", false);
+  check("quality( 'highPuritySetWithPV' )", false);
 
   // check handling of errors 
   //   first those who are the same in lazy and non lazy parsing