Merge remote-tracking branch 'upstream/master'

Author: nathan-russell

ChangeLog

@@ -5,6 +5,8 @@
         * inst/include/Rcpp/sugar/matrix/matrix_functions.h: Idem
         * inst/unitTests/cpp/sugar.cpp: Unit tests for new functions
         * inst/unitTests/runit.sugar.R: Idem
+        * inst/unitTests/runit.dispatch.R (test.ExpressionVector): Use
+        expression rather than parse, correct typo
 
 2016-10-21  Qiang Kou  <[email protected]>
 

inst/NEWS.Rd

@@ -18,6 +18,10 @@
       \item Added new (matrix) Sugar functions \code{eye()}, 
       \code{ones()}, \code{zeros()} (PR \ghpr{566} by Nathan Russell)
     }
+    \item Changes in Rcpp unit tests
+    \itemize{
+      \item A test for expression vectors was corrected.
+    }
     \item Updated Date and Datetime vector classes:
     \itemize{
       \item The \code{DateVector} and \code{DatetimeVector} classes were renamed

inst/unitTests/runit.dispatch.R

@@ -1,7 +1,8 @@
 #!/usr/bin/env r
 # -*- mode: R; tab-width: 4; -*-
 #
-# Copyright (C) 2009 - 2014  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2016  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2016         Dirk Eddelbuettel, Romain Francois and Nathan Russell
 #
 # This file is part of Rcpp.
 #
@@ -44,8 +45,8 @@ if (.runThisTest) {
     }
 
     test.ExpressionVector <- function() {
-        x <- parse(text = "rnrom; rnrom(10); mean(1:10)")
-        checkEquals(first_el(x), x[1], msg = "RCPP_RETURN_VECTOR (numeric)")
+        x <- expression(rnorm, rnorm(10), mean(1:10))
+        checkEquals(first_el(x), x[1], msg = "RCPP_RETURN_VECTOR (expression)")
     }
 
     test.GenericVector <- function() {