retain compat with released packages

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 1.2.1.9013
+Version: 1.2.1.9014
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
     a socket library implementing 'Scalability Protocols', a reliable,
     high-performance standard for common communications patterns including

NAMESPACE

@@ -47,8 +47,8 @@ export("%~>%")
 export("opt<-")
 export(.advance)
 export(.context)
+export(.keep)
 export(.mark)
-export(.promise)
 export(.unresolved)
 export(call_aio)
 export(call_aio_)
@@ -89,6 +89,7 @@ export(request)
 export(send)
 export(send_aio)
 export(serial_config)
+export(set_promise_context)
 export(socket)
 export(stat)
 export(status_code)

NEWS.md

@@ -1,4 +1,4 @@
-# nanonext 1.2.1.9013 (development)
+# nanonext 1.2.1.9014 (development)
 
 #### New Features
 

R/aio.R

@@ -371,8 +371,7 @@ as.promise.recvAio <- function(x) {
     if (unresolved(x)) {
       promise <- promises::then(
         promises::promise(
-          function(resolve, reject)
-            .promise(x, environment())
+          function(resolve, reject) .keep(x, environment())
         ),
         onFulfilled = function(value)
           if (is_error_value(value)) stop(nng_error(value)) else value
@@ -397,7 +396,7 @@ as.promise.recvAio <- function(x) {
 #'
 is.promising.recvAio <- function(x) TRUE
 
-#' Create Promise
+#' Keep Promise
 #'
 #' Internal package function.
 #'
@@ -412,4 +411,9 @@ is.promising.recvAio <- function(x) TRUE
 #' @keywords internal
 #' @export
 #'
-.promise <- function(x, ctx) .Call(rnng_create_promise, x, ctx)
+.keep <- function(x, ctx) .Call(rnng_set_promise_context, x, ctx)
+
+#' @rdname dot-keep
+#' @export
+#'
+set_promise_context <- .keep

R/ncurl.R

@@ -246,8 +246,7 @@ as.promise.ncurlAio <- function(x) {
     if (unresolved(x)) {
       promise <- promises::then(
         promises::promise(
-          function(resolve, reject)
-            .promise(x, environment())
+          function(resolve, reject) .keep(x, environment())
         ),
         onFulfilled = function(value)
           if (value != 200L)

man/dot-promise.Rd renamed to man/dot-keep.Rd

@@ -129,7 +129,6 @@ static const R_CallMethodDef callMethods[] = {
   {"rnng_aio_stop", (DL_FUNC) &rnng_aio_stop, 1},
   {"rnng_clock", (DL_FUNC) &rnng_clock, 0},
   {"rnng_close", (DL_FUNC) &rnng_close, 1},
-  {"rnng_create_promise", (DL_FUNC) &rnng_create_promise, 2},
   {"rnng_ctx_close", (DL_FUNC) &rnng_ctx_close, 1},
   {"rnng_ctx_create", (DL_FUNC) &rnng_ctx_create, 1},
   {"rnng_ctx_open", (DL_FUNC) &rnng_ctx_open, 1},
@@ -170,6 +169,7 @@ static const R_CallMethodDef callMethods[] = {
   {"rnng_serial_config", (DL_FUNC) &rnng_serial_config, 4},
   {"rnng_set_marker", (DL_FUNC) &rnng_set_marker, 1},
   {"rnng_set_opt", (DL_FUNC) &rnng_set_opt, 3},
+  {"rnng_set_promise_context", (DL_FUNC) &rnng_set_promise_context, 2},
   {"rnng_signal_thread_create", (DL_FUNC) &rnng_signal_thread_create, 2},
   {"rnng_sleep", (DL_FUNC) &rnng_sleep, 1},
   {"rnng_socket_lock", (DL_FUNC) &rnng_socket_lock, 2},

src/init.c

@@ -259,7 +259,6 @@ SEXP rnng_aio_result(SEXP);
 SEXP rnng_aio_stop(SEXP);
 SEXP rnng_clock(void);
 SEXP rnng_close(SEXP);
-SEXP rnng_create_promise(SEXP, SEXP);
 SEXP rnng_ctx_close(SEXP);
 SEXP rnng_ctx_create(SEXP);
 SEXP rnng_ctx_open(SEXP);
@@ -301,6 +300,7 @@ SEXP rnng_send_aio(SEXP, SEXP, SEXP, SEXP, SEXP);
 SEXP rnng_serial_config(SEXP, SEXP, SEXP, SEXP);
 SEXP rnng_set_marker(SEXP);
 SEXP rnng_set_opt(SEXP, SEXP, SEXP);
+SEXP rnng_set_promise_context(SEXP, SEXP);
 SEXP rnng_signal_thread_create(SEXP, SEXP);
 SEXP rnng_sleep(SEXP);
 SEXP rnng_socket_lock(SEXP, SEXP);

src/nanonext.h

@@ -498,7 +498,7 @@ SEXP rnng_request(SEXP con, SEXP data, SEXP sendmode, SEXP recvmode, SEXP timeou
 
 }
 
-SEXP rnng_create_promise(SEXP x, SEXP ctx) {
+SEXP rnng_set_promise_context(SEXP x, SEXP ctx) {
 
   if (TYPEOF(x) != ENVSXP)
     return R_NilValue;

src/sync.c

@@ -211,7 +211,7 @@ nanotestp(p <- tryCatch(collect_pipe(r), error = function(e) NULL))
 if (!is.null(p)) nanotest(is_nano(p))
 nanotest(.mark())
 nanotestaio(r <- send_aio(if (is_nano(p)) p else rep, "", timeout = 500))
-if (later) nanotestn(.promise(r, new.env()))
+if (later) nanotestn(.keep(r, new.env()))
 nanotesterr(collect_pipe(r), "valid")
 nanotest(req$recv(mode = 8L, block = 500)[4L] == 1L)
 nanotest(!.mark(FALSE))
@@ -571,8 +571,8 @@ nanotesterr(collect_aio_(list("a")), "object is not an Aio or list of Aios")
 nanotesterr(collect_aio(list(fakesock)), "object is not an Aio or list of Aios")
 nanotestn(stop_aio("a"))
 nanotestn(stop_aio(list("a")))
-nanotestn(.promise(NULL, new.env()))
-nanotestn(.promise(new.env(), new.env()))
+nanotestn(.keep(NULL, new.env()))
+nanotestn(.keep(new.env(), new.env()))
 
 pem <- "-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----"
 test_tls <- function(pem) {