Merge pull request #21 from D-Se/coverage

Extend coverage for type checks
D-Se · Nov 29, 2023 · 8b68e12 · 8b68e12
2 parents 77fe330 + 838cc00
commit 8b68e12
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/inst/tinytest/test_ifelse.R b/inst/tinytest/test_ifelse.R
@@ -53,4 +53,6 @@ error(c(NA, NA) ? 1 ~ "a", "Type")
 # misc
 (TRUE ? lst[[2]] ~ lst[[3]]) := 2
 num = "hi"
-(num ? num) := FALSE
+(num ? num) := FALSE
+
+# new types
diff --git a/inst/tinytest/test_isas.R b/inst/tinytest/test_isas.R
@@ -39,6 +39,26 @@ for (i in seq_len(nrow(ask_is))) {
   }
 }
 
+error(1 ? huh, "Abbreviation")
+vals = list(
+  1, 1+0i, raw(1), ts(1), factor(1), ordered(1), table(1),
+  mtcars, mtcars, new.env(), c(1, 2), matrix(1), array(1:3, 4:6),
+  lapply, expression(1+1), getClass("MethodDefinition")
+)
+abbs2 = c(
+  "dbl", "cpl", "raw", "ts", "fct", "ord", "tab",
+  "df", "dfr", "env", "vec", "mtx", "arr",
+  "fun", "exp", "s4"
+)
+for (i in seq_along(vals)) {
+  eval(substitute(x ? y, list(x = vals[[i]], y = as.name(abbs2[i])))) := TRUE
+}
+
+# misc type check
+(as.name("x") ? sym) := TRUE
+(call("f") ? lng) := TRUE
+(x ~ y ? fml) := TRUE
+
 #### Type coercion ####
 as_names <- paste0("as.", names)
 base_as <- vapply(paste0("as.", names), function(fun) {

diff --git a/man/ask.Rd b/man/ask.Rd
@@ -2,7 +2,7 @@
 \alias{ask}
 \title{Control \code{ask} package behavior in a session.}
 \description{
-OpenMP parallelisation powers vectorised-if. By default 50\% of available cores
+OpenMP parallelisation powers ternary `?`. By default 50\% of available cores
 are used, with as many threads.
 }
 \usage{

diff --git a/src/isas.c b/src/isas.c
@@ -36,7 +36,7 @@ ABB str2abb(S abb) {
     if (!strcmp(s, AbbCheckTable[i].str))
       return (ABB) AbbCheckTable[i].abb;
   }
-  err("Abbreviation not found");                           // x ?~ bla
+  err("Abbreviation not found");                           // x ? bla
 }
 S is(S x, S fml, bool negate) {
   bool ans = false;
@@ -77,8 +77,8 @@ S is(S x, S fml, bool negate) {
   //case ATMABB: ans = isAtomic(x); break;
   // third-party
   // case TBLABB: Rf_inherits(x, "tbl"); break;
-  case ANYABB:
-  default: ans = TYPEOF(x) == str2sexp(fml);
+  // case ANYABB: for completeness, but only in C API
+  default: ans = TYPEOF(x) == str2sexp(fml); // #nocov should never be reached
   };
   if(negate) ans = !ans;
   return Rf_ScalarLogical(ans);
@@ -96,4 +96,4 @@ S isas(S x, S fml) {
   }
   default: return Rf_ScalarLogical(0); // NULL ? NULL opens help, always false
   }
-}
+}