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

MOD files ending with @#endif/@#endfor but no newline now work (closes #73)

time-shift
Sébastien Villemot 2010-12-06 17:59:30 +01:00
parent 2d84d8dc49
commit 33dee34214
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
preprocessor/macro/MacroDriver.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008-2009 Dynare Team * Copyright (C) 2008-2010 Dynare Team
* *
* This file is part of Dynare. * This file is part of Dynare.
* *
@ -20,6 +20,7 @@
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <sstream>
#include "MacroDriver.hh" #include "MacroDriver.hh"
@ -46,7 +47,15 @@ MacroDriver::parse(const string &f, ostream &out, bool debug, bool no_line_macro
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
lexer = new MacroFlex(&in, &out, no_line_macro); /*
Copy the file into a stringstream, and add an extra end-of-line. This is a
workaround for trac ticket #73: with this workaround, MOD files ending with
an @#endif or an @#endfor - but no newline - no longer trigger an error.
*/
stringstream file_with_endl;
file_with_endl << in.rdbuf() << endl;
lexer = new MacroFlex(&file_with_endl, &out, no_line_macro);
lexer->set_debug(debug); lexer->set_debug(debug);
Macro::parser parser(*this, out); Macro::parser parser(*this, out);