From 78fdd508943694ff87700b51c676434d6b4264df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 4 Feb 2021 15:43:10 +0100
Subject: [PATCH] cherrypick.m: Octave compatibility fix
The plus sign (+) was unescaped in the regular expression, which was confusing
Octave.
By the way, also remove unneeded parenthesis groupings.
---
matlab/cherrypick.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/cherrypick.m b/matlab/cherrypick.m
index c12a1987c0..48f89098b3 100644
--- a/matlab/cherrypick.m
+++ b/matlab/cherrypick.m
@@ -17,7 +17,7 @@ function json = cherrypick(infile, outfold, eqtags, noresids, json)
% It is expected that the file infile.mod has already been run, and
% that the associated JSON output is available.
-% Copyright © 2019-2020 Dynare Team
+% Copyright © 2019-2021 Dynare Team
%
% This file is part of Dynare.
%
@@ -114,7 +114,7 @@ for i=1:length(eqtags)
if any(exogenous_variables_to_be_removed)
switch sum(exogenous_variables_to_be_removed)
case 1
- RHS = regexprep(RHS, sprintf('(\\ *)(+)(\\ *)%s', xnames{exogenous_variables_to_be_removed}), '');
+ RHS = regexprep(RHS, sprintf('\\ *\\+\\ *%s', xnames{exogenous_variables_to_be_removed}), '');
RHS = regexprep(RHS, sprintf('%s', xnames{exogenous_variables_to_be_removed}), '');
case 0
% Nothing to do.
@@ -297,4 +297,4 @@ function printlistofvariables(fid, kind, list, DynareModel, vappend)
vlist = sprintf('%s\n\t%s', vlist, list{i});
end
fprintf(fid, '%s;', vlist);
- end
\ No newline at end of file
+ end
--
GitLab