[Roxygen-commits] r74 - pkg/R

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

Author: pcd
Date: 2008-07-22 20:28:50 +0200 (Tue, 22 Jul 2008)
New Revision: 74

Modified:
   pkg/R/Rd.R
   pkg/R/collate.R
   pkg/R/namespace.R
Log:
@includes must be linear! e.g. include parse.R first


Modified: pkg/R/Rd.R
===================================================================
--- pkg/R/Rd.R	2008-07-22 18:28:19 UTC (rev 73)
+++ pkg/R/Rd.R	2008-07-22 18:28:50 UTC (rev 74)
@@ -1,3 +1,4 @@
+#' @include parse.R
 #' @include list.R
 #' @include string.R
 #' @include roclet.R

Modified: pkg/R/collate.R
===================================================================
--- pkg/R/collate.R	2008-07-22 18:28:19 UTC (rev 73)
+++ pkg/R/collate.R	2008-07-22 18:28:50 UTC (rev 74)
@@ -1,3 +1,4 @@
+#' @include parse.R
 #' @include roclet.R
 #' @include string.R
 roxygen()
@@ -56,10 +57,12 @@
   topological.sort <- function(vertices) {
     sorted <- NULL
     visit <- function(predecessor) {
+      debug(visit=predecessor$file)
       predecessor$discovered <- TRUE
       for (ancestor in predecessor$ancestors)
         if (!ancestor$discovered)
           visit(ancestor)
+      debug(finish=predecessor$file)
       assign.parent('sorted',
                     append(sorted, predecessor),
                     environment())

Modified: pkg/R/namespace.R
===================================================================
--- pkg/R/namespace.R	2008-07-22 18:28:19 UTC (rev 73)
+++ pkg/R/namespace.R	2008-07-22 18:28:50 UTC (rev 74)
@@ -1,3 +1,4 @@
+#' @include parse.R
 #' @include roclet.R
 #' @include string.R
 roxygen()