From 70d7a48d445e02641da7b7841f3677ff6cadc96d Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 19 Feb 2020 22:02:45 +0100 Subject: [PATCH] preprocessor update - macro processor: allow for the definition of a variable without a value - dragonfly: add new field to `options_.parallel_info` - fix lookbehind to handle `-` sign in substitution of dates in native statements - remove support for weekly dates - dragonfly: support ProgramConfig config file option - dragonfly: support ProgramPath config file option - add undocumented `gui` option to preprocessor - occbin: support occbin tags in equation tags, add occbin_likelihood and occbin_smoother as options to estimation - make loop variables const - Combine `DynareMain.cc` and `DynareMain2.cc` --- doc/manual/source/the-model-file.rst | 4 +++- preprocessor | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/manual/source/the-model-file.rst b/doc/manual/source/the-model-file.rst index 099032aa7..84e6d878b 100644 --- a/doc/manual/source/the-model-file.rst +++ b/doc/manual/source/the-model-file.rst @@ -10995,7 +10995,8 @@ Macro directives -.. macrodir:: @#define MACRO_VARIABLE = MACRO_EXPRESSION +.. macrodir:: @#define MACRO_VARIABLE + @#define MACRO_VARIABLE = MACRO_EXPRESSION @#define MACRO_FUNCTION = MACRO_EXPRESSION |br| Defines a macro-variable or macro function. @@ -11004,6 +11005,7 @@ Macro directives :: + @#define var // Equals 1 @#define x = 5 // Real @#define y = "US" // String @#define v = [ 1, 2, 4 ] // Real array diff --git a/preprocessor b/preprocessor index 1dbbd87d3..abedb4757 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 1dbbd87d3d4a44b2762e4779ccb4173b6ae9088f +Subproject commit abedb47573317dd16089b72cb95d0abca3893f6a