Use pointer functions instead of binary linkage functions

Author: mattfidler

R/zzz.R

@@ -1,4 +1,10 @@
+.dparserLoad <- function() {
+  .Call(`_nonmem2rx_iniDparserPtr`,
+        dparser::.dparsePtr(),
+        PACKAGE = "nonmem2rx")
+}
 .onLoad <- function(libname, pkgname) {
+  .dparserLoad()
   .Call(`_nonmem2rx_r_parseIni`)
   if (requireNamespace("nlme", quietly=TRUE)) {
     rxode2::.s3register("nlme::getData", "nonmem2rx")
@@ -9,5 +15,6 @@
   rxode2::.s3register("rxode2::rxUiGet", "simulationModelIwres")
 }
 .onAttach <- function(libname,pkgname){
+  .dparserLoad()
   .Call(`_nonmem2rx_r_parseIni`)
 }

src/abbrec.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/abbrev.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/data.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
@@ -164,7 +164,7 @@ void trans_data(const char* parse){
   // problems with R's garbage collection, so duplicate the string.
   gBuf = (char*)(parse);
   gBufFree=0;
-  
+
   eBuf = gBuf;
   eBufLast = 0;
   errP = curP;

src/dparser3.h

@@ -28,8 +28,10 @@ SEXP _nonmem2rx_r_parseFree(void);
 SEXP _nonmem2rx_r_parseIni(void);
 SEXP _nonmem2rx_fixNonmemTies(SEXP idS, SEXP timeS, SEXP deltaS);
 SEXP _nonmem2rx_setRecord(SEXP rec);
+SEXP _nonmem2rx_iniDparserPtr(SEXP ptr);
 void R_init_nonmem2rx(DllInfo *info) {
   R_CallMethodDef callMethods[]  = {
+    {"_nonmem2rx_iniDparserPtr", (DL_FUNC) &_nonmem2rx_iniDparserPtr, 1},
     {"_nonmem2rx_fromNonmemToRxId_", (DL_FUNC) &_nonmem2rx_fromNonmemToRxId_, 2},
     {"_nonmem2rx_setRecord", (DL_FUNC) &_nonmem2rx_setRecord, 1},
     {"_nonmem2rx_fixNonmemTies", (DL_FUNC) &_nonmem2rx_fixNonmemTies, 3},

src/init.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
@@ -68,7 +68,7 @@ void parseFree(int last) {
 typedef void (print_node_fn_t)(int depth, char *token_name, char *token_value, void *client_data);
 
 void wprint_node_input(int depth, char *name, char *value, void *client_data)  {
-  
+
 }
 
 extern char * rc_dup_str(const char *s, const char *e);
@@ -123,7 +123,7 @@ void trans_input(const char* parse){
   // problems with R's garbage collection, so duplicate the string.
   gBuf = (char*)(parse);
   gBufFree=0;
-  
+
   eBuf = gBuf;
   eBufLast = 0;
   errP = curP;

src/input.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
@@ -160,7 +160,7 @@ void trans_lst(const char* parse){
   // problems with R's garbage collection, so duplicate the string.
   gBuf = (char*)(parse);
   gBufFree=0;
-  
+
   eBuf = gBuf;
   eBufLast = 0;
   errP = curP;

src/lst.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/mem.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/model.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
@@ -68,7 +68,7 @@ void parseFree(int last) {
 extern char * rc_dup_str(const char *s, const char *e);
 typedef void (print_node_fn_t)(int depth, char *token_name, char *token_value, void *client_data);
 void wprint_node_omega(int depth, char *token_name, char *token_value, void *client_data) {
-  
+
 }
 
 int nonmem2rx_unintFix = 0;
@@ -337,10 +337,10 @@ int omegaParseOmeg0(_arg_) {
     } else {
       if (fix[0] != 0) {
         if ((fix[0] == 'u' || fix[0] == 'U')){
-          if (nonmem2rx_unintFix) 
-            nonmem2rx_omegaFixed = 1; 
+          if (nonmem2rx_unintFix)
+            nonmem2rx_omegaFixed = 1;
         } else {
-          nonmem2rx_omegaFixed = 1; 
+          nonmem2rx_omegaFixed = 1;
         }
       }
       addOmegaBlockItem(v);

src/omega.c

@@ -6,7 +6,11 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include <dparser.h>
+
+#define iniDparserPtr _nonmem2rx_iniDparserPtr
+#include <dparserPtr.h>
+dparserPtrIni;
+
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/records.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>
@@ -240,7 +240,7 @@ void trans_sub(const char* parse){
   // problems with R's garbage collection, so duplicate the string.
   gBuf = (char*)(parse);
   gBufFree=0;
-  
+
   eBuf = gBuf;
   eBufLast = 0;
   errP = curP;

src/sub.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>

src/tab.c

@@ -6,7 +6,7 @@
 //#include "ode.h"
 #include <rxode2parseSbuf.h>
 #include <errno.h>
-#include "dparser3.h"
+#include <dparserPtr.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <R_ext/Rdynload.h>