Better check for numeric values

hadley · hadley · commit cd0395de74af · 2016-02-02T08:32:55.000-06:00
diff --git a/NEWS b/NEWS
@@ -1,6 +1,8 @@
 Version 0.3.0.9000
 ------------------------------------------------------------------------------
 
+* `scale_continuous()` uses a more correct check for numeric values.
+
 * NaN is correctly recognised as a missing value by the gradient palettes
   (ggplot2#1482).
 
diff --git a/R/scale-continuous.r b/R/scale-continuous.r
@@ -35,7 +35,7 @@ cscale <- function(x, palette, na.value = NA_real_, trans = identity_trans()) {
 train_continuous <- function(new, existing = NULL) {
   if (is.null(new)) return(existing)
 
-  if (!is.numeric(new)) {
+  if (!typeof(new) %in% c("integer", "double")) {
     stop("Discrete value supplied to continuous scale",  call. = FALSE)
   }
   suppressWarnings(range(existing, new, na.rm = TRUE, finite = TRUE))

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ cscale <- function(x, palette, na.value = NA_real_, trans = identity_trans()) {`
`35`	`35`	`train_continuous <- function(new, existing = NULL) {`
`36`	`36`	`if (is.null(new)) return(existing)`
`37`	`37`
`38`		`- if (!is.numeric(new)) {`
	`38`	`+ if (!typeof(new) %in% c("integer", "double")) {`
`39`	`39`	`stop("Discrete value supplied to continuous scale", call. = FALSE)`
`40`	`40`	`}`
`41`	`41`	`suppressWarnings(range(existing, new, na.rm = TRUE, finite = TRUE))`