[Roxygen-commits] r140 - pkg/R

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

Author: pcd
Date: 2008-07-30 17:28:33 +0200 (Wed, 30 Jul 2008)
New Revision: 140

Modified:
   pkg/R/callgraph.R
   pkg/R/functional.R
   pkg/R/parse.R
Log:
export make.callgraph.roclet; Compose at 3; <= in stack.depth comparison; parse.file at 3


Modified: pkg/R/callgraph.R
===================================================================
--- pkg/R/callgraph.R	2008-07-30 05:38:10 UTC (rev 139)
+++ pkg/R/callgraph.R	2008-07-30 15:28:33 UTC (rev 140)
@@ -17,6 +17,7 @@
 #' @param dir the directory to place the callgraphs in
 #' @param verbose anounce what we're doing
 #' @importFrom Rgraphviz toFile
+#' @export
 make.callgraph.roclet <- function(dependencies=NULL,
                                   dir='.',
                                   verbose=TRUE) {
@@ -107,7 +108,7 @@
     if (is.name(exprofundum)) {
       subcall <- as.character(exprofundum)
       if (is.callable(subcall, do.callgraph.primitives) &&
-          call.stack$top < depth) {
+          call.stack$top <= depth) {
         supercall <-
           if (call.stack$is.empty())
             name

Modified: pkg/R/functional.R
===================================================================
--- pkg/R/functional.R	2008-07-30 05:38:10 UTC (rev 139)
+++ pkg/R/functional.R	2008-07-30 15:28:33 UTC (rev 140)
@@ -24,6 +24,8 @@
 #' procedure; moment of silence, please.
 #' @param \dots the functions to be composed
 #' @return A composed function
+#' @callGraphPrimitives
+#' @callGraphDepth 3
 Compose <- function(...) {
   fs <- list(...)
   function(...) Reduce(function(x, f) f(x),

Modified: pkg/R/parse.R
===================================================================
--- pkg/R/parse.R	2008-07-30 05:38:10 UTC (rev 139)
+++ pkg/R/parse.R	2008-07-30 15:28:33 UTC (rev 140)
@@ -505,7 +505,7 @@
 #' @param file string naming file to be parsed
 #' @return List containing parsed directives
 #' @callGraph
-#' @callGraphDepth 4
+#' @callGraphDepth 3
 parse.file <- function(file) {
   srcfile <- srcfile(file)
   srcrefs <- attributes(parse(srcfile$filename,