Merge pull request robjhyndman#322 from mitchelloharawild/master

Removed the need for forecast:::datamat
DaveGerson · May 13, 2016 · a4c29cb · a4c29cb
2 parents 81902a0 + 5bd5ca4
commit a4c29cb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/R/lm.R b/R/lm.R
@@ -32,12 +32,11 @@ tslm <- function(formula, data, subset, lambda=NULL, biasadj=FALSE, ...){
   }
 
   # Grab any variables missing from data
-  vars[[1]] <- quote(forecast:::datamat)
   if(!missing(data)){
-    data <- datamat(eval.parent(vars), data)
+    data <- datamat(do.call(datamat, as.list(vars[-1]), envir = parent.frame()),data)
   }
   else{
-    data <- eval.parent(vars)
+    data <- do.call(datamat, as.list(vars[-1]), envir = parent.frame())
   }
 
   # Check to see if data is univariate time series