From c63d08007cee954261831591769a82592c012215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 29 Oct 2021 14:08:03 +0200
Subject: [PATCH] Fix error message when using pac_expectation with
occbin_constraints
By the way, also fix the argument name (the model is not a VAR).
(cherry picked from commit 0123326123545181e1fb447eb770552907b57dae)
---
src/ParsingDriver.cc | 6 +++---
src/ParsingDriver.hh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ParsingDriver.cc b/src/ParsingDriver.cc
index af2cf849..86b066b3 100644
--- a/src/ParsingDriver.cc
+++ b/src/ParsingDriver.cc
@@ -2580,12 +2580,12 @@ ParsingDriver::add_var_expectation(const string &model_name)
}
expr_t
-ParsingDriver::add_pac_expectation(const string &var_model_name)
+ParsingDriver::add_pac_expectation(const string &model_name)
{
if (data_tree == occbin_constraints_tree.get())
- error("The 'var_expectation' operator is forbidden in 'occbin_constraints'.");
+ error("The 'pac_expectation' operator is forbidden in 'occbin_constraints'.");
- return data_tree->AddPacExpectation(var_model_name);
+ return data_tree->AddPacExpectation(model_name);
}
void
diff --git a/src/ParsingDriver.hh b/src/ParsingDriver.hh
index af0dca75..0c21db3b 100644
--- a/src/ParsingDriver.hh
+++ b/src/ParsingDriver.hh
@@ -738,7 +738,7 @@ public:
//! Writes token "VAR_EXPECTATION(model_name)" to model tree
expr_t add_var_expectation(const string &model_name);
//! Writes token "PAC_EXPECTATION(model_name, discount, growth)" to model tree
- expr_t add_pac_expectation(const string &var_model_name);
+ expr_t add_pac_expectation(const string &model_name);
//! Creates pac_model statement
void begin_pac_growth();
void begin_pac_model();
--
GitLab