Rev 76063 – Merged changes from trunk through 76062

luke — Tue, 05 Feb 2019 23:19:55 +0000

luke – 236 file(s) modified
Merged changes from trunk through 76062

~ /branches/R-conflicts/config.site
~ /branches/R-conflicts/configure
~ /branches/R-conflicts/configure.ac
~ /branches/R-conflicts/doc/CRAN_mirrors.csv
~ /branches/R-conflicts/doc/manual/Makefile.in
~ /branches/R-conflicts/doc/manual/Makefile.win
~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/manual/R-ints.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/etc/Makeconf.in
~ /branches/R-conflicts/m4/cxx_11.m4
~ /branches/R-conflicts/m4/libtool.m4
~ /branches/R-conflicts/m4/R.m4
~ /branches/R-conflicts/Makeconf.in
~ /branches/R-conflicts/Makefile.in
~ /branches/R-conflicts/share/texmf/bibtex/bib/RJournal.bib
~ /branches/R-conflicts/src/appl/lbfgsb.c
~ /branches/R-conflicts/src/appl/Makefile.in
~ /branches/R-conflicts/src/extra/tzone/Make.zi
~ /branches/R-conflicts/src/extra/tzone/Notes
~ /branches/R-conflicts/src/extra/tzone/zoneinfo.zip
~ /branches/R-conflicts/src/gnuwin32/cran/index.in
~ /branches/R-conflicts/src/gnuwin32/cran/Makefile
~ /branches/R-conflicts/src/gnuwin32/cran/rdevel.in
~ /branches/R-conflicts/src/gnuwin32/cran/rpatched.in
~ /branches/R-conflicts/src/gnuwin32/cran/rtest.in
~ /branches/R-conflicts/src/gnuwin32/extra.c
~ /branches/R-conflicts/src/gnuwin32/fixed/etc/Makeconf
~ /branches/R-conflicts/src/gnuwin32/fixed/h/config.h
~ /branches/R-conflicts/src/gnuwin32/front-ends/rcmdfn.c
~ /branches/R-conflicts/src/gnuwin32/MkRules.rules
~ /branches/R-conflicts/src/gnuwin32/Rdll.hide
~ /branches/R-conflicts/src/gnuwin32/run.c
~ /branches/R-conflicts/src/gnuwin32/run.h
~ /branches/R-conflicts/src/gnuwin32/sys-win32.c
~ /branches/R-conflicts/src/include/config.h.in
~ /branches/R-conflicts/src/include/Defn.h
~ /branches/R-conflicts/src/include/Rconnections.h
~ /branches/R-conflicts/src/include/Rinternals.h
~ /branches/R-conflicts/src/include/Rmodules/Rinternet.h
~ /branches/R-conflicts/src/library/base/man/Bessel.Rd
~ /branches/R-conflicts/src/library/base/man/connections.Rd
~ /branches/R-conflicts/src/library/base/man/Extract.data.frame.Rd
~ /branches/R-conflicts/src/library/base/man/format.Rd
~ /branches/R-conflicts/src/library/base/man/grep.Rd
~ /branches/R-conflicts/src/library/base/man/list.files.Rd
~ /branches/R-conflicts/src/library/base/man/LongVectors.Rd
~ /branches/R-conflicts/src/library/base/man/nchar.Rd
~ /branches/R-conflicts/src/library/base/man/rep.Rd
~ /branches/R-conflicts/src/library/base/man/system.Rd
~ /branches/R-conflicts/src/library/base/man/system2.Rd
~ /branches/R-conflicts/src/library/base/man/tapply.Rd
~ /branches/R-conflicts/src/library/base/man/tempfile.Rd
~ /branches/R-conflicts/src/library/base/man/which.Rd
~ /branches/R-conflicts/src/library/base/R/connections.R
~ /branches/R-conflicts/src/library/base/R/dataframe.R
~ /branches/R-conflicts/src/library/base/R/format.R
~ /branches/R-conflicts/src/library/base/R/ifelse.R
~ /branches/R-conflicts/src/library/base/R/library.R
~ /branches/R-conflicts/src/library/base/R/message.R
~ /branches/R-conflicts/src/library/base/R/namespace.R
~ /branches/R-conflicts/src/library/base/R/seq.R
~ /branches/R-conflicts/src/library/base/R/windows/system.R
~ /branches/R-conflicts/src/library/base/R/zzz.R
~ /branches/R-conflicts/src/library/compiler/noweb/compiler.nw
~ /branches/R-conflicts/src/library/compiler/R/cmp.R
~ /branches/R-conflicts/src/library/graphics/R/identify.R
~ /branches/R-conflicts/src/library/grDevices/man/convertColor.Rd
~ /branches/R-conflicts/src/library/grDevices/man/make.rgb.Rd
~ /branches/R-conflicts/src/library/grDevices/man/plotmath.Rd
~ /branches/R-conflicts/src/library/grDevices/man/unix/savePlot.Rd
~ /branches/R-conflicts/src/library/grDevices/man/windows/savePlot.Rd
~ /branches/R-conflicts/src/library/grDevices/R/convertColor.R
~ /branches/R-conflicts/src/library/grDevices/src/cairo/Makefile.in
+ /branches/R-conflicts/src/library/grDevices/tests/convertColor-tests.R (copied from /trunk/src/library/grDevices/tests/convertColor-tests.R@76062)
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/man/drawDetails.Rd
~ /branches/R-conflicts/src/library/grid/NAMESPACE
~ /branches/R-conflicts/src/library/grid/R/grab.R
~ /branches/R-conflicts/src/library/grid/R/unit.R
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/man/findMethods.Rd
~ /branches/R-conflicts/src/library/methods/man/languageEl.Rd
~ /branches/R-conflicts/src/library/methods/R/BasicFunsList.R
~ /branches/R-conflicts/src/library/methods/R/is.R
~ /branches/R-conflicts/src/library/methods/R/Methods.R
~ /branches/R-conflicts/src/library/methods/R/MethodsList.R
~ /branches/R-conflicts/src/library/methods/R/methodsTable.R
~ /branches/R-conflicts/src/library/methods/R/RClassUtils.R
~ /branches/R-conflicts/src/library/methods/R/RMethodUtils.R
~ /branches/R-conflicts/src/library/methods/R/zzz.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/stats/man/approxfun.Rd
~ /branches/R-conflicts/src/library/stats/man/formula.Rd
~ /branches/R-conflicts/src/library/stats/man/ls.diag.Rd
~ /branches/R-conflicts/src/library/stats/man/splinefun.Rd
~ /branches/R-conflicts/src/library/stats/NAMESPACE
~ /branches/R-conflicts/src/library/stats/R/approx.R
~ /branches/R-conflicts/src/library/stats/R/ar.R
~ /branches/R-conflicts/src/library/stats/R/lsfit.R
~ /branches/R-conflicts/src/library/stats/R/models.R
~ /branches/R-conflicts/src/library/stats/R/p.adjust.R
~ /branches/R-conflicts/src/library/stats/R/spline.R
~ /branches/R-conflicts/src/library/stats/R/splinefun.R
~ /branches/R-conflicts/src/library/stats/src/Makefile.in
~ /branches/R-conflicts/src/library/stats/src/Makefile.win
~ /branches/R-conflicts/src/library/stats/src/model.c
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tools/man/buildVignette.Rd
~ /branches/R-conflicts/src/library/tools/man/buildVignettes.Rd
~ /branches/R-conflicts/src/library/tools/NAMESPACE
~ /branches/R-conflicts/src/library/tools/R/build.R
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/dynamicHelp.R
~ /branches/R-conflicts/src/library/tools/R/index.R
~ /branches/R-conflicts/src/library/tools/R/install.R
x /branches/R-conflicts/src/library/tools/R/pdftools.R
~ /branches/R-conflicts/src/library/tools/R/QC.R
~ /branches/R-conflicts/src/library/tools/R/Rd.R
~ /branches/R-conflicts/src/library/tools/R/Rd2ex.R
~ /branches/R-conflicts/src/library/tools/R/Rd2latex.R
~ /branches/R-conflicts/src/library/tools/R/Rd2txt.R
~ /branches/R-conflicts/src/library/tools/R/RdConv2.R
~ /branches/R-conflicts/src/library/tools/R/recode.R
~ /branches/R-conflicts/src/library/tools/R/sotools.R
~ /branches/R-conflicts/src/library/tools/R/sysdata.rda
~ /branches/R-conflicts/src/library/tools/R/toHTML.R
~ /branches/R-conflicts/src/library/tools/R/urltools.R
~ /branches/R-conflicts/src/library/tools/R/utils.R
~ /branches/R-conflicts/src/library/tools/R/Vignettes.R
~ /branches/R-conflicts/src/library/utils/man/download.file.Rd
~ /branches/R-conflicts/src/library/utils/man/Sweave.Rd
~ /branches/R-conflicts/src/library/utils/man/untar.Rd
~ /branches/R-conflicts/src/library/utils/R/databrowser.R
~ /branches/R-conflicts/src/library/utils/R/help.search.R
~ /branches/R-conflicts/src/library/utils/R/packages2.R
~ /branches/R-conflicts/src/library/utils/R/unix/download.file.R
~ /branches/R-conflicts/src/library/utils/R/windows/download.file.R
~ /branches/R-conflicts/src/library/utils/R/zzz.R
~ /branches/R-conflicts/src/library/utils/src/init.c
~ /branches/R-conflicts/src/library/utils/src/stubs.c
+ /branches/R-conflicts/src/library/utils/tests/download.file.R (copied from /trunk/src/library/utils/tests/download.file.R@76062)
~ /branches/R-conflicts/src/main/character.c
~ /branches/R-conflicts/src/main/connections.c
~ /branches/R-conflicts/src/main/context.c
~ /branches/R-conflicts/src/main/deparse.c
~ /branches/R-conflicts/src/main/duplicate.c
~ /branches/R-conflicts/src/main/envir.c
~ /branches/R-conflicts/src/main/eval.c
~ /branches/R-conflicts/src/main/gram.c
~ /branches/R-conflicts/src/main/gram.y
~ /branches/R-conflicts/src/main/grep.c
~ /branches/R-conflicts/src/main/internet.c
~ /branches/R-conflicts/src/main/main.c
~ /branches/R-conflicts/src/main/Makefile.in
~ /branches/R-conflicts/src/main/memory.c
~ /branches/R-conflicts/src/main/names.c
~ /branches/R-conflicts/src/main/platform.c
~ /branches/R-conflicts/src/main/Rcomplex.h
~ /branches/R-conflicts/src/main/Rdynload.c
~ /branches/R-conflicts/src/main/summary.c
~ /branches/R-conflicts/src/main/util.c
~ /branches/R-conflicts/src/modules/internet/internet.c
~ /branches/R-conflicts/src/modules/internet/libcurl.c
~ /branches/R-conflicts/src/modules/lapack/Makefile.in
~ /branches/R-conflicts/src/modules/lapack/vecLibg95c.c
~ /branches/R-conflicts/src/modules/X11/devX11.c
~ /branches/R-conflicts/src/nmath/gamma.c
~ /branches/R-conflicts/src/nmath/lgamma.c
~ /branches/R-conflicts/src/scripts/config
~ /branches/R-conflicts/src/unix/dynload.c
x /branches/R-conflicts/src/unix/hpdlfcn.c
x /branches/R-conflicts/src/unix/hpdlfcn.h
~ /branches/R-conflicts/src/unix/Makefile.in
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime.R
~ /branches/R-conflicts/tests/datetime.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/Makefile.in
~ /branches/R-conflicts/tests/Makefile.install
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/Pkgs/exNSS4/NAMESPACE
+ /branches/R-conflicts/tests/Pkgs/exNSS4/R/zlater.R (copied from /trunk/tests/Pkgs/exNSS4/R/zlater.R@76062)
+ /branches/R-conflicts/tests/Pkgs/exSexpr/man/a.Rd (copied from /trunk/tests/Pkgs/exSexpr/man/a.Rd@76062)
~ /branches/R-conflicts/tests/Pkgs/pkgB/DESCRIPTION
~ /branches/R-conflicts/tests/Pkgs/pkgB/NAMESPACE
+ /branches/R-conflicts/tests/Pkgs/pkgC (copied from /trunk/tests/Pkgs/pkgC@76062)
~ /branches/R-conflicts/tests/Pkgs/xDir/pkg/NAMESPACE
~ /branches/R-conflicts/tests/Pkgs/xDir/pkg/R/pkgA.R
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-large.R
~ /branches/R-conflicts/tests/reg-packages.R
~ /branches/R-conflicts/tests/reg-S4.R
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1a.R
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save
~ /branches/R-conflicts/tools/config.guess
~ /branches/R-conflicts/tools/config.sub

Rev 75453 – Create branch for experimenting with search path conflict resolution.

luke — Thu, 18 Oct 2018 16:45:09 +0000

luke – 1 file(s) modified
Create branch for experimenting with search path conflict resolution.

+ /branches/R-conflicts (copied from /trunk@75452)

Rev 73732 – More use of read-only vector data pointers.

luke — Wed, 15 Nov 2017 08:46:46 +0000

luke – 3 file(s) modified
More use of read-only vector data pointers.

~ /trunk/src/main/arithmetic.c
~ /trunk/src/main/complex.c
~ /trunk/src/main/Rcomplex.h

Rev 72294 – Fix complex number multiplication in matrix product to match scalar/element-wise ...

kalibera — Wed, 01 Mar 2017 15:45:56 +0000

kalibera – 4 file(s) modified
Fix complex number multiplication in matrix product to match
scalar/element-wise complex number multplication in complex.c (the
difference was in treatment of Inf/NaN in inputs).

~ /trunk/src/main/array.c
~ /trunk/src/main/complex.c
+ /trunk/src/main/Rcomplex.h
~ /trunk/tests/reg-BLAS.R

R – /branches/R-conflicts/src/main/Rcomplex.h

Rev 76063 – Merged changes from trunk through 76062

Rev 75453 – Create branch for experimenting with search path conflict resolution.

Rev 73732 – More use of read-only vector data pointers.

Rev 72294 – Fix complex number multiplication in matrix product to match scalar/element-wise ...