Skip to content

Commit 380d521

Browse files
committed
do not persist unresolvedValue
1 parent 2e3828f commit 380d521

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
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.9.2.9040
4+
Version: 0.9.2.9041
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library providing high-performance scalability protocols, a
77
cross-platform standard for messaging and communications. Serves as a

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.9.2.9040 (development)
1+
# nanonext 0.9.2.9041 (development)
22

33
#### New Features
44

src/aio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,10 +768,10 @@ SEXP rnng_unresolved(SEXP x) {
768768
SEXP value = Rf_findVarInFrame(x, nano_DataSymbol);
769769
if (value == R_UnboundValue)
770770
value = Rf_findVarInFrame(x, nano_ResultSymbol);
771-
xc = Rf_inherits(value, "unresolvedValue");
771+
xc = TYPEOF(value) == ENVSXP ? Rf_inherits(value, "unresolvedValue") : value == nano_unresolved;
772772
break;
773773
case LGLSXP:
774-
xc = Rf_inherits(x, "unresolvedValue");
774+
xc = x == nano_unresolved;
775775
break;
776776
default:
777777
xc = 0;

tests/tests.R

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,8 @@ fakelist <- `class<-`("test", "nanoListener")
466466
nanotesterr(start(fakelist), "valid Listener")
467467
nanotesterr(close(fakelist), "valid Listener")
468468
unres <- `class<-`(NA, "unresolvedValue")
469-
nanotest(unresolved(unres))
470-
nanotestp(unres)
471-
unres <- `class<-`("", "unresolvedValue")
472469
nanotest(!unresolved(unres))
470+
nanotestp(unres)
473471
nanotest(identical(call_aio("a"), "a"))
474472
nanotestn(stop_aio("a"))
475473

0 commit comments

Comments
 (0)