C level cleanups (#165)

* Cleaner unreached code paths

* Better organize compilation units

* Mark later2() inline

Author: shikokuchuo

NEWS.md

@@ -2,7 +2,7 @@
 
 #### Updates
 
-* Fixes rare cases of `unresolvedValue` being returned by fulfilled promises (#163).
+* Fixes very rare cases of `unresolvedValue` being returned by fulfilled promises (#163).
 
 # nanonext 1.6.1
 

src/aio.c

@@ -290,7 +290,8 @@ SEXP nano_aio_get_msg(SEXP env) {
       return mk_error_aio(res, env);
     break;
   default:
-    return R_MissingArg;
+    /* not reached */
+    res = 0;
   }
 
   return create_aio_msg(env, aio, raio, res);
@@ -353,7 +354,8 @@ SEXP rnng_aio_get_msg(SEXP env) {
 
     break;
   default:
-    return R_MissingArg;
+    /* not reached */
+    res = 0;
   }
 
   return create_aio_msg(env, aio, raio, res);

src/core.c

@@ -231,44 +231,10 @@ inline SEXP R_mkClosure(SEXP formals, SEXP body, SEXP env) {
 
 #endif
 
-inline SEXP nano_PreserveObject(const SEXP x) {
-
-  SEXP tail = CDR(nano_precious);
-  SEXP node = Rf_cons(nano_precious, tail);
-  SETCDR(nano_precious, node);
-  if (tail != R_NilValue)
-    SETCAR(tail, node);
-  SET_TAG(node, x);
-
-  return node;
-
-}
-
-inline void nano_ReleaseObject(SEXP node) {
-
-  SET_TAG(node, R_NilValue);
-  SEXP head = CAR(node);
-  SEXP tail = CDR(node);
-  SETCDR(head, tail);
-  if (tail != R_NilValue)
-    SETCAR(tail, head);
-
-}
-
-void later2(void (*fun)(void *), void *data) {
+inline void later2(void (*fun)(void *), void *data) {
   eln2(fun, data, 0, 0);
 }
 
-void raio_invoke_cb(void *arg) {
-
-  SEXP call, node = (SEXP) arg, x = TAG(node);
-  PROTECT(call = Rf_lcons(nano_ResolveSymbol, Rf_cons(nano_aio_get_msg(x), R_NilValue)));
-  Rf_eval(call, NANO_ENCLOS(x));
-  UNPROTECT(1);
-  nano_ReleaseObject(node);
-
-}
-
 inline int nano_integer(const SEXP x) {
   return (TYPEOF(x) == INTSXP || TYPEOF(x) == LGLSXP) ? NANO_INTEGER(x) : Rf_asInteger(x);
 }

src/nanonext.h

@@ -285,13 +285,12 @@ SEXP R_NewEnv(SEXP, int, int);
 #if R_VERSION < R_Version(4, 5, 0)
 SEXP R_mkClosure(SEXP, SEXP, SEXP);
 #endif
-SEXP nano_PreserveObject(const SEXP);
-void nano_ReleaseObject(SEXP);
 void dialer_finalizer(SEXP);
 void listener_finalizer(SEXP);
 void socket_finalizer(SEXP);
 void later2(void (*)(void *), void *);
 void raio_invoke_cb(void *);
+void haio_invoke_cb(void *);
 int nano_integer(const SEXP);
 SEXP mk_error(const int);
 SEXP mk_error_data(const int);

src/ncurl.c

@@ -69,17 +69,6 @@ static nano_buf nano_char_buf(const SEXP data) {
 
 // aio completion callbacks ----------------------------------------------------
 
-static void haio_invoke_cb(void *arg) {
-
-  SEXP call, status, node = (SEXP) arg, x = TAG(node);
-  status = nano_aio_http_status(x);
-  PROTECT(call = Rf_lcons(nano_ResolveSymbol, Rf_cons(status, R_NilValue)));
-  Rf_eval(call, NANO_ENCLOS(x));
-  UNPROTECT(1);
-  nano_ReleaseObject(node);
-
-}
-
 static void haio_complete(void *arg) {
 
   nano_aio *haio = (nano_aio *) arg;

src/sync.c

@@ -16,8 +16,54 @@ static void nano_load_later(void) {
 
 }
 
+static inline SEXP nano_PreserveObject(const SEXP x) {
+
+  SEXP tail = CDR(nano_precious);
+  SEXP node = Rf_cons(nano_precious, tail);
+  SETCDR(nano_precious, node);
+  if (tail != R_NilValue)
+    SETCAR(tail, node);
+  SET_TAG(node, x);
+
+  return node;
+
+}
+
+static inline void nano_ReleaseObject(SEXP node) {
+
+  SET_TAG(node, R_NilValue);
+  SEXP head = CAR(node);
+  SEXP tail = CDR(node);
+  SETCDR(head, tail);
+  if (tail != R_NilValue)
+    SETCAR(tail, head);
+
+}
+
 // aio completion callbacks ----------------------------------------------------
 
+
+void raio_invoke_cb(void *arg) {
+
+  SEXP call, node = (SEXP) arg, x = TAG(node);
+  PROTECT(call = Rf_lcons(nano_ResolveSymbol, Rf_cons(nano_aio_get_msg(x), R_NilValue)));
+  Rf_eval(call, NANO_ENCLOS(x));
+  UNPROTECT(1);
+  nano_ReleaseObject(node);
+
+}
+
+void haio_invoke_cb(void *arg) {
+
+  SEXP call, status, node = (SEXP) arg, x = TAG(node);
+  status = nano_aio_http_status(x);
+  PROTECT(call = Rf_lcons(nano_ResolveSymbol, Rf_cons(status, R_NilValue)));
+  Rf_eval(call, NANO_ENCLOS(x));
+  UNPROTECT(1);
+  nano_ReleaseObject(node);
+
+}
+
 static void sendaio_complete(void *arg) {
 
   nng_aio *aio = ((nano_saio *) arg)->aio;