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

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

Author: jarioksa
Date: 2014-01-12 16:56:57 +0100 (Sun, 12 Jan 2014)
New Revision: 2832

Modified:
   pkg/permute/DESCRIPTION
   pkg/permute/R/setFoo-methods.R
   pkg/permute/inst/ChangeLog
Log:
save name of blocks before evaluating list() of blocks

Modified: pkg/permute/DESCRIPTION
===================================================================
--- pkg/permute/DESCRIPTION	2014-01-10 17:07:08 UTC (rev 2831)
+++ pkg/permute/DESCRIPTION	2014-01-12 15:56:57 UTC (rev 2832)
@@ -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	2014-01-10 17:07:08 UTC (rev 2831)
+++ pkg/permute/R/setFoo-methods.R	2014-01-12 15:56:57 UTC (rev 2832)
@@ -141,10 +141,10 @@
 }
 
 `setBlocks<-.how` <- function(object, value) {
+    object[["blocks.name"]] <- deparse(substitute(value))
     if (!is.null(value))
         value <- as.factor(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	2014-01-10 17:07:08 UTC (rev 2831)
+++ pkg/permute/inst/ChangeLog	2014-01-12 15:56:57 UTC (rev 2832)
@@ -2,6 +2,11 @@
 
 permute ChangeLog
 
+Version 0.8-1
+
+	* setBlocks: get block name before doing anything so that you
+	really get only name instead of its evaluated value.
+
 Version 0.8-0
 
 	* Released to CRAN