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 246, Thu Apr 7 13:21:39 2011 UTC revision 308, Fri Oct 21 12:08:39 2011 UTC
# Line 20  Line 20 
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    
24    getSource <- function
25    ### Extract a function's source code.
26    (fun.obj
27    ### A function.
28     ) {
29          srcref <- attr(fun.obj, "srcref")
30          if (!is.null(srcref)) {
31            ##unlist(strsplit(as.character(srcref), "\n"))
32            as.character(srcref)
33          }
34          else attr(fun.obj, "source")
35    ### Source code lines as a character vector.
36    }
37    
38  ### Prefix for code comments used with grep and gsub.  ### Prefix for code comments used with grep and gsub.
39  prefix <- "^[ \t]*###[ \t]"  prefix <- "^[ \t]*###[ \t]*"
40    
41  decomment <- function  decomment <- function
42  ### Remove comment prefix and join lines of code to form a  ### Remove comment prefix and join lines of code to form a
# Line 46  Line 61 
61   ){   ){
62    FUN <- FUN    FUN <- FUN
63    f <- function(objs,docs,...){    f <- function(objs,docs,...){
64        if(length(objs)==0)return(list())
65      objs <- objs[sapply(objs,subfun)]      objs <- objs[sapply(objs,subfun)]
66      L <- list()      L <- list()
67      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))
68      for(N in union(names(docs),names(objs))){      for(N in union(names(docs),names(objs))){
69        o <- objs[[N]]        o <- objs[[N]]
70        L[[N]] <- FUN(src=attr(o,"source"),        L[[N]] <- FUN(src=getSource(o),
71                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)
72      }      }
73      on.exit()## remove warning message      on.exit()## remove warning message
# Line 89  Line 105 
105  ### Character vector of code lines with preceding whitespace removed.  ### Character vector of code lines with preceding whitespace removed.
106  }  }
107    
 examples.after.return <- function  
 ### 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 = ex, value = value)  
 }  
   
108  prefixed.lines <- structure(function(src,...){  prefixed.lines <- structure(function(src,...){
109  ### The primary mechanism of inline documentation is via consecutive  ### The primary mechanism of inline documentation is via consecutive
110  ### groups of lines matching the specified prefix regular expression  ### groups of lines matching the specified prefix regular expression
# Line 169  Line 134 
134    for(i in seq_along(starts)){    for(i in seq_along(starts)){
135      start <- clines[starts[i]]      start <- clines[starts[i]]
136      end <- clines[ends[i]]      end <- clines[ends[i]]
137      lab <- if(all(grepl("^\\s*#",src[end:(length(src)-1)])))"value"      processed <- gsub("#.*","",gsub("[ }]","",src[(end+1):length(src)]))
138        lab <- if(all(processed==""))"value"
139      else if(start==2)"description"      else if(start==2)"description"
140      else if(is.arg()){      else if(is.arg()){
141        ##twutz: strip leading white spaces and brackets and ,        ##twutz: strip leading white spaces and brackets and ,
# Line 196  Line 162 
162  ### the return value  ### the return value
163  ##seealso<< foobar  ##seealso<< foobar
164  }  }
165  src <- attr(test,"source")  src <- getSource(test)
166  prefixed.lines(src)  prefixed.lines(src)
167  extract.xxx.chunks(src)  extract.xxx.chunks(src)
168  })  })
# Line 293  Line 259 
259      }      }
260    while ( k <= length(src) ){    while ( k <= length(src) ){
261      line <- src[k]      line <- src[k]
262        ##print(line)
263        ##if(grepl("^$",line))browser()
264      if ( grepl(extra.regexp,line,perl=TRUE) ){      if ( grepl(extra.regexp,line,perl=TRUE) ){
265        ## 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
266        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)
267        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)
268          ##cat(new.field,"\n-----\n",new.contents,"\n\n")
269        ##details<< As a special case, the construct \code{##describe<<} causes        ##details<< As a special case, the construct \code{##describe<<} causes
270        ## similar processing to the main function arguments to be        ## similar processing to the main function arguments to be
271        ## applied in order to construct a describe block within the        ## applied in order to construct a describe block within the
# Line 306  Line 274 
274        ## block until terminated by a subsequent \code{##}\emph{xxx}\code{<<} line.        ## block until terminated by a subsequent \code{##}\emph{xxx}\code{<<} line.
275        if ( "describe" == new.field ){        if ( "describe" == new.field ){
276          ##details<< Such regions may be nested, but not in such a way          ##details<< Such regions may be nested, but not in such a way
277          ## that the first element in a \code{describe} is another \code{describe}.          ## that the first element in a \code{describe} is another
278          ## Thus there must be at least one \code{##<<} comment between each          ## \code{describe}.  Thus there must be at least one
279          ## pair of \code{##describe<<} comments.          ## \code{##<<} comment between each pair of
280            ## \code{##describe<<} comments.
281          if ( first.describe ){          if ( first.describe ){
282            stop("consecutive ##describe<< at line",k,"in",name.fun)            stop("consecutive ##describe<< at line",k,"in",name.fun)
283          } else {          } else {
# Line 484  Line 453 
453  ### individual object.  ### individual object.
454  forfun.parsers <-  forfun.parsers <-
455    list(prefixed.lines=prefixed.lines,    list(prefixed.lines=prefixed.lines,
        examples.after.return=examples.after.return,  
456         extract.xxx.chunks=extract.xxx.chunks,         extract.xxx.chunks=extract.xxx.chunks,
457         ## title from first line of function def         ## title from first line of function def
458         title.from.firstline=function(src,...){         title.from.firstline=function(src,...){
# Line 516  Line 484 
484  forall.parsers <-  forall.parsers <-
485    list(## Fill in author from DESCRIPTION and titles.    list(## Fill in author from DESCRIPTION and titles.
486         author.from.description=function(desc,...){         author.from.description=function(desc,...){
487           list(author=desc[,"Maintainer"])           list(author=desc[,"Author"])
488         },         },
489         ## The format section sometimes causes problems, so erase it.         ## The format section sometimes causes problems, so erase it.
490         erase.format=function(...){         erase.format=function(...){
# Line 534  Line 502 
502             ## Special case for code contained in a function             ## Special case for code contained in a function
503             if (inherits(ex, "function")) {             if (inherits(ex, "function")) {
504               ## If source is available, start from there               ## If source is available, start from there
505               src <- attr(ex, "source")               src <- getSource(ex)
506               if (!is.null(src)) {               if (!is.null(src)) {
507                 ex <- src                 ex <- src
508               } else { ## Use the body of the function               } else { ## Use the body of the function
# Line 542  Line 510 
510               }               }
511               ## Eliminate leading and trailing code               ## Eliminate leading and trailing code
512               ex <- ex[-c(1, length(ex))]               ex <- ex[-c(1, length(ex))]
513                 if(ex[1]=="{")ex <- ex[-1]
514               ## all the prefixes               ## all the prefixes
515               ex <- kill.prefix.whitespace(ex)               ex <- kill.prefix.whitespace(ex)
516               ## Add an empty line before and after example               ## Add an empty line before and after example
# Line 571  Line 540 
540           sum=x+y) ##<< their sum           sum=x+y) ##<< their sum
541      ##end<<      ##end<<
542    }    }
543    src <- attr(f,"source")    src <- getSource(f)
544    lonely$extract.xxx.chunks(src)    lonely$extract.xxx.chunks(src)
545    lonely$prefixed.lines(src)    lonely$prefixed.lines(src)
546  })  })
# Line 629  Line 598 
598      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){
599        NULL        NULL
600      } else if(0 == length(res) && "function" %in% class(o)      } else if(0 == length(res) && "function" %in% class(o)
601                && 1 == length(osource <- attr(o,"source"))                && 1 == length(osource <- getSource(o))
602                && grepl(paste("UseMethod(",on,")",sep="\""),osource)                && grepl(paste("UseMethod(",on,")",sep="\""),osource)
603                ){                ){
604        ## phew - this should only pick up R.oo S3 generic definitions like:        ## phew - this should only pick up R.oo S3 generic definitions like:
# Line 849  Line 818 
818    docs <- combine(docs,lonely$prefixed.lines(chunk.source))    docs <- combine(docs,lonely$prefixed.lines(chunk.source))
819    docs$title <- lonely$title.from.firstline(chunk.source)    docs$title <- lonely$title.from.firstline(chunk.source)
820    ##details<<    ##details<<
821      ## If there is no explicit title on the first line of setClass, then
822      ## one is made up from the class name.
823      if ( 0 == length(docs$title) ){
824        docs$title <- list(title=paste(class.name,"S4 class"))
825      }
826      ##details<<
827    ## The class definition skeleton includes an \code{Objects from the Class}    ## The class definition skeleton includes an \code{Objects from the Class}
828    ## section, to which any \code{##details<<} documentation chunks are    ## section, to which any \code{##details<<} documentation chunks are
829    ## written. It is given a vanilla content if there are no specific    ## written. It is given a vanilla content if there are no specific
# Line 895  Line 870 
870    old <- options(keep.source=TRUE,topLevelEnvironment=e)    old <- options(keep.source=TRUE,topLevelEnvironment=e)
871    on.exit(options(old))    on.exit(options(old))
872    exprs <- parse(text=code)    exprs <- parse(text=code)
873      ## TDH 2011-04-07 set this so that no warnings about creating a fake
874      ## package when we try to process S4 classes defined in code
875      e$.packageName <- "inlinedocs.processor"
876    for (i in exprs){    for (i in exprs){
877      tryCatch(eval(i, e),error=function(e){      ## TDH 2011-04-07 Disable this tryCatch since it makes it harder
878        ##to debug errors/warnings in the evaluated code
879    
880        ##tryCatch({
881          eval(i, e)
882        ##},error=function(e){
883        ##print(e)        ##print(e)
884      })      ##})
885    }    }
886    objs <- sapply(ls(e),get,e,simplify=FALSE)    objs <- sapply(ls(e),get,e,simplify=FALSE)
887    
# Line 954  Line 937 
937    apply.parsers(readLines(f),parsers,verbose=FALSE,...)    apply.parsers(readLines(f),parsers,verbose=FALSE,...)
938  },ex=function(){  },ex=function(){
939    f <- system.file("silly","R","silly.R",package="inlinedocs")    f <- system.file("silly","R","silly.R",package="inlinedocs")
940    extract.docs.file(f) ##FIXME: warning    extract.docs.file(f)
941  })  })
942    

Legend:
Removed from v.246  
changed lines
  Added in v.308

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