Skip to content

Commit

Permalink
more custom/standard replacements
Browse files Browse the repository at this point in the history
  • Loading branch information
brodieG committed Sep 4, 2017
1 parent 8107fc3 commit f7b517b
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
12 changes: 6 additions & 6 deletions R/validate.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#'
#' @section Vetting Expressions:
#'
#' Vetting expressions can be template tokens, custom tokens, or any
#' combination of template and custom tokens combined with `&&` and/or `||`.
#' Vetting expressions can be template tokens, standard tokens, or any
#' combination of template and standard tokens combined with `&&` and/or `||`.
#' Template tokens are R objects that define the required structure, much like
#' the `FUN.VALUE` argument to [vapply()]. Custom tokens are tokens that
#' the `FUN.VALUE` argument to [vapply()]. Standard tokens are tokens that
#' contain the `.` symbol and are used to vet values.
#'
#' See `vignette('vetr', package='vetr')` and examples for details on how
Expand All @@ -58,7 +58,7 @@
#' with none of the formatting or surrounding verbiage
#' }
#' @param stop TRUE or FALSE whether to call [stop()] on failure
#' (default) or not
#' or not (default)
#' @param settings a settings list as produced by [vetr_settings()], or NULL to
#' use the default settings
#' @return TRUE if validation succeeds, otherwise varies according to value
Expand Down Expand Up @@ -105,11 +105,11 @@
#'
#' ## See `example(alike)` for more template examples
#'
#' ## Custom tokens allow you to check values
#' ## Standard tokens allow you to check values
#' vet(. > 0, runif(10))
#' vet(. > 0, -runif(10))
#'
#' ## You can combine templates and custom tokens with
#' ## You can combine templates and standard tokens with
#' ## `&&` and/or `||`
#' vet(numeric(2L) && . > 0, runif(2))
#' vet(numeric(2L) && . > 0, runif(10))
Expand Down
2 changes: 1 addition & 1 deletion R/validators.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#' to allow NAs or infinite values just use a template object (e.g.
#' `integer(1L)`).
#'
#' @note **This will only work with custom expressions containing `.`**. Anything
#' @note **This will only work with standard tokens containing `.`**. Anything
#' else will be interpreted as a template token.
#'
#' @export
Expand Down
12 changes: 6 additions & 6 deletions man/vet.Rd

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

2 changes: 1 addition & 1 deletion man/vet_token.Rd

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

6 changes: 3 additions & 3 deletions man/vetr.Rd

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

16 changes: 8 additions & 8 deletions man/vetr_settings.Rd

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

0 comments on commit f7b517b

Please sign in to comment.