Commit c50f757b authored by sebastien's avatar sebastien
Browse files

v4 parser: renamed .h files to .hh


git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1029 ac1d8469-bf42-47a9-8791-bf33cf982152
parent bc48569e
......@@ -8,8 +8,8 @@
using namespace std;
//------------------------------------------------------------------------------
#include "ComputingTasks.h"
#include "Interface.h"
#include "ComputingTasks.hh"
#include "Interface.hh"
//------------------------------------------------------------------------------
//ostringstream ComputingTasks::output;
//------------------------------------------------------------------------------
......
......@@ -15,10 +15,10 @@ using namespace std;
#include <time.h>
//------------------------------------------------------------------------------
#include "DynareBison.h"
#include "VariableTable.h"
#include "NumericalConstants.h"
#include "DataTree.h"
#include "DynareBison.hh"
#include "VariableTable.hh"
#include "NumericalConstants.hh"
#include "DataTree.hh"
//------------------------------------------------------------------------------
const int DataTree::NoOpCode = -1;
const NodeID DataTree::NullID = NULL;
......
%{
/* Declarations */
#include "DynareParser.h"
#include "DynareParser.hh"
#define yyparse tcparse
#define yylex tclex
//#define yyerror tcerror
......
......@@ -2,7 +2,7 @@
#define YY_BUF_SIZE 1000000
#include <unistd.h>
#include <string.h>
#include "DynareScanner.h"
#include "DynareScanner.hh"
#ifdef HAVE_CONFIG_H
# include "config.hh"
#endif
......
......@@ -11,10 +11,10 @@
using namespace std;
#include "DynareParser.h"
#include "DynareScanner.h"
#include "OutputFile.h"
#include "Interface.h"
#include "DynareParser.hh"
#include "DynareScanner.hh"
#include "OutputFile.hh"
#include "Interface.hh"
//------------------------------------------------------------------------------
/*! main function
\brief Main function of Dynare.
......
......@@ -4,17 +4,17 @@
\par This file implements the parser class methodes.
*/
//------------------------------------------------------------------------------
#include "ModelParameters.h"
#include "SymbolTable.h"
#include "Expression.h"
#include "NumericalInitialization.h"
#include "ModelTree.h"
#include "VariableTable.h"
#include "Shocks.h"
#include "SigmaeInitialization.h"
#include "ComputingTasks.h"
#include "TmpSymbolTable.h"
#include "DynareParser.h"
#include "ModelParameters.hh"
#include "SymbolTable.hh"
#include "Expression.hh"
#include "NumericalInitialization.hh"
#include "ModelTree.hh"
#include "VariableTable.hh"
#include "Shocks.hh"
#include "SigmaeInitialization.hh"
#include "ComputingTasks.hh"
#include "TmpSymbolTable.hh"
#include "DynareParser.hh"
string dynare::parser::file_name = "";
void dynare::parser::set_file_name(string fname)
......
......@@ -7,7 +7,7 @@
#include <stack>
using namespace std;
//------------------------------------------------------------------------------
#include "Expression.h"
#include "Expression.hh"
//------------------------------------------------------------------------------
ostringstream Expression::output;
//------------------------------------------------------------------------------
......
#include <string>
#include "Interface.h"
#include "Interface.hh"
namespace interfaces
{
......
#include <string>
#include "Interface.h"
#include "Interface.hh"
namespace interfaces
{
......
......@@ -69,11 +69,11 @@ dynare_s.exe: $(COMMON_OBJ) $(SCILAB_OBJ)
-include $(COMMON_OBJ:.o=.P) $(MATLAB_OBJ:.o=.P) $(SCILAB_OBJ:.o=.P)
DynareFlex.cc: DynareFlex.ll include/DynareScanner.h include/DynareBison.h
DynareFlex.cc: DynareFlex.ll include/DynareScanner.hh include/DynareBison.hh
flex $(FLEXFLAGS) -oDynareFlex.cc DynareFlex.ll
DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
(bison -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/DynareBison.h)
DynareBison.cc include/DynareBison.hh: DynareBison.yy include/DynareParser.hh
(bison -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/)
################################################################################
......@@ -83,7 +83,7 @@ DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
clean:
rm -f *.o *.P \
DynareBison.cc \
include/DynareBison.h \
include/DynareBison.hh \
DynareBison.output \
DynareFlex.cc \
dynare.exe \
......
......@@ -51,7 +51,7 @@ dynare_s: $(COMMON_OBJ) $(SCILAB_OBJ)
### Compile ####################################################################
################################################################################
%.o : %.cc include/DynareBison.h
%.o : %.cc
$(CPP) $(CPPFLAGS) -MD -I include -c $<
@cp $*.d $*.P; \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
......@@ -60,11 +60,11 @@ dynare_s: $(COMMON_OBJ) $(SCILAB_OBJ)
-include $(COMMON_OBJ:.o=.P) $(MATLAB_OBJ:.o=.P) $(SCILAB_OBJ:.o=.P)
DynareFlex.cc: DynareFlex.ll include/DynareScanner.h include/DynareBison.h
DynareFlex.cc: DynareFlex.ll include/DynareScanner.hh include/DynareBison.hh
flex $(FLEXFLAGS) -oDynareFlex.cc DynareFlex.ll
DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
(bison -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/DynareBison.h)
DynareBison.cc include/DynareBison.hh: DynareBison.yy include/DynareParser.hh
(bison -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/)
################################################################################
......@@ -74,7 +74,7 @@ DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
clean:
rm -f *.o *.P \
DynareBison.cc \
include/DynareBison.h \
include/DynareBison.hh \
DynareBison.output \
DynareFlex.cc \
dynare_m \
......
......@@ -5,8 +5,7 @@
*/
//------------------------------------------------------------------------------
#include <iostream>
#include "ModelParameters.h"
#include "limits.h"
#include "ModelParameters.hh"
//------------------------------------------------------------------------------
int ModelParameters::eq_nbr = 0;
int ModelParameters::exo_nbr = 0;
......
......@@ -14,12 +14,12 @@
#include <time.h>
using namespace std;
//------------------------------------------------------------------------------
#include "VariableTable.h"
#include "DynareBison.h"
#include "NumericalConstants.h"
#include "ModelTree.h"
#include "ModelParameters.h"
#include "Interface.h"
#include "VariableTable.hh"
#include "DynareBison.hh"
#include "NumericalConstants.hh"
#include "ModelTree.hh"
#include "ModelParameters.hh"
#include "Interface.hh"
//------------------------------------------------------------------------------
ostringstream ModelTree::output;
//------------------------------------------------------------------------------
......
......@@ -7,7 +7,7 @@
#include <iostream>
using namespace std;
//------------------------------------------------------------------------------
#include "NumericalConstants.h"
#include "NumericalConstants.hh"
//------------------------------------------------------------------------------
vector<string> NumericalConstants::mNumericalConstants = *(new vector<string>);
//------------------------------------------------------------------------------
......
......@@ -6,8 +6,8 @@
//------------------------------------------------------------------------------
using namespace std;
//------------------------------------------------------------------------------
#include "NumericalInitialization.h"
#include "Interface.h"
#include "NumericalInitialization.hh"
#include "Interface.hh"
//------------------------------------------------------------------------------
//ostringstream NumericalInitialization::output;
//------------------------------------------------------------------------------
......
......@@ -8,7 +8,7 @@
#include <string>
using namespace std;
//------------------------------------------------------------------------------
#include "OperatorTable.h"
#include "OperatorTable.hh"
//------------------------------------------------------------------------------
OperatorTable::OperatorTable()
{
......
......@@ -8,10 +8,10 @@
#include <sstream>
using namespace std;
//------------------------------------------------------------------------------
#include "OutputFile.h"
#include "SymbolTable.h"
#include "ModelTree.h"
#include "Interface.h"
#include "OutputFile.hh"
#include "SymbolTable.hh"
#include "ModelTree.hh"
#include "Interface.hh"
//------------------------------------------------------------------------------
OutputFile::OutputFile()
{
......
......@@ -7,9 +7,9 @@
#include <iostream>
using namespace std;
//------------------------------------------------------------------------------
#include "Shocks.h"
#include "ModelParameters.h"
#include "Interface.h"
#include "Shocks.hh"
#include "ModelParameters.hh"
#include "Interface.hh"
static int mshock_flag = 0;
static int exo_det_length = 0;
......
......@@ -8,7 +8,7 @@
using namespace std;
#include "SigmaeInitialization.h"
#include "SigmaeInitialization.hh"
//------------------------------------------------------------------------------
SigmaeInitialization::SigmaeInitialization()
{
......
......@@ -7,8 +7,8 @@
#include <iostream>
#include <algorithm>
//------------------------------------------------------------------------------
#include "SymbolTable.h"
#include "Interface.h"
#include "SymbolTable.hh"
#include "Interface.hh"
using namespace std;
//------------------------------------------------------------------------------
map<string, Symbol, less<string> > SymbolTable::symboltable;// = *(new symbolmap);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment