ergm_Init_*() messaging functions now have their base-R based counter…

…parts with similar argument interpretation but different defaults, suppressing the caller. Also, ergm_Init_abort() now takes a call= argument and propagates it.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ergm
-Version: 4.7-7364
-Date: 2024-06-03
+Version: 4.7-7367
+Date: 2024-06-05
 Title: Fit, Simulate and Diagnose Exponential-Family Models for Networks
 Authors@R: c(
              person(c("Mark", "S."), "Handcock", role=c("aut"), email="[email protected]"),

NAMESPACE

@@ -211,8 +211,11 @@ export(ergm_Cstate_clear)
 export(ergm_GWDECAY)
 export(ergm_Init_abort)
 export(ergm_Init_inform)
+export(ergm_Init_message)
+export(ergm_Init_stop)
 export(ergm_Init_try)
 export(ergm_Init_warn)
+export(ergm_Init_warning)
 export(ergm_MCMC_sample)
 export(ergm_MCMC_slave)
 export(ergm_SAN_slave)

R/ergm.errors.R

@@ -18,15 +18,31 @@
 #'   character vector, concatenated into the message.
 #' @param default.loc Optional name for the source of the error, to be
 #'   used if an initializer cannot be autodetected.
+#' @param call.,call See [stop()] and [abort()] respectively; note the
+#'   different defaults.
 #'
+#' @note At this time, the \CRANpkg{rlang} analogues
+#'   `ergm_Init_abort()`, `ergm_Init_warn()`, and `ergm_Init_inform()`
+#'   all concatenate their arguments like their base \R
+#'   counterparts. This may change in the future, and if you wish to
+#'   retain their old behavior, please switch to their base \R
+#'   analogues `ergm_Init_stop()`, `ergm_Init_warning()`, and
+#'   `ergm_Init_message()`.
 #' @importFrom rlang abort
 #' @seealso [stop()], [abort()]
 #' @name ergm-errors
 #' @keywords internal
 #' @export
-ergm_Init_abort <- function(..., default.loc=NULL){
+ergm_Init_abort <- function(..., default.loc=NULL, call=NULL){
   loc <- traceback.Initializers() %>% format_traceback()
-  abort(paste0('In ', NVL(loc, default.loc, "unknown function"), ': ', ...))
+  abort(paste0('In ', NVL(loc, default.loc, "unknown function"), ': ', ...), call=call)
+}
+
+#' @rdname ergm-errors
+#' @export
+ergm_Init_stop <- function(..., call. = FALSE, default.loc=NULL){
+  loc <- traceback.Initializers() %>% format_traceback()
+  stop(paste0('In ', NVL(loc, default.loc, "unknown function"), ': '), ..., call.=call.)
 }
 
 #' @rdname ergm-errors
@@ -38,6 +54,13 @@ ergm_Init_warn <- function(..., default.loc=NULL){
   warn(paste0('In ', NVL(loc, default.loc, "unknown function"), ': ', ...))
 }
 
+#' @rdname ergm-errors
+#' @export
+ergm_Init_warning <- function(..., call. = FALSE, default.loc=NULL){
+  loc <- traceback.Initializers() %>% format_traceback()
+  warning(paste0('In ', NVL(loc, default.loc, "unknown function"), ': '), ..., call.=call.)
+}
+
 #' @rdname ergm-errors
 #' @seealso [message()], [inform()]
 #' @importFrom rlang inform
@@ -47,6 +70,13 @@ ergm_Init_inform <- function(..., default.loc=NULL){
   inform(paste0('In ', NVL(loc, default.loc, "unknown function"), ': ', ...))
 }
 
+#' @rdname ergm-errors
+#' @export
+ergm_Init_message <- function(..., default.loc=NULL){
+  loc <- traceback.Initializers() %>% format_traceback()
+  message(paste0('In ', NVL(loc, default.loc, "unknown function"), ': '), ...)
+}
+
 #' @describeIn ergm-errors A helper function that evaluates the
 #'   specified expression in the caller's environment, passing any
 #'   errors to [ergm_Init_abort()].