Skip to content

Commit 30bc279

Browse files
prep resubmission
1 parent 4ec5a7d commit 30bc279

32 files changed

+108
-56
lines changed

DESCRIPTION

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ Version: 0.1.0
44
Authors@R: c(
55
person("Tyler", "Littlefield", email = "[email protected]", role = c("aut", "cre"), comment=c(ORCID="0000-0002-6020-1125")),
66
person("Dmytro", "Perepolkin", email = "[email protected]", role = c("ctb"), comment=c(ORCID="0000-0001-8558-6183")))
7-
Description: The goal of RVerbalExpressions is to make it easier to build regular
8-
expressions using grammar and functionality inspired by
9-
<https://github.com/VerbalExpressions>. Usage of the
10-
`%>%` is encouraged to build expressions in a chain-like fashion.
7+
Description: Build regular expressions using grammar and functionality inspired
8+
by <https://github.com/VerbalExpressions>. Usage of the %>% is encouraged to
9+
build expressions in a chain-like fashion.
1110
License: MIT + file LICENSE
1211
Encoding: UTF-8
1312
LazyData: true

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
# RVerbalExpressions 0.0.0.9000
1+
# RVerbalExpressions 0.1.0
22

3+
* Released version 0.1.0 on CRAN.
34
* Added a `NEWS.md` file to track changes to the package.

R/lookarounds.R

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
#'
99
#' @examples
1010
#' # matches any number of digits, but not preceded by "USD"
11-
#' rx() %>% rx_avoid_prefix('USD') %>% rx_digit() %>% rx_one_or_more()
11+
#' rx() %>%
12+
#' rx_avoid_prefix('USD') %>%
13+
#' rx_digit() %>%
14+
#' rx_one_or_more()
1215
#'
1316
#' #matches a digit, but not followed by " dollars"
14-
#' rx() %>% rx_digit() %>% rx_avoid_suffix(' dollars')
17+
#' rx() %>%
18+
#' rx_digit() %>%
19+
#' rx_avoid_suffix(' dollars')
1520
#'
1621
#' @rdname rx_avoid
1722
#' @export

R/loops.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#' rx_one_or_more()
1111
#'
1212
#' # create an expression
13-
#' x <- rx_find(value = "a") %>%
13+
#' x <- rx() %>%
14+
#' rx_find("a") %>%
1415
#' rx_one_or_more()
1516
#'
1617
#' # create input
@@ -40,7 +41,8 @@ rx_one_or_more <- function(.data = NULL, mode = "greedy") {
4041
#' rx_none_or_more()
4142
#'
4243
#' # create an expression
43-
#' x <- rx_find(value = "a") %>%
44+
#' x <- rx() %>%
45+
#' rx_find("a") %>%
4446
#' rx_none_or_more()
4547
#'
4648
#' # create input

R/modifiers.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
#' rx_with_any_case()
1010
#'
1111
#' # case insensitive
12-
#' x <- rx_find(value = "abc") %>%
12+
#' x <- rx() %>%
13+
#' rx_find("abc") %>%
1314
#' rx_with_any_case()
1415
#'
1516
#' # case sensitive
16-
#' y <- rx_find(value = "abc") %>%
17+
#' y <- rx() %>%
18+
#' rx_find("abc") %>%
1719
#' rx_with_any_case(enable = FALSE)
1820
#'
1921
#' grepl(x, "ABC") # should be true

R/rules.R

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#' rx_start_of_line(enable = FALSE)
1212
#'
1313
#' # create expression
14-
#' x <- rx_start_of_line() %>%
14+
#' x <- rx() %>%
15+
#' rx_start_of_line() %>%
1516
#' rx_find("apple")
1617
#'
1718
#' grepl(x, "pineapple") # should be false
@@ -43,7 +44,8 @@ rx_start_of_line <- function(.data = NULL, enable = TRUE) {
4344
#' rx_end_of_line("abc", enable = TRUE)
4445
#'
4546
#' # create expression
46-
#' x <- rx_start_of_line(FALSE) %>%
47+
#' x <- rx() %>%
48+
#' rx_start_of_line(FALSE) %>%
4749
#' rx_find("apple") %>%
4850
#' rx_end_of_line()
4951
#'
@@ -99,7 +101,8 @@ rx_find <- function(.data = NULL, value) {
99101
#' rx_maybe(value = "abc")
100102
#'
101103
#' # create expression
102-
#' x <- rx_start_of_line() %>%
104+
#' x <- rx() %>%
105+
#' rx_start_of_line() %>%
103106
#' rx_maybe("abc") %>%
104107
#' rx_end_of_line(enable = FALSE)
105108
#'
@@ -153,7 +156,8 @@ rx_either_of <- function(.data, ...) {
153156
#' rx_anything()
154157
#' rx_anything(mode = "lazy")
155158
#'
156-
#' x <- rx_start_of_line() %>%
159+
#' x <- rx() %>%
160+
#' rx_start_of_line() %>%
157161
#' rx_anything() %>%
158162
#' rx_end_of_line()
159163
#'
@@ -332,7 +336,8 @@ rx_any_of <- function(.data = NULL, value) {
332336
#' rx_not(value = "FEB-28")
333337
#'
334338
#' # construct expression
335-
#' x <- rx_start_of_line() %>%
339+
#' x <- rx() %>%
340+
#' rx_start_of_line() %>%
336341
#' rx_find('FEB-29') %>%
337342
#' rx_not("FEB-28")
338343
#'
@@ -343,7 +348,8 @@ rx_any_of <- function(.data = NULL, value) {
343348
#' regmatches(string, regexpr(x, string, perl = TRUE))
344349
#'
345350
#' # another example
346-
#' rx_find(value = "q") %>%
351+
#' rx() %>%
352+
#' rx_find("q") %>%
347353
#' rx_not("u") %>%
348354
#' grepl(x = c("qu", "qa", "qq", "q", "q u"), perl = TRUE)
349355
#'
@@ -392,7 +398,8 @@ rx_range <- function(.data = NULL, value) {
392398
#' @examples
393399
#' rx_word_edge()
394400
#'
395-
#'x <- rx_word_edge() %>%
401+
#'x <- rx() %>%
402+
#' rx_word_edge() %>%
396403
#' rx_alpha() %>%
397404
#' rx_one_or_more() %>%
398405
#' rx_word_edge()

R/utils.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ NULL
2525
#' sanitize("^")
2626
#' sanitize("^+")
2727
#' sanitize("^+?")
28-
#' #export - nade not exported
2928
#'
3029
#' @export
3130
sanitize <- function(x) {

cran-comments.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## Resubmission
2+
This is a resubmission. In this version I have:
3+
4+
* Removed the beginning text of the the Description in the DESCRIPTION file. Per the docs "It is good practice not to start with the package name, ‘This package’ or similar."
5+
6+
* Removed backticks from %>%.
7+
18
## Test environments
29
* local OS X install, R 3.6.0
310
* ubuntu 14.04 (on travis-ci), R 3.6.0

docs/index.html

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/news/index.html

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)