Skip to content

Commit a89bd5f

Browse files
author
maechler
committed
resolve PR#18905: typos in {tools}
git-svn-id: https://svn.r-project.org/R/trunk@88268 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 1ca6aba commit a89bd5f

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

src/library/tools/R/CRANtools.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function()
196196
Sys.getenv("R_CRAN_SRC", .get_CRAN_repository_URL())
197197

198198
## This allows for partial local mirrors, or to look at a
199-
## more-freqently-updated mirror. Exposed as utils::findCRANmirror
199+
## more-frequently-updated mirror. Exposed as utils::findCRANmirror
200200
CRAN_baseurl_for_web_area <-
201201
function()
202202
Sys.getenv("R_CRAN_WEB", .get_CRAN_repository_URL())

src/library/tools/R/Rd2pdf.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
if (is.character(out) && !nzchar(out)) {
499499
## choose 'out' from filename
500500
bf <- sub("\\.[Rr]d$", "", file)
501-
exts <- c(txt=".txt", html=".html", latex=".tex", exmaple=".R")
501+
exts <- c(txt=".txt", html=".html", latex=".tex", example=".R")
502502
out <- paste0(bf, exts[type])
503503
} else if (is.null(out)) out <- ""
504504
if (!nzchar(os)) os <- .Platform$OS.type

src/library/tools/R/check.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4044,7 +4044,7 @@ add_dummies <- function(dir, Log)
40444044

40454045
check_rust <- function()
40464046
{
4047-
## It is impossible to tell definiitively if a package
4047+
## It is impossible to tell definitively if a package
40484048
## compiles rust code. SystemRequirements in DESCRIPTION is
40494049
## fres-format, and only advisory. So we look at the
40504050
## installation log, which we found in check_src()
@@ -5679,7 +5679,7 @@ add_dummies <- function(dir, Log)
56795679
## <https://bugs.astron.com/view.php?id=316>
56805680
pretest <- function(f)
56815681
{
5682-
## The format is (in bytes) the version mumber,
5682+
## The format is (in bytes) the version number,
56835683
## year-1900 of last change, month#, day, ...
56845684
z <- readBin(f, raw(), 2L)
56855685
identical(z, as.raw(c(3, 122)))
@@ -7208,7 +7208,7 @@ add_dummies <- function(dir, Log)
72087208
if (WINDOWS) {
72097209
## always has sub-archs as from R 2.12.0.
72107210
## usually if two are installed, it was done on a 64-bit OS,
7211-
## but the filesystem might be shared betweeen OSes.
7211+
## but the filesystem might be shared between OSes.
72127212
f <- dir(file.path(R.home(), "bin"))
72137213
archs <- f[f %in% c("i386", "x64")]
72147214
## if we have x64, can only run it on a 64-bit OS
@@ -7684,7 +7684,7 @@ add_dummies <- function(dir, Log)
76847684
## have a 'DESCRIPTION.in' file (instead of 'DESCRIPTION'),
76857685
## with Version and License fields containing '@VERSION@' for
76867686
## substitution by configure. Earlier bundles had packages
7687-
## containing DESCRIPTIION.in, hence the extra check for
7687+
## containing DESCRIPTION.in, hence the extra check for
76887688
## Makefile.in.
76897689

76907690
is_base_pkg <- is_rec_pkg <- FALSE
@@ -7758,7 +7758,7 @@ add_dummies <- function(dir, Log)
77587758
resultLog(Log, "OK")
77597759
else if (file.exists(file.path(pkgdir, "NAMESPACE"))) {
77607760
errorLog(Log,
7761-
"File NAMESPACE does not exist but there is a case-insenstiive match.")
7761+
"File NAMESPACE does not exist but there is a case-insensitive match.")
77627762
summaryLog(Log)
77637763
do_exit(1L)
77647764
} else if (dir.exists(file.path(pkgdir, "R"))) {

src/library/tools/R/install.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ if(FALSE) {
15261526
## Tweak fake installation to provide an 'empty'
15271527
## useDynLib() for the time being. Completely
15281528
## removing the directive results in checkFF()
1529-
## being too aggresive in the case where the
1529+
## being too aggressive in the case where the
15301530
## presence of the directive enables unambiguous
15311531
## symbol resolution w/out 'PACKAGE' arguments.
15321532
## However, empty directives are not really meant

src/library/tools/R/license.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
## * The name of abbreviation of a versioned license, optionally
3434
## followed by a version spec
3535
## * The name of a versioned license followed by the version
36-
## * The abbrevation of a versioned license combined with '-',
36+
## * The abbreviation of a versioned license combined with '-',
3737
## optionally followed by an extension spec as in B (in principle,
3838
## only if the base license is extensible).
3939
##
@@ -89,7 +89,7 @@ function(paths = NULL)
8989
ldb[is.na(ldb)] <- ""
9090
## (Could also keep NAs and filter on is.finite() in subsequent
9191
## computations.)
92-
## FOSS == "yes" implues Restricts_use = "no":
92+
## FOSS == "yes" implies Restricts_use = "no":
9393
ldb[ldb[, "FOSS"] == "yes", "Restricts_use"] <- "no"
9494
ldb <- data.frame(ldb, stringsAsFactors = FALSE)
9595
ldb$Labels <- R_license_db_labels(ldb)

src/library/tools/R/news.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ function(file, out = stdout(), codify = FALSE)
419419
}
420420
}
421421

422-
## No longer support taking NEWS files without correponding
422+
## No longer support taking NEWS files without corresponding
423423
## DESCRIPTION file as being from R itself (PR #16556).
424424

425425
meta <- .read_description(dfile)

src/library/tools/R/testing.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ massageExamples <-
145145
## compares 2 files
146146
## 2022-07: it is reasonable to assume that almost all users will
147147
## have diff (it is part of Rtools), and currently only GNU diff
148-
## (from 2022 on macOS) and FreeBSD versions semm to be in use.
148+
## (from 2022 on macOS) and FreeBSD versions seem to be in use.
149149
## So the support without diff is minimal.
150150
Rdiff <- function(from, to, useDiff = FALSE, forEx = FALSE,
151151
nullPointers = TRUE, Log = FALSE)

src/library/tools/R/utils.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function(x)
232232
if(any(ind)) {
233233
message(paste0(which(ind), ": ",
234234
## iconv will usually substitute,
235-
## but inplementations including macOS 14
235+
## but implementations including macOS 14
236236
## may translate to ASCII.
237237
iconv(x[ind], "", "ASCII", sub = "byte"),
238238
collapse = "\n"), domain = NA)
@@ -1020,7 +1020,7 @@ function(con, n = 4L)
10201020
## Try matching both the regular error indicator ('!') as well as
10211021
## the file line error indicator ('file:line:').
10221022
pos <- grep("(^! |^!pdfTeX error:|:[0123456789]+:.*[Ee]rror)", lines)
1023-
## unforunately that was too general and caught false positives
1023+
## unfortunately that was too general and caught false positives
10241024
## Errors are typically of the form
10251025
## ! LaTeX Error:
10261026
## !pdfTeX error:

src/library/tools/src/Rsha256.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static void *Rsha256_buffer (const void *buffer, size_t len, void *resblock)
4141
return Rsha256_finish_ctx(&ctx, resblock);
4242
}
4343

44-
/* This is essentailly identical to Rmd5 */
44+
/* This is essentially identical to Rmd5 */
4545

4646
/* .Call so manages R_alloc stack */
4747
SEXP Rsha256(SEXP files)

src/library/tools/tests/hashes.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ stopifnot(identical(sha256sum(bytes=rep(charToRaw("a"),1e6)),
2929
## let's see if there are hidden HMAC functions - if so, test them
3030
if (!is.null(environment(tools::sha256sum)[["hmac"]])) {
3131

32-
## [[ we have not expoorted HMAC functions yet ]]
32+
## [[ we have not exported HMAC functions yet ]]
3333
hmac.md5 <- tools:::hmac.md5
3434
hmac.sha256 <- tools:::hmac.sha256
3535

0 commit comments

Comments
 (0)