up

ripley · ripley · commit 4e2a40240b95 · 2025-02-25T17:44:19.000Z
git-svn-id: https://svn.r-project.org/R/trunk@87824 00db46b3-68df-0310-9c12-caf00c1e9a41
diff --git a/src/main/coerce.c b/src/main/coerce.c
@@ -1824,6 +1824,7 @@ int asLogical(SEXP x)
     return asLogical2(x, /* checking = */ 0, R_NilValue);
 }
 
+// private version
 Rboolean asRbool(SEXP x, SEXP call)
 {
     int ans = asLogical2(x, 1, call);
@@ -1832,6 +1833,15 @@ Rboolean asRbool(SEXP x, SEXP call)
     return (Rboolean) ans;
 }
 
+// public version
+Rboolean asRboolean(SEXP x)
+{
+    int ans = asLogical2(x, 1, R_NilValue);
+    if (ans == NA_LOGICAL)
+	error(_("NA in coercion to Rboolean"));
+    return (Rboolean) ans;
+}
+
 
 int asInteger(SEXP x)
 {

Original file line number	Diff line number	Diff line change
`@@ -1824,6 +1824,7 @@ int asLogical(SEXP x)`
`1824`	`1824`	`return asLogical2(x, /* checking = */ 0, R_NilValue);`
`1825`	`1825`	`}`
`1826`	`1826`
	`1827`	`+// private version`
`1827`	`1828`	`Rboolean asRbool(SEXP x, SEXP call)`
`1828`	`1829`	`{`
`1829`	`1830`	`int ans = asLogical2(x, 1, call);`
`@@ -1832,6 +1833,15 @@ Rboolean asRbool(SEXP x, SEXP call)`
`1832`	`1833`	`return (Rboolean) ans;`
`1833`	`1834`	`}`
`1834`	`1835`
	`1836`	`+// public version`
	`1837`	`+Rboolean asRboolean(SEXP x)`
	`1838`	`+{`
	`1839`	`+ int ans = asLogical2(x, 1, R_NilValue);`
	`1840`	`+ if (ans == NA_LOGICAL)`
	`1841`	`+ error(_("NA in coercion to Rboolean"));`
	`1842`	`+ return (Rboolean) ans;`
	`1843`	`+}`
	`1844`	`+`
`1835`	`1845`
`1836`	`1846`	`int asInteger(SEXP x)`
`1837`	`1847`	`{`