Merge branch 'v2.3' into v2.4

CHANGES/v2.3.md

@@ -221,6 +221,7 @@ For developers:
 For users:
 - Fixed `plumed partial_tempering` to agree with GROMACS conventions for choice of dihedrals (see \issue{337}).
   Should be irrelevant for the vast majority of cases.
+- Fixed small bug in regexp parses - the part outside the parentheses was just ignored.
 
 For developers:
 - Doxygen on travis-ci has been updated to 1.8.14.

src/core/ActionWithArguments.cpp

@@ -66,14 +66,13 @@ bool ActionWithArguments::parseArgumentList(const std::string&key,int i,std::vec
 void ActionWithArguments::interpretArgumentList(const std::vector<std::string>& c, std::vector<Value*>&arg) {
   for(unsigned i=0; i<c.size(); i++) {
     // is a regex? then just interpret it. The signal is ()
-    std::size_t found1 = c[i].find("(");
-    if(found1!=std::string::npos) {
-      std::size_t found2=c[i].find(")",found1+1,1); // find it again
-      if(found2!=std::string::npos) {
+    if(!c[i].compare(0,1,"(")) {
+      unsigned l=c[i].length();
+      if(!c[i].compare(l-1,1,")")) {
         // start regex parsing
 #ifdef __PLUMED_HAS_CREGEX
         // take the string enclosed in quotes and put in round brackets
-        std::string myregex=c[i].substr(found1,found2-found1+1);
+        std::string myregex=c[i];
         log.printf("  Evaluating regexp for this action: %s \n",myregex.c_str());
         int errcode;
         regex_t *preg = (regex_t*)malloc(sizeof(regex_t)); // pointer to the regular expression