Correctly handle signature termination characters ('{' or ';') contained in quotes

Author: jjallaire

ChangeLog

@@ -2,6 +2,8 @@
 
         * Rcpp.Rproj: don't use devtools mode in RStudio (enables the
         Test Package command to invoke the RUnit based test-suite)
+        * src/attributes.cpp: Correctly handle signature termination 
+        characters ('{' or ';') contained in quotes
 
 2015-07-16  Kevin Ushey  <[email protected]>
 

inst/NEWS.Rd

@@ -24,6 +24,8 @@
       libraries.
       \item The \code{evalCpp} function now also supports the \code{plugins}
       argument.
+      \item Correctly handle signature termination characters ('\{' or ';') contained
+      in quotes.
     }
     \item Changes in Rcpp Documentation:
     \itemize{

src/attributes.cpp

@@ -1460,19 +1460,34 @@ namespace attributes {
     // Parse the text of a function signature from the specified line
     std::string SourceFileAttributesParser::parseSignature(size_t lineNumber) {
 
-        // Look for the next {
+        // Look for the signature termination ({ or ; not inside quotes)
+        // on this line and then subsequent lines if necessary
         std::string signature;
         for (int i = lineNumber; i<lines_.size(); i++) {
             std::string line;
             line = lines_[i];
-            std::string::size_type end = line.find_first_of("{;");
-            if (end == std::string::npos) {
-                signature.append(line);
-                signature.push_back(' ');
-            } else {
-                signature.append(line.substr(0, end));
-                return signature;
+            bool insideQuotes = false;
+            char prevChar = 0;
+            // scan for { or ; not inside quotes
+            for (size_t c = 0; c < line.length(); ++c) {
+                // alias character
+                char ch = line.at(c);  
+                // update quotes state
+                if (ch == '"' && prevChar != '\\')
+                    insideQuotes = !insideQuotes;
+                // found signature termination, append and return
+                if (!insideQuotes && ((ch == '{') || (ch == ';'))) {
+                    signature.append(line.substr(0, c));
+                    return signature;
+                }
+                // record prev char (used to check for escaped quote i.e. \")
+                prevChar = ch;
             }
+            
+            // if we didn't find a terminator on this line then just append the line
+            // and move on to the next line
+            signature.append(line);
+            signature.push_back(' ');
         }
 
         // Not found