[Vegan-commits] r2787 - in pkg/permute: . R inst

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

Author: jarioksa
Date: 2013-12-01 17:07:19 +0100 (Sun, 01 Dec 2013)
New Revision: 2787

Modified:
   pkg/permute/DESCRIPTION
   pkg/permute/R/setFoo-methods.R
   pkg/permute/inst/ChangeLog
Log:
deparse substitute block name before evaluating block and destroying its name

Modified: pkg/permute/DESCRIPTION
===================================================================
--- pkg/permute/DESCRIPTION	2013-12-01 15:57:50 UTC (rev 2786)
+++ pkg/permute/DESCRIPTION	2013-12-01 16:07:19 UTC (rev 2787)
@@ -1,6 +1,6 @@
 Package: permute
 Title: Functions for generating restricted permutations of data
-Version: 0.8-0
+Version: 0.8-1
 Date: $Date$
 Authors at R: c(person(given = "Gavin L.", family = "Simpson",
                     email = "ucfagls at gmail.com",

Modified: pkg/permute/R/setFoo-methods.R
===================================================================
--- pkg/permute/R/setFoo-methods.R	2013-12-01 15:57:50 UTC (rev 2786)
+++ pkg/permute/R/setFoo-methods.R	2013-12-01 16:07:19 UTC (rev 2787)
@@ -143,8 +143,8 @@
 `setBlocks<-.how` <- function(object, value) {
     if (!is.null(value))
         value <- as.factor(value)
+    object[["blocks.name"]] <- deparse(substitute(value))
     object["blocks"] <- list(value)
-    object[["blocks.name"]] <- deparse(substitute(value))
     object <- fixupCall(object, "blocks", value)
     object
 }

Modified: pkg/permute/inst/ChangeLog
===================================================================
--- pkg/permute/inst/ChangeLog	2013-12-01 15:57:50 UTC (rev 2786)
+++ pkg/permute/inst/ChangeLog	2013-12-01 16:07:19 UTC (rev 2787)
@@ -2,6 +2,12 @@
 
 permute ChangeLog
 
+Version 0.8-1
+
+	* setBlocks<-: the name of the block must be collected with
+	deparse(substitute()) before it is evaluated with list() or its
+	name will be lost. 
+
 Version 0.8-0
 
 	* Released to CRAN