Commit 36baa70c authored by Radford Neal's avatar Radford Neal

more warning -> warningcall

parent 7576e4cc
......@@ -2232,9 +2232,9 @@ static SEXP do_set (SEXP call, SEXP op, SEXP args, SEXP rho, int variant)
s[d].value = e;
}
/* Call the replacement functions levels 1 to depth, changing the
/* Call the replacement functions at levels 1 to depth, changing the
values at each level, using the fetched value at that level, and
the new value after replacement at the lower level. The value
the new value after replacement at the lower level. The new value
at the outermost level (0) is taken as the rhs value. */
for (d = 1; d <= depth; d++) {
......
......@@ -63,8 +63,9 @@ static SEXP EnlargeVector(SEXP call, SEXP x, R_len_t newlen)
/* Enlarge the vector itself. */
len = LENGTH(x);
if (LOGICAL(GetOption1(install("check.bounds")))[0])
warning(_("assignment outside vector/list limits (extending from %d to %d)"),
len, newlen);
warningcall (call,
_("assignment outside vector/list limits (extending from %d to %d)"),
len, newlen);
PROTECT(x);
PROTECT(newx = allocVector(TYPEOF(x), newlen));
......@@ -446,7 +447,8 @@ static SEXP VectorAssign(SEXP call, SEXP x, SEXP s, SEXP y)
if (oldn > 0 && ny == 0)
errorcall(call,_("replacement has length zero"));
if (oldn > 0 && n % ny)
warning(_("number of items to replace is not a multiple of replacement length"));
warningcall(call,
_("number of items to replace is not a multiple of replacement length"));
}
/* When array elements are being permuted the RHS */
......@@ -1542,7 +1544,7 @@ SEXP R_subassign3_dflt(SEXP call, SEXP x, SEXP name, SEXP val)
if (isExpression(x))
type = EXPRSXP;
else if (!isNewList(x)) {
warning(_("Coercing LHS to a list"));
warningcall(call,_("Coercing LHS to a list"));
REPROTECT(x = coerceVector(x, VECSXP), pxidx);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment