Merge pull request #193 from luckyrandom/attribute_parse

Attribute parse

Author: jjallaire

R/Attributes.R

@@ -366,7 +366,7 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
         dir.create(rDir)
 
     # get a list of all source files
-    cppFiles <- list.files(srcDir, pattern="\\.c(c|pp)$")
+    cppFiles <- list.files(srcDir, pattern = "\\.(c(c|pp))|(h(pp)?)$")
 
     # derive base names (will be used for modules)
     cppFileBasenames <- tools::file_path_sans_ext(cppFiles)

inst/unitTests/cpp/attributes.cpp

@@ -10,3 +10,10 @@ std::string comments_test( /// // "\""" some '"// more / // ///garbge"
 ) { // """
     return msg;
 }
+
+std::string parse_declaration_test(std::string msg) {
+    return msg;
+}
+
+// [[Rcpp::export]]
+std::string parse_declaration_test(std::string msg = "Parse function declaration");

inst/unitTests/runit.attributes.R

@@ -28,6 +28,10 @@ if (.runThisTest) {
             comments_test(),
             "Start a C++ line comment with the characters \"//\""
         )
+        checkEquals(
+            parse_declaration_test(),
+            "Parse function declaration"
+        )
     }
 
 }

src/attributes.cpp

@@ -1162,12 +1162,12 @@ namespace attributes {
         for (int i = lineNumber; i<lines_.size(); i++) {
             std::string line;
             line = lines_[i];
-            std::string::size_type bracePos = line.find('{');
-            if (bracePos == std::string::npos) {
+            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, bracePos));
+                signature.append(line.substr(0, end));
                 return signature;
             }
         }