From c50f757b5d2b08a385e61ef7bf5b785a900af02b Mon Sep 17 00:00:00 2001 From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Sat, 4 Nov 2006 22:41:30 +0000 Subject: [PATCH] v4 parser: renamed .h files to .hh git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1029 ac1d8469-bf42-47a9-8791-bf33cf982152 --- parser.src/ComputingTasks.cc | 4 +-- parser.src/DataTree.cc | 8 +++--- parser.src/DynareBison.yy | 2 +- parser.src/DynareFlex.ll | 2 +- parser.src/DynareMain.cc | 8 +++--- parser.src/DynareParser.cc | 22 ++++++++-------- parser.src/Expression.cc | 2 +- parser.src/InterfaceMatlab.cc | 2 +- parser.src/InterfaceScilab.cc | 2 +- parser.src/Makefile | 8 +++--- parser.src/Makefile.linux | 10 +++---- parser.src/ModelParameters.cc | 3 +-- parser.src/ModelTree.cc | 12 ++++----- parser.src/NumericalConstants.cc | 2 +- parser.src/NumericalInitialization.cc | 4 +-- parser.src/OperatorTable.cc | 2 +- parser.src/OutputFile.cc | 8 +++--- parser.src/Shocks.cc | 6 ++--- parser.src/SigmaeInitialization.cc | 2 +- parser.src/SymbolTable.cc | 4 +-- parser.src/TmpSymbolTable.cc | 6 ++--- parser.src/VariableTable.cc | 2 +- .../{ComputingTasks.h => ComputingTasks.hh} | 8 +++--- .../include/{DataTree.h => DataTree.hh} | 14 +++++----- .../{DynareParser.h => DynareParser.hh} | 26 +++++++++---------- .../{DynareScanner.h => DynareScanner.hh} | 10 +++---- .../include/{Expression.h => Expression.hh} | 10 +++---- .../include/{Interface.h => Interface.hh} | 5 ++++ .../{ModelParameters.h => ModelParameters.hh} | 4 +-- .../include/{ModelTree.h => ModelTree.hh} | 14 +++++----- .../include/{ModelTypes.h => ModelTypes.hh} | 4 +-- ...ricalConstants.h => NumericalConstants.hh} | 4 +-- ...alization.h => NumericalInitialization.hh} | 6 ++--- parser.src/include/{Objects.h => Objects.hh} | 8 +++--- .../{OperatorTable.h => OperatorTable.hh} | 6 ++--- .../include/{OutputFile.h => OutputFile.hh} | 4 +-- parser.src/include/{Shocks.h => Shocks.hh} | 4 +-- ...itialization.h => SigmaeInitialization.hh} | 4 +-- .../include/{SymbolTable.h => SymbolTable.hh} | 8 +++--- ...SymbolTableTypes.h => SymbolTableTypes.hh} | 4 +-- .../{TmpSymbolTable.h => TmpSymbolTable.hh} | 4 +-- .../{VariableTable.h => VariableTable.hh} | 6 ++--- 42 files changed, 139 insertions(+), 135 deletions(-) rename parser.src/include/{ComputingTasks.h => ComputingTasks.hh} (93%) rename parser.src/include/{DataTree.h => DataTree.hh} (94%) rename parser.src/include/{DynareParser.h => DynareParser.hh} (96%) rename parser.src/include/{DynareScanner.h => DynareScanner.hh} (89%) rename parser.src/include/{Expression.h => Expression.hh} (91%) rename parser.src/include/{Interface.h => Interface.hh} (87%) rename parser.src/include/{ModelParameters.h => ModelParameters.hh} (93%) rename parser.src/include/{ModelTree.h => ModelTree.hh} (92%) rename parser.src/include/{ModelTypes.h => ModelTypes.hh} (95%) rename parser.src/include/{NumericalConstants.h => NumericalConstants.hh} (91%) rename parser.src/include/{NumericalInitialization.h => NumericalInitialization.hh} (94%) rename parser.src/include/{Objects.h => Objects.hh} (91%) rename parser.src/include/{OperatorTable.h => OperatorTable.hh} (93%) rename parser.src/include/{OutputFile.h => OutputFile.hh} (92%) rename parser.src/include/{Shocks.h => Shocks.hh} (94%) rename parser.src/include/{SigmaeInitialization.h => SigmaeInitialization.hh} (93%) rename parser.src/include/{SymbolTable.h => SymbolTable.hh} (94%) rename parser.src/include/{SymbolTableTypes.h => SymbolTableTypes.hh} (93%) rename parser.src/include/{TmpSymbolTable.h => TmpSymbolTable.hh} (93%) rename parser.src/include/{VariableTable.h => VariableTable.hh} (95%) diff --git a/parser.src/ComputingTasks.cc b/parser.src/ComputingTasks.cc index 87b61c2e46..37a402a345 100644 --- a/parser.src/ComputingTasks.cc +++ b/parser.src/ComputingTasks.cc @@ -8,8 +8,8 @@ using namespace std; //------------------------------------------------------------------------------ -#include "ComputingTasks.h" -#include "Interface.h" +#include "ComputingTasks.hh" +#include "Interface.hh" //------------------------------------------------------------------------------ //ostringstream ComputingTasks::output; //------------------------------------------------------------------------------ diff --git a/parser.src/DataTree.cc b/parser.src/DataTree.cc index 3f6a868be6..caae44a1d3 100644 --- a/parser.src/DataTree.cc +++ b/parser.src/DataTree.cc @@ -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; diff --git a/parser.src/DynareBison.yy b/parser.src/DynareBison.yy index 2d70a58f12..aafafcced9 100644 --- a/parser.src/DynareBison.yy +++ b/parser.src/DynareBison.yy @@ -1,6 +1,6 @@ %{ /* Declarations */ -#include "DynareParser.h" +#include "DynareParser.hh" #define yyparse tcparse #define yylex tclex //#define yyerror tcerror diff --git a/parser.src/DynareFlex.ll b/parser.src/DynareFlex.ll index d06606e9cd..80fd07a9b5 100644 --- a/parser.src/DynareFlex.ll +++ b/parser.src/DynareFlex.ll @@ -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 diff --git a/parser.src/DynareMain.cc b/parser.src/DynareMain.cc index 9111457faa..70ac2d2d57 100644 --- a/parser.src/DynareMain.cc +++ b/parser.src/DynareMain.cc @@ -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. diff --git a/parser.src/DynareParser.cc b/parser.src/DynareParser.cc index 2e96ab7016..20a57d4f9e 100644 --- a/parser.src/DynareParser.cc +++ b/parser.src/DynareParser.cc @@ -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) diff --git a/parser.src/Expression.cc b/parser.src/Expression.cc index 193ff889d0..7488baa10a 100644 --- a/parser.src/Expression.cc +++ b/parser.src/Expression.cc @@ -7,7 +7,7 @@ #include <stack> using namespace std; //------------------------------------------------------------------------------ -#include "Expression.h" +#include "Expression.hh" //------------------------------------------------------------------------------ ostringstream Expression::output; //------------------------------------------------------------------------------ diff --git a/parser.src/InterfaceMatlab.cc b/parser.src/InterfaceMatlab.cc index aa3372da65..b30875dd7f 100644 --- a/parser.src/InterfaceMatlab.cc +++ b/parser.src/InterfaceMatlab.cc @@ -1,6 +1,6 @@ #include <string> -#include "Interface.h" +#include "Interface.hh" namespace interfaces { diff --git a/parser.src/InterfaceScilab.cc b/parser.src/InterfaceScilab.cc index d6ec6c883b..ee6ce9be8e 100644 --- a/parser.src/InterfaceScilab.cc +++ b/parser.src/InterfaceScilab.cc @@ -1,6 +1,6 @@ #include <string> -#include "Interface.h" +#include "Interface.hh" namespace interfaces { diff --git a/parser.src/Makefile b/parser.src/Makefile index 206423e9b8..31d9ae7efc 100644 --- a/parser.src/Makefile +++ b/parser.src/Makefile @@ -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 \ diff --git a/parser.src/Makefile.linux b/parser.src/Makefile.linux index d1c07abae7..51c84d21f3 100644 --- a/parser.src/Makefile.linux +++ b/parser.src/Makefile.linux @@ -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 \ diff --git a/parser.src/ModelParameters.cc b/parser.src/ModelParameters.cc index 532be5e46a..963940ab13 100644 --- a/parser.src/ModelParameters.cc +++ b/parser.src/ModelParameters.cc @@ -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; diff --git a/parser.src/ModelTree.cc b/parser.src/ModelTree.cc index 56018e5f73..9126b283d1 100644 --- a/parser.src/ModelTree.cc +++ b/parser.src/ModelTree.cc @@ -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; //------------------------------------------------------------------------------ diff --git a/parser.src/NumericalConstants.cc b/parser.src/NumericalConstants.cc index 1a3d6ee764..6cfb44c709 100644 --- a/parser.src/NumericalConstants.cc +++ b/parser.src/NumericalConstants.cc @@ -7,7 +7,7 @@ #include <iostream> using namespace std; //------------------------------------------------------------------------------ -#include "NumericalConstants.h" +#include "NumericalConstants.hh" //------------------------------------------------------------------------------ vector<string> NumericalConstants::mNumericalConstants = *(new vector<string>); //------------------------------------------------------------------------------ diff --git a/parser.src/NumericalInitialization.cc b/parser.src/NumericalInitialization.cc index 22b90df3fa..a2704f0461 100644 --- a/parser.src/NumericalInitialization.cc +++ b/parser.src/NumericalInitialization.cc @@ -6,8 +6,8 @@ //------------------------------------------------------------------------------ using namespace std; //------------------------------------------------------------------------------ -#include "NumericalInitialization.h" -#include "Interface.h" +#include "NumericalInitialization.hh" +#include "Interface.hh" //------------------------------------------------------------------------------ //ostringstream NumericalInitialization::output; //------------------------------------------------------------------------------ diff --git a/parser.src/OperatorTable.cc b/parser.src/OperatorTable.cc index 005207c75c..c7c1bdd814 100644 --- a/parser.src/OperatorTable.cc +++ b/parser.src/OperatorTable.cc @@ -8,7 +8,7 @@ #include <string> using namespace std; //------------------------------------------------------------------------------ -#include "OperatorTable.h" +#include "OperatorTable.hh" //------------------------------------------------------------------------------ OperatorTable::OperatorTable() { diff --git a/parser.src/OutputFile.cc b/parser.src/OutputFile.cc index 83aee48c16..1d089d9f72 100644 --- a/parser.src/OutputFile.cc +++ b/parser.src/OutputFile.cc @@ -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() { diff --git a/parser.src/Shocks.cc b/parser.src/Shocks.cc index 2b7086fe6c..7fe8c4a821 100644 --- a/parser.src/Shocks.cc +++ b/parser.src/Shocks.cc @@ -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; diff --git a/parser.src/SigmaeInitialization.cc b/parser.src/SigmaeInitialization.cc index d242466231..c99c560512 100644 --- a/parser.src/SigmaeInitialization.cc +++ b/parser.src/SigmaeInitialization.cc @@ -8,7 +8,7 @@ using namespace std; -#include "SigmaeInitialization.h" +#include "SigmaeInitialization.hh" //------------------------------------------------------------------------------ SigmaeInitialization::SigmaeInitialization() { diff --git a/parser.src/SymbolTable.cc b/parser.src/SymbolTable.cc index df33f2b395..d9aaaaf7a8 100644 --- a/parser.src/SymbolTable.cc +++ b/parser.src/SymbolTable.cc @@ -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); diff --git a/parser.src/TmpSymbolTable.cc b/parser.src/TmpSymbolTable.cc index 44b949dce7..ebd37990e6 100644 --- a/parser.src/TmpSymbolTable.cc +++ b/parser.src/TmpSymbolTable.cc @@ -6,9 +6,9 @@ //------------------------------------------------------------------------------ using namespace std; //------------------------------------------------------------------------------ -#include "SymbolTable.h" -#include "TmpSymbolTable.h" -#include "Interface.h" +#include "SymbolTable.hh" +#include "TmpSymbolTable.hh" +#include "Interface.hh" //------------------------------------------------------------------------------ TmpSymbolTable::TmpSymbolTable() { diff --git a/parser.src/VariableTable.cc b/parser.src/VariableTable.cc index 0cba635e6c..c460eb7d2a 100644 --- a/parser.src/VariableTable.cc +++ b/parser.src/VariableTable.cc @@ -9,7 +9,7 @@ #include <algorithm> using namespace std; //------------------------------------------------------------------------------ -#include "VariableTable.h" +#include "VariableTable.hh" //------------------------------------------------------------------------------ map<varKey,int> VariableTable::mVariableTable = *(new map<varKey,int>); vector<varKey> VariableTable::mVariableIndex = *(new vector<varKey>); diff --git a/parser.src/include/ComputingTasks.h b/parser.src/include/ComputingTasks.hh similarity index 93% rename from parser.src/include/ComputingTasks.h rename to parser.src/include/ComputingTasks.hh index 8864e255cb..0b80a3c58f 100644 --- a/parser.src/include/ComputingTasks.h +++ b/parser.src/include/ComputingTasks.hh @@ -1,5 +1,5 @@ -#ifndef COMPUTINGTASKS_H -#define COMPUTINGTASKS_H +#ifndef _COMPUTINGTASKS_HH +#define _COMPUTINGTASKS_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 @@ -9,8 +9,8 @@ //------------------------------------------------------------------------------ #include <sstream> //------------------------------------------------------------------------------ -#include "TmpSymbolTable.h" -#include "SymbolTable.h" +#include "TmpSymbolTable.hh" +#include "SymbolTable.hh" //------------------------------------------------------------------------------ /*! \class EstimationParams diff --git a/parser.src/include/DataTree.h b/parser.src/include/DataTree.hh similarity index 94% rename from parser.src/include/DataTree.h rename to parser.src/include/DataTree.hh index b381960859..6bf844a3d8 100644 --- a/parser.src/include/DataTree.h +++ b/parser.src/include/DataTree.hh @@ -1,5 +1,5 @@ -#ifndef DATATREE_H -#define DATATREE_H +#ifndef _DATATREE_HH +#define _DATATREE_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -17,11 +17,11 @@ #include <map> #include <stdio.h> //------------------------------------------------------------------------------ -#include "SymbolTable.h" -#include "OperatorTable.h" -#include "NumericalConstants.h" -#include "ModelTypes.h" -#include "VariableTable.h" +#include "SymbolTable.hh" +#include "OperatorTable.hh" +#include "NumericalConstants.hh" +#include "ModelTypes.hh" +#include "VariableTable.hh" //------------------------------------------------------------------------------ typedef std::map<std::string,NodeID, std::less<std::string> > TreeMap; diff --git a/parser.src/include/DynareParser.h b/parser.src/include/DynareParser.hh similarity index 96% rename from parser.src/include/DynareParser.h rename to parser.src/include/DynareParser.hh index baa007033d..73777b998b 100644 --- a/parser.src/include/DynareParser.h +++ b/parser.src/include/DynareParser.hh @@ -1,5 +1,5 @@ -#ifndef DYNAREPARSER_H -#define DYNAREPARSER_H +#ifndef _DYNAREPARSER_HH +#define _DYNAREPARSER_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -8,17 +8,17 @@ */ //------------------------------------------------------------------------------ #include <sstream> -#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 "Objects.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 "Objects.hh" #ifndef YLMM_basic_parser #include "ylmm/basic_parser.hh" #endif diff --git a/parser.src/include/DynareScanner.h b/parser.src/include/DynareScanner.hh similarity index 89% rename from parser.src/include/DynareScanner.h rename to parser.src/include/DynareScanner.hh index eca845afd8..b5805b1e87 100644 --- a/parser.src/include/DynareScanner.h +++ b/parser.src/include/DynareScanner.hh @@ -1,5 +1,5 @@ -#ifndef DYNARESCANNER_H -#define DYNARESCANNER_H +#ifndef _DYNARESCANNER_HH +#define _DYNARESCANNER_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -10,12 +10,12 @@ #include <iostream> #include <sstream> #include <string> -#include "DynareBison.h" +#include "DynareBison.hh" #ifndef YLMM_basic_scanner #include "ylmm/basic_scanner.hh" #endif -#include "Objects.h" -#include "SymbolTable.h" +#include "Objects.hh" +#include "SymbolTable.hh" //------------------------------------------------------------------------------ /*! \namespace scanner */ diff --git a/parser.src/include/Expression.h b/parser.src/include/Expression.hh similarity index 91% rename from parser.src/include/Expression.h rename to parser.src/include/Expression.hh index 5a530450cc..e93f98ad95 100644 --- a/parser.src/include/Expression.h +++ b/parser.src/include/Expression.hh @@ -1,5 +1,5 @@ -#ifndef EXPRESSION_H -#define EXPRESSION_H +#ifndef _EXPRESSION_HH +#define _EXPRESSION_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 @@ -11,9 +11,9 @@ #include <vector> #include <sstream> //------------------------------------------------------------------------------ -#include "SymbolTable.h" -#include "OperatorTable.h" -#include "NumericalConstants.h" +#include "SymbolTable.hh" +#include "OperatorTable.hh" +#include "NumericalConstants.hh" //------------------------------------------------------------------------------ struct Token { diff --git a/parser.src/include/Interface.h b/parser.src/include/Interface.hh similarity index 87% rename from parser.src/include/Interface.h rename to parser.src/include/Interface.hh index 22d58dd27f..70f7478794 100644 --- a/parser.src/include/Interface.h +++ b/parser.src/include/Interface.hh @@ -1,3 +1,6 @@ +#ifndef _INTERFACE_HH +#define _INTERFACE_HH + namespace interfaces { std::string comment(); std::string delete_file(std::string s); @@ -8,3 +11,5 @@ namespace interfaces { std::string strvcat(std::string s1, std::string s2); std::string load_model_function_files(std::string filename); } + +#endif diff --git a/parser.src/include/ModelParameters.h b/parser.src/include/ModelParameters.hh similarity index 93% rename from parser.src/include/ModelParameters.h rename to parser.src/include/ModelParameters.hh index c98743bb27..b23efbd6e7 100644 --- a/parser.src/include/ModelParameters.h +++ b/parser.src/include/ModelParameters.hh @@ -1,5 +1,5 @@ -#ifndef MODELPARAMETERS_H -#define MODELPARAMETERS_H +#ifndef _MODELPARAMETERS_HH +#define _MODELPARAMETERS_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 diff --git a/parser.src/include/ModelTree.h b/parser.src/include/ModelTree.hh similarity index 92% rename from parser.src/include/ModelTree.h rename to parser.src/include/ModelTree.hh index 7e5b755dda..74af4352c7 100644 --- a/parser.src/include/ModelTree.h +++ b/parser.src/include/ModelTree.hh @@ -1,5 +1,5 @@ -#ifndef MODELTREE_H -#define MODELTREE_H +#ifndef _MODELTREE_HH +#define _MODELTREE_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -14,11 +14,11 @@ #include <sstream> #include <fstream> //------------------------------------------------------------------------------ -#include "SymbolTable.h" -#include "OperatorTable.h" -#include "NumericalConstants.h" -#include "ModelTypes.h" -#include "DataTree.h" +#include "SymbolTable.hh" +#include "OperatorTable.hh" +#include "NumericalConstants.hh" +#include "ModelTypes.hh" +#include "DataTree.hh" //------------------------------------------------------------------------------ /*! \class ModelTree diff --git a/parser.src/include/ModelTypes.h b/parser.src/include/ModelTypes.hh similarity index 95% rename from parser.src/include/ModelTypes.h rename to parser.src/include/ModelTypes.hh index 4b6c8cb642..b1ef8eefd6 100644 --- a/parser.src/include/ModelTypes.h +++ b/parser.src/include/ModelTypes.hh @@ -1,5 +1,5 @@ -#ifndef MODELTYPES -#define MODELTYPES +#ifndef _MODELTYPES_HH +#define _MODELTYPES_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 diff --git a/parser.src/include/NumericalConstants.h b/parser.src/include/NumericalConstants.hh similarity index 91% rename from parser.src/include/NumericalConstants.h rename to parser.src/include/NumericalConstants.hh index 210d95b667..0bc3d73565 100644 --- a/parser.src/include/NumericalConstants.h +++ b/parser.src/include/NumericalConstants.hh @@ -1,5 +1,5 @@ -#ifndef NUMERICALCONSTANTS_H -#define NUMERICALCONSTANTS_H +#ifndef _NUMERICALCONSTANTS_HH +#define _NUMERICALCONSTANTS_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 diff --git a/parser.src/include/NumericalInitialization.h b/parser.src/include/NumericalInitialization.hh similarity index 94% rename from parser.src/include/NumericalInitialization.h rename to parser.src/include/NumericalInitialization.hh index 46091485dd..c2994c9652 100644 --- a/parser.src/include/NumericalInitialization.h +++ b/parser.src/include/NumericalInitialization.hh @@ -1,5 +1,5 @@ -#ifndef NUMERICALINITIALIZATION_H -#define NUMERICALINITIALIZATION_H +#ifndef _NUMERICALINITIALIZATION_HH +#define _NUMERICALINITIALIZATION_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -11,7 +11,7 @@ #include <string> #include <sstream> //------------------------------------------------------------------------------ -#include "SymbolTable.h" +#include "SymbolTable.hh" //------------------------------------------------------------------------------ /*! \class NumericalInitialization \brief Handles numerical initialization of Endogenousous and Exogenousous variables. diff --git a/parser.src/include/Objects.h b/parser.src/include/Objects.hh similarity index 91% rename from parser.src/include/Objects.h rename to parser.src/include/Objects.hh index 3220085c27..09def808e2 100644 --- a/parser.src/include/Objects.h +++ b/parser.src/include/Objects.hh @@ -1,5 +1,5 @@ -#ifndef OBJECTS_HH -#define OBJECTS_HH +#ifndef _OBJECTS_HH +#define _OBJECTS_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -8,8 +8,8 @@ */ //------------------------------------------------------------------------------ using namespace std; -#include "SymbolTable.h" -#include "ModelTypes.h" +#include "SymbolTable.hh" +#include "ModelTypes.hh" //------------------------------------------------------------------------------ namespace dynare { diff --git a/parser.src/include/OperatorTable.h b/parser.src/include/OperatorTable.hh similarity index 93% rename from parser.src/include/OperatorTable.h rename to parser.src/include/OperatorTable.hh index f04da7ce22..c1d76b20fe 100644 --- a/parser.src/include/OperatorTable.h +++ b/parser.src/include/OperatorTable.hh @@ -1,5 +1,5 @@ -#ifndef OPERATORTABLE_H -#define OPERATORTABLE_H +#ifndef _OPERATORTABLE_HH +#define _OPERATORTABLE_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 @@ -11,7 +11,7 @@ #include <string> #include <vector> //------------------------------------------------------------------------------ -#include "DynareBison.h" +#include "DynareBison.hh" //------------------------------------------------------------------------------ /*! \class OperatorTable diff --git a/parser.src/include/OutputFile.h b/parser.src/include/OutputFile.hh similarity index 92% rename from parser.src/include/OutputFile.h rename to parser.src/include/OutputFile.hh index 37e5a85290..10ec95c4ce 100644 --- a/parser.src/include/OutputFile.h +++ b/parser.src/include/OutputFile.hh @@ -1,5 +1,5 @@ -#ifndef OUTPUTFILE -#define OUTPUTFILE +#ifndef _OUTPUTFILE_HH +#define _OUTPUTFILE_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 diff --git a/parser.src/include/Shocks.h b/parser.src/include/Shocks.hh similarity index 94% rename from parser.src/include/Shocks.h rename to parser.src/include/Shocks.hh index 4a8ca4f362..a39d184e80 100644 --- a/parser.src/include/Shocks.h +++ b/parser.src/include/Shocks.hh @@ -1,5 +1,5 @@ -#ifndef SHOCKS_H -#define SHOCKS_H +#ifndef _SHOCKS_HH +#define _SHOCKS_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 diff --git a/parser.src/include/SigmaeInitialization.h b/parser.src/include/SigmaeInitialization.hh similarity index 93% rename from parser.src/include/SigmaeInitialization.h rename to parser.src/include/SigmaeInitialization.hh index dd00827baf..03ee81541b 100644 --- a/parser.src/include/SigmaeInitialization.h +++ b/parser.src/include/SigmaeInitialization.hh @@ -1,5 +1,5 @@ -#ifndef SIGMAEINITIALIZATION_H -#define SIGMAEINITIALIZATION_H +#ifndef _SIGMAEINITIALIZATION_HH +#define _SIGMAEINITIALIZATION_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 diff --git a/parser.src/include/SymbolTable.h b/parser.src/include/SymbolTable.hh similarity index 94% rename from parser.src/include/SymbolTable.h rename to parser.src/include/SymbolTable.hh index a7ba4d3a3c..d0d3e56332 100644 --- a/parser.src/include/SymbolTable.h +++ b/parser.src/include/SymbolTable.hh @@ -1,5 +1,5 @@ -#ifndef SYMBOLTABLE_H -#define SYMBOLTABLE_H +#ifndef _SYMBOLTABLE_HH +#define _SYMBOLTABLE_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 @@ -12,8 +12,8 @@ #include <vector> #include <sstream> //------------------------------------------------------------------------------ -#include "ModelParameters.h" -#include "SymbolTableTypes.h" +#include "ModelParameters.hh" +#include "SymbolTableTypes.hh" //------------------------------------------------------------------------------ /*! \class SymbolTable diff --git a/parser.src/include/SymbolTableTypes.h b/parser.src/include/SymbolTableTypes.hh similarity index 93% rename from parser.src/include/SymbolTableTypes.h rename to parser.src/include/SymbolTableTypes.hh index 6093363b6d..97c3011fa0 100644 --- a/parser.src/include/SymbolTableTypes.h +++ b/parser.src/include/SymbolTableTypes.hh @@ -1,5 +1,5 @@ -#ifndef SYMBOLTABLETYPES_H -#define SYMBOLTABLETYPES_H +#ifndef _SYMBOLTABLETYPES_HH +#define _SYMBOLTABLETYPES_HH //------------------------------------------------------------------------------ /*! \file \version 1.0 diff --git a/parser.src/include/TmpSymbolTable.h b/parser.src/include/TmpSymbolTable.hh similarity index 93% rename from parser.src/include/TmpSymbolTable.h rename to parser.src/include/TmpSymbolTable.hh index 70b04ffa12..f892627962 100644 --- a/parser.src/include/TmpSymbolTable.h +++ b/parser.src/include/TmpSymbolTable.hh @@ -1,5 +1,5 @@ -#ifndef TMPSYMBOLTABLE_H -#define TMPSYMBOLTABLE_H +#ifndef _TMPSYMBOLTABLE_HH +#define _TMPSYMBOLTABLE_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 diff --git a/parser.src/include/VariableTable.h b/parser.src/include/VariableTable.hh similarity index 95% rename from parser.src/include/VariableTable.h rename to parser.src/include/VariableTable.hh index e08ec38438..22df45636a 100644 --- a/parser.src/include/VariableTable.h +++ b/parser.src/include/VariableTable.hh @@ -1,5 +1,5 @@ -#ifndef VARIABLETABLE_H -#define VARIABLETABLE_H +#ifndef _VARIABLETABLE_HH +#define _VARIABLETABLE_HH //------------------------------------------------------------------------------ /** \file * \version 1.0 @@ -11,7 +11,7 @@ #include <string> #include <vector> //------------------------------------------------------------------------------ -#include "SymbolTable.h" +#include "SymbolTable.hh" //------------------------------------------------------------------------------ /*! \class Variable -- GitLab