Merge pull request #35 from dmurdoch/withTableFns

dmurdoch · web-flow · commit bdc0e2eb2a0f · 2025-01-22T06:48:36.000-05:00
Missing use of withTableFns.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tables
 Title: Formula-Driven Table Generation
-Version: 0.9.31
+Version: 0.9.32
 Authors@R: person(given = "Duncan",
                   family = "Murdoch",
                   role = c("aut", "cre"),
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# tables 0.9.32
+
+- The fix for issue #30 was incomplete for some reason.
+
 # tables 0.9.31
 
 - In a few places `len` was used instead of `length.out` in calls to
diff --git a/R/tabular.R b/R/tabular.R
@@ -643,7 +643,7 @@ tabular.formula <- function(table, data=NULL, n, suppressLabels=0, ...) {
     if (is.null(data) || is.environment(data))
     	data <- withTableFns
     else if (is.list(data))
-    	data <- list2env(data, parent = environment(table))
+    	data <- list2env(data, parent = withTableFns)
     else if (!is.environment(data))
     	stop("'data' must be a dataframe, list or environment")
     	
diff --git a/tables.Rproj b/tables.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: ff106abd-954f-4630-ab81-b1ea0de6fa9b
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Version: 1.0`
	`2`	`+ProjectId: ff106abd-954f-4630-ab81-b1ea0de6fa9b`
`2`	`3`
`3`	`4`	`RestoreWorkspace: Default`
`4`	`5`	`SaveWorkspace: Default`