r-devel · t-kalinowski · Jun 7, 2023 · Jun 7, 2023 · Jun 7, 2023 · Jun 7, 2023
diff --git a/doc/NEWS.Rd b/doc/NEWS.Rd
@@ -207,6 +207,12 @@
  argument descriptions when they spanned multiple lines,
  including those generated by \code{prompt()}.
  These cases are now noted by \command{R CMD check}.
+
+ \item Communication between parent and child processes in
+ \code{multicore} part of \code{parallel} could fail on platforms
+ that do not support arbitrarily large payload in system functions
+ \code{read()}/\code{write()} on pipes (seen on macOS). The payload
+ is now split into 1Gb chunks to avoid that problem. \PR{18571}
  }
  }
 }

diff --git a/src/include/Rinlinedfuns.h b/src/include/Rinlinedfuns.h
@@ -1,7 +1,7 @@
 /*
  * R : A Computer Language for Statistical Data Analysis
+ * Copyright (C) 1999--2023 The R Core Team.
  * Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
- * Copyright (C) 1999-2017 The R Core Team.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ INLINE_FUN void CHKVEC(SEXP x) {
  case WEAKREFSXP:
  break;
  default:
- error("cannot get data pointer of '%s' objects", type2char(TYPEOF(x)));
+ error("cannot get data pointer of '%s' objects", R_typeToChar(x));
  }
 }
 #else

diff --git a/src/include/Rinternals.h b/src/include/Rinternals.h
@@ -129,7 +129,8 @@ typedef unsigned int SEXPTYPE;
 #define EXTPTRSXP 22 /* external pointer */
 #define WEAKREFSXP 23 /* weak reference */
 #define RAWSXP 24 /* raw bytes */
-#define S4SXP 25 /* S4, non-vector */
+#define OBJSXP 25 /* object, non-vector */
+#define S4SXP 25 /* same as OBJSXP, retained for back compatability */
 
 /* used for detecting PROTECT issues in memory.c */
 #define NEWSXP 30 /* fresh node created in new page */
@@ -561,6 +562,10 @@ SEXP Rf_topenv(SEXP, SEXP);
 const char * Rf_translateChar(SEXP);
 const char * Rf_translateCharUTF8(SEXP);
 const char * Rf_type2char(SEXPTYPE);
+const char * R_typeToChar(SEXP);
+#ifdef USE_TYPE2CHAR_2
+const char * R_typeToChar2(SEXP, SEXPTYPE);
+#endif
 SEXP Rf_type2rstr(SEXPTYPE);
 SEXP Rf_type2str(SEXPTYPE);
 SEXP Rf_type2str_nowarn(SEXPTYPE);

diff --git a/src/library/methods/src/methods_list_dispatch.c b/src/library/methods/src/methods_list_dispatch.c
@@ -127,7 +127,7 @@ static SEXP R_conditionMessage(SEXP cond)
  /* Type check return value so callers can safely extract a C string */
  if (TYPEOF(out) != STRSXP)
  error(_("unexpected type '%s' for condition message"),
- type2char(TYPEOF(out)));
+ R_typeToChar(out));
  if (length(out) != 1)
  error(_("condition message must be length 1"));
 

diff --git a/src/library/stats/src/complete_cases.c b/src/library/stats/src/complete_cases.c
@@ -62,7 +62,7 @@ SEXP compcases(SEXP args)
  goto bad;
  }
  else
- error(R_MSG_type, type2char(TYPEOF(CAR(t))));
+ error(R_MSG_type, R_typeToChar(CAR(t)));
  }
  /* FIXME : Need to be careful with the use of isVector() */
  /* since this includes lists and expressions. */
@@ -113,7 +113,7 @@ SEXP compcases(SEXP args)
  goto bad;
  }
  else
- error(R_MSG_type, type2char(TYPEOF(CAR(s))));
+ error(R_MSG_type, R_typeToChar(CAR(s)));
  }
 
  if (len < 0)
@@ -151,7 +151,7 @@ SEXP compcases(SEXP args)
  break;
  default:
  UNPROTECT(1);
- error(R_MSG_type, type2char(TYPEOF(u)));
+ error(R_MSG_type, R_typeToChar(u));
  }
  }
  }
@@ -183,7 +183,7 @@ SEXP compcases(SEXP args)
  break;
  default:
  UNPROTECT(1);
- error(R_MSG_type, type2char(TYPEOF(u)));
+ error(R_MSG_type, R_typeToChar(u));
  }
  }
  }
@@ -211,7 +211,7 @@ SEXP compcases(SEXP args)
  break;
  default:
  UNPROTECT(1);
- error(R_MSG_type, type2char(TYPEOF(u)));
+ error(R_MSG_type, R_typeToChar(u));
  }
  }
  }

diff --git a/src/library/stats/src/deriv.c b/src/library/stats/src/deriv.c
@@ -786,7 +786,7 @@ SEXP doD(SEXP args)
  if (isExpression(CAR(args))) expr = VECTOR_ELT(CAR(args), 0);
  else expr = CAR(args);
  if (!(isLanguage(expr) || isSymbol(expr) || isNumeric(expr) || isComplex(expr)))
- error(_("expression must not be type '%s'"), type2char(TYPEOF(expr)));
+ error(_("expression must not be type '%s'"), R_typeToChar(expr));
  SEXP var = CADR(args);
  if (!isString(var) || length(var) < 1)
  error(_("variable must be a character string"));

diff --git a/src/library/stats/src/model.c b/src/library/stats/src/model.c
@@ -154,7 +154,7 @@ SEXP modelframe(SEXP call, SEXP op, SEXP args, SEXP rho)
  break;
  default:
  error(_("invalid type (%s) for variable '%s'"),
- type2char(TYPEOF(ans)),
+ R_typeToChar(ans),
  translateChar(STRING_ELT(names, i)));
  }
  if (nrows(ans) != nr)
@@ -667,7 +667,7 @@ SEXP modelmatrix(SEXP call, SEXP op, SEXP args, SEXP rho)
  }
  } else
  error(_("variables of type '%s' are not allowed in model matrices"),
- type2char(TYPEOF(var_i)));
+ R_typeToChar(var_i));
  indx /= ll;
  }
  }

diff --git a/src/library/utils/R/str.R b/src/library/utils/R/str.R
@@ -1,7 +1,7 @@
 # File src/library/utils/R/str.R
 # Part of the R package, https://www.R-project.org
 #
-# Copyright (C) 1995-2021 The R Core Team
+# Copyright (C) 1995-2023 The R Core Team
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -474,7 +474,7 @@ str.default <-
  )
  }
  } else if(typeof(object) %in%
- c("externalptr", "weakref", "environment", "bytecode")) {
+ c("externalptr", "weakref", "environment", "bytecode", "object")) {
  ## Careful here, we don't want to change pointer objects
  if(has.class)
  cat(pClass(cl))

diff --git a/src/main/RNG.c b/src/main/RNG.c
@@ -354,7 +354,7 @@ static Rboolean GetRNGkind(SEXP seeds)
  if (seeds == R_MissingArg) /* How can this happen? */
  error(_("'.Random.seed' is a missing argument with no default"));
  warning(_("'.Random.seed' is not an integer vector but of type '%s', so ignored"),
- type2char(TYPEOF(seeds)));
+ R_typeToChar(seeds));
  goto invalid;
  }
  is = INTEGER(seeds);

diff --git a/src/main/altclasses.c b/src/main/altclasses.c
@@ -1125,7 +1125,7 @@ static Rboolean mmap_Inspect(SEXP x, int pre, int deep, int pvec,
  Rboolean ptrOK = MMAP_PTROK(x);
  Rboolean wrtOK = MMAP_WRTOK(x);
  Rboolean serOK = MMAP_SEROK(x);
- Rprintf(" mmaped %s", type2char(TYPEOF(x)));
+ Rprintf(" mmaped %s", R_typeToChar(x));
  Rprintf(" [ptr=%d,wrt=%d,ser=%d]\n", ptrOK, wrtOK, serOK);
  return TRUE;
 }

diff --git a/src/main/apply.c b/src/main/apply.c
@@ -126,7 +126,7 @@ attribute_hidden SEXP do_vapply(SEXP call, SEXP op, SEXP args, SEXP rho)
  commonType != INTSXP && commonType != LGLSXP &&
  commonType != RAWSXP && commonType != STRSXP &&
  commonType != VECSXP)
- error(_("type '%s' is not supported"), type2char(commonType));
+ error(_("type '%s' is not supported"), R_typeToChar(value));
  dim_v = getAttrib(value, R_DimSymbol);
  array_value = (TYPEOF(dim_v) == INTSXP && LENGTH(dim_v) >= 1);
  PROTECT(ans = allocVector(commonType, n*commonLen));
@@ -187,7 +187,7 @@ attribute_hidden SEXP do_vapply(SEXP call, SEXP op, SEXP args, SEXP rho)
  }
  if (!okay)
  error(_("values must be type '%s',\n but FUN(X[[%d]]) result is type '%s'"),
- type2char(commonType), i+1, type2char(valType));
+ R_typeToChar(value), i+1, R_typeToChar(val));
  REPROTECT(val = coerceVector(val, commonType), indx);
  }
  /* Take row names from the first result only */

diff --git a/src/main/array.c b/src/main/array.c
@@ -84,7 +84,7 @@ attribute_hidden SEXP do_matrix(SEXP call, SEXP op, SEXP args, SEXP rho)
  break;
  default:
  error(_("'data' must be of a vector type, was '%s'"),
- type2char(TYPEOF(vals)));
+ R_typeToChar(vals));
  }
  lendat = XLENGTH(vals);
  snr = CAR(args); args = CDR(args);
@@ -2071,7 +2071,7 @@ attribute_hidden SEXP do_array(SEXP call, SEXP op, SEXP args, SEXP rho)
  break;
  default:
  error(_("'data' must be of a vector type, was '%s'"),
- type2char(TYPEOF(vals)));
+ R_typeToChar(vals));
  }
  lendat = XLENGTH(vals);
  dims = CADR(args);

diff --git a/src/main/attrib.c b/src/main/attrib.c
@@ -75,7 +75,7 @@ static SEXP row_names_gets(SEXP vec, SEXP val)
  }
  } else if(!isString(val))
  error(_("row names must be 'character' or 'integer', not '%s'"),
- type2char(TYPEOF(val)));
+ R_typeToChar(val));
  PROTECT(vec);
  PROTECT(val);
  ans = installAttrib(vec, R_RowNamesSymbol, val);
@@ -135,7 +135,7 @@ attribute_hidden SEXP getAttrib0(SEXP vec, SEXP name)
  }
  else
  error(_("getAttrib: invalid type (%s) for TAG"),
- type2char(TYPEOF(TAG(vec))));
+ R_typeToChar(TAG(vec)));
  }
  UNPROTECT(1);
  if (any) {
@@ -401,7 +401,7 @@ static void checkNames(SEXP x, SEXP s)
  if (isVector(x) || isList(x) || isLanguage(x)) {
  if (!isVector(s) && !isList(s))
  error(_("invalid type (%s) for 'names': must be vector or NULL"),
- type2char(TYPEOF(s)));
+ R_typeToChar(s));
  if (xlength(x) != xlength(s))
  error(_("'names' attribute [%d] must be the same length as the vector [%d]"), length(s), length(x));
  }
@@ -1011,7 +1011,7 @@ SEXP namesgets(SEXP vec, SEXP val)
  installAttrib(vec, R_NamesSymbol, val);
  else
  error(_("invalid type (%s) to set 'names' attribute"),
- type2char(TYPEOF(vec)));
+ R_typeToChar(vec));
  UNPROTECT(2);
  return vec;
 }
@@ -1131,7 +1131,7 @@ SEXP dimnamesgets(SEXP vec, SEXP val)
  if (_this != R_NilValue) {
  if (!isVector(_this))
  error(_("invalid type (%s) for 'dimnames' (must be a vector)"),
- type2char(TYPEOF(_this)));
+ R_typeToChar(_this));
  if (INTEGER(dims)[i] != LENGTH(_this) && LENGTH(_this) != 0)
  error(_("length of 'dimnames' [%d] not equal to array extent"),
  i+1);
@@ -1169,7 +1169,7 @@ attribute_hidden SEXP do_dimnames(SEXP call, SEXP op, SEXP args, SEXP env)
 }
 
 SEXP R_dim(SEXP call, SEXP op, SEXP args, SEXP env)
-{ 
+{
  SEXP ans;
  /* DispatchOrEval internal generic: dim */
  if (DispatchOrEval(call, op, "dim", args, env, &ans, 0, /* argsevald: */ 1))
@@ -1597,7 +1597,7 @@ attribute_hidden SEXP do_attrgets(SEXP call, SEXP op, SEXP args, SEXP env)
  }
  else {
  error(_("invalid type '%s' for slot name"),
- type2char(TYPEOF(nlist)));
+ R_typeToChar(nlist));
  return R_NilValue; /*-Wall*/
  }
 

diff --git a/src/main/bind.c b/src/main/bind.c
@@ -293,7 +293,7 @@ LogicalAnswer(SEXP x, struct BindData *data, SEXP call)
  break;
  default:
  errorcall(call, _("type '%s' is unimplemented in '%s'"),
- type2char(TYPEOF(x)), "LogicalAnswer");
+ R_typeToChar(x), "LogicalAnswer");
  }
 }
 
@@ -329,7 +329,7 @@ IntegerAnswer(SEXP x, struct BindData *data, SEXP call)
  break;
  default:
  errorcall(call, _("type '%s' is unimplemented in '%s'"),
- type2char(TYPEOF(x)), "IntegerAnswer");
+ R_typeToChar(x), "IntegerAnswer");
  }
 }
 
@@ -378,7 +378,7 @@ RealAnswer(SEXP x, struct BindData *data, SEXP call)
  break;
  default:
  errorcall(call, _("type '%s' is unimplemented in '%s'"),
- type2char(TYPEOF(x)), "RealAnswer");
+ R_typeToChar(x), "RealAnswer");
  }
 }
 
@@ -451,7 +451,7 @@ ComplexAnswer(SEXP x, struct BindData *data, SEXP call)
 
  default:
  errorcall(call, _("type '%s' is unimplemented in '%s'"),
- type2char(TYPEOF(x)), "ComplexAnswer");
+ R_typeToChar(x), "ComplexAnswer");
  }
 }
 
@@ -479,7 +479,7 @@ RawAnswer(SEXP x, struct BindData *data, SEXP call)
  break;
  default:
  errorcall(call, _("type '%s' is unimplemented in '%s'"),
- type2char(TYPEOF(x)), "RawAnswer");
+ R_typeToChar(x), "RawAnswer");
  }
 }
 
@@ -1162,8 +1162,8 @@ attribute_hidden SEXP do_bind(SEXP call, SEXP op, SEXP args, SEXP env)
  to an expression is not ideal.
  FIXME? had cbind(y ~ x, 1) work using lists, before */
  default:
- error(_("cannot create a matrix from type '%s'"),
- type2char(mode));
+ error(_("cannot create a matrix from type '%s'"), 
+ type2char(mode)); /* mode can only be EXPRSXP here */
  }
 
  if (PRIMVAL(op) == 1)
@@ -1396,6 +1396,8 @@ static SEXP cbind(SEXP call, SEXP args, SEXPTYPE mode, SEXP rho,
  });
  } else
  /* not sure this can be reached, but to be safe: */
+ /* `mode` is created in do_bind(), it can only be one of the following:
+ NILSXP, LGLSXP, INTSXP, REALSXP, CPLXSXP, STRSXP, VECSXP, RAWSXP */
  error(_("cannot create a matrix of type '%s'"),
  type2char(mode));
  }

diff --git a/src/main/builtin.c b/src/main/builtin.c
@@ -667,7 +667,7 @@ attribute_hidden SEXP do_cat(SEXP call, SEXP op, SEXP args, SEXP rho)
 #endif
  else
  error(_("argument %d (type '%s') cannot be handled by 'cat'"),
- 1+iobj, type2char(TYPEOF(s)));
+ 1+iobj, R_typeToChar(s));
  /* FIXME : cat(...) should handle ANYTHING */
  size_t w = strlen(p);
  cat_sepwidth(sepr, &sepw, ntot);