Move logic in () query method

Author: MKyhos

R/model.R

@@ -265,7 +265,11 @@ CmdStanModel <- R6::R6Class(
       invisible(self)
     },
     include_paths = function() {
-      private$include_paths_
+      if (length(self$exe_file()) > 0 && file.exists(self$exe_file())) {
+        return(private$include_paths_)
+      } else {
+        return(private$precompile_include_paths_)
+      }
     },
     code = function() {
       if (length(private$stan_code_) == 0) {
@@ -655,13 +659,7 @@ variables <- function() {
   if (is.null(private$variables_) && file.exists(self$stan_file())) {
     private$variables_ <- model_variables(
       stan_file = self$stan_file(),
-      include_paths = {
-        if (length(self$exe_file()) > 0 && file.exists(self$exe_file())) {
-          self$include_paths()
-        } else {
-          private$precompile_include_paths_
-        }
-      },
+      include_paths = self$include_paths(),
       allow_undefined = private$using_user_header_
     )
   }