Merge branch 'devel' of github.com:nimble-dev/nimble into devel

Author: paciorek

UserManual/src/tables/parameterizationTableLong.md

@@ -47,7 +47,7 @@ relationship to the *canonical* parameterization used in NIMBLE.
   `...shape, size)`
   `dnegbin(prob, size)`     canonical
   `dnorm(mean, sd)`         canonical
-  `dnorm(mean, tau)`        `dnorm(mean, sd = 1 / sqrt(var))`
+  `dnorm(mean, tau)`        `dnorm(mean, sd = 1 / sqrt(tau))`
   `dnorm(mean, var)`        `dnorm(mean, sd = sqrt(var))`
   `dpois(lambda)`           canonical
   `dt(mu, sigma, df)`       canonical

packages/nimble/R/BUGS_macros.R

@@ -198,6 +198,11 @@ buildMacro <- function(fun,
     if(use3pieces) {
         wrapper <- function(code, modelInfo, .env) {
             args <- as.list(code)
+            if(length(args) != 3){
+              stop(paste0("buildMacro: This macro must be used as part of an assignment.\n",
+                         "Are you missing the left-hand-side of the assignment or assignment operator (~ / <-)?"),
+                   call.=FALSE)
+            }
             args[[1]] <- args[[1]] == '~'
             names(args) <- c('stoch','LHS','RHS')
             if(unpackArgs) {

packages/nimble/tests/testthat/test-macros.R

@@ -1271,6 +1271,37 @@ test_that("message given if same parameter is generated by macros multiple times
   nimbleOptions(verbose = FALSE)
 })
 
+test_that("error when macro has use3pieces = TRUE but code is not an assignment", {
+    testMacro <- nimble:::buildMacro(
+        function(stoch, LHS, RHSarg, modelInfo, .env) {
+            ans <- substitute(
+                OP(LHS, dnorm(RHSarg, 1)),
+                list(LHS = LHS, RHSarg = RHSarg,
+                     OP = if(stoch) as.name('~') else as.name('<-'))
+            )
+            list(code = ans, modelInfo=modelInfo)
+        },
+        use3pieces = TRUE, ## default
+        unpackArgs = TRUE  ## default
+    )
+
+    # Code without LHS/assigment
+    code <- quote(testMacro(y[1]))
+
+    expect_error(
+      testMacro$process(code, modelInfo=list(), .env=environment()),
+      "This macro must be used as part of an assignment"
+    )
+
+    code <- quote(~testMacro(y[1]))
+
+    expect_error(
+      testMacro$process(code, modelInfo=list(), .env=environment()),
+      "This macro must be used as part of an assignment"
+    )
+
+})
+
 options(warn = RwarnLevel)
 nimbleOptions(verbose = nimbleVerboseSetting)