Skip to content

Commit 27eae61

Browse files
committed
nextmode -> next_config
1 parent 5d4974b commit 27eae61

File tree

14 files changed

+50
-48
lines changed

14 files changed

+50
-48
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nanonext
22
Type: Package
33
Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
4-
Version: 0.10.4.9025
4+
Version: 0.10.4.9026
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library implementing 'Scalability Protocols', a reliable,
77
high-performance standard for common communications patterns including

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export(nano)
6363
export(ncurl)
6464
export(ncurl_aio)
6565
export(ncurl_session)
66-
export(nextmode)
66+
export(next_config)
6767
export(nng_error)
6868
export(nng_version)
6969
export(opt)

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.10.4.9025
1+
# nanonext 0.10.4.9026
22

33
*This is a major stability release bundling the 'libnng' v1.6.0 source code.*
44

@@ -11,8 +11,8 @@
1111
#### Updates
1212

1313
* `until()` updated to be identical to `.until()`, returning FALSE instead of TRUE if the timeout has been reached.
14-
* `nextmode()` improvements:
15-
+ simplified function signature to take a 'refhook' argument comprising a list of serialization / unserialization functions.
14+
* `next_config()` replaces `nextmode()` with the following improvements:
15+
+ simplified 'refhook' argument takes a pair of serialization and unserialization functions as a list.
1616
+ registered 'refhook' functions apply to external pointer type objects only.
1717
+ no longer returns invisibly for easier confimation that the correct functions have been registered.
1818
* `reap()` updated to no longer warn in cases it returns an 'errorValue'.

R/sendrecv.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
#' corresponding to the vector sent should be used.
6565
#'
6666
#' Mode 'next' sends serialised R objects, with native extensions enabled by
67-
#' \code{\link{nextmode}}. This allows custom serialization and
68-
#' unserialization functions to be registered for objects accessed via an
69-
#' external pointer. When receiving, mode 'serial' should be used as 'next'
70-
#' sends are fully compatible.
67+
#' \code{\link{next_config}}. This configures custom serialization and
68+
#' unserialization functions for external pointer type objects. When
69+
#' receiving, mode 'serial' should be used as 'next' sends are fully
70+
#' compatible.
7171
#'
7272
#' @seealso \code{\link{send_aio}} for asynchronous send.
7373
#' @examples

R/utils.R

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ status_code <- function(x) .Call(rnng_status_code, x)
275275
#'
276276
strcat <- function(a, b) .Call(rnng_strcat, a, b)
277277

278-
#' Next Mode Settings
278+
#' Configure Next Mode
279279
#'
280280
#' Configures send mode 'next' by registering functions for custom serialization
281281
#' and unserialization of external pointer objects, allowing these to be
@@ -295,14 +295,15 @@ strcat <- function(a, b) .Call(rnng_strcat, a, b)
295295
#' currently-registered 'refhook' functions (and resets 'mark' to FALSE).
296296
#'
297297
#' @examples
298-
#' nextmode(refhook = list(function(x) serialize(x, NULL), unserialize),
299-
#' mark = TRUE)
300-
#' nextmode()
298+
#' g <- next_config(refhook = list(function(x) serialize(x, NULL), unserialize),
299+
#' mark = TRUE)
300+
#' next_config()
301+
#' next_config(g)
301302
#'
302-
#' nextmode(NULL)
303-
#' nextmode()
303+
#' next_config(NULL)
304+
#' next_config()
304305
#'
305306
#' @export
306307
#'
307-
nextmode <- function(refhook = list(), mark = FALSE)
308-
.Call(rnng_next_mode, refhook, mark)
308+
next_config <- function(refhook = list(), mark = FALSE)
309+
.Call(rnng_next_config, refhook, mark)

man/nextmode.Rd renamed to man/next_config.Rd

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/reply.Rd

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/request.Rd

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/send.Rd

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/send_aio.Rd

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)