Merge pull request #775 from adrian-lison/master

Fix model$format and model$check_syntax for compiled models with include-paths

Author: andrjohns

R/model.R

@@ -784,8 +784,8 @@ check_syntax <- function(pedantic = FALSE,
   if (length(stanc_options) == 0 && !is.null(private$precompile_stanc_options_)) {
     stanc_options <- private$precompile_stanc_options_
   }
-  if (is.null(include_paths) && !is.null(private$precompile_include_paths_)) {
-    include_paths <- private$precompile_include_paths_
+  if (is.null(include_paths) && !is.null(self$include_paths())) {
+    include_paths <- self$include_paths()
   }
 
   temp_hpp_file <- tempfile(pattern = "model-", fileext = ".hpp")
@@ -922,7 +922,7 @@ format <- function(overwrite_file = FALSE,
     lower = 1, len = 1, null.ok = TRUE
   )
   stanc_options <- private$precompile_stanc_options_
-  stancflags_val <- include_paths_stanc3_args(private$precompile_include_paths_)
+  stancflags_val <- include_paths_stanc3_args(self$include_paths())
   stanc_options["auto-format"] <- TRUE
   if (!is.null(max_line_length)) {
     stanc_options["max-line-length"] <- max_line_length

tests/testthat/test-model-compile.R

@@ -406,6 +406,15 @@ test_that("check_syntax() works with include_paths", {
 
 })
 
+test_that("check_syntax() works with include_paths on compiled model", {
+  stan_program_w_include <- testing_stan_file("bernoulli_include")
+
+  mod_w_include <- cmdstan_model(stan_file = stan_program_w_include, compile=TRUE,
+                                 include_paths = test_path("resources", "stan"))
+  expect_true(mod_w_include$check_syntax())
+
+})
+
 test_that("check_syntax() works with pedantic=TRUE", {
   model_code <- "
   transformed data {
@@ -741,6 +750,28 @@ test_that("format() works with include_paths", {
   )
 })
 
+test_that("format() works with include_paths on compiled model", {
+  stan_program_w_include <- testing_stan_file("bernoulli_include")
+
+  mod_w_include <- cmdstan_model(stan_file = stan_program_w_include, compile=TRUE,
+                                 include_paths = test_path("resources", "stan"))
+  expect_output(
+    mod_w_include$format(),
+    "#include ",
+    fixed = TRUE
+  )
+  expect_output(
+    mod_w_include$format(canonicalize = list('deprecations', 'parentheses', 'braces')),
+    "#include ",
+    fixed = TRUE
+  )
+  expect_output(
+    mod_w_include$format(canonicalize = list('includes')),
+    "real divide_real_by_two",
+    fixed = TRUE
+  )
+})
+
 test_that("overwrite_file works with format()", {
   code <- "
   parameters {