Cleaned up some warnings and notes in R CMD check

dcdillon · dcdillon · commit 492a10bfbf85 · 2016-07-26T14:40:57.000-05:00
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,2 +1,3 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^\.travis\.yml$
diff --git a/LICENSE b/LICENSE
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -5,59 +5,3 @@ example_manually_hooked <- function() {
     .Call('RcppHoney_example_manually_hooked', PACKAGE = 'RcppHoney')
 }
 
-test_hooked_plus_scalar <- function(v1, s) {
-    .Call('RcppHoney_test_hooked_plus_scalar', PACKAGE = 'RcppHoney', v1, s)
-}
-
-test_scalar_plus_hooked <- function(s, v1) {
-    .Call('RcppHoney_test_scalar_plus_hooked', PACKAGE = 'RcppHoney', s, v1)
-}
-
-test_hooked_plus_hooked <- function(v1, v2) {
-    .Call('RcppHoney_test_hooked_plus_hooked', PACKAGE = 'RcppHoney', v1, v2)
-}
-
-test_hooked_plus_other_hooked <- function(v1, v2) {
-    .Call('RcppHoney_test_hooked_plus_other_hooked', PACKAGE = 'RcppHoney', v1, v2)
-}
-
-test_other_hooked_plus_hooked <- function(v1, v2) {
-    .Call('RcppHoney_test_other_hooked_plus_hooked', PACKAGE = 'RcppHoney', v1, v2)
-}
-
-test_operand_plus_scalar <- function(v1, v2, s) {
-    .Call('RcppHoney_test_operand_plus_scalar', PACKAGE = 'RcppHoney', v1, v2, s)
-}
-
-test_scalar_plus_operand <- function(s, v1, v2) {
-    .Call('RcppHoney_test_scalar_plus_operand', PACKAGE = 'RcppHoney', s, v1, v2)
-}
-
-test_operand_plus_hooked <- function(v1, v2, v3) {
-    .Call('RcppHoney_test_operand_plus_hooked', PACKAGE = 'RcppHoney', v1, v2, v3)
-}
-
-test_hooked_plus_operand <- function(v1, v2, v3) {
-    .Call('RcppHoney_test_hooked_plus_operand', PACKAGE = 'RcppHoney', v1, v2, v3)
-}
-
-test_operand_plus_operand <- function(s, v1, v2) {
-    .Call('RcppHoney_test_operand_plus_operand', PACKAGE = 'RcppHoney', s, v1, v2)
-}
-
-test_unary_operator_hooked <- function(v) {
-    .Call('RcppHoney_test_unary_operator_hooked', PACKAGE = 'RcppHoney', v)
-}
-
-test_unary_operator_operand <- function(v) {
-    .Call('RcppHoney_test_unary_operator_operand', PACKAGE = 'RcppHoney', v)
-}
-
-test_unary_function_hooked <- function(v) {
-    .Call('RcppHoney_test_unary_function_hooked', PACKAGE = 'RcppHoney', v)
-}
-
-test_unary_function_operand <- function(v) {
-    .Call('RcppHoney_test_unary_function_operand', PACKAGE = 'RcppHoney', v)
-}
-
diff --git a/inst/include/RcppHoney.hpp b/inst/include/RcppHoney.hpp
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <RcppCommon.h>
 #include "RcppHoneyForward.hpp"
 #include <Rcpp.h>
 #include "RcppHoney/wrap.hpp"
diff --git a/inst/include/RcppHoneyForward.hpp b/inst/include/RcppHoneyForward.hpp
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <RcppCommon.h>
 #include "RcppHoney/traits/ctype.hpp"
 #include "RcppHoney/traits/enable_if.hpp"
 #include "RcppHoney/traits/if_else.hpp"
@@ -39,7 +40,7 @@ struct const_iterator {
     typedef typename T::const_iterator type;
 };
 
-    
+
 } // namespace hooks
 
 } // namespace RcppHoney
diff --git a/inst/tests/tests.cpp b/inst/tests/tests.cpp
diff --git a/man/example_manually_hooked.Rd b/man/example_manually_hooked.Rd
@@ -0,0 +1,22 @@
+\name{example_manually_hooked}
+\alias{example_manually_hooked}
+\title{
+example_manually_hooked
+}
+\description{
+Simple demonstration of RcppHoney functionality.
+}
+\usage{
+example_manually_hooked()
+}
+\value{
+A numeric vector.
+}
+\author{
+Daniel C. Dillon
+}
+\examples{
+library(RcppHoney)
+v <- 1:5
+all.equal(example_manually_hooked(), 42 + v + v + log(v) - v - v + sqrt(v) + -v + 42)
+}
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -15,172 +15,3 @@ BEGIN_RCPP
     return __result;
 END_RCPP
 }
-// test_hooked_plus_scalar
-Rcpp::NumericVector test_hooked_plus_scalar(std::vector< int > v1, double s);
-RcppExport SEXP RcppHoney_test_hooked_plus_scalar(SEXP v1SEXP, SEXP sSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< double >::type s(sSEXP);
-    __result = Rcpp::wrap(test_hooked_plus_scalar(v1, s));
-    return __result;
-END_RCPP
-}
-// test_scalar_plus_hooked
-Rcpp::NumericVector test_scalar_plus_hooked(double s, std::vector< int > v1);
-RcppExport SEXP RcppHoney_test_scalar_plus_hooked(SEXP sSEXP, SEXP v1SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< double >::type s(sSEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    __result = Rcpp::wrap(test_scalar_plus_hooked(s, v1));
-    return __result;
-END_RCPP
-}
-// test_hooked_plus_hooked
-Rcpp::NumericVector test_hooked_plus_hooked(std::vector< int > v1, std::vector< int > v2);
-RcppExport SEXP RcppHoney_test_hooked_plus_hooked(SEXP v1SEXP, SEXP v2SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    __result = Rcpp::wrap(test_hooked_plus_hooked(v1, v2));
-    return __result;
-END_RCPP
-}
-// test_hooked_plus_other_hooked
-Rcpp::NumericVector test_hooked_plus_other_hooked(std::vector< int > v1, Rcpp::NumericVector v2);
-RcppExport SEXP RcppHoney_test_hooked_plus_other_hooked(SEXP v1SEXP, SEXP v2SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< Rcpp::NumericVector >::type v2(v2SEXP);
-    __result = Rcpp::wrap(test_hooked_plus_other_hooked(v1, v2));
-    return __result;
-END_RCPP
-}
-// test_other_hooked_plus_hooked
-Rcpp::NumericVector test_other_hooked_plus_hooked(Rcpp::NumericVector v1, std::vector< int > v2);
-RcppExport SEXP RcppHoney_test_other_hooked_plus_hooked(SEXP v1SEXP, SEXP v2SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< Rcpp::NumericVector >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    __result = Rcpp::wrap(test_other_hooked_plus_hooked(v1, v2));
-    return __result;
-END_RCPP
-}
-// test_operand_plus_scalar
-Rcpp::NumericVector test_operand_plus_scalar(std::vector< int > v1, std::vector< int > v2, double s);
-RcppExport SEXP RcppHoney_test_operand_plus_scalar(SEXP v1SEXP, SEXP v2SEXP, SEXP sSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    Rcpp::traits::input_parameter< double >::type s(sSEXP);
-    __result = Rcpp::wrap(test_operand_plus_scalar(v1, v2, s));
-    return __result;
-END_RCPP
-}
-// test_scalar_plus_operand
-Rcpp::NumericVector test_scalar_plus_operand(double s, std::vector< int > v1, std::vector< int > v2);
-RcppExport SEXP RcppHoney_test_scalar_plus_operand(SEXP sSEXP, SEXP v1SEXP, SEXP v2SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< double >::type s(sSEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    __result = Rcpp::wrap(test_scalar_plus_operand(s, v1, v2));
-    return __result;
-END_RCPP
-}
-// test_operand_plus_hooked
-Rcpp::NumericVector test_operand_plus_hooked(std::vector< int > v1, std::vector< int > v2, Rcpp::NumericVector v3);
-RcppExport SEXP RcppHoney_test_operand_plus_hooked(SEXP v1SEXP, SEXP v2SEXP, SEXP v3SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    Rcpp::traits::input_parameter< Rcpp::NumericVector >::type v3(v3SEXP);
-    __result = Rcpp::wrap(test_operand_plus_hooked(v1, v2, v3));
-    return __result;
-END_RCPP
-}
-// test_hooked_plus_operand
-Rcpp::NumericVector test_hooked_plus_operand(Rcpp::NumericVector v1, std::vector< int > v2, std::vector< int > v3);
-RcppExport SEXP RcppHoney_test_hooked_plus_operand(SEXP v1SEXP, SEXP v2SEXP, SEXP v3SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< Rcpp::NumericVector >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v3(v3SEXP);
-    __result = Rcpp::wrap(test_hooked_plus_operand(v1, v2, v3));
-    return __result;
-END_RCPP
-}
-// test_operand_plus_operand
-Rcpp::NumericVector test_operand_plus_operand(double s, std::vector< int > v1, std::vector< int > v2);
-RcppExport SEXP RcppHoney_test_operand_plus_operand(SEXP sSEXP, SEXP v1SEXP, SEXP v2SEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< double >::type s(sSEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v1(v1SEXP);
-    Rcpp::traits::input_parameter< std::vector< int > >::type v2(v2SEXP);
-    __result = Rcpp::wrap(test_operand_plus_operand(s, v1, v2));
-    return __result;
-END_RCPP
-}
-// test_unary_operator_hooked
-Rcpp::NumericVector test_unary_operator_hooked(std::vector< int > v);
-RcppExport SEXP RcppHoney_test_unary_operator_hooked(SEXP vSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v(vSEXP);
-    __result = Rcpp::wrap(test_unary_operator_hooked(v));
-    return __result;
-END_RCPP
-}
-// test_unary_operator_operand
-Rcpp::NumericVector test_unary_operator_operand(std::vector< int > v);
-RcppExport SEXP RcppHoney_test_unary_operator_operand(SEXP vSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v(vSEXP);
-    __result = Rcpp::wrap(test_unary_operator_operand(v));
-    return __result;
-END_RCPP
-}
-// test_unary_function_hooked
-Rcpp::NumericVector test_unary_function_hooked(std::vector< int > v);
-RcppExport SEXP RcppHoney_test_unary_function_hooked(SEXP vSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v(vSEXP);
-    __result = Rcpp::wrap(test_unary_function_hooked(v));
-    return __result;
-END_RCPP
-}
-// test_unary_function_operand
-Rcpp::NumericVector test_unary_function_operand(std::vector< int > v);
-RcppExport SEXP RcppHoney_test_unary_function_operand(SEXP vSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
-    Rcpp::traits::input_parameter< std::vector< int > >::type v(vSEXP);
-    __result = Rcpp::wrap(test_unary_function_operand(v));
-    return __result;
-END_RCPP
-}
diff --git a/src/examples.cpp b/src/examples.cpp
@@ -1,4 +1,3 @@
-#include <Rcpp.h>
 #include <RcppHoneyForward.hpp>
 #include <vector>
 
@@ -58,6 +57,6 @@ Rcpp::NumericVector example_manually_hooked() {
     // now do some weird operations incorporating both std::vector and std::list and some
     // RcppHoney functions and return it.
     RcppHoney::NumericVector retval
-        =  l + v + RcppHoney::log(v) - v - l + RcppHoney::sqrt(v) + -v2;
+        =  42 + l + v + RcppHoney::log(v) - v - l + RcppHoney::sqrt(v) + -v2 + 42;
     return retval;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`^.*\.Rproj$`
`2`	`2`	`^\.Rproj\.user$`
	`3`	`+^\.travis\.yml$`