Jun 2, 2017 · Jun 2, 2017 · Jun 2, 2017 · Jun 2, 2017
diff --git a/ChangeLog b/ChangeLog
 2017-06-02  JJ Allaire  <jj@rstudio.com>

        * src/attributes.cpp: Automatically register init functions for RcppModules

 2017-06-01  JJ Allaire  <jj@rstudio.com>

        * src/attributes.cpp: Fix registration for exports with name attribute.
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
      or newer (Elias Pipping in \ghpr{698}).
      \item Fix native registration for exports with name attribute (\ghpr{703}
      addressing \ghit{702}).
      \item Automatically register init functions for RcppModules.
    }
  }
 }
diff --git a/src/attributes.cpp b/src/attributes.cpp
        // for generating C++ interfaces
        std::vector<Attribute> cppExports_;

        // for generating native routine registration
        // for generatingRcpp::exportnative routine registration
        std::vector<Attribute> nativeRoutines_;

        // for generating module native routine registration
        std::vector<std::string> modules_;
    };

    // Class which manages generating PackageName_RcppExports.h header file
            }
        }                                               // #nocov end

        // record modules
        const std::vector<std::string>& modules = attributes.modules();
        modules_.insert(modules_.end(), modules.begin(), modules.end());

        // verbose if requested
        if (verbose) {// #nocov start
         }

         // write native routines
         if (!hasPackageInit && !nativeRoutines_.empty()) {
         if (!hasPackageInit &&(!nativeRoutines_.empty() || !modules_.empty())) {

            // build list of routines we will register
            std::vector<std::string> routineNames;
                routineNames.push_back(package() + "_" + attr.function().name());
                routineArgs.push_back(attr.function().arguments().size());
            }
            std::string kRcppModuleBoot = "_rcpp_module_boot_";
            for (std::size_t i=0;i<modules_.size(); i++) {
                routineNames.push_back(kRcppModuleBoot + modules_[i]);
                routineArgs.push_back(0);
            }
            if (hasCppInterface()) {
                routineNames.push_back(registerCCallableExportedName());
                routineArgs.push_back(0);
            std::vector<std::string> declarations = extraRoutines["declarations"];
            std::vector<std::string> callEntries = extraRoutines["call_entries"];

            // add declarations for modules
            for (std::size_t i=0;i<modules_.size(); i++) {
                declarations.push_back("RcppExport SEXP " + kRcppModuleBoot + modules_[i] + "();");
            }

            // generate declarations
            if (declarations.size() > 0) {
                ostr() << std::endl;
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,7 @@
		2017-06-02 JJ Allaire <jj@rstudio.com>

		* src/attributes.cpp: Automatically register init functions for RcppModules

		2017-06-01 JJ Allaire <jj@rstudio.com>

		* src/attributes.cpp: Fix registration for exports with name attribute.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@
		or newer (Elias Pipping in \ghpr{698}).
		\item Fix native registration for exports with name attribute (\ghpr{703}
		addressing \ghit{702}).
		\item Automatically register init functions for RcppModules.
		}
		}
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -675,8 +675,11 @@ namespace attributes {
		// for generating C++ interfaces
		std::vector<Attribute> cppExports_;

		// for generating native routine registration
		// for generatingRcpp::exportnative routine registration
		std::vector<Attribute> nativeRoutines_;

		// for generating module native routine registration
		std::vector<std::string> modules_;
		};

		// Class which manages generating PackageName_RcppExports.h header file
Expand DownExpand Up		@@ -1888,6 +1891,9 @@ namespace attributes {
		}
		} // #nocov end

		// record modules
		const std::vector<std::string>& modules = attributes.modules();
		modules_.insert(modules_.end(), modules.begin(), modules.end());

		// verbose if requested
		if (verbose) {// #nocov start
Expand DownExpand Up		@@ -1955,7 +1961,7 @@ namespace attributes {
		}

		// write native routines
		if (!hasPackageInit && !nativeRoutines_.empty()) {
		if (!hasPackageInit &&(!nativeRoutines_.empty() \|\| !modules_.empty())) {

		// build list of routines we will register
		std::vector<std::string> routineNames;
Expand All		@@ -1965,6 +1971,11 @@ namespace attributes {
		routineNames.push_back(package() + "_" + attr.function().name());
		routineArgs.push_back(attr.function().arguments().size());
		}
		std::string kRcppModuleBoot = "_rcpp_module_boot_";
		for (std::size_t i=0;i<modules_.size(); i++) {
		routineNames.push_back(kRcppModuleBoot + modules_[i]);
		routineArgs.push_back(0);
		}
		if (hasCppInterface()) {
		routineNames.push_back(registerCCallableExportedName());
		routineArgs.push_back(0);
Expand All		@@ -1976,6 +1987,11 @@ namespace attributes {
		std::vector<std::string> declarations = extraRoutines["declarations"];
		std::vector<std::string> callEntries = extraRoutines["call_entries"];

		// add declarations for modules
		for (std::size_t i=0;i<modules_.size(); i++) {
		declarations.push_back("RcppExport SEXP " + kRcppModuleBoot + modules_[i] + "();");
		}

		// generate declarations
		if (declarations.size() > 0) {
		ostr() << std::endl;
Expand Down