From 8fc3d7bf0509f8da947baf1c3de980bb15e82a91 Mon Sep 17 00:00:00 2001
From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Mon, 14 Apr 2008 09:17:15 +0000
Subject: [PATCH] v4 preprocessor: * fixed bug in InitValFile statement (typo
in Matlab option name) * various cosmetic changes
git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1798 ac1d8469-bf42-47a9-8791-bf33cf982152
---
DynareBison.yy | 6 +++++-
NumericalInitialization.cc | 9 +++++----
ParsingDriver.cc | 2 +-
include/NumericalInitialization.hh | 4 ++--
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/DynareBison.yy b/DynareBison.yy
index ca14f440..dfc223b4 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -673,7 +673,11 @@ symbol_list : symbol_list NAME
;
symbol_list_ext : symbol_list
-| ':' {std::string* colon=new std::string(":");driver.add_in_symbol_list(colon);}
+ | ':'
+ {
+ string *colon = new string(":");
+ driver.add_in_symbol_list(colon);
+ }
;
signed_integer : PLUS INT_NUMBER
diff --git a/NumericalInitialization.cc b/NumericalInitialization.cc
index 8b0a447b..d0d38ff6 100644
--- a/NumericalInitialization.cc
+++ b/NumericalInitialization.cc
@@ -153,17 +153,18 @@ HistValStatement::writeOutput(ostream &output, const string &basename) const
}
}
-InitvalFileStatement::InitvalFileStatement(const string* const filename_arg):
- filename(*filename_arg)
+InitvalFileStatement::InitvalFileStatement(const string &filename_arg) :
+ filename(filename_arg)
{
}
-void InitvalFileStatement::writeOutput(ostream &output, const string &basename) const
+void
+InitvalFileStatement::writeOutput(ostream &output, const string &basename) const
{
output << interfaces::comment() << endl
<< interfaces::comment() << "INITVAL_FILE statement" << endl
<< interfaces::comment() << endl
- << "options_.intival_file = 1;" << endl;
+ << "options_.initval_file = 1;" << endl;
output << "initvalf('" << filename << "');" << endl;
}
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index 0766301e..b6378479 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -307,7 +307,7 @@ ParsingDriver::init_val(string *name, NodeID rhs)
void
ParsingDriver::initval_file(string *filename)
{
- mod_file->addStatement(new InitvalFileStatement(filename));
+ mod_file->addStatement(new InitvalFileStatement(*filename));
delete filename;
}
diff --git a/include/NumericalInitialization.hh b/include/NumericalInitialization.hh
index 2dad9a9b..ff9e4ed3 100644
--- a/include/NumericalInitialization.hh
+++ b/include/NumericalInitialization.hh
@@ -95,9 +95,9 @@ public:
class InitvalFileStatement : public Statement
{
private:
- string filename;
+ const string filename;
public:
- InitvalFileStatement(const string* const filename);
+ InitvalFileStatement(const string &filename_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
};
--
GitLab