.Rbuildignore

@@ -34,3 +34,5 @@
 ^\.github/workflows/R-CMD-check\.yaml$
 ^\.github/workflows/pkgdown\.yaml$
 ^\.github/workflows/pr-commands\.yaml$
+^.clangd$
+^compile_commands.json$

.github/workflows/R-CMD-check.yaml

@@ -59,6 +59,9 @@ jobs:
           Rscript -e "remotes::install_github('r-hub/sysreqs')"
           sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
           sudo -s eval "$sysreqs"
+          mkdir -p ~/.R/
+          sudo apt install g++-6 -y
+          echo $'CXX1X=g++-6\nCXX11=g++-6' >> ~/.R/Makevars
 
       - name: Install dependencies
         run: Rscript -e "library(remotes)" -e "update(readRDS('depends.Rds'))" -e "remotes::install_cran('rcmdcheck')"

.gitignore

@@ -12,3 +12,5 @@ script.R
 sanitize.sh
 .vimrc
 docs
+.clangd
+compile_commands.json

DESCRIPTION

@@ -42,7 +42,6 @@ Imports:
     hms (>= 0.4.1),
     methods,
     R6,
-    Rcpp (>= 0.12.0.5),
     tibble,
     utils
 Suggests:
@@ -57,11 +56,14 @@ Suggests:
     xml2
 LinkingTo: 
     BH,
-    Rcpp
+    cpp11
 VignetteBuilder: 
     knitr
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.0.2
-SystemRequirements: GNU make
+RoxygenNote: 7.1.0
+SystemRequirements: GNU make, C++11
+Remotes:
+  r-lib/cpp11,
+  rstudio/rmarkdown

NAMESPACE

@@ -136,7 +136,6 @@ export(write_file)
 export(write_lines)
 export(write_rds)
 export(write_tsv)
-importClassesFrom(Rcpp,"C++Object")
 importFrom(R6,R6Class)
 importFrom(hms,hms)
 importFrom(methods,setOldClass)

NEWS.md

@@ -57,7 +57,7 @@
 
 * `type_convert()` removes a 'spec' attribute, because the current columns likely have modified data types.  The 'spec' attribute is set by functions like `read_delim()` (@jimhester, @wibeasley, #1032).
 
-* `write_rds()` now can specify the rds version to use. The default value is
+* `write_rds()` now can specify the Rds version to use. The default value is
   2 as it's compatible to R versions prior to 3.5.0 (@shrektan, #1001).
 
 # readr 1.3.1

R/collectors.R

@@ -142,7 +142,7 @@ col_skip <- function() {
 #' parse_number("$1,000")     ## leading $ and grouping character , ignored
 #' parse_number("euro1,000")  ## leading non-numeric euro ignored
 #'
-#' parse_number("1,234.56)
+#' parse_number("1,234.56")
 #' ## explicit locale specifying European grouping and decimal marks
 #' parse_number("1.234,56", locale = locale(decimal_mark = ",", grouping_mark = "."))
 #' ## SI/ISO 31-0 standard spaces for number grouping

R/cpp11-exports.R

@@ -0,0 +1,107 @@
+# Generated by cpp11: do not edit by hand
+
+collectorGuess <- function(input, locale_, guessInteger){
+  .Call("_readr_collectorGuess" , input, locale_, guessInteger)
+}
+
+read_connection_ <- function(con, filename, chunk_size){
+  .Call("_readr_read_connection_" , con, filename, chunk_size)
+}
+
+utctime <- function(year, month, day, hour, min, sec, psec){
+  .Call("_readr_utctime" , year, month, day, hour, min, sec, psec)
+}
+
+dim_tokens_ <- function(sourceSpec, tokenizerSpec){
+  .Call("_readr_dim_tokens_" , sourceSpec, tokenizerSpec)
+}
+
+count_fields_ <- function(sourceSpec, tokenizerSpec, n_max){
+  .Call("_readr_count_fields_" , sourceSpec, tokenizerSpec, n_max)
+}
+
+guess_header_ <- function(sourceSpec, tokenizerSpec, locale_){
+  .Call("_readr_guess_header_" , sourceSpec, tokenizerSpec, locale_)
+}
+
+tokenize_ <- function(sourceSpec, tokenizerSpec, n_max){
+  .Call("_readr_tokenize_" , sourceSpec, tokenizerSpec, n_max)
+}
+
+parse_vector_ <- function(x, collectorSpec, locale_, na, trim_ws){
+  .Call("_readr_parse_vector_" , x, collectorSpec, locale_, na, trim_ws)
+}
+
+read_file_ <- function(sourceSpec, locale_){
+  .Call("_readr_read_file_" , sourceSpec, locale_)
+}
+
+read_file_raw_ <- function(sourceSpec){
+  .Call("_readr_read_file_raw_" , sourceSpec)
+}
+
+read_lines_ <- function(sourceSpec, locale_, na, n_max, skip_empty_rows, progress){
+  .Call("_readr_read_lines_" , sourceSpec, locale_, na, n_max, skip_empty_rows, progress)
+}
+
+read_lines_chunked_ <- function(sourceSpec, locale_, na, chunkSize, callback, skip_empty_rows, progress){
+  invisible(.Call("_readr_read_lines_chunked_" , sourceSpec, locale_, na, chunkSize, callback, skip_empty_rows, progress))
+}
+
+read_lines_raw_ <- function(sourceSpec, n_max, progress){
+  .Call("_readr_read_lines_raw_" , sourceSpec, n_max, progress)
+}
+
+read_lines_raw_chunked_ <- function(sourceSpec, chunkSize, callback, progress){
+  invisible(.Call("_readr_read_lines_raw_chunked_" , sourceSpec, chunkSize, callback, progress))
+}
+
+read_tokens_ <- function(sourceSpec, tokenizerSpec, colSpecs, colNames, locale_, n_max, progress){
+  .Call("_readr_read_tokens_" , sourceSpec, tokenizerSpec, colSpecs, colNames, locale_, n_max, progress)
+}
+
+read_tokens_chunked_ <- function(sourceSpec, callback, chunkSize, tokenizerSpec, colSpecs, colNames, locale_, progress){
+  invisible(.Call("_readr_read_tokens_chunked_" , sourceSpec, callback, chunkSize, tokenizerSpec, colSpecs, colNames, locale_, progress))
+}
+
+melt_tokens_ <- function(sourceSpec, tokenizerSpec, colSpecs, locale_, n_max, progress){
+  .Call("_readr_melt_tokens_" , sourceSpec, tokenizerSpec, colSpecs, locale_, n_max, progress)
+}
+
+melt_tokens_chunked_ <- function(sourceSpec, callback, chunkSize, tokenizerSpec, colSpecs, locale_, progress){
+  invisible(.Call("_readr_melt_tokens_chunked_" , sourceSpec, callback, chunkSize, tokenizerSpec, colSpecs, locale_, progress))
+}
+
+guess_types_ <- function(sourceSpec, tokenizerSpec, locale_, n){
+  .Call("_readr_guess_types_" , sourceSpec, tokenizerSpec, locale_, n)
+}
+
+whitespaceColumns <- function(sourceSpec, n, comment){
+  .Call("_readr_whitespaceColumns" , sourceSpec, n, comment)
+}
+
+type_convert_col <- function(x, spec, locale_, col, na, trim_ws){
+  .Call("_readr_type_convert_col" , x, spec, locale_, col, na, trim_ws)
+}
+
+stream_delim_ <- function(df, connection, delim, na, col_names, bom, quote_escape, eol){
+  .Call("_readr_stream_delim_" , df, connection, delim, na, col_names, bom, quote_escape, eol)
+}
+
+write_lines_ <- function(lines, connection, na, sep){
+  invisible(.Call("_readr_write_lines_" , lines, connection, na, sep))
+}
+
+write_lines_raw_ <- function(x, connection, sep){
+  invisible(.Call("_readr_write_lines_raw_" , x, connection, sep))
+}
+
+write_file_ <- function(x, connection){
+  invisible(.Call("_readr_write_file_" , x, connection))
+}
+
+write_file_raw_ <- function(x, connection){
+  invisible(.Call("_readr_write_file_raw_" , x, connection))
+}
+
+

R/melt_fwf.R

@@ -43,7 +43,7 @@ melt_fwf <- function(file, col_positions,
        return(tibble::tibble(row = double(), col = double(),
                              data_type = character(), value = character()))
   }
-  tokenizer <- tokenizer_fwf(col_positions$begin, col_positions$end, na = na,
+  tokenizer <- tokenizer_fwf(as.integer(col_positions$begin), as.integer(col_positions$end), na = na,
                              comment = comment, trim_ws = trim_ws,
                              skip_empty_rows = skip_empty_rows)
   out <- melt_tokens(ds, tokenizer, locale_ = locale,

R/read_delim.R

@@ -1,5 +1,4 @@
 #' @useDynLib readr, .registration = TRUE
-#' @importClassesFrom Rcpp "C++Object"
 NULL
 
 #' Read a delimited file (including csv & tsv) into a tibble

R/read_lines_chunked.R

@@ -14,7 +14,7 @@ read_lines_chunked <- function(file, callback, chunk_size = 10000, skip = 0,
   callback <- as_chunk_callback(callback)
   on.exit(callback$finally(), add = TRUE)
 
-  read_lines_chunked_(ds, locale, na, chunk_size, callback, progress)
+  read_lines_chunked_(ds, locale, na, chunk_size, callback, FALSE, progress)
 
   return(callback$result())
 }

R/source.R

@@ -103,15 +103,15 @@ datasource_raw <- function(text, skip, skip_empty_rows, comment) {
 
 # Helpers ----------------------------------------------------------------------
 
-read_connection <- function(con) {
+read_connection <- function(con, chunk_size = 64L * 1024L) {
   stopifnot(is.connection(con))
 
   if (!isOpen(con)) {
     on.exit(close(con), add = TRUE)
     open(con, "rb")
   }
 
-  read_connection_(con, tempfile())
+  read_connection_(con, tempfile(), chunk_size)
 }
 
 standardise_path <- function(path, input = TRUE) {

R/tokenizer.R

@@ -133,7 +133,7 @@ tokenizer_log <- function() {
 #'   [begin, end) (i.e inclusive-exclusive).
 tokenizer_fwf <- function(begin, end, na = "NA", comment = "", trim_ws = TRUE,
                           skip_empty_rows = TRUE) {
-  structure(list(begin = begin, end = end, na = na, comment = comment,
+  structure(list(begin = as.integer(begin), end = as.integer(end), na = na, comment = comment,
                  trim_ws = trim_ws, skip_empty_rows = skip_empty_rows),
             class = "tokenizer_fwf")
 }

inst/WORDLIST

@@ -14,6 +14,7 @@ bzipped
 centric
 Cheatsheet
 Cheng
+cloneable
 coloured
 Colouring
 csv
@@ -57,6 +58,7 @@ na
 nd
 noamross
 null's
+NaN
 otherbug
 parsers
 PLDI
@@ -71,6 +73,7 @@ recognising
 recongise
 reinitialization
 reprexes
+Rds
 rmarkdown
 serialise
 setosa