Skip to content

Commit 66d3b06

Browse files
authored
Merge pull request #1256 from RcppCore/bugfix/issue1255/one_more_backtick_use
Update code generation with one more backtick (instead of apostrophe) pair
2 parents 7fc0a8f + ddd83d2 commit 66d3b06

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2023-03-19 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): Roll minor version
4+
* inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem
5+
6+
* src/attributes.cpp (RExportsGenerator::writeEnd): Replace a pair of
7+
apostrophes with backticks in generated .Call() statemente
8+
19
2023-02-07 Dirk Eddelbuettel <[email protected]>
210

311
* inst/tinytest/test_stats.R: Use more accurate value in R 4.3.0

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 1.0.10.2
4-
Date: 2023-02-02
3+
Version: 1.0.10.3
4+
Date: 2023-03-19
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

inst/NEWS.Rd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
\newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}}
44
\newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}}
55

6-
\section{Changes in Rcpp rc version 1.0.10.2 for 1.0.11 (2023-07-xx)}{
6+
\section{Changes in Rcpp rc version 1.0.10.3 for 1.0.11 (2023-07-xx)}{
77
\itemize{
88
\item Changes in Rcpp API:
99
\itemize{
@@ -13,6 +13,8 @@
1313
Iñaki in \ghpr{1245}).
1414
\item Compilation under C++ using \pkg{clang++} and its standard
1515
library is enabled (Dirk in \ghpr{1248}) closing \ghit{1244}).
16+
\item Use backticks in a generated \code{.Call()} statement in
17+
`RcppExports.R` (Dirk \ghpr{1256} closing \ghit{1255}).
1618
}
1719
\item Changes in Rcpp Documentation:
1820
\itemize{

inst/include/Rcpp/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define RCPP_VERSION_STRING "1.0.10"
3131

3232
// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
33-
#define RCPP_DEV_VERSION RcppDevVersion(1,0,10,2)
34-
#define RCPP_DEV_VERSION_STRING "1.0.10.2"
33+
#define RCPP_DEV_VERSION RcppDevVersion(1,0,10,3)
34+
#define RCPP_DEV_VERSION_STRING "1.0.10.3"
3535

3636
#endif

src/attributes.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,8 +2539,13 @@ namespace attributes {
25392539
ostr() << "# Register entry points for exported C++ functions"
25402540
<< std::endl;
25412541
ostr() << "methods::setLoadAction(function(ns) {" << std::endl;
2542-
ostr() << " .Call('" << registerCCallableExportedName()
2543-
<< "', PACKAGE = '" << package() << "')"
2542+
ostr() << " .Call("
2543+
<< (registration_ ? "`" : "'")
2544+
<< registerCCallableExportedName()
2545+
<< (registration_ ? "`" : "'");
2546+
if (!registration_)
2547+
ostr() << ", PACKAGE = '" << package() << "'";
2548+
ostr() << ")"
25442549
<< std::endl << "})" << std::endl; // #nocov end
25452550
}
25462551
}

0 commit comments

Comments
 (0)