removes unresolvedSymbol

shikokuchuo · Oct 25, 2023 · 3513f42 · 3513f42
1 parent 974aca6
commit 3513f42
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 0.10.2.9009
+Version: 0.10.2.9010
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is 
     a socket library providing high-performance scalability protocols, a
     cross-platform standard for messaging and communications. Serves as a

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# nanonext 0.10.2.9009 (development)
+# nanonext 0.10.2.9010 (development)
 
 #### New Features
 

diff --git a/src/aio.c b/src/aio.c
@@ -798,7 +798,7 @@ SEXP rnng_unresolved(SEXP x) {
     SEXP value = Rf_findVarInFrame(x, nano_DataSymbol);
     if (value == R_UnboundValue)
       value = Rf_findVarInFrame(x, nano_ResultSymbol);
-    xc = value == nano_unresolved || value == nano_UnresSymbol || (TYPEOF(value) == ENVSXP && Rf_inherits(value, "unresolvedValue"));
+    xc = TYPEOF(value) == ENVSXP ? Rf_inherits(value, "unresolvedValue") : value == nano_unresolved;
     break;
   case LGLSXP:
     xc = x == nano_unresolved;

diff --git a/src/init.c b/src/init.c
@@ -39,7 +39,6 @@ SEXP nano_StatusSymbol;
 SEXP nano_StreamSymbol;
 SEXP nano_TextframesSymbol;
 SEXP nano_TlsSymbol;
-SEXP nano_UnresSymbol;
 SEXP nano_UrlSymbol;
 SEXP nano_ValueSymbol;
 
@@ -81,7 +80,6 @@ static void RegisterSymbols(void) {
   nano_StreamSymbol = Rf_install("stream");
   nano_TextframesSymbol = Rf_install("textframes");
   nano_TlsSymbol = Rf_install("tls");
-  nano_UnresSymbol = Rf_install(" unresolved ");
   nano_UrlSymbol = Rf_install("url");
   nano_ValueSymbol = Rf_install("value");
 }

diff --git a/src/nanonext.h b/src/nanonext.h
@@ -216,7 +216,6 @@ extern SEXP nano_StatusSymbol;
 extern SEXP nano_StreamSymbol;
 extern SEXP nano_TextframesSymbol;
 extern SEXP nano_TlsSymbol;
-extern SEXP nano_UnresSymbol;
 extern SEXP nano_UrlSymbol;
 extern SEXP nano_ValueSymbol;
 

diff --git a/tests/tests.R b/tests/tests.R
@@ -484,7 +484,6 @@ nanotesterr(start(fakelist), "valid Listener")
 nanotesterr(close(fakelist), "valid Listener")
 unres <- `class<-`(NA, "unresolvedValue")
 nanotest(!unresolved(unres))
-nanotest(unresolved(`[[<-`(new.env(), "data", as.symbol(" unresolved "))))
 nanotestp(unres)
 nanotest(identical(call_aio("a"), "a"))
 nanotestn(stop_aio("a"))