[R-gregmisc-users] SF.net SVN: r-gregmisc:[1713] trunk/gtools/R

[<wa...@us...>]

Revision: 1713
          http://sourceforge.net/p/r-gregmisc/code/1713
Author:   warnes
Date:     2013-09-23 15:29:26 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Mark 'addLast()' as defunct and move 'lastAdd()' function to a separate file.

Modified Paths:
--------------
    trunk/gtools/R/addLast.R

Added Paths:
-----------
    trunk/gtools/R/lastAdd.R

Modified: trunk/gtools/R/addLast.R
===================================================================
--- trunk/gtools/R/addLast.R	2013-09-23 15:23:34 UTC (rev 1712)
+++ trunk/gtools/R/addLast.R	2013-09-23 15:29:26 UTC (rev 1713)
@@ -1,39 +1,4 @@
 addLast <- function( fun )
-  {
-    .Deprecated(new=paste(".Last <- lastAdd(", deparse(substitute(fun)), ")", sep=''),
-                package='gtools'
-                )
-    
-    if (!is.function(fun)) stop("fun must be a function")
-    if (!exists(".Last", envir = .GlobalEnv)) 
-      assign(".Last", fun, envir = .GlobalEnv)
-    else
-      {
-        Last <- get(".Last", envir = .GlobalEnv)
-        newfun <- function(...) {
-            fun()
-            Last()
-        }
-        assign(".Last", newfun, envir = .GlobalEnv)
-      }
-  }
-
-lastAdd <- function( fun )
-  {
-    if (!is.function(fun)) stop("fun must be a function")
-    if(!exists(".Last", envir=.GlobalEnv))
-      {
-        return(fun)
-      }
-    else
-      {
-        Last <- get(".Last", envir=.GlobalEnv)
-        newfun <- function(...)
-          {
-            fun()
-            Last()
-          }
-        return(newfun)
-      }
-  }
-
+    .Defunct(new=paste(".Last <- lastAdd(", deparse(substitute(fun)), ")", sep=''),
+             package='gtools'
+             )

Added: trunk/gtools/R/lastAdd.R
===================================================================
--- trunk/gtools/R/lastAdd.R	                        (rev 0)
+++ trunk/gtools/R/lastAdd.R	2013-09-23 15:29:26 UTC (rev 1713)
@@ -0,0 +1,22 @@
+##
+## Replaces the (defunct) addLast() function.
+##
+lastAdd <- function( fun )
+  {
+    if (!is.function(fun)) stop("fun must be a function")
+    if(!exists(".Last", envir=.GlobalEnv))
+      {
+        return(fun)
+      }
+    else
+      {
+        Last <- get(".Last", envir=.GlobalEnv)
+        newfun <- function(...)
+          {
+            fun()
+            Last()
+          }
+        return(newfun)
+      }
+  }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.