stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
time-shift
sebastien 2008-04-14 09:17:15 +00:00
parent 6b6598914f
commit fcc7233a37
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
preprocessor/DynareBison.yy
View File

@ -673,7 +673,11 @@ symbol_list : symbol_list NAME
; ;
symbol_list_ext : symbol_list 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 signed_integer : PLUS INT_NUMBER

9
preprocessor/NumericalInitialization.cc
View File

@ -153,17 +153,18 @@ HistValStatement::writeOutput(ostream &output, const string &basename) const
} }
} }
InitvalFileStatement::InitvalFileStatement(const string* const filename_arg): InitvalFileStatement::InitvalFileStatement(const string &filename_arg) :
filename(*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 output << interfaces::comment() << endl
<< interfaces::comment() << "INITVAL_FILE statement" << endl << interfaces::comment() << "INITVAL_FILE statement" << endl
<< interfaces::comment() << endl << interfaces::comment() << endl
<< "options_.intival_file = 1;" << endl; << "options_.initval_file = 1;" << endl;
output << "initvalf('" << filename << "');" << endl; output << "initvalf('" << filename << "');" << endl;
} }

2
preprocessor/ParsingDriver.cc
View File

@ -307,7 +307,7 @@ ParsingDriver::init_val(string *name, NodeID rhs)
void void
ParsingDriver::initval_file(string *filename) ParsingDriver::initval_file(string *filename)
{ {
mod_file->addStatement(new InitvalFileStatement(filename)); mod_file->addStatement(new InitvalFileStatement(*filename));
delete filename; delete filename;
} }

4
preprocessor/include/NumericalInitialization.hh
View File

@ -95,9 +95,9 @@ public:
class InitvalFileStatement : public Statement class InitvalFileStatement : public Statement
{ {
private: private:
string filename; const string filename;
public: public:
InitvalFileStatement(const string* const filename); InitvalFileStatement(const string &filename_arg);
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
}; };