Rcpp::String ctor update(close #263) #529
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -53,7 +52,7 @@ namespace Rcpp { | |||
| typedef internal::const_string_proxy<STRSXP> const_StringProxy; | |||
|
|
|||
| /** default constructor */ | |||
| String(): data(Rf_mkChar("")), buffer(), valid(true), buffer_ready(true), enc(CE_NATIVE) { | |||
| String(): data(Rf_mkChar("")), buffer(), valid(true), buffer_ready(true), enc(CE_UTF8) { | |||
There was a problem hiding this comment.
Should the data element be initialized with Rf_mkCharCE()? Do we need to explicitly set the encoding? (probably doesn't matter for the empty string but we should be consistent)
| @@ -88,7 +87,7 @@ namespace Rcpp { | |||
| RCPP_STRING_DEBUG("String(SEXP)"); | |||
| } | |||
|
|
|||
| String(SEXP charsxp, const std::string& enc) : data(R_NilValue) { | |||
| String(SEXP charsxp, cetype_t enc) : data(R_NilValue) { | |||
There was a problem hiding this comment.
Same as above -- overriding encoding on a passed-in charsxp.
thirdwing
changed the title
|
PR looks good for me; let's see if anyone else has thoughts. |
|
Same here. Lemme sleep it over and give a glance over morning coffee in 6 to 7 hours and it'll go in. |
eddelbuettel
added a commit
that referenced
this pull request
Aug 3, 2016
eddelbuettel
added a commit
that referenced
this pull request
Aug 3, 2016
|
Merged by hand |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #263
(1) remove the string representation of encoding (I am not sure if any pkgs really use this, we might need a rev.dep);
(2) use
CE_UTF8as default encoding (not sure if this will cause problems with no-English string).@kevinushey @hadley @jjallaire