Added env capture to Rpipe. Defaults to parent.frame()

yikelu · yikelu · commit c69f5af2b122 · 2012-05-16T19:05:45.000-04:00
diff --git a/pkg/R/Rpipe.R b/pkg/R/Rpipe.R
@@ -41,7 +41,7 @@ Rpipe.prefix.default <- function(e1) {
   c("Rpipe.", "")
 }
 
-Rpipe.eval <- function(e1, expr) {
+Rpipe.eval <- function(e1, expr, env) {
   if (as.character(expr[1]) == "(") {
     do.call(`%|%`, list(e1 = e1, e2 = expr[[2]]))
   } else if (as.character(expr[1]) == "%|%") {
@@ -63,12 +63,12 @@ Rpipe.eval <- function(e1, expr) {
       stop(paste("Could not find pipe function", expr[1]))
     }
     do.call(names(func.names)[1],
-            c(list(e1), as.list(expr[-1])))
+            c(list(e1), as.list(expr[-1])), env=env)
   }
 }
 
 `%|%` <- function(e1, e2) {
   expr <- substitute(e2)
-  Rpipe.eval(e1, expr)
+  Rpipe.eval(e1, expr, env=parent.frame())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ Rpipe.prefix.default <- function(e1) {`
`41`	`41`	`c("Rpipe.", "")`
`42`	`42`	`}`
`43`	`43`
`44`		`-Rpipe.eval <- function(e1, expr) {`
	`44`	`+Rpipe.eval <- function(e1, expr, env) {`
`45`	`45`	`if (as.character(expr[1]) == "(") {`
`46`	`46`	do.call(`%\|%`, list(e1 = e1, e2 = expr[[2]]))
`47`	`47`	`} else if (as.character(expr[1]) == "%\|%") {`
`@@ -63,12 +63,12 @@ Rpipe.eval <- function(e1, expr) {`
`63`	`63`	`stop(paste("Could not find pipe function", expr[1]))`
`64`	`64`	`}`
`65`	`65`	`do.call(names(func.names)[1],`
`66`		`- c(list(e1), as.list(expr[-1])))`
	`66`	`+ c(list(e1), as.list(expr[-1])), env=env)`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`%\|%` <- function(e1, e2) {
`71`	`71`	`expr <- substitute(e2)`
`72`		`- Rpipe.eval(e1, expr)`
	`72`	`+ Rpipe.eval(e1, expr, env=parent.frame())`
`73`	`73`	`}`
`74`	`74`