[Swift-commit] r4365 - SwiftApps/SwiftR/Swift/R

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-04-13 13:44:57 -0500 (Wed, 13 Apr 2011)
New Revision: 4365

Modified:
   SwiftApps/SwiftR/Swift/R/Export.R
   SwiftApps/SwiftR/Swift/R/Library.R
Log:
Made sure didn't return any extraneous data.


Modified: SwiftApps/SwiftR/Swift/R/Export.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Export.R	2011-04-13 18:39:10 UTC (rev 4364)
+++ SwiftApps/SwiftR/Swift/R/Export.R	2011-04-13 18:44:57 UTC (rev 4365)
@@ -87,6 +87,8 @@
     session$exports[[length(session$exports) + 1]] <- file
     options(.swift.session=session)
 
+    return(NULL)
+
 }
 
 newSession <- function () {
@@ -104,6 +106,7 @@
     # TODO: think about how to clean up data files.
     # it is hard to know when they can be safely removed
     options(.swift.session=newSession())
+    return(NULL)
 }
 
 getExportDir <- function () {

Modified: SwiftApps/SwiftR/Swift/R/Library.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Library.R	2011-04-13 18:39:10 UTC (rev 4364)
+++ SwiftApps/SwiftR/Swift/R/Library.R	2011-04-13 18:44:57 UTC (rev 4365)
@@ -38,6 +38,7 @@
         plist[[length(plist) + 1]] <- c("library", packname)
     
     options(.swift.packages=plist)
+    return (NULL)
 }
 
 swiftDetachAll <- function () {
@@ -60,6 +61,7 @@
                 }
             })
     options(.swift.packages=plist)
+    return (NULL)
 }
 
 sstartsWith <- function (str, prefix) {
@@ -111,6 +113,7 @@
     plist[[length(plist) + 1]] = c("detach", packname)
 
     options(.swift.packages=plist)
+    return (NULL)
 }
 
 buildLibStr <- function () {