Merge pull request #843 from stan-dev/fix-old-array-syntax

Compatibility fixes for cmdstan 2.33+

Author: andrjohns

R/example.R

@@ -124,7 +124,7 @@ print_example_program <-
 #' stan_program <- "
 #' data {
 #'   int<lower=0> N;
-#'   int<lower=0,upper=1> y[N];
+#'   array[N] int<lower=0,upper=1> y;
 #' }
 #' parameters {
 #'   real<lower=0,upper=1> theta;

R/fit.R

@@ -1158,7 +1158,7 @@ CmdStanFit$set("public", name = "return_codes", value = return_codes)
 #' mcmc_program <- write_stan_file(
 #'   'data {
 #'     int<lower=0> N;
-#'     int<lower=0,upper=1> y[N];
+#'     array[N] int<lower=0,upper=1> y;
 #'   }
 #'   parameters {
 #'     real<lower=0,upper=1> theta;
@@ -1169,7 +1169,7 @@ CmdStanFit$set("public", name = "return_codes", value = return_codes)
 #'     }
 #'   }
 #'   generated quantities {
-#'     int y_rep[N];
+#'     array[N] int y_rep;
 #'     profile("gq") {
 #'       y_rep = bernoulli_rng(rep_vector(theta, N));
 #'     }

R/model.R

@@ -806,7 +806,7 @@ CmdStanModel$set("public", name = "variables", value = variables)
 #' file <- write_stan_file("
 #' data {
 #'   int N;
-#'   int y[N];
+#'   array[N] int y;
 #' }
 #' parameters {
 #'   // should have <lower=0> but omitting to demonstrate pedantic mode
@@ -932,7 +932,7 @@ CmdStanModel$set("public", name = "check_syntax", value = check_syntax)
 #' file <- write_stan_file("
 #' data {
 #'   int N;
-#'   int y[N];
+#'   array[N] int y;
 #' }
 #' parameters {
 #'   real                     lambda;
@@ -1659,7 +1659,7 @@ CmdStanModel$set("public", name = "variational", value = variational)
 #' mcmc_program <- write_stan_file(
 #'   "data {
 #'     int<lower=0> N;
-#'     int<lower=0,upper=1> y[N];
+#'     array[N] int<lower=0,upper=1> y;
 #'   }
 #'   parameters {
 #'     real<lower=0,upper=1> theta;
@@ -1678,13 +1678,13 @@ CmdStanModel$set("public", name = "variational", value = variational)
 #' gq_program <- write_stan_file(
 #'   "data {
 #'     int<lower=0> N;
-#'     int<lower=0,upper=1> y[N];
+#'     array[N] int<lower=0,upper=1> y;
 #'   }
 #'   parameters {
 #'     real<lower=0,upper=1> theta;
 #'   }
 #'   generated quantities {
-#'     int y_rep[N] = bernoulli_rng(rep_vector(theta, N));
+#'     array[N] int y_rep = bernoulli_rng(rep_vector(theta, N));
 #'   }"
 #' )
 #'

R/utils.R

@@ -816,7 +816,20 @@ get_standalone_hpp <- function(stan_file, stancflags) {
 
 get_function_name <- function(fun_start, fun_end, model_lines) {
   fun_string <- paste(model_lines[(fun_start+1):fun_end], collapse = " ")
-  fun_name <- gsub("auto ", "", fun_string, fixed = TRUE)
+  types <- c(
+    "auto",
+    "int",
+    "double",
+    "Eigen::Matrix<(.*)>",
+    "std::vector<(.*)>"
+  )
+  pattern <- paste0(
+    # Only match if the type occurs at start of string
+    "^(\\s*)?(",
+    paste0(types, collapse="|"),
+    # Only match if type followed by a function name and opening bracket
+    ")\\s*(?=\\w*\\()")
+  fun_name <- gsub(pattern, "", fun_string, perl = TRUE)
   sub("\\(.*", "", fun_name, perl = TRUE)
 }
 
@@ -864,7 +877,9 @@ get_plain_rtn <- function(fun_start, fun_end, model_lines) {
 #     that instantiates an RNG
 prep_fun_cpp <- function(fun_start, fun_end, model_lines) {
   fun_body <- paste(model_lines[fun_start:fun_end], collapse = " ")
-  fun_body <- gsub("auto", get_plain_rtn(fun_start, fun_end, model_lines), fun_body)
+  if (cmdstan_version() < "2.33") {
+    fun_body <- gsub("auto", get_plain_rtn(fun_start, fun_end, model_lines), fun_body)
+  }
   fun_body <- gsub("// [[stan::function]]", "// [[Rcpp::export]]\n", fun_body, fixed = TRUE)
   fun_body <- gsub("std::ostream\\*\\s*pstream__\\s*=\\s*nullptr", "", fun_body)
   fun_body <- gsub("boost::ecuyer1988&\\s*base_rng__", "SEXP base_rng_ptr", fun_body)

_pkgdown.yml

@@ -72,7 +72,6 @@ articles:
       - cmdstanr-internals
       - posterior
       - r-markdown
-      - deprecations
       - profiling
       - articles-online-only/opencl