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 204, Fri Feb 18 16:48:22 2011 UTC revision 302, Tue Jul 12 12:06:42 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)) unlist(strsplit(as.character(srcref), "\n"))
31          else attr(fun.obj, "source")
32    ### Source code lines as a character vector.
33    }
34    
35  ### Prefix for code comments used with grep and gsub.  ### Prefix for code comments used with grep and gsub.
36  prefix <- "^[ \t]*###[ \t]"  prefix <- "^[ \t]*###[ \t]*"
37    
38  decomment <- function  decomment <- function
39  ### 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 58 
58   ){   ){
59    FUN <- FUN    FUN <- FUN
60    f <- function(objs,docs,...){    f <- function(objs,docs,...){
61        if(length(objs)==0)return(list())
62      objs <- objs[sapply(objs,subfun)]      objs <- objs[sapply(objs,subfun)]
63      L <- list()      L <- list()
64      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))      on.exit(cat(sprintf("Parser Function failed on %s\n",N)))
65      for(N in union(names(docs),names(objs))){      for(N in union(names(docs),names(objs))){
66        o <- objs[[N]]        o <- objs[[N]]
67        L[[N]] <- FUN(src=attr(o,"source"),        L[[N]] <- FUN(src=getSource(o),
68                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)
69      }      }
70      on.exit()## remove warning message      on.exit()## remove warning message
# Line 89  Line 102 
102  ### Character vector of code lines with preceding whitespace removed.  ### Character vector of code lines with preceding whitespace removed.
103  }  }
104    
 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)  
 }  
   
105  prefixed.lines <- structure(function(src,...){  prefixed.lines <- structure(function(src,...){
106  ### The primary mechanism of inline documentation is via consecutive  ### The primary mechanism of inline documentation is via consecutive
107  ### groups of lines matching the specified prefix regular expression  ### groups of lines matching the specified prefix regular expression
# Line 196  Line 158 
158  ### the return value  ### the return value
159  ##seealso<< foobar  ##seealso<< foobar
160  }  }
161  src <- attr(test,"source")  src <- getSource(test)
162  prefixed.lines(src)  prefixed.lines(src)
163  extract.xxx.chunks(src)  extract.xxx.chunks(src)
164  })  })
# Line 445  Line 407 
407  ### with the string in this list (implemented in modify.Rd.file).  ### with the string in this list (implemented in modify.Rd.file).
408  }  }
409    
410    leadingS3generic <- function # check whether function name is an S3 generic
411    ### Determines whether a function name looks like an S3 generic function
412    (name,                     ##<< name of function
413     env,                      ##<< environment to search for additional generics
414     ...)                      ##<< ignored here
415    {
416      ##details<< This function is one of the default parsers, but exposed as
417      ## possibly of more general interest. Given a function name of the form
418      ## x.y.z it looks for the generic function x applying to objects of class
419      ## y.z and also for generic function x.y applying to objects of class z.
420      ##
421      parts <- strsplit(name, ".", fixed = TRUE)[[1]]
422      l <- length(parts)
423      if (l > 1) {
424        for (i in 1:(l - 1)) {
425          ## Look for a generic function (known by the system or defined
426          ## in the package) that matches that part of the function name
427          generic <- paste(parts[1:i], collapse = ".")
428          if (any(generic %in% utils:::getKnownS3generics()) ||
429              utils:::findGeneric(generic, env) != "") {
430            object <- paste(parts[(i + 1):l], collapse = ".")
431            ##details<< Assumes that the first name which matches any known
432            ## generics is the target generic function, so if both x and x.y
433            ## are generic functions, will assume generic x applying to objects
434            ## of class y.z
435            ##value<< If a matching generic found returns a list with a single component:
436            return(list(.s3method=c(generic, object))) ##<< a character vector containing generic name and object name.
437          }
438        }
439      }
440      ##value<< If no matching generic functions are found, returns an empty list.
441      list()
442    }
443    
444  ### Parsers for each function that are constructed automatically. This  ### Parsers for each function that are constructed automatically. This
445  ### 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
446  ### individual object.  ### individual object.
447  forfun.parsers <-  forfun.parsers <-
448    list(prefixed.lines=prefixed.lines,    list(prefixed.lines=prefixed.lines,
        examples.after.return=examples.after.return,  
449         extract.xxx.chunks=extract.xxx.chunks,         extract.xxx.chunks=extract.xxx.chunks,
450         ## title from first line of function def         ## title from first line of function def
451         title.from.firstline=function(src,...){         title.from.firstline=function(src,...){
# Line 500  Line 495 
495             ## Special case for code contained in a function             ## Special case for code contained in a function
496             if (inherits(ex, "function")) {             if (inherits(ex, "function")) {
497               ## If source is available, start from there               ## If source is available, start from there
498               src <- attr(ex, "source")               src <- getSource(ex)
499               if (!is.null(src)) {               if (!is.null(src)) {
500                 ex <- src                 ex <- src
501               } else { ## Use the body of the function               } else { ## Use the body of the function
# Line 519  Line 514 
514           L <- lapply(doc,paste,collapse="\n")           L <- lapply(doc,paste,collapse="\n")
515           L$.overwrite <- TRUE           L$.overwrite <- TRUE
516           L           L
517         },tag.s3methods=function(name,env,...){         },tag.s3methods=leadingS3generic
          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, env) != "") {  
                object <- paste(parts[(i + 1):l], collapse = ".")  
                return(list(.s3method=c(generic, object)))  
              }  
            }  
          }  
          list()  
        }  
518         )         )
519    
520  ### List of parser functions that operate on single objects. This list  ### List of parser functions that operate on single objects. This list
# Line 553  Line 532 
532           sum=x+y) ##<< their sum           sum=x+y) ##<< their sum
533      ##end<<      ##end<<
534    }    }
535    src <- attr(f,"source")    src <- getSource(f)
536    lonely$extract.xxx.chunks(src)    lonely$extract.xxx.chunks(src)
537    lonely$prefixed.lines(src)    lonely$prefixed.lines(src)
538  })  })
# Line 586  Line 565 
565          if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){          if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){
566            doc$description <- parsed[[on]]@description            doc$description <- parsed[[on]]@description
567          }          }
568          if ( "setMethodS3" == parsed[[on]]@created ){          ## if ( "setMethodS3" == parsed[[on]]@created ){
569            # PhG: this may be wrong! It does not catch correctly how the method          ##   gen <- leadingS3generic(on,topenv())
570            # must be splitted in case of methods containing dots. for instance,          ##   if ( 0 < length(gen) ){
571            # as.data.frame.matrix must be split into: m1 = as.data.frame and          ##     doc$.s3method <- gen$.s3method
572            # m2 = matrix... here you got m1 = as, and m2 = data.frame.matrix!!!          ##     cat("S3method(",gen$.s3method[1],",",gen$.s3method[2],")\n",sep="")
573                    pattern <- "^([^\\.]+)\\.(.*)$"          ##   }
574            doc$.s3method=c(m1 <- gsub(pattern,"\\1",on,perl=TRUE),          ## }
               m2 <- gsub(pattern,"\\2",on,perl=TRUE))  
           if ( grepl("\\W",m1,perl=TRUE) ){  
                           m1 <- paste("`",m1,"`",sep="")  
           }  
           cat("S3method(",m1,",",m2,")\n",sep="")  
         }  
575        }        }
576        if("title" %in% names(doc) && !"description" %in% names(doc) ){        if("title" %in% names(doc) && !"description" %in% names(doc) ){
577          ## For short functions having both would duplicate, but a          ## For short functions having both would duplicate, but a
# Line 617  Line 590 
590      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){      } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){
591        NULL        NULL
592      } else if(0 == length(res) && "function" %in% class(o)      } else if(0 == length(res) && "function" %in% class(o)
593                && 1 == length(osource <- attr(o,"source"))                && 1 == length(osource <- getSource(o))
594                && grepl(paste("UseMethod(",on,")",sep="\""),osource)                && grepl(paste("UseMethod(",on,")",sep="\""),osource)
595                ){                ){
596        ## 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 695  Line 668 
668  setClass("DocLink", # Link documentation among related functions  setClass("DocLink", # Link documentation among related functions
669  ### The \code{.DocLink} class provides the basis for hooking together  ### The \code{.DocLink} class provides the basis for hooking together
670  ### documentation of related classes/functions/objects. The aim is that  ### documentation of related classes/functions/objects. The aim is that
671  ### documentation sections missing from the child are  ### documentation sections missing from the child are inherited from
672    ### the parent class.
673           representation(name="character", ##<< name of object           representation(name="character", ##<< name of object
674                          created="character", ##<< how created                          created="character", ##<< how created
675                          parent="character", ##<< parent class or NA                          parent="character", ##<< parent class or NA
# Line 872  Line 846 
846  ### Additional arguments to pass to Parser Functions.  ### Additional arguments to pass to Parser Functions.
847   ){   ){
848    e <- new.env()    e <- new.env()
849    old <- options(keep.source=TRUE)    ## KMP 2011-03-09 fix problem with DocLink when inlinedocs ran on itself
850      ## Error in assignClassDef(Class, classDef, where) :
851      ##   Class "DocLink" has a locked definition in package "inlinedocs"
852      ## Traced to "where" argument in setClassDef which defaults to topenv()
853      ## which in turn is inlinedocs when processing inlinedocs package, hence
854      ## the clash. The following works (under R 2.12.2), so that the topenv()
855      ## now finds e before finding the inlinedocs environment.
856      old <- options(keep.source=TRUE,topLevelEnvironment=e)
857    on.exit(options(old))    on.exit(options(old))
858    exprs <- parse(text=code)    exprs <- parse(text=code)
859      ## TDH 2011-04-07 set this so that no warnings about creating a fake
860      ## package when we try to process S4 classes defined in code
861      e$.packageName <- "inlinedocs.processor"
862    for (i in exprs){    for (i in exprs){
863      tryCatch(eval(i, e),error=function(e){      ## TDH 2011-04-07 Disable this tryCatch since it makes it harder
864        ##to debug errors/warnings in the evaluated code
865    
866        ##tryCatch({
867          eval(i, e)
868        ##},error=function(e){
869        ##print(e)        ##print(e)
870      })      ##})
871    }    }
872    objs <- sapply(ls(e),get,e,simplify=FALSE)    objs <- sapply(ls(e),get,e,simplify=FALSE)
873    
# Line 920  Line 909 
909  ### description file.  ### description file.
910  nondesc.parsers <- default.parsers[non.descfile.names]  nondesc.parsers <- default.parsers[non.descfile.names]
911    
912  extract.docs.file <- function  extract.docs.file <- structure(function
913  ### Apply all parsers relevant to extract info from just 1 code file.  ### Apply all parsers relevant to extract info from just 1 code file.
914  (f,  (f,
915  ### File name of R code to read and parse.  ### File name of R code to read and parse.
# Line 932  Line 921 
921   ){   ){
922    if(is.null(parsers))parsers <- nondesc.parsers    if(is.null(parsers))parsers <- nondesc.parsers
923    apply.parsers(readLines(f),parsers,verbose=FALSE,...)    apply.parsers(readLines(f),parsers,verbose=FALSE,...)
924  }  },ex=function(){
925      f <- system.file("silly","R","silly.R",package="inlinedocs")
926      extract.docs.file(f)
927    })
928    

Legend:
Removed from v.204  
changed lines
  Added in v.302

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