Skip to content

Commit

Permalink
prep resubmission
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerlittlefield committed Nov 6, 2019
1 parent 4ec5a7d commit 30bc279
Show file tree
Hide file tree
Showing 32 changed files with 108 additions and 56 deletions.
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ Version: 0.1.0
Authors@R: c(
person("Tyler", "Littlefield", email = "[email protected]", role = c("aut", "cre"), comment=c(ORCID="0000-0002-6020-1125")),
person("Dmytro", "Perepolkin", email = "[email protected]", role = c("ctb"), comment=c(ORCID="0000-0001-8558-6183")))
Description: The goal of RVerbalExpressions is to make it easier to build regular
expressions using grammar and functionality inspired by
<https://github.com/VerbalExpressions>. Usage of the
`%>%` is encouraged to build expressions in a chain-like fashion.
Description: Build regular expressions using grammar and functionality inspired
by <https://github.com/VerbalExpressions>. Usage of the %>% is encouraged to
build expressions in a chain-like fashion.
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# RVerbalExpressions 0.0.0.9000
# RVerbalExpressions 0.1.0

* Released version 0.1.0 on CRAN.
* Added a `NEWS.md` file to track changes to the package.
9 changes: 7 additions & 2 deletions R/lookarounds.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@
#'
#' @examples
#' # matches any number of digits, but not preceded by "USD"
#' rx() %>% rx_avoid_prefix('USD') %>% rx_digit() %>% rx_one_or_more()
#' rx() %>%
#' rx_avoid_prefix('USD') %>%
#' rx_digit() %>%
#' rx_one_or_more()
#'
#' #matches a digit, but not followed by " dollars"
#' rx() %>% rx_digit() %>% rx_avoid_suffix(' dollars')
#' rx() %>%
#' rx_digit() %>%
#' rx_avoid_suffix(' dollars')
#'
#' @rdname rx_avoid
#' @export
Expand Down
6 changes: 4 additions & 2 deletions R/loops.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
#' rx_one_or_more()
#'
#' # create an expression
#' x <- rx_find(value = "a") %>%
#' x <- rx() %>%
#' rx_find("a") %>%
#' rx_one_or_more()
#'
#' # create input
Expand Down Expand Up @@ -40,7 +41,8 @@ rx_one_or_more <- function(.data = NULL, mode = "greedy") {
#' rx_none_or_more()
#'
#' # create an expression
#' x <- rx_find(value = "a") %>%
#' x <- rx() %>%
#' rx_find("a") %>%
#' rx_none_or_more()
#'
#' # create input
Expand Down
6 changes: 4 additions & 2 deletions R/modifiers.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
#' rx_with_any_case()
#'
#' # case insensitive
#' x <- rx_find(value = "abc") %>%
#' x <- rx() %>%
#' rx_find("abc") %>%
#' rx_with_any_case()
#'
#' # case sensitive
#' y <- rx_find(value = "abc") %>%
#' y <- rx() %>%
#' rx_find("abc") %>%
#' rx_with_any_case(enable = FALSE)
#'
#' grepl(x, "ABC") # should be true
Expand Down
21 changes: 14 additions & 7 deletions R/rules.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#' rx_start_of_line(enable = FALSE)
#'
#' # create expression
#' x <- rx_start_of_line() %>%
#' x <- rx() %>%
#' rx_start_of_line() %>%
#' rx_find("apple")
#'
#' grepl(x, "pineapple") # should be false
Expand Down Expand Up @@ -43,7 +44,8 @@ rx_start_of_line <- function(.data = NULL, enable = TRUE) {
#' rx_end_of_line("abc", enable = TRUE)
#'
#' # create expression
#' x <- rx_start_of_line(FALSE) %>%
#' x <- rx() %>%
#' rx_start_of_line(FALSE) %>%
#' rx_find("apple") %>%
#' rx_end_of_line()
#'
Expand Down Expand Up @@ -99,7 +101,8 @@ rx_find <- function(.data = NULL, value) {
#' rx_maybe(value = "abc")
#'
#' # create expression
#' x <- rx_start_of_line() %>%
#' x <- rx() %>%
#' rx_start_of_line() %>%
#' rx_maybe("abc") %>%
#' rx_end_of_line(enable = FALSE)
#'
Expand Down Expand Up @@ -153,7 +156,8 @@ rx_either_of <- function(.data, ...) {
#' rx_anything()
#' rx_anything(mode = "lazy")
#'
#' x <- rx_start_of_line() %>%
#' x <- rx() %>%
#' rx_start_of_line() %>%
#' rx_anything() %>%
#' rx_end_of_line()
#'
Expand Down Expand Up @@ -332,7 +336,8 @@ rx_any_of <- function(.data = NULL, value) {
#' rx_not(value = "FEB-28")
#'
#' # construct expression
#' x <- rx_start_of_line() %>%
#' x <- rx() %>%
#' rx_start_of_line() %>%
#' rx_find('FEB-29') %>%
#' rx_not("FEB-28")
#'
Expand All @@ -343,7 +348,8 @@ rx_any_of <- function(.data = NULL, value) {
#' regmatches(string, regexpr(x, string, perl = TRUE))
#'
#' # another example
#' rx_find(value = "q") %>%
#' rx() %>%
#' rx_find("q") %>%
#' rx_not("u") %>%
#' grepl(x = c("qu", "qa", "qq", "q", "q u"), perl = TRUE)
#'
Expand Down Expand Up @@ -392,7 +398,8 @@ rx_range <- function(.data = NULL, value) {
#' @examples
#' rx_word_edge()
#'
#'x <- rx_word_edge() %>%
#'x <- rx() %>%
#' rx_word_edge() %>%
#' rx_alpha() %>%
#' rx_one_or_more() %>%
#' rx_word_edge()
Expand Down
1 change: 0 additions & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ NULL
#' sanitize("^")
#' sanitize("^+")
#' sanitize("^+?")
#' #export - nade not exported
#'
#' @export
sanitize <- function(x) {
Expand Down
7 changes: 7 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Resubmission
This is a resubmission. In this version I have:

* 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."

* Removed backticks from %>%.

## Test environments
* local OS X install, R 3.6.0
* ubuntu 14.04 (on travis-ci), R 3.6.0
Expand Down
7 changes: 3 additions & 4 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docs/reference/rx_anything.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions docs/reference/rx_avoid.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions docs/reference/rx_end_of_line.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docs/reference/rx_maybe.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docs/reference/rx_none_or_more.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions docs/reference/rx_not.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docs/reference/rx_one_or_more.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30bc279

Please sign in to comment.