SCM

SCM Repository

[inlinedocs] Diff of /pkg/inlinedocs/R/parsers.R
ViewVC logotype

Diff of /pkg/inlinedocs/R/parsers.R

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 163, Tue Nov 16 12:06:29 2010 UTC revision 270, Mon May 23 15:53:47 2011 UTC
# Line 7  Line 7 
7    
8  ### combine lists by adding elements or adding to existing elements  ### combine lists by adding elements or adding to existing elements
9  combine.list <- function(x,y){  combine.list <- function(x,y){
10    toadd <- !names(y)%in%names(x)    toadd <- if(".overwrite"%in%names(y)){
11    toup <- names(y)[names(y)%in%names(x)]      y <- y[names(y)!=".overwrite"]
12        rep(TRUE,length(y))
13      }else{
14        !names(y)%in%names(x)
15      }
16      toup <- names(y)[!toadd]
17    x[names(y)[toadd]] <- y[toadd]    x[names(y)[toadd]] <- y[toadd]
18    for(up in toup)x[[up]] <- combine(x[[up]],y[[up]])    for(up in toup)x[[up]] <- combine(x[[up]],y[[up]])
19    return(x)    x
20  ### A list, same type as x, but with added elements from y.  ### A list, same type as x, but with added elements from y.
21  }  }
22    
23  ### Prefix for code comments used with grep and gsub.  ### Prefix for code comments used with grep and gsub.
24  prefix <- "^[ \t]*###[ \t]"  prefix <- "^[ \t]*###[ \t]*"
25    
26  decomment <- function  decomment <- function
27  ### Remove comment prefix and join lines of code to form a  ### Remove comment prefix and join lines of code to form a
# Line 24  Line 29 
29  (comments  (comments
30  ### Character vector of prefixed comment lines.  ### Character vector of prefixed comment lines.
31   ){   ){
32    paste(gsub(prefix,"",comments),collapse="\n")    gsub(prefix,"",comments)
33  ### String without prefixes or newlines.  ### String without prefixes or newlines.
34  }  }
35    
# Line 44  Line 49 
49      objs <- objs[sapply(objs,subfun)]      objs <- objs[sapply(objs,subfun)]
50      L <- list()      L <- list()
51      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))
52      for(N in names(docs)){      for(N in union(names(docs),names(objs))){
53        o <- objs[[N]]        o <- objs[[N]]
54        L[[N]] <- FUN(src=attr(o,"source"),        L[[N]] <- FUN(src=attr(o,"source"),
55                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)
# Line 84  Line 89 
89  ### Character vector of code lines with preceding whitespace removed.  ### Character vector of code lines with preceding whitespace removed.
90  }  }
91    
92  examples.after.return <- function  prefixed.lines <- structure(function(src,...){
 ### Get examples from inline definitions after return()  
 ### PhG: this does not work well! Think of these situations:  
 ### 1) You have multiple return() in the code of your function,  
 ### 2) You have return() appearing is some example code, ...  
 ### I can hardly propose a hack here. The whole code of the function  
 ### must be parsed, and one must determine which one is the last line  
 ### of code that is actually executed.  
 ###  
 ### I make two propositions here  
 ### 1) to keep the same mechanism that has the advantage of simplicity  
 ###    but to use a special tag  
 ###    ##examples<< or #{{{examples to separate  
 ###    function code from examples explicitly, and  
 ### 2) to place the example in an "ex" attribute  
 ###    attached to the function  
 ###    (see next parser). That solution will be also interesting for  
 ###    documenting datasets, something not done yet by inlinedocs!  
 (src,name="",...) {  
   ## Look for the examples mark  
   m <- grep("^\\s*(##examples<<|#\\{\\{\\{examples)", src)  
   if (!length(m)) return(list())  
   if (length(m) > 1)  
     warning("More than one examples tag for ", name,  
             ". Taking the last one")  
   m <- m[length(m)]  
   ## Look for the lines containing return value comments just before  
   r <- grep("\\s*### ", src[1:(m-1)])  
     if (!length(r)) {  
       value <- NULL  
     } else {  
       ## Only take consecutive lines before the mark  
       keep <- rev((m - rev(r)) == 1:length(r))  
       if (!any(keep)) {  
         value <- NULL  
       } else {  
         value <- decomment(src[r[keep]])  
       }  
     }  
   ## Collect now the example code beneath the mark  
   ex <- src[(m + 1):(length(src) - 1)]  
   ## Possibly eliminate a #}}} tag  
   ex <- ex[!grepl("#}}}", ex)]  
   ## Eliminate leading tabulations or four spaces  
   ex <- kill.prefix.whitespace(ex)  
   ## Add an empty line before and after example  
   ex <- c("", ex, "")  
   ## Return examples and value  
   list(examples = paste(ex, collapse = "\n"), value = value)  
 }  
   
 prefixed.lines <- function(src,...){  
93  ### The primary mechanism of inline documentation is via consecutive  ### The primary mechanism of inline documentation is via consecutive
94  ### groups of lines matching the specified prefix regular expression  ### groups of lines matching the specified prefix regular expression
95  ### "\code{^### }" (i.e. lines beginning with "\code{### }") are  ### "\code{^### }" (i.e. lines beginning with "\code{### }") are
# Line 155  Line 109 
109    f <- function(ch)cumsum(nchar(gsub(sprintf("[^%s]",ch),"",code)))    f <- function(ch)cumsum(nchar(gsub(sprintf("[^%s]",ch),"",code)))
110    parens <- f("(")-f(")")    parens <- f("(")-f(")")
111    body.begin <- which(diff(parens)<0 & parens[-1]==0)+2    body.begin <- which(diff(parens)<0 & parens[-1]==0)+2
112      if(length(body.begin)==0)body.begin <- 1 ## rare cases
113    is.arg <- function(){    is.arg <- function(){
114      gres <- grep("^\\s*#",src[start-1],perl=TRUE)      gres <- grep("^\\s*#",src[start-1],perl=TRUE)
115      0 == length(gres) && start<=body.begin      0 == length(gres) && start<=body.begin
# Line 163  Line 118 
118    for(i in seq_along(starts)){    for(i in seq_along(starts)){
119      start <- clines[starts[i]]      start <- clines[starts[i]]
120      end <- clines[ends[i]]      end <- clines[ends[i]]
121      lab <- if(end+1==length(src))"value"      lab <- if(all(grepl("^\\s*#",src[end:(length(src)-1)])))"value"
122      else if(start==2)"description"      else if(start==2)"description"
123      else if(is.arg()){      else if(is.arg()){
124        ##twutz: strip leading white spaces and brackets and ,        ##twutz: strip leading white spaces and brackets and ,
# Line 179  Line 134 
134      res[[lab]] <- decomment(src[start:end])      res[[lab]] <- decomment(src[start:end])
135    }    }
136    res    res
137  }  },ex=function(){
138    test <- function
139    ### the description
140    (x,
141    ### the first argument
142     y ##<< another argument
143     ){
144      5
145    ### the return value
146    ##seealso<< foobar
147    }
148    src <- attr(test,"source")
149    prefixed.lines(src)
150    extract.xxx.chunks(src)
151    })
152    
153  extract.xxx.chunks <- function # Extract documentation from a function  extract.xxx.chunks <- function # Extract documentation from a function
154  ### Given source code of a function, return a list describing inline  ### Given source code of a function, return a list describing inline
# Line 265  Line 234 
234          chunk.sep <- "\n\n"          chunk.sep <- "\n\n"
235        }        }
236        chunk.res <- NULL        chunk.res <- NULL
237        if ( 0 == length(grep("^\\s*$",payload,perl=TRUE)) )        if ( !grepl("^\\s*$",payload,perl=TRUE) )
238          chunk.res <-          chunk.res <-
239            if ( is.null(res[[field]]) ) payload            if ( is.null(res[[field]]) ) payload
240            else paste(res[[field]], payload, sep=chunk.sep)            else paste(res[[field]], payload, sep=chunk.sep)
# Line 273  Line 242 
242      }      }
243    while ( k <= length(src) ){    while ( k <= length(src) ){
244      line <- src[k]      line <- src[k]
245      if ( 0 < length(grep(extra.regexp,line,perl=TRUE) ) ){      if ( grepl(extra.regexp,line,perl=TRUE) ){
246        ## we have a new extra chunk - first get field name and any payload        ## we have a new extra chunk - first get field name and any payload
247        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)
248        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)
# Line 348  Line 317 
317            first.describe <- TRUE;            first.describe <- TRUE;
318          }          }
319        }        }
320      } else if ( in.chunk && 0<length(grep(cont.re,line,perl=TRUE)) ){      } else if ( in.chunk && grepl(cont.re,line,perl=TRUE) ){
321        ## append this line to current chunk        ## append this line to current chunk
322        if ( 0 == length(grep(prefix,line,perl=TRUE)) ){        if ( !grepl(prefix,line,perl=TRUE) ){
323          ##describe<< Any lines with "\code{### }" at the left hand          ##describe<< Any lines with "\code{### }" at the left hand
324          ## margin within the included chunks are handled separately,          ## margin within the included chunks are handled separately,
325          ## so if they appear in the documentation they will appear          ## so if they appear in the documentation they will appear
# Line 363  Line 332 
332            payload <- stripped            payload <- stripped
333          }          }
334        }        }
335      } else if ( 0 < length(grep(arg.pat,line,perl=TRUE)) ){      } else if ( grepl(arg.pat,line,perl=TRUE) ){
336        not.describe <- (0==in.describe && !first.describe)        not.describe <- (0==in.describe && !first.describe)
337        if ( in.chunk && not.describe){        if ( in.chunk && not.describe){
338          res[[cur.field]] <- end.chunk(cur.field,payload)          res[[cur.field]] <- end.chunk(cur.field,payload)
# Line 425  Line 394 
394  ### with the string in this list (implemented in modify.Rd.file).  ### with the string in this list (implemented in modify.Rd.file).
395  }  }
396    
397    leadingS3generic <- function # check whether function name is an S3 generic
398    ### Determines whether a function name looks like an S3 generic function
399    (name,                     ##<< name of function
400     env,                      ##<< environment to search for additional generics
401     ...)                      ##<< ignored here
402    {
403      ##details<< This function is one of the default parsers, but exposed as
404      ## possibly of more general interest. Given a function name of the form
405      ## x.y.z it looks for the generic function x applying to objects of class
406      ## y.z and also for generic function x.y applying to objects of class z.
407      ##
408      parts <- strsplit(name, ".", fixed = TRUE)[[1]]
409      l <- length(parts)
410      if (l > 1) {
411        for (i in 1:(l - 1)) {
412          ## Look for a generic function (known by the system or defined
413          ## in the package) that matches that part of the function name
414          generic <- paste(parts[1:i], collapse = ".")
415          if (any(generic %in% utils:::getKnownS3generics()) ||
416              utils:::findGeneric(generic, env) != "") {
417            object <- paste(parts[(i + 1):l], collapse = ".")
418            ##details<< Assumes that the first name which matches any known
419            ## generics is the target generic function, so if both x and x.y
420            ## are generic functions, will assume generic x applying to objects
421            ## of class y.z
422            ##value<< If a matching generic found returns a list with a single component:
423            return(list(.s3method=c(generic, object))) ##<< a character vector containing generic name and object name.
424          }
425        }
426      }
427      ##value<< If no matching generic functions are found, returns an empty list.
428      list()
429    }
430    
431  ### Parsers for each function that are constructed automatically. This  ### Parsers for each function that are constructed automatically. This
432  ### is a named list, and each element is a parser function for an  ### is a named list, and each element is a parser function for an
433  ### individual object.  ### individual object.
434  forfun.parsers <-  forfun.parsers <-
435    list(prefixed.lines=prefixed.lines,    list(prefixed.lines=prefixed.lines,
        examples.after.return=examples.after.return,  
436         extract.xxx.chunks=extract.xxx.chunks,         extract.xxx.chunks=extract.xxx.chunks,
437         ## title from first line of function def         ## title from first line of function def
438         title.from.firstline=function(src,name,code,...){         title.from.firstline=function(src,...){
439           if(length(grep("#",src[1]))){           first <- src[1]
440             list(title=gsub("[^#]*#\\s*(.*)","\\1",src[1],perl=TRUE))           if(!is.character(first))return(list())
441           } else list()           if(!grepl("#",first))return(list())
442             list(title=gsub("[^#]*#\\s*(.*)","\\1",first,perl=TRUE))
443         },         },
444         ## PhG: it is tests/FUN.R!!! I would like more flexibility here         ## PhG: it is tests/FUN.R!!! I would like more flexibility here
445         ## please, let me choose which dir to use for examples!         ## please, let me choose which dir to use for examples!
# Line 446  Line 449 
449           if (is.null(tsubdir)) tsubdir <- "tests"       # Default value           if (is.null(tsubdir)) tsubdir <- "tests"       # Default value
450           tfile <- file.path("..",tsubdir,paste(name,".R",sep=""))           tfile <- file.path("..",tsubdir,paste(name,".R",sep=""))
451           if(file.exists(tfile))           if(file.exists(tfile))
452             list(examples=paste(readLines(tfile),collapse="\n"))             list(examples=readLines(tfile))
453           else list()           else list()
454         },         },
455         definition.from.source=function(doc,src,...){         definition.from.source=function(doc,src,...){
456           def <- doc$definition           def <- doc$definition
457           is.empty <- function(x)is.null(x)||x==""           is.empty <- function(x)is.null(x)||x==""
458           if(is.empty(def) && !is.empty(src))           if(is.empty(def) && !is.empty(src))
459             list(definition=paste(src,collapse="\n"))             list(definition=src)
460           else list()           else list()
461         })         })
462    
# Line 492  Line 495 
495               ## Add an empty line before and after example               ## Add an empty line before and after example
496               ex <- c("", ex, "")               ex <- c("", ex, "")
497             }             }
498             list(examples = paste(ex, collapse = "\n"))             list(examples = ex)
499           } else list()           } else list()
500         })         },collapse=function(doc,...){
501             L <- lapply(doc,paste,collapse="\n")
502             L$.overwrite <- TRUE
503             L
504           },tag.s3methods=leadingS3generic
505           )
506    
507  ### List of parser functions that operate on single objects. This list  ### List of parser functions that operate on single objects. This list
508  ### is useful for testing these functions.  ### is useful for testing these functions.
509  lonely <- c(forall.parsers,forfun.parsers)  lonely <- structure(c(forall.parsers,forfun.parsers),ex=function(){
 attr(lonely,"ex") <- function(){  
510    f <- function # title    f <- function # title
511  ### description  ### description
512    (x, ##<< arg x    (x, ##<< arg x
# Line 515  Line 522 
522    src <- attr(f,"source")    src <- attr(f,"source")
523    lonely$extract.xxx.chunks(src)    lonely$extract.xxx.chunks(src)
524    lonely$prefixed.lines(src)    lonely$prefixed.lines(src)
525  }  })
526    
527  extra.code.docs <- function # Extract documentation from code chunks  extra.code.docs <- function # Extract documentation from code chunks
528  ### Parse R code to extract inline documentation from comments around  ### Parse R code to extract inline documentation from comments around
# Line 540  Line 547 
547        doc <- list()        doc <- list()
548        if ( !is.null(parsed[[on]]) ){        if ( !is.null(parsed[[on]]) ){
549          if ( !is.na(parsed[[on]]@code[1]) ){ # no code given for generics          if ( !is.na(parsed[[on]]@code[1]) ){ # no code given for generics
550            doc$definition <- paste(parsed[[on]]@code,collapse="\n")            doc$definition <- paste(parsed[[on]]@code)
551          }          }
552          if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){          if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){
553            doc$description <- parsed[[on]]@description            doc$description <- parsed[[on]]@description
554          }          }
555          if ( "setMethodS3" == parsed[[on]]@created ){          ## if ( "setMethodS3" == parsed[[on]]@created ){
556            # PhG: this may be wrong! It does not catch correctly how the method          ##   gen <- leadingS3generic(on,topenv())
557            # must be splitted in case of methods containing dots. for instance,          ##   if ( 0 < length(gen) ){
558            # as.data.frame.matrix must be split into: m1 = as.data.frame and          ##     doc$.s3method <- gen$.s3method
559            # m2 = matrix... here you got m1 = as, and m2 = data.frame.matrix!!!          ##     cat("S3method(",gen$.s3method[1],",",gen$.s3method[2],")\n",sep="")
560                    pattern <- "^([^\\.]+)\\.(.*)$"          ##   }
561            doc$s3method=c(m1 <- gsub(pattern,"\\1",on,perl=TRUE),          ## }
               m2 <- gsub(pattern,"\\2",on,perl=TRUE))  
           if ( 0 < length(grep("\\W",m1,perl=TRUE)) ){  
                           m1 <- paste("`",m1,"`",sep="")  
           }  
           cat("S3method(",m1,",",m2,")\n",sep="")  
         }  
562        }        }
563        if("title" %in% names(doc) && !"description" %in% names(doc) ){        if("title" %in% names(doc) && !"description" %in% names(doc) ){
564          ## For short functions having both would duplicate, but a          ## For short functions having both would duplicate, but a
# Line 577  Line 578 
578        NULL        NULL
579      } else if(0 == length(res) && "function" %in% class(o)      } else if(0 == length(res) && "function" %in% class(o)
580                && 1 == length(osource <- attr(o,"source"))                && 1 == length(osource <- attr(o,"source"))
581                && 1 == length(grep(paste("UseMethod(",on,")",sep="\""),osource))                && grepl(paste("UseMethod(",on,")",sep="\""),osource)
582                ){                ){
583        ## phew - this should only pick up R.oo S3 generic definitions like:        ## phew - this should only pick up R.oo S3 generic definitions like:
584        ## attr(*, "source")= chr "function(...) UseMethod(\"select\")"        ## attr(*, "source")= chr "function(...) UseMethod(\"select\")"
# Line 638  Line 639 
639  default.parsers <-  default.parsers <-
640    c(extra.code.docs=extra.code.docs, ## TODO: cleanup!    c(extra.code.docs=extra.code.docs, ## TODO: cleanup!
641      sapply(forfun.parsers,forfun),      sapply(forfun.parsers,forfun),
     sapply(forall.parsers,forall),  
642      edit.package.file=function(desc,...){      edit.package.file=function(desc,...){
643        in.details <- setdiff(colnames(desc),"Description")        in.details <- setdiff(colnames(desc),"Description")
644        details <- paste(paste(in.details,": \\tab ",desc[,in.details],"\\cr",        details <- sprintf("%s: \\tab %s\\cr",in.details,desc[,in.details])
                              sep=""),collapse="\n")  
645        L <-        L <-
646          list(list(title=desc[,"Title"],          list(list(title=desc[,"Title"],
647                    description=desc[,"Description"],                    description=desc[,"Description"],
648                    `tabular{ll}`=details,                    `tabular{ll}`=details))
                   author=desc[,"Maintainer"]))  
649        names(L) <- paste(desc[,"Package"],"-package",sep="")        names(L) <- paste(desc[,"Package"],"-package",sep="")
650        L        L
651      })      },
652        sapply(forall.parsers,forall)
653        )
654    
655  setClass("DocLink", # Link documentation among related functions  setClass("DocLink", # Link documentation among related functions
656  ### The \code{.DocLink} class provides the basis for hooking together  ### The \code{.DocLink} class provides the basis for hooking together
657  ### documentation of related classes/functions/objects. The aim is that  ### documentation of related classes/functions/objects. The aim is that
658  ### documentation sections missing from the child are  ### documentation sections missing from the child are inherited from
659    ### the parent class.
660           representation(name="character", ##<< name of object           representation(name="character", ##<< name of object
661                          created="character", ##<< how created                          created="character", ##<< how created
662                          parent="character", ##<< parent class or NA                          parent="character", ##<< parent class or NA
# Line 690  Line 691 
691      ## "prefix" lines will be used instead.      ## "prefix" lines will be used instead.
692      default.description <- NULL      default.description <- NULL
693      while ( start > last.end+1      while ( start > last.end+1
694             && 1 == length(grep(prefix,code[start-1],perl=TRUE)) ){             && grepl(prefix,code[start-1],perl=TRUE) ){
695        start <- start-1        start <- start-1
696      }      }
697      if ( start < chunks[[k]][1] ){      if ( start < chunks[[k]][1] ){
# Line 717  Line 718 
718        ## If the function definition is not embedded within the call, then        ## If the function definition is not embedded within the call, then
719        ## the parent is that function. Test whether the the third value        ## the parent is that function. Test whether the the third value
720        ## looks like a name and add it to parents if so.        ## looks like a name and add it to parents if so.
721        if ( 1 == length(grep("^[\\._\\w]+$",chars[3],perl=TRUE)) ){        if ( grepl("^[\\._\\w]+$",chars[3],perl=TRUE) ){
722          parent <- chars[3]          parent <- chars[3]
723        }        }
724        res[[object.name]] <- new("DocLink",name=object.name,        res[[object.name]] <- new("DocLink",name=object.name,
# Line 749  Line 750 
750        ## If the function definition is not embedded within the call, then        ## If the function definition is not embedded within the call, then
751        ## the parent is that function. Test whether the the fourth value        ## the parent is that function. Test whether the the fourth value
752        ## looks like a name and add it to parents if so.        ## looks like a name and add it to parents if so.
753        if ( 1 == length(grep("^[\\._\\w]+$",chars[4],perl=TRUE)) ){        if ( grepl("^[\\._\\w]+$",chars[4],perl=TRUE) ){
754          parent <- c(chars[4],parent)          parent <- c(chars[4],parent)
755        }        }
756        res[[object.name]] <- new("DocLink",name=object.name,        res[[object.name]] <- new("DocLink",name=object.name,
# Line 832  Line 833 
833  ### Additional arguments to pass to Parser Functions.  ### Additional arguments to pass to Parser Functions.
834   ){   ){
835    e <- new.env()    e <- new.env()
836    old <- options(keep.source=TRUE)    ## KMP 2011-03-09 fix problem with DocLink when inlinedocs ran on itself
837      ## Error in assignClassDef(Class, classDef, where) :
838      ##   Class "DocLink" has a locked definition in package "inlinedocs"
839      ## Traced to "where" argument in setClassDef which defaults to topenv()
840      ## which in turn is inlinedocs when processing inlinedocs package, hence
841      ## the clash. The following works (under R 2.12.2), so that the topenv()
842      ## now finds e before finding the inlinedocs environment.
843      old <- options(keep.source=TRUE,topLevelEnvironment=e)
844    on.exit(options(old))    on.exit(options(old))
845    exprs <- parse(text=code)    exprs <- parse(text=code)
846      ## TDH 2011-04-07 set this so that no warnings about creating a fake
847      ## package when we try to process S4 classes defined in code
848      e$.packageName <- "inlinedocs.processor"
849    for (i in exprs){    for (i in exprs){
850      tryCatch(eval(i, e),error=function(e){      ## TDH 2011-04-07 Disable this tryCatch since it makes it harder
851        ##to debug errors/warnings in the evaluated code
852    
853        ##tryCatch({
854          eval(i, e)
855        ##},error=function(e){
856        ##print(e)        ##print(e)
857      })      ##})
858    }    }
859    objs <- sapply(ls(e),get,e,simplify=FALSE)    objs <- sapply(ls(e),get,e,simplify=FALSE)
860    
861    docs <- list()    docs <- list()
862    
   # PhG: Automatically determine who is S3 methods  
   for (name in names(objs)) {  
     parts <- strsplit(name, ".", fixed = TRUE)[[1]]  
         l <- length(parts)  
         if (l > 1) {  
         for (i in 1:(l - 1)) {  
             # Look for a generic function (known by the system or defined  
             # in the package) that matches that part of the function name  
             generic <- paste(parts[1:i], collapse = ".")  
             if (any(generic %in% utils:::getKnownS3generics()) ||  
                 utils:::findGeneric(generic, e) != "") {  
                 object <- paste(parts[(i + 1):l], collapse = ".")  
                 docs[[name]]$s3method <- c(generic, object)  
                 break  
             }  
         }  
     }  
   }  
863    ## apply parsers in sequence to code and objs    ## apply parsers in sequence to code and objs
864    for(i in seq_along(parsers)){    for(i in seq_along(parsers)){
865      N <- names(parsers[i])      N <- names(parsers[i])
# Line 872  Line 870 
870      }      }
871      p <- parsers[[i]]      p <- parsers[[i]]
872      ## This is the argument list that each parser receives:      ## This is the argument list that each parser receives:
873      L <- p(code=code,objs=objs,docs=docs,...)      L <- p(code=code,objs=objs,docs=docs,env=e,...)
874      docs <- combine(docs,L)      docs <- combine(docs,L)
875    }    }
876      ## post-process to collapse all character vectors
877      for(i in seq_along(docs)){
878        for(j in seq_along(docs[[i]])){
879          if(names(docs[[i]])[j]!=".s3method")
880          docs[[i]][[j]] <- paste(docs[[i]][[j]],collapse="\n")
881        }
882      }
883    if(verbose)cat("\n")    if(verbose)cat("\n")
884    docs    docs
885  ### A list of extracted documentation from code.  ### A list of extracted documentation from code.
# Line 891  Line 896 
896  ### description file.  ### description file.
897  nondesc.parsers <- default.parsers[non.descfile.names]  nondesc.parsers <- default.parsers[non.descfile.names]
898    
899  extract.docs.file <- function  extract.docs.file <- structure(function
900  ### Apply all parsers relevant to extract info from just 1 code file.  ### Apply all parsers relevant to extract info from just 1 code file.
901  (f,  (f,
902  ### File name of R code to read and parse.  ### File name of R code to read and parse.
903   parsers=nondesc.parsers,   parsers=NULL,
904  ### Parser Functions to use to parse the code and extract  ### Parser Functions to use to parse the code and extract
905  ### documentation.  ### documentation.
906   ...   ...
907  ### Other arguments to pass to Parser Functions.  ### Other arguments to pass to Parser Functions.
908   ){   ){
909      if(is.null(parsers))parsers <- nondesc.parsers
910    apply.parsers(readLines(f),parsers,verbose=FALSE,...)    apply.parsers(readLines(f),parsers,verbose=FALSE,...)
911  }  },ex=function(){
912      f <- system.file("silly","R","silly.R",package="inlinedocs")
913      extract.docs.file(f)
914    })
915    

Legend:
Removed from v.163  
changed lines
  Added in v.270

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge