[Rcpp-commits] r3473 - pkg/Rcpp/R

[noreply at r-forge.r-project.org]

Author: edd
Date: 2012-02-14 17:43:52 +0100 (Tue, 14 Feb 2012)
New Revision: 3473

Modified:
   pkg/Rcpp/R/exceptions.R
Log:
fix one type, and document one more unsuccessful fix
this is still an open issue


Modified: pkg/Rcpp/R/exceptions.R
===================================================================
--- pkg/Rcpp/R/exceptions.R	2012-02-14 16:43:10 UTC (rev 3472)
+++ pkg/Rcpp/R/exceptions.R	2012-02-14 16:43:52 UTC (rev 3473)
@@ -51,12 +51,14 @@
     invisible( .Call( rcpp_error_recorder, e ) )
 }
 
-# simplified version of utils::tryCatch
+# simplified version of base::tryCatch
 rcpp_tryCatch <- function(expr, unused){  # unused is kept for compatibility, but is indeed not used
     .Call(reset_current_error)
     rcpp_doTryCatch <- function(expr, env) {
-        .Internal(.addCondHands("error", list(.rcpp_error_recorder),
-                                env, environment(), FALSE))
+        .Internal(.addCondHands("error", list(.rcpp_error_recorder), env, environment(), FALSE))
+        ## dot.int.ernal <- get( paste( '.Int', 'ernal', sep=''), baseenv())
+        ## dot.add.cond.hands <- get( paste( '.add', 'Cond', 'Hands', sep=''), baseenv()) -- never found :-/
+        ## dot.int.ernal(.Call("addcondhands", "error", list(.rcpp_error_recorder), env, environment(), FALSE))
         expr
     }
     parentenv <- parent.frame()