v0.2.18 MTN R-devel API restrictions

Author: brodieG

DESCRIPTION

@@ -3,7 +3,7 @@ Title: Trust, but Verify
 Description: Declarative template-based framework for verifying that objects
   meet structural requirements, and auto-composing error messages when they do
   not.
-Version: 0.2.16
+Version: 0.2.18
 Authors@R: c(
     person("Brodie", "Gaslam", email="[email protected]",
     role=c("aut", "cre")),

NEWS.md

@@ -1,3 +1,11 @@
+## 0.2.17-18
+
+* Fix bad C API accesses uncovered by new R-devel checks.
+
+## 0.2.16
+
+* Fix -Wformat warnings.
+
 ## 0.2.15
 
 * [#109](https://github.com/brodieG/vetr/issues/109) allow for substituted

README.md

@@ -47,8 +47,10 @@ care of the rest:
     tpl <- numeric(1L)
     vet(tpl, 1:3)
     ## [1] "`length(1:3)` should be 1 (is 3)"
+
     vet(tpl, "hello")
     ## [1] "`\"hello\"` should be type \"numeric\" (is \"character\")"
+
     vet(tpl, 42)
     ## [1] TRUE
 
@@ -59,6 +61,7 @@ example, zero length templates match any length:
     tpl <- integer()
     vet(tpl, 1L:3L)
     ## [1] TRUE
+
     vet(tpl, 1L)
     ## [1] TRUE
 
@@ -68,6 +71,7 @@ considered integer:
     tpl <- integer(1L)
     vet(tpl, 1)       # this is a numeric, not an integer
     ## [1] TRUE
+
     vet(tpl, 1.0001)
     ## [1] "`1.0001` should be type \"integer-like\" (is \"double\")"
 
@@ -79,6 +83,7 @@ considered integer:
 
     vet(tpl.iris, iris)
     ## [1] TRUE
+
     vet(tpl.iris, iris.fake)
     ## [1] "`levels(iris.fake$Species)[3]` should be \"virginica\" (is \"sibirica\")"
 
@@ -134,8 +139,10 @@ You can combine templates with `&&` / `||`:
 
     vet(numeric(1L) || NULL, NULL)
     ## [1] TRUE
+
     vet(numeric(1L) || NULL, 42)
     ## [1] TRUE
+
     vet(numeric(1L) || NULL, "foo")
     ## [1] "`\"foo\"` should be `NULL`, or type \"numeric\" (is \"character\")"
 
@@ -144,6 +151,7 @@ refer to the object:
 
     vet(numeric(1L) && . > 0, -42)  # strictly positive scalar numeric
     ## [1] "`-42 > 0` is not TRUE (FALSE)"
+
     vet(numeric(1L) && . > 0, 42)
     ## [1] TRUE
 
@@ -161,8 +169,10 @@ them:
 
     vet(vet.exp, 42)
     ## [1] TRUE
+
     vet(vet.exp, "foo")
     ## [1] TRUE
+
     vet(vet.exp, "baz")
     ## [1] "At least one of these should pass:"                         
     ## [2] "  - `\"baz\" %in% c(\"foo\", \"bar\")` is not TRUE (FALSE)" 
@@ -172,7 +182,7 @@ them:
 `isTRUE(all(. >= x & . <= y))` for large vectors):
 
     vet(all_bw(., 0, 1), runif(5) + 1)
-    ## [1] "`all_bw(runif(5) + 1, 0, 1)` is not TRUE (is chr: \"`1.234342` at index 1 not in `[0,1]`\")"
+    ## [1] "`all_bw(runif(5) + 1, 0, 1)` is not TRUE (is chr: \"`1.614709` at index 1 not in `[0,1]`\")"
 
 There are a number of predefined vetting tokens you can use in your
 vetting expressions such as:
@@ -198,6 +208,7 @@ functions:
     }
     fun(1:2, "foo")
     ## Error in fun(x = 1:2, y = "foo"): For argument `x`, `length(1:2)` should be 1 (is 2)
+
     fun(1, "foo")
     ## Error in fun(x = 1, y = "foo"): For argument `y`, `"foo"` should be type "logical" (is "character")
 
@@ -280,9 +291,9 @@ review them:
 -   [`validate`](https://github.com/data-cleaning/validate) by Mark van
     der Loo and Edwin de Jonge, with a primary focus on validating data
     in data frames and similar data structures.
--   [`assertr`](https://github.com/ropensci/assertr) by Tony Fischetti,
-    also focused on data validation in data frames and similar
-    structures.
+-   [`assertr`](https://github.com/tonyfischetti/assertr) by Tony
+    Fischetti, also focused on data validation in data frames and
+    similar structures.
 -   [`types`](https://github.com/jimhester/types) by Jim Hester, which
     implements but does not enforce type hinting.
 -   [`argufy`](https://github.com/gaborcsardi/argufy) by Gábor Csárdi,

src/alike.h

@@ -263,6 +263,7 @@ Go to <https://www.r-project.org/Licenses/GPL-2> for a copy of the license.
   extern SEXP ALIKEC_SYM_tilde;
   extern SEXP ALIKEC_SYM_paren_open;
   extern SEXP ALIKEC_SYM_args;
+  extern SEXP ALIKEC_SYM_function;
   extern SEXP ALIKEC_SYM_deparse;
   extern SEXP ALIKEC_SYM_nlines;
   extern SEXP ALIKEC_SYM_getOption;

src/fun.c

@@ -46,19 +46,17 @@ struct ALIKEC_res ALIKEC_fun_alike_internal(
   if(!isFunction(target) || !isFunction(current))
     error("Arguments must be functions.");
 
-  SEXP tar_form, cur_form, args;
+  SEXP tar_form, cur_form, args, func;
   SEXPTYPE tar_type = TYPEOF(target), cur_type = TYPEOF(current);
   struct ALIKEC_res res = ALIKEC_res_init();
 
   // Translate specials and builtins to formals, if possible
 
   args = PROTECT(list2(ALIKEC_SYM_args, R_NilValue));
-  if(
-    tar_type == SPECIALSXP || tar_type == BUILTINSXP ||
-    cur_type == SPECIALSXP || cur_type == BUILTINSXP
-  ) {
-    SET_TYPEOF(args, LANGSXP);
-  }
+  SET_TYPEOF(args, LANGSXP);
+  func = PROTECT(list3(ALIKEC_SYM_function, R_NilValue, R_NilValue));
+  SET_TYPEOF(func, LANGSXP);
+
   if(tar_type == SPECIALSXP || tar_type == BUILTINSXP) {
     SETCADR(args, target);
     target = PROTECT(eval(args, R_BaseEnv));
@@ -69,6 +67,16 @@ struct ALIKEC_res ALIKEC_fun_alike_internal(
     current = PROTECT(eval(args, R_BaseEnv));
   } else PROTECT(R_NilValue);
 
+  // As of ~r86700 R became stricter about what we could call FORMALS on, so we
+  // need to make sure that we do get actual formals and not NULL.
+
+  if(TYPEOF(target) != CLOSXP) {
+    target = PROTECT(eval(func, R_BaseEnv));
+  } else PROTECT(R_NilValue);
+  if(TYPEOF(current) != CLOSXP) {
+    current = PROTECT(eval(func, R_BaseEnv));
+  } else PROTECT(R_NilValue);
+
   // Cycle through all formals
 
   int dots = 0, dots_last = 0, dots_reset = 0, tag_match = 1, dots_cur = 0;
@@ -156,7 +164,7 @@ struct ALIKEC_res ALIKEC_fun_alike_internal(
       res.dat.strings.target[2] = arg_type;
     }
   }
-  UNPROTECT(3);
+  UNPROTECT(6);
   if(!res.success) res.wrap = allocVector(VECSXP, 2);
   return res;
 }

src/init.c

@@ -107,6 +107,7 @@ SEXP ALIKEC_SYM_inherits;
 SEXP ALIKEC_SYM_paren_open;
 SEXP ALIKEC_SYM_tilde;
 SEXP ALIKEC_SYM_args;
+SEXP ALIKEC_SYM_function;
 SEXP ALIKEC_SYM_deparse;
 SEXP ALIKEC_SYM_nlines;
 SEXP ALIKEC_SYM_widthcutoff;
@@ -143,6 +144,7 @@ void R_init_vetr(DllInfo *info)
   ALIKEC_SYM_paren_open = install("(");
   ALIKEC_SYM_tilde = install("~");
   ALIKEC_SYM_args = install("args");
+  ALIKEC_SYM_function = install("function");
   ALIKEC_SYM_deparse = install("deparse");
   ALIKEC_SYM_nlines = install("nlines");
   ALIKEC_SYM_widthcutoff = install("width.cutoff");

src/merge.c

@@ -117,18 +117,17 @@ static SEXP ALIKEC_unique_msg(SEXP msgs) {
   R_xlen_t len = xlength(msgs);
   if(len < 2) return(msgs);
 
-  // Loop once to check for dupes
+  // Loop once to count how many distinct values
 
-  int some_dup = 0;
+  int distinct_vals = 1;
   for(R_xlen_t i = 1; i < len; ++i) {
-    if(R_compute_identical(VECTOR_ELT(msgs, i - 1), VECTOR_ELT(msgs, i), 16)) {
-      some_dup = 1;
-      break;
+    if(!R_compute_identical(VECTOR_ELT(msgs, i - 1), VECTOR_ELT(msgs, i), 16)) {
+      ++distinct_vals;
     }
   }
   SEXP res;
-  if(some_dup) {
-    res = PROTECT(allocVector(VECSXP, len));
+  if(distinct_vals != len) {
+    res = PROTECT(allocVector(VECSXP, distinct_vals));
     SET_VECTOR_ELT(res, 0, VECTOR_ELT(msgs, 0));
     R_xlen_t j = 1;
     for(R_xlen_t i = 1; i < len; ++i) {
@@ -138,7 +137,6 @@ static SEXP ALIKEC_unique_msg(SEXP msgs) {
         SET_VECTOR_ELT(res, j++, VECTOR_ELT(msgs, i));
       }
     }
-    SETLENGTH(res, j);
     UNPROTECT(1);
   } else res = msgs;
   return res;

src/r-copied.c

@@ -63,7 +63,7 @@ SEXP ALIKEC_findFun(SEXP symbol, SEXP rho) {
     error("Internal Error: `rho` must be environment");// nocov
   SEXP vl;
   while (rho != R_EmptyEnv) {
-    vl = findVarInFrame3(rho, symbol, TRUE);
+    vl = findVarInFrame(rho, symbol);
     if (vl != R_UnboundValue) {
       if (TYPEOF(vl) == PROMSXP) {
         PROTECT(vl);

vignettes/rmdhunks/related-packages.Rmd

@@ -19,7 +19,7 @@ them:
 * [`validate`](https://github.com/data-cleaning/validate) by Mark van
   der Loo and Edwin de Jonge, with a primary focus on validating data in data
   frames and similar data structures.
-* [`assertr`](https://github.com/ropensci/assertr) by Tony Fischetti, also
+* [`assertr`](https://github.com/tonyfischetti/assertr) by Tony Fischetti, also
   focused on data validation in data frames and similar structures.
 * [`types`](https://github.com/jimhester/types) by Jim Hester, which implements
   but does not enforce type hinting.