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 336, Thu Apr 5 12:44:33 2012 UTC
# Line 1  Line 1 
1    do.not.generate <- structure(function
2    ### Make a Parser Function used to indicate that certain Rd files
3    ### should not be generated.
4    (...
5    ### Character strings indicating Rd files without the .Rd suffix.
6     ){
7      filenames <- c(...)
8      function(docs,...){
9        for(fn in filenames){
10          docs[[fn]] <- list()
11        }
12        docs$.overwrite <- TRUE
13        docs
14      }
15    ### A Parser Function that will delete items from the outer
16    ### Documentation List.
17    },ex=function(){
18      silly.pkg <- system.file("silly",package="inlinedocs")
19      owd <- setwd(tempdir())
20      file.copy(silly.pkg,".",recursive=TRUE)
21    
22      ## define a custom Parser Function that will not generate some Rd
23      ## files
24      custom <- do.not.generate("silly-package","Silly-class")
25      parsers <- c(default.parsers,list(exclude=custom))
26    
27      ## At first, no Rd files in the man subdirectory.
28      man.dir <- file.path("silly","man")
29      dir(man.dir)
30    
31      ## Running package.skeleton.dx will generate bare-bones files for
32      ## those specified in do.not.generate, if they do not exist.
33      package.skeleton.dx("silly",parsers)
34      Rd.files <- c("silly-package.Rd","Silly-class.Rd","silly.example.Rd")
35      Rd.paths <- file.path(man.dir,Rd.files)
36      stopifnot(all(file.exists(Rd.paths)))
37    
38      ## Save the modification times of the Rd files
39      old <- file.info(Rd.paths)$mtime
40    
41      ## However, it will NOT generate Rd for files specified in
42      ## do.not.generate, if they DO exist already.
43      package.skeleton.dx("silly",parsers)
44      mtimes <- data.frame(old,new=file.info(Rd.paths)$mtime)
45      rownames(mtimes) <- Rd.files
46      mtimes$changed <- mtimes$old != mtimes$new
47      print(mtimes)
48      stopifnot(mtimes["silly-package.Rd","changed"]==FALSE)
49      stopifnot(mtimes["Silly-class.Rd","changed"]==FALSE)
50      stopifnot(mtimes["silly.example.Rd","changed"]==TRUE)
51    
52      unlink("silly",recursive=TRUE)
53      setwd(owd)
54    })
55    
56  ### combine lists or character strings  ### combine lists or character strings
57  combine <- function(x,y)UseMethod("combine")  combine <- function(x,y)UseMethod("combine")
58    
# Line 20  Line 75 
75  ### A list, same type as x, but with added elements from y.  ### A list, same type as x, but with added elements from y.
76  }  }
77    
78    
79    getSource <- function
80    ### Extract a function's source code.
81    (fun.obj
82    ### A function.
83     ) {
84          srcref <- attr(fun.obj, "srcref")
85          if (!is.null(srcref)) {
86            ##unlist(strsplit(as.character(srcref), "\n"))
87            as.character(srcref)
88          }
89          else attr(fun.obj, "source")
90    ### Source code lines as a character vector.
91    }
92    
93  ### Prefix for code comments used with grep and gsub.  ### Prefix for code comments used with grep and gsub.
94  prefix <- "^[ \t]*###[ \t]"  prefix <- "^[ \t]*###[ \t]*"
95    
96  decomment <- function  decomment <- function
97  ### 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 116 
116   ){   ){
117    FUN <- FUN    FUN <- FUN
118    f <- function(objs,docs,...){    f <- function(objs,docs,...){
119        if(length(objs)==0)return(list())
120      objs <- objs[sapply(objs,subfun)]      objs <- objs[sapply(objs,subfun)]
121      L <- list()      L <- list()
122      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))
123      for(N in union(names(docs),names(objs))){      for(N in union(names(docs),names(objs))){
124        o <- objs[[N]]        o <- objs[[N]]
125        L[[N]] <- FUN(src=attr(o,"source"),        L[[N]] <- FUN(src=getSource(o),
126                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)
127      }      }
128      on.exit()## remove warning message      on.exit()## remove warning message
# Line 89  Line 160 
160  ### Character vector of code lines with preceding whitespace removed.  ### Character vector of code lines with preceding whitespace removed.
161  }  }
162    
 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)  
 }  
   
163  prefixed.lines <- structure(function(src,...){  prefixed.lines <- structure(function(src,...){
164  ### The primary mechanism of inline documentation is via consecutive  ### The primary mechanism of inline documentation is via consecutive
165  ### groups of lines matching the specified prefix regular expression  ### groups of lines matching the specified prefix regular expression
# Line 169  Line 189 
189    for(i in seq_along(starts)){    for(i in seq_along(starts)){
190      start <- clines[starts[i]]      start <- clines[starts[i]]
191      end <- clines[ends[i]]      end <- clines[ends[i]]
192      lab <- if(all(grepl("^\\s*#",src[end:(length(src)-1)])))"value"      processed <- gsub("#.*","",gsub("[ }]","",src[(end+1):length(src)]))
193        lab <- if(all(processed==""))"value"
194      else if(start==2)"description"      else if(start==2)"description"
195      else if(is.arg()){      else if(is.arg()){
196        ##twutz: strip leading white spaces and brackets and ,        ##twutz: strip leading white spaces and brackets and ,
# Line 177  Line 198 
198        arg <- gsub("^([^=,]*)[=,].*", "\\1", arg)        arg <- gsub("^([^=,]*)[=,].*", "\\1", arg)
199        ##twutz: remove trailing whitespaces        ##twutz: remove trailing whitespaces
200        arg <- gsub("^([^ \t]*)([ \t]+)$","\\1",arg)        arg <- gsub("^([^ \t]*)([ \t]+)$","\\1",arg)
201        arg <- gsub("...", "\\dots", arg, fix = TRUE)        arg <- gsub("...", "\\dots", arg, fixed = TRUE)
202        paste("item{",arg,"}",sep="")        paste("item{",arg,"}",sep="")
203      } else {      } else {
204        next;        next;
# Line 196  Line 217 
217  ### the return value  ### the return value
218  ##seealso<< foobar  ##seealso<< foobar
219  }  }
220  src <- attr(test,"source")  src <- getSource(test)
221  prefixed.lines(src)  prefixed.lines(src)
222  extract.xxx.chunks(src)  extract.xxx.chunks(src)
223  })  })
# Line 293  Line 314 
314      }      }
315    while ( k <= length(src) ){    while ( k <= length(src) ){
316      line <- src[k]      line <- src[k]
317        ##print(line)
318        ##if(grepl("^$",line))browser()
319      if ( grepl(extra.regexp,line,perl=TRUE) ){      if ( grepl(extra.regexp,line,perl=TRUE) ){
320        ## 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
321        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)
322        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)        new.contents <- gsub(extra.regexp,"\\2",line,perl=TRUE)
323          ##cat(new.field,"\n-----\n",new.contents,"\n\n")
324        ##details<< As a special case, the construct \code{##describe<<} causes        ##details<< As a special case, the construct \code{##describe<<} causes
325        ## similar processing to the main function arguments to be        ## similar processing to the main function arguments to be
326        ## applied in order to construct a describe block within the        ## applied in order to construct a describe block within the
# Line 306  Line 329 
329        ## block until terminated by a subsequent \code{##}\emph{xxx}\code{<<} line.        ## block until terminated by a subsequent \code{##}\emph{xxx}\code{<<} line.
330        if ( "describe" == new.field ){        if ( "describe" == new.field ){
331          ##details<< Such regions may be nested, but not in such a way          ##details<< Such regions may be nested, but not in such a way
332          ## that the first element in a \code{describe} is another \code{describe}.          ## that the first element in a \code{describe} is another
333          ## Thus there must be at least one \code{##<<} comment between each          ## \code{describe}.  Thus there must be at least one
334          ## pair of \code{##describe<<} comments.          ## \code{##<<} comment between each pair of
335            ## \code{##describe<<} comments.
336          if ( first.describe ){          if ( first.describe ){
337            stop("consecutive ##describe<< at line",k,"in",name.fun)            stop("consecutive ##describe<< at line",k,"in",name.fun)
338          } else {          } else {
# Line 395  Line 419 
419          ## TDH 2010-06-18 For item{}s in the documentation list names,          ## TDH 2010-06-18 For item{}s in the documentation list names,
420          ## we don't need to have a backslash before, so delete it.          ## we don't need to have a backslash before, so delete it.
421          arg <- gsub("^[\\]+","",arg)          arg <- gsub("^[\\]+","",arg)
422          cur.field <- gsub("...","\\dots",arg,fix=TRUE) ##special case for dots          cur.field <- gsub("...","\\dots",arg,fixed=TRUE) ##special case for dots
423          payload <- comment          payload <- comment
424        } else {        } else {
425          ## this is a describe block, so we need to paste with existing          ## this is a describe block, so we need to paste with existing
# Line 484  Line 508 
508  ### individual object.  ### individual object.
509  forfun.parsers <-  forfun.parsers <-
510    list(prefixed.lines=prefixed.lines,    list(prefixed.lines=prefixed.lines,
        examples.after.return=examples.after.return,  
511         extract.xxx.chunks=extract.xxx.chunks,         extract.xxx.chunks=extract.xxx.chunks,
512         ## title from first line of function def         ## title from first line of function def
513         title.from.firstline=function(src,...){         title.from.firstline=function(src,...){
# Line 516  Line 539 
539  forall.parsers <-  forall.parsers <-
540    list(## Fill in author from DESCRIPTION and titles.    list(## Fill in author from DESCRIPTION and titles.
541         author.from.description=function(desc,...){         author.from.description=function(desc,...){
542           list(author=desc[,"Maintainer"])           list(author=desc[,"Author"])
543         },         },
544         ## The format section sometimes causes problems, so erase it.         ## The format section sometimes causes problems, so erase it.
545         erase.format=function(...){         erase.format=function(...){
# Line 534  Line 557 
557             ## Special case for code contained in a function             ## Special case for code contained in a function
558             if (inherits(ex, "function")) {             if (inherits(ex, "function")) {
559               ## If source is available, start from there               ## If source is available, start from there
560               src <- attr(ex, "source")               src <- getSource(ex)
561               if (!is.null(src)) {               if (!is.null(src)) {
562                 ex <- src                 ex <- src
563               } else { ## Use the body of the function               } else { ## Use the body of the function
# Line 542  Line 565 
565               }               }
566               ## Eliminate leading and trailing code               ## Eliminate leading and trailing code
567               ex <- ex[-c(1, length(ex))]               ex <- ex[-c(1, length(ex))]
568                 if(ex[1]=="{")ex <- ex[-1]
569               ## all the prefixes               ## all the prefixes
570               ex <- kill.prefix.whitespace(ex)               ex <- kill.prefix.whitespace(ex)
571               ## Add an empty line before and after example               ## Add an empty line before and after example
# Line 571  Line 595 
595           sum=x+y) ##<< their sum           sum=x+y) ##<< their sum
596      ##end<<      ##end<<
597    }    }
598    src <- attr(f,"source")    src <- getSource(f)
599    lonely$extract.xxx.chunks(src)    lonely$extract.xxx.chunks(src)
600    lonely$prefixed.lines(src)    lonely$prefixed.lines(src)
601  })  })
# Line 629  Line 653 
653      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){
654        NULL        NULL
655      } else if(0 == length(res) && "function" %in% class(o)      } else if(0 == length(res) && "function" %in% class(o)
656                && 1 == length(osource <- attr(o,"source"))                && 1 == length(osource <- getSource(o))
657                && grepl(paste("UseMethod(",on,")",sep="\""),osource)                && grepl(paste("UseMethod(",on,")",sep="\""),osource)
658                ){                ){
659        ## 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 873 
873    docs <- combine(docs,lonely$prefixed.lines(chunk.source))    docs <- combine(docs,lonely$prefixed.lines(chunk.source))
874    docs$title <- lonely$title.from.firstline(chunk.source)    docs$title <- lonely$title.from.firstline(chunk.source)
875    ##details<<    ##details<<
876      ## If there is no explicit title on the first line of setClass, then
877      ## one is made up from the class name.
878      if ( 0 == length(docs$title) ){
879        docs$title <- list(title=paste(class.name,"S4 class"))
880      }
881      ##details<<
882    ## The class definition skeleton includes an \code{Objects from the Class}    ## The class definition skeleton includes an \code{Objects from the Class}
883    ## section, to which any \code{##details<<} documentation chunks are    ## section, to which any \code{##details<<} documentation chunks are
884    ## 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 925 
925    old <- options(keep.source=TRUE,topLevelEnvironment=e)    old <- options(keep.source=TRUE,topLevelEnvironment=e)
926    on.exit(options(old))    on.exit(options(old))
927    exprs <- parse(text=code)    exprs <- parse(text=code)
928      ## TDH 2011-04-07 set this so that no warnings about creating a fake
929      ## package when we try to process S4 classes defined in code
930      e$.packageName <- "inlinedocs.processor"
931    for (i in exprs){    for (i in exprs){
932      tryCatch(eval(i, e),error=function(e){        eval(i, e)
       ##print(e)  
     })  
933    }    }
934    objs <- sapply(ls(e),get,e,simplify=FALSE)    objs <- sapply(ls(e),get,e,simplify=FALSE)
935    
936    docs <- list()    docs <- list()
937    
938    ## apply parsers in sequence to code and objs    ## apply parsers in sequence to code and objs
939      if(verbose)cat("Applying parsers:\n")
940    for(i in seq_along(parsers)){    for(i in seq_along(parsers)){
941      N <- names(parsers[i])      N <- names(parsers[i])
942      if(verbose){      if(verbose){
943        if(is.character(N) && N!=""){        if(is.character(N) && N!=""){
944          cat(N," ",sep="")          cat(N,"\n",sep="")
945        }else cat('. ')        }else cat('.\n')
946      }      }
947      p <- parsers[[i]]      p <- parsers[[i]]
948      ## This is the argument list that each parser receives:      ## This is the argument list that each parser receives:
949      L <- p(code=code,objs=objs,docs=docs,env=e,...)      L <- p(code=code,objs=objs,docs=docs,env=e,...)
950        #print(paste(L,"\n"))
951        #if(N=="exclude")browser()
952      docs <- combine(docs,L)      docs <- combine(docs,L)
953    }    }
954    ## post-process to collapse all character vectors    ## post-process to collapse all character vectors
# Line 925  Line 959 
959      }      }
960    }    }
961    if(verbose)cat("\n")    if(verbose)cat("\n")
962    docs    return(docs)
963  ### A list of extracted documentation from code.  ### A list of extracted documentation from code.
964  }  }
965    
# Line 954  Line 988 
988    apply.parsers(readLines(f),parsers,verbose=FALSE,...)    apply.parsers(readLines(f),parsers,verbose=FALSE,...)
989  },ex=function(){  },ex=function(){
990    f <- system.file("silly","R","silly.R",package="inlinedocs")    f <- system.file("silly","R","silly.R",package="inlinedocs")
991    extract.docs.file(f) ##FIXME: warning    extract.docs.file(f)
992  })  })
993    

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

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