Merge pull request #16 from nlmixr2/16-rm-set-typeof

Remove SET_TYPEOF

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dparser
 Title: Port of 'Dparser' Package
-Version: 1.3.1-11
+Version: 1.3.1-12
 Authors@R: c(person("Matthew", "Fidler", email = "[email protected]", role = c("aut", "cre")),
 	   person("John", "Plevyak", role = c("aut", "cph"), email = "[email protected]"))
 Imports:

NEWS.md

@@ -1,3 +1,7 @@
+# dparser 1.3.1-12
+
+- Changed language access to not use `SET_TYPEOF` (as required by CRAN)
+
 # dparser 1.3.1-11
 
 - Changed `gram.c` to handle NULL strings without printing them (as requested by CRAN)

src/rdparse.c

@@ -26,8 +26,7 @@ void callparsefn(char *name, char *value, int pos, int depth, SEXP fn, SEXP env)
    fn(name = name, value = value, pos = pos, depth = depth)
    */
   SEXP s, t;
-  t = s = PROTECT(allocList(5));
-  SET_TYPEOF(s, LANGSXP);
+  t = s = PROTECT(LCONS(R_NilValue, allocList(4)));
   SETCAR(t, fn); t = CDR(t);
   // name = name
   SETCAR(t, mkString(name));
@@ -52,8 +51,7 @@ int callskipchildrenfn(char *name, char *value, int pos, int depth, SEXP skip_fn
    */
   SEXP s, t;
   int ret;
-  t = s = PROTECT(allocList(5));
-  SET_TYPEOF(s, LANGSXP);
+  t = s = PROTECT(LCONS(R_NilValue, allocList(4)));
   SETCAR(t, skip_fn); t = CDR(t);
   // name = name
   SETCAR(t, mkString(name));