From cd443a6083ab294f21e35278a95352796480d98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 6 Jan 2021 15:50:30 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20to=20accepting=20the=20=E2=80=9Cnolog?=
 =?UTF-8?q?=E2=80=9D=20option,=20but=20do=20nothing=20about=20it?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is necessary to avoid an “unknown option” error.

Ref. dynare#1743
---
 src/DynareMain.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/DynareMain.cc b/src/DynareMain.cc
index b5ef7db7..dbdf6460 100644
--- a/src/DynareMain.cc
+++ b/src/DynareMain.cc
@@ -52,9 +52,6 @@ macroExpandModFile(const string &filename, const string &basename, const istream
 void
 usage()
 {
-  /* "nolog" is in the following output, even though it is not parsed by the
-     preprocessor but by dynare.m, so that users get the right list of options
-     if they call the preprocessor from MATLAB/Octave. */
   cerr << "Dynare usage: dynare mod_file [debug] [noclearall] [onlyclearglobals] [savemacro[=macro_file]] [onlymacro] [linemacro] [notmpterms] [nolog] [warn_uninit]"
        << " [console] [nograph] [nointeractive] [parallel[=cluster_name]] [conffile=parallel_config_path_and_filename] [parallel_slave_open_mode] [parallel_test]"
        << " [-D<variable>[=<value>]] [-I/path] [nostrict] [stochastic] [fast] [minimal_workspace] [compute_xrefs] [output=dynamic|first|second|third] [language=matlab|julia]"
@@ -212,6 +209,11 @@ main(int argc, char **argv)
         line_macro = true;
       else if (s == "notmpterms")
         no_tmp_terms = true;
+      else if (s == "nolog")
+        {
+          // Do nothing, the option is implemented at the dynare.m level.
+          // We nevertheless accept it, to avoid an “unknown option” error.
+        }
       else if (s == "nowarn")
         no_warn = true;
       else if (s == "warn_uninit")
-- 
GitLab