Merge https://github.com/extendr/libR-sys into ignore_constants

extendr · Oct 7, 2023 · c570d73 · c570d73
2 parents cd09e6c + a452bff
commit c570d73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/src/lib.rs b/src/lib.rs
@@ -137,19 +137,11 @@ mod tests {
     fn test_eval() {
         start_R();
         unsafe {
-            // In an ideal world, we would do the following.
-            //   let res = R_ParseEvalString(cstr!("1"), R_NilValue);
-            // But R_ParseEvalString is only in recent packages.
-
-            let s = Rf_protect(Rf_mkString(cstr!("1")));
-            let mut status: ParseStatus = 0;
-            let status_ptr = &mut status as *mut ParseStatus;
-            let ps = Rf_protect(R_ParseVector(s, -1, status_ptr, R_NilValue));
-            let val = Rf_eval(VECTOR_ELT(ps, 0), R_GlobalEnv);
+            let val = Rf_protect(R_ParseEvalString(cstr!("1"), R_NilValue));
             Rf_PrintValue(val);
             assert_eq!(TYPEOF(val) as u32, REALSXP);
             assert_eq!(*REAL(val), 1.);
-            Rf_unprotect(2);
+            Rf_unprotect(1);
         }
     }
 }