Tweaks.

git-svn-id: https://svn.r-project.org/R/trunk@85513 00db46b3-68df-0310-9c12-caf00c1e9a41

src/library/utils/NAMESPACE

@@ -65,6 +65,7 @@ S3method(edit, matrix)
 S3method(edit, vignette)
 S3method(format, MethodsFunction)
 S3method(format, "aspell")
+S3method(format, "aspell_inspect_context")
 S3method(format, "news_db")
 S3method(format, "object_size")
 S3method(format, "roman")

src/library/utils/R/aspell.R

@@ -370,38 +370,42 @@ function(x)
     y
 }
 
-print.aspell_inspect_context <-
+format.aspell_inspect_context <-
 function(x, ..., byfile = FALSE)
 {
-    if(byfile) {
-        s <- split(x, x$File)
-        nms <- names(s)
-        for(i in seq_along(s)) {
-            e <- s[[i]]
-            writeLines(c(sprintf("File '%s':", nms[i]),
-                         sprintf("  Line %s: \"%s\", \"%s\", \"%s\"",
-                                 format(e$Line),
-                                 gsub("\"", "\\\"", e$Left ), e$Original,
-                                 gsub("\"", "\\\"", e$Right)),
-                         ""))
-        }
+    chunks <- if(byfile) {
+        chunks <- split(x, x$File)
+        Map(function(u, e)
+                c(sprintf("File '%s':", u),
+                  sprintf("  Line %s: \"%s\", \"%s\", \"%s\"",
+                          format(e$Line),
+                          gsub("\"", "\\\"", e$Left ), e$Original,
+                          gsub("\"", "\\\"", e$Right)),
+                  ""),
+            names(chunks),
+            chunks)
     } else {
         y <- sprintf("  %s:%s:%s\n  %s%s%s\n  %s%s",
                      x$File, x$Line, x$Column,
                      x$Left, x$Original, x$Right,
                      strrep(" ", as.integer(x$Column) - 1L),
                      strrep("^", nchar(x$Original)))
         chunks <- split(y, x$Original)
-        chunks <- Map(function(u, v)
-                          paste(c(paste("Word:", u), v),
-                                collapse = "\n"),
-                      names(chunks),
-                      chunks)
-        writeLines(unlist(chunks))
+        Map(function(u, v)
+                paste(c(paste("Word:", u), v),
+                      collapse = "\n"),
+            names(chunks),
+            chunks)
     }
-    invisible(x)
+    unlist(chunks, use.names = FALSE)
 }
 
+print.aspell_inspect_context <-
+function(x, ..., byfile = FALSE)
+{        
+    writeLines(format(x, ..., byfile = byfile))
+    invisible(x)
+}
 
 ## For spell-checking the R manuals: