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 144, Wed Oct 20 09:33:04 2010 UTC revision 163, Tue Nov 16 12:06:29 2010 UTC
# Line 28  Line 28 
28  ### String without prefixes or newlines.  ### String without prefixes or newlines.
29  }  }
30    
 ### For each object in the package that satisfies the criterion#  
 ## checked by subfun, parse source using FUN and return the resulting  
 ### documentation list.  
31  forall <- function  forall <- function
32    ### For each object in the package that satisfies the criterion
33    ### checked by subfun, parse source using FUN and return the resulting
34    ### documentation list.
35  (FUN,  (FUN,
36  ### Function to apply to each element in the package.  ### Function to apply to each element in the package.
37   subfun=function(x)TRUE   subfun=function(x)TRUE
# Line 43  Line 43 
43    f <- function(objs,docs,...){    f <- function(objs,docs,...){
44      objs <- objs[sapply(objs,subfun)]      objs <- objs[sapply(objs,subfun)]
45      L <- list()      L <- list()
46        on.exit(cat(sprintf("Parser Function failed on %s\n",N)))
47      for(N in names(docs)){      for(N in names(docs)){
48        o <- objs[[N]]        o <- objs[[N]]
49        L[[N]] <- FUN(src=attr(o,"source"),        L[[N]] <- FUN(src=attr(o,"source"),
50                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)                      name=N,objs=objs,o=o,docs=docs,doc=docs[[N]],...)
51      }      }
52        on.exit()## remove warning message
53      L      L
54    }    }
55    class(f) <- c("allfun","function")    class(f) <- c("allfun","function")
# Line 67  Line 69 
69  ### For each function in the package, do something.  ### For each function in the package, do something.
70  forfun <- function(FUN)forall(FUN,is.function)  forfun <- function(FUN)forall(FUN,is.function)
71    
72    kill.prefix.whitespace <- function
73    ### Figure out what the whitespace preceding the example code is, and
74    ### then delete that from every line.
75    (ex
76    ### character vector of example code lines.
77     ){
78      tlines <- gsub("\\s*","",ex)
79      ##tlines <- gsub("#.*","",tlines)
80      prefixes <- unique(gsub("\\S.*","",ex[tlines!=""]))
81      FIND <- prefixes[which.min(nchar(prefixes))]
82      ## Eliminate leading tabulations or 2/4 spaces
83      sub(FIND, "", ex)
84    ### Character vector of code lines with preceding whitespace removed.
85    }
86    
87  examples.after.return <- function  examples.after.return <- function
88  ### Get examples from inline definitions after return()  ### Get examples from inline definitions after return()
89  ### PhG: this does not work well! Think of these situations:  ### PhG: this does not work well! Think of these situations:
# Line 111  Line 128 
128    ## Possibly eliminate a #}}} tag    ## Possibly eliminate a #}}} tag
129    ex <- ex[!grepl("#}}}", ex)]    ex <- ex[!grepl("#}}}", ex)]
130    ## Eliminate leading tabulations or four spaces    ## Eliminate leading tabulations or four spaces
131    prefixes <- gsub("(\\s*).*","\\1",ex,perl=TRUE)[grep("\\w",ex)]    ex <- kill.prefix.whitespace(ex)
   FIND <- prefixes[which.min(nchar(prefixes))]  
   ex <- sub(FIND,"",ex)  
132    ## Add an empty line before and after example    ## Add an empty line before and after example
133    ex <- c("", ex, "")    ex <- c("", ex, "")
134    ## Return examples and value    ## Return examples and value
# Line 136  Line 151 
151    starts <- c(1,bounds+1)    starts <- c(1,bounds+1)
152    ends <- c(bounds,length(clines))    ends <- c(bounds,length(clines))
153    ## detect body of function using paren matching    ## detect body of function using paren matching
154    f <- function(ch)cumsum(nchar(gsub(sprintf("[^%s]",ch),"",src)))    code <- gsub("#.*","",src)
155      f <- function(ch)cumsum(nchar(gsub(sprintf("[^%s]",ch),"",code)))
156    parens <- f("(")-f(")")    parens <- f("(")-f(")")
157    body.begin <- which(diff(parens)<0 & parens[-1]==0)+2    body.begin <- which(diff(parens)<0 & parens[-1]==0)+2
158    is.arg <- function(){    is.arg <- function(){
159      0 == length(grep("^\\s*#",src[start-1],perl=TRUE)) &&      gres <- grep("^\\s*#",src[start-1],perl=TRUE)
160        start<=body.begin      0 == length(gres) && start<=body.begin
161      }      }
162    res <- list()    res <- list()
163    for(i in seq_along(starts)){    for(i in seq_along(starts)){
# Line 165  Line 181 
181    res    res
182  }  }
183    
184  ### Parsers for each object/function that are constructed  extract.xxx.chunks <- function # Extract documentation from a function
 ### automatically. This is a named list, each element is a list of 2  
 ### elements: forfun/forall, then a parser function for an individual  
 ### object.  
 forfun.parsers <-  
   list(prefixed.lines=prefixed.lines,  
        examples.after.return=examples.after.return,  
        ## Extract lots of info from normal functions.  
        parsefun=function(src,name,...){  
          extract.docs.fun(src,name)  
        },  
        ## title from first line of function def  
        title.from.firstline=function(src,name,code,...){  
          if(length(grep("#",src[1]))){  
            list(title=gsub("[^#]*#\\s*(.*)","\\1",src[1],perl=TRUE))  
          } else list()  
        },  
        ## PhG: it is tests/FUN.R!!! I would like more flexibility here  
        ## please, let me choose which dir to use for examples!  
        ## Get examples for FUN from the file tests/FUN.R  
        examples.from.testfile=function(name,...){  
          tsubdir <- getOption("inlinedocs.exdir")  
          if (is.null(tsubdir)) tsubdir <- "tests"       # Default value  
          tfile <- file.path("..",tsubdir,paste(name,".R",sep=""))  
          if(file.exists(tfile))  
            list(examples=paste(readLines(tfile),collapse="\n"))  
          else list()  
        },  
        definition.from.source=function(doc,src,...){  
          def <- doc$definition  
          is.empty <- function(x)is.null(x)||x==""  
          if(is.empty(def) && !is.empty(src))  
            list(definition=paste(src,collapse="\n"))  
          else list()  
        })  
   
 ### List of Parser Functions that can be applied to any object.  
 forall.parsers <-  
   list(## Fill in author from DESCRIPTION and titles.  
        author.from.description=function(desc,...){  
          list(author=desc[,"Maintainer"])  
        },  
        ## The format section sometimes causes problems, so erase it.  
        erase.format=function(...){  
          list(format="")  
        },  
        ## Convert the function name to a title.  
        title.from.name=function(name,doc,...){  
          if("title"%in%names(doc))list() else  
          list(title=gsub("[._]"," ",name))  
        },  
        ## PhG: here is what I propose for examples code in the 'ex' attribute  
        examples.in.attr =  function (name, o, ...) {  
          ex <- attr(o, "ex")  
          if (!is.null(ex)) {  
            ## Special case for code contained in a function  
            if (inherits(ex, "function")) {  
              ## If source is available, start from there  
              src <- attr(ex, "source")  
              if (!is.null(src)) {  
                ex <- src  
              } else { ## Use the body of the function  
                ex <- deparse(body(ex))  
              }  
              ## Eliminate leading and trailing code  
              ex <- ex[-c(1, length(ex))]  
              ## Eliminate leading tabulations or 2/4 spaces  
              ex <- sub("^\t|    |  ", "", ex)  
              ## Add an empty line before and after example  
              ex <- c("", ex, "")  
            }  
            list(examples = paste(ex, collapse = "\n"))  
          } else list()  
        })  
   
 ### List of parser functions that operate on single objects. This list  
 ### is useful for testing these functions.  
 lonely <- c(forall.parsers,forfun.parsers)  
 attr(lonely,"ex") <- function(){  
   lonely$parsefun(attr(extract.docs.file,"source"),"extract.docs.file")  
 }  
   
 extra.code.docs <- function # Extract documentation from code chunks  
 ### Parse R code to extract inline documentation from comments around  
 ### each function. These are not able to be retreived simply by  
 ### looking at the "source" attribute. This is a Parser Function that  
 ### can be used in the parser list of package.skeleton.dx(). TODO:  
 ### Modularize this into separate Parsers Functions for S4 classes,  
 ### prefixes, ##<<blocks, etc. Right now it is not very clean!  
 (code,  
 ### Code lines in a character vector containing multiple R objects to  
 ### parse for documentation.  
  objs,  
 ### The objects defined in the code.  
  ...  
 ### ignored  
  ){  
   parsed <- extract.file.parse(code)  
   extract.docs.try <- function(o,on)  
     {  
       ## Note: we could use parsed information here too, but that  
       ## would produce different results for setMethodS3 etc.  
       doc <- list()  
       if ( !is.null(parsed[[on]]) ){  
         if ( !is.na(parsed[[on]]@code[1]) ){ # no code given for generics  
           doc$definition <- paste(parsed[[on]]@code,collapse="\n")  
         }  
         if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){  
           doc$description <- parsed[[on]]@description  
         }  
         if ( "setMethodS3" == parsed[[on]]@created ){  
           # PhG: this may be wrong! It does not catch correctly how the method  
           # must be splitted in case of methods containing dots. for instance,  
           # as.data.frame.matrix must be split into: m1 = as.data.frame and  
           # m2 = matrix... here you got m1 = as, and m2 = data.frame.matrix!!!  
                   pattern <- "^([^\\.]+)\\.(.*)$"  
           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="")  
         }  
       }  
       if("title" %in% names(doc) && !"description" %in% names(doc) ){  
         ## For short functions having both would duplicate, but a  
         ## description is required. Therefore automatically copy title  
         ## across to avoid errors at package build time.  
         doc$description <- doc$title  
       }  
       doc  
     }  
   extract.docs <- function(on){  
     res <- try({o <- objs[[on]]  
                 extract.docs.try(o, on)},FALSE)  
     if(class(res)=="try-error"){  
       cat("Failed to extract docs for: ",on,"\n\n")  
       list()  
     } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){  
       NULL  
     } else if(0 == length(res) && "function" %in% class(o)  
               && 1 == length(osource <- attr(o,"source"))  
               && 1 == length(grep(paste("UseMethod(",on,")",sep="\""),osource))  
               ){  
       ## phew - this should only pick up R.oo S3 generic definitions like:  
       ## attr(*, "source")= chr "function(...) UseMethod(\"select\")"  
       NULL  
     } else res  
   }  
   doc.names <- names(objs)  
   res <- sapply(doc.names,extract.docs,simplify=FALSE)  
   ## Special processing for S4 classes as they do not appear in normal ls()  
   for ( nn in names(parsed) ){  
     if ( parsed[[nn]]@created == "setClass" ){  
       S4class.docs <- extract.docs.setClass(parsed[[nn]])  
       docname <- paste(nn,"class",sep="-")  
       if ( is.null(res[[docname]]) ){  
         res[[docname]] <- S4class.docs  
         doc.names <- c(doc.names,docname)  
       } else {  
         stop(nn," appears as both S4 class and some other definition")  
       }  
     }  
   }  
   inherit.docs <- function(on){  
     in.res <- res[[on]]  
     if ( !is.null(parsed[[on]]) ){  
       for ( parent in parsed[[on]]@parent ){  
         if ( !is.na(parent) ){  
           if ( is.null(in.res) ){  
             in.res <- res[[parent]]  
           } else if ( parent %in% names(res) ){  
             parent.docs <- res[[parent]]  
             for ( nn in names(parent.docs) ){  
               if ( !nn %in% names(in.res) ){  
                 in.res[[nn]] <- parent.docs[[nn]]  
               }  
             }  
           }  
         }  
       }  
     }  
     invisible(in.res)  
   }  
   all.done <- FALSE  
   while ( !all.done ){  
     res1 <- sapply(doc.names,inherit.docs,simplify=FALSE)  
     all.done <- identical(res1,res)  
     res <- res1  
   }  
   ## now strip out any generics (which have value NULL in res):  
   res.not.null <- sapply(res,function(x){!is.null(x)})  
   if ( 0 < length(res.not.null) && length(res.not.null) < length(res) ){  
     res <- res[res.not.null]  
   }  
   res  
 ### named list of lists, one for each object to document.  
 }  
   
 ### List of parsers to use by default with package.skeleton.dx.  
 default.parsers <-  
   c(extra.code.docs=extra.code.docs, ## TODO: cleanup!  
     sapply(forfun.parsers,forfun),  
     sapply(forall.parsers,forall),  
     edit.package.file=function(desc,...){  
       in.details <- setdiff(colnames(desc),"Description")  
       details <- paste(paste(in.details,": \\tab ",desc[,in.details],"\\cr",  
                              sep=""),collapse="\n")  
       L <-  
         list(list(title=desc[,"Title"],  
                   description=desc[,"Description"],  
                   `tabular{ll}`=details,  
                   author=desc[,"Maintainer"]))  
       names(L) <- paste(desc[,"Package"],"-package",sep="")  
       L  
     })  
   
 extract.docs.fun <- function # Extract documentation from a function  
185  ### Given source code of a function, return a list describing inline  ### Given source code of a function, return a list describing inline
186  ### documentation in that source code.  ### documentation in that source code.
187  (code,  (src,
188  ### The function to examine.  ### The source lines of the function to examine, as a character
189   name.fun  ### vector.
190     name.fun="(unnamed function)",
191  ### The name of the function/chunk to use in warning messages.  ### The name of the function/chunk to use in warning messages.
192     ...
193    ### ignored.
194   ){   ){
195    res <- list()    res <- list()
196    ##details<< For simple functions/arguments, the argument may also be    ##details<< For simple functions/arguments, the argument may also be
# Line 469  Line 271 
271            else paste(res[[field]], payload, sep=chunk.sep)            else paste(res[[field]], payload, sep=chunk.sep)
272        invisible(chunk.res)        invisible(chunk.res)
273      }      }
274    while ( k <= length(code) ){    while ( k <= length(src) ){
275      line <- code[k]      line <- src[k]
276      if ( 0 < length(grep(extra.regexp,line,perl=TRUE) ) ){      if ( 0 < length(grep(extra.regexp,line,perl=TRUE) ) ){
277        ## 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
278        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)        new.field <- gsub(extra.regexp,"\\1",line,perl=TRUE)
# Line 623  Line 425 
425  ### with the string in this list (implemented in modify.Rd.file).  ### with the string in this list (implemented in modify.Rd.file).
426  }  }
427    
428    ### Parsers for each function that are constructed automatically. This
429    ### is a named list, and each element is a parser function for an
430    ### individual object.
431    forfun.parsers <-
432      list(prefixed.lines=prefixed.lines,
433           examples.after.return=examples.after.return,
434           extract.xxx.chunks=extract.xxx.chunks,
435           ## title from first line of function def
436           title.from.firstline=function(src,name,code,...){
437             if(length(grep("#",src[1]))){
438               list(title=gsub("[^#]*#\\s*(.*)","\\1",src[1],perl=TRUE))
439             } else list()
440           },
441           ## PhG: it is tests/FUN.R!!! I would like more flexibility here
442           ## please, let me choose which dir to use for examples!
443           ## Get examples for FUN from the file tests/FUN.R
444           examples.from.testfile=function(name,...){
445             tsubdir <- getOption("inlinedocs.exdir")
446             if (is.null(tsubdir)) tsubdir <- "tests"       # Default value
447             tfile <- file.path("..",tsubdir,paste(name,".R",sep=""))
448             if(file.exists(tfile))
449               list(examples=paste(readLines(tfile),collapse="\n"))
450             else list()
451           },
452           definition.from.source=function(doc,src,...){
453             def <- doc$definition
454             is.empty <- function(x)is.null(x)||x==""
455             if(is.empty(def) && !is.empty(src))
456               list(definition=paste(src,collapse="\n"))
457             else list()
458           })
459    
460    ### List of Parser Functions that can be applied to any object.
461    forall.parsers <-
462      list(## Fill in author from DESCRIPTION and titles.
463           author.from.description=function(desc,...){
464             list(author=desc[,"Maintainer"])
465           },
466           ## The format section sometimes causes problems, so erase it.
467           erase.format=function(...){
468             list(format="")
469           },
470           ## Convert the function name to a title.
471           title.from.name=function(name,doc,...){
472             if("title"%in%names(doc))list() else
473             list(title=gsub("[._]"," ",name))
474           },
475           ## PhG: here is what I propose for examples code in the 'ex' attribute
476           examples.in.attr =  function (name, o, ...) {
477             ex <- attr(o, "ex")
478             if (!is.null(ex)) {
479               ## Special case for code contained in a function
480               if (inherits(ex, "function")) {
481                 ## If source is available, start from there
482                 src <- attr(ex, "source")
483                 if (!is.null(src)) {
484                   ex <- src
485                 } else { ## Use the body of the function
486                   ex <- deparse(body(ex))
487                 }
488                 ## Eliminate leading and trailing code
489                 ex <- ex[-c(1, length(ex))]
490                 ## all the prefixes
491                 ex <- kill.prefix.whitespace(ex)
492                 ## Add an empty line before and after example
493                 ex <- c("", ex, "")
494               }
495               list(examples = paste(ex, collapse = "\n"))
496             } else list()
497           })
498    
499    ### List of parser functions that operate on single objects. This list
500    ### is useful for testing these functions.
501    lonely <- c(forall.parsers,forfun.parsers)
502    attr(lonely,"ex") <- function(){
503      f <- function # title
504    ### description
505      (x, ##<< arg x
506       y
507    ### arg y
508       ){
509        ##value<< a list with elements
510        list(x=x, ##<< original x value
511             y=y, ##<< original y value
512             sum=x+y) ##<< their sum
513        ##end<<
514      }
515      src <- attr(f,"source")
516      lonely$extract.xxx.chunks(src)
517      lonely$prefixed.lines(src)
518    }
519    
520    extra.code.docs <- function # Extract documentation from code chunks
521    ### Parse R code to extract inline documentation from comments around
522    ### each function. These are not able to be retreived simply by
523    ### looking at the "source" attribute. This is a Parser Function that
524    ### can be used in the parser list of package.skeleton.dx(). TODO:
525    ### Modularize this into separate Parsers Functions for S4 classes,
526    ### prefixes, ##<<blocks, etc. Right now it is not very clean!
527    (code,
528    ### Code lines in a character vector containing multiple R objects to
529    ### parse for documentation.
530     objs,
531    ### The objects defined in the code.
532     ...
533    ### ignored
534     ){
535      parsed <- extract.file.parse(code)
536      extract.docs.try <- function(o,on)
537        {
538          ## Note: we could use parsed information here too, but that
539          ## would produce different results for setMethodS3 etc.
540          doc <- list()
541          if ( !is.null(parsed[[on]]) ){
542            if ( !is.na(parsed[[on]]@code[1]) ){ # no code given for generics
543              doc$definition <- paste(parsed[[on]]@code,collapse="\n")
544            }
545            if(!"description"%in%names(doc) && !is.na(parsed[[on]]@description) ){
546              doc$description <- parsed[[on]]@description
547            }
548            if ( "setMethodS3" == parsed[[on]]@created ){
549              # PhG: this may be wrong! It does not catch correctly how the method
550              # must be splitted in case of methods containing dots. for instance,
551              # as.data.frame.matrix must be split into: m1 = as.data.frame and
552              # m2 = matrix... here you got m1 = as, and m2 = data.frame.matrix!!!
553                      pattern <- "^([^\\.]+)\\.(.*)$"
554              doc$s3method=c(m1 <- gsub(pattern,"\\1",on,perl=TRUE),
555                  m2 <- gsub(pattern,"\\2",on,perl=TRUE))
556              if ( 0 < length(grep("\\W",m1,perl=TRUE)) ){
557                              m1 <- paste("`",m1,"`",sep="")
558              }
559              cat("S3method(",m1,",",m2,")\n",sep="")
560            }
561          }
562          if("title" %in% names(doc) && !"description" %in% names(doc) ){
563            ## For short functions having both would duplicate, but a
564            ## description is required. Therefore automatically copy title
565            ## across to avoid errors at package build time.
566            doc$description <- doc$title
567          }
568          doc
569        }
570      extract.docs <- function(on){
571        res <- try({o <- objs[[on]]
572                    extract.docs.try(o, on)},FALSE)
573        if(class(res)=="try-error"){
574          cat("Failed to extract docs for: ",on,"\n\n")
575          list()
576        } else if(0 == length(res) && inherits(objs[[on]],"standardGeneric")){
577          NULL
578        } else if(0 == length(res) && "function" %in% class(o)
579                  && 1 == length(osource <- attr(o,"source"))
580                  && 1 == length(grep(paste("UseMethod(",on,")",sep="\""),osource))
581                  ){
582          ## phew - this should only pick up R.oo S3 generic definitions like:
583          ## attr(*, "source")= chr "function(...) UseMethod(\"select\")"
584          NULL
585        } else res
586      }
587      doc.names <- names(objs)
588      res <- sapply(doc.names,extract.docs,simplify=FALSE)
589      ## Special processing for S4 classes as they do not appear in normal ls()
590      for ( nn in names(parsed) ){
591        if ( parsed[[nn]]@created == "setClass" ){
592          S4class.docs <- extract.docs.setClass(parsed[[nn]])
593          docname <- paste(nn,"class",sep="-")
594          if ( is.null(res[[docname]]) ){
595            res[[docname]] <- S4class.docs
596            doc.names <- c(doc.names,docname)
597          } else {
598            stop(nn," appears as both S4 class and some other definition")
599          }
600        }
601      }
602      inherit.docs <- function(on){
603        in.res <- res[[on]]
604        if ( !is.null(parsed[[on]]) ){
605          for ( parent in parsed[[on]]@parent ){
606            if ( !is.na(parent) ){
607              if ( is.null(in.res) ){
608                in.res <- res[[parent]]
609              } else if ( parent %in% names(res) ){
610                parent.docs <- res[[parent]]
611                for ( nn in names(parent.docs) ){
612                  if ( !nn %in% names(in.res) ){
613                    in.res[[nn]] <- parent.docs[[nn]]
614                  }
615                }
616              }
617            }
618          }
619        }
620        invisible(in.res)
621      }
622      all.done <- FALSE
623      while ( !all.done ){
624        res1 <- sapply(doc.names,inherit.docs,simplify=FALSE)
625        all.done <- identical(res1,res)
626        res <- res1
627      }
628      ## now strip out any generics (which have value NULL in res):
629      res.not.null <- sapply(res,function(x){!is.null(x)})
630      if ( 0 < length(res.not.null) && length(res.not.null) < length(res) ){
631        res <- res[res.not.null]
632      }
633      res
634    ### named list of lists, one for each object to document.
635    }
636    
637    ### List of parsers to use by default with package.skeleton.dx.
638    default.parsers <-
639      c(extra.code.docs=extra.code.docs, ## TODO: cleanup!
640        sapply(forfun.parsers,forfun),
641        sapply(forall.parsers,forall),
642        edit.package.file=function(desc,...){
643          in.details <- setdiff(colnames(desc),"Description")
644          details <- paste(paste(in.details,": \\tab ",desc[,in.details],"\\cr",
645                                 sep=""),collapse="\n")
646          L <-
647            list(list(title=desc[,"Title"],
648                      description=desc[,"Description"],
649                      `tabular{ll}`=details,
650                      author=desc[,"Maintainer"]))
651          names(L) <- paste(desc[,"Package"],"-package",sep="")
652          L
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
# Line 761  Line 790 
790    ## the same line or \code{### } comments at the beginning of the    ## the same line or \code{### } comments at the beginning of the
791    ## following line.    ## following line.
792    f.n <- paste(class.name,"class",sep="-")    f.n <- paste(class.name,"class",sep="-")
793    docs <- extract.docs.fun(chunk.source,f.n)    docs <- extract.xxx.chunks(chunk.source,f.n)
794    ## also apply source parsing functions that I separated out into    ## also apply source parsing functions that I separated out into
795    ## separate functions    ## separate functions
796    docs <- combine(docs,lonely$prefixed.lines(chunk.source))    docs <- combine(docs,lonely$prefixed.lines(chunk.source))
# Line 806  Line 835 
835    old <- options(keep.source=TRUE)    old <- options(keep.source=TRUE)
836    on.exit(options(old))    on.exit(options(old))
837    exprs <- parse(text=code)    exprs <- parse(text=code)
838    for (i in exprs) eval(i, e)    for (i in exprs){
839        tryCatch(eval(i, e),error=function(e){
840          ##print(e)
841        })
842      }
843    objs <- sapply(ls(e),get,e,simplify=FALSE)    objs <- sapply(ls(e),get,e,simplify=FALSE)
844    
845    docs <- list()    docs <- list()

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

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