Skip to content
GitLab
Commit c188e1e1 authored by sebastien's avatar sebastien
Browse files

v4 parser: removed OperatorTable (no longer needed) 


git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1205 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 573227a0
Hide whitespace changes
Inline Side-by-side
parser.src/Makefile
View file @ c188e1e1
......@@ -40,7 +40,6 @@ COMMON_OBJ=\
ModelTree.o\
NumericalConstants.o\
NumericalInitialization.o\
OperatorTable.o\
Shocks.o\
SigmaeInitialization.o\
SymbolTable.o\
......
parser.src/OperatorTable.cc deleted 100644 → 0
View file @ 573227a0
#include "OperatorTable.hh"
OperatorTable::operator_map OperatorTable::operator_table;
bool OperatorTable::initialized = false;
void
OperatorTable::init()
{
if (initialized)
return;
initialized = true;
operator_table[token::COMMA].str = ",";
operator_table[token::EQUAL].str = "=";
operator_table[token::PLUS].str = "+";
operator_table[token::MINUS].str = "-";
operator_table[token::TIMES].str = "*";
operator_table[token::DIVIDE].str = "/";
operator_table[token::UMINUS].str = "-";
operator_table[token::POWER].str = "^";
operator_table[token::EXP].str = "exp";
operator_table[token::LOG].str = "log";
operator_table[token::LOG10].str = "log10";
operator_table[token::COS].str = "cos";
operator_table[token::SIN].str = "sin";
operator_table[token::TAN].str = "tan";
operator_table[token::ACOS].str = "acos";
operator_table[token::ASIN].str = "asin";
operator_table[token::ATAN].str = "atan";
operator_table[token::COSH].str = "cosh";
operator_table[token::SINH].str = "sinh";
operator_table[token::TANH].str = "tanh";
operator_table[token::ACOSH].str = "acosh";
operator_table[token::ASINH].str = "asinh";
operator_table[token::ATANH].str = "atanh";
operator_table[token::SQRT].str = "sqrt";
operator_table[token::NAME].str = "";
operator_table[token::COMMA].precedence = -1;
operator_table[token::EQUAL].precedence = 0;
operator_table[token::PLUS].precedence = 0;
operator_table[token::MINUS].precedence = 1;
operator_table[token::TIMES].precedence = 2;
operator_table[token::DIVIDE].precedence = 3;
operator_table[token::UMINUS].precedence = 4;
operator_table[token::POWER].precedence = 5;
operator_table[token::EXP].precedence =
operator_table[token::LOG].precedence =
operator_table[token::LOG10].precedence =
operator_table[token::COS].precedence =
operator_table[token::SIN].precedence =
operator_table[token::TAN].precedence =
operator_table[token::ACOS].precedence =
operator_table[token::ASIN].precedence =
operator_table[token::ATAN].precedence =
operator_table[token::COSH].precedence =
operator_table[token::SINH].precedence =
operator_table[token::TANH].precedence =
operator_table[token::ACOSH].precedence =
operator_table[token::ASINH].precedence =
operator_table[token::ATANH].precedence =
operator_table[token::SQRT].precedence =
operator_table[token::NAME].precedence = 6;
// Operator costs for M files
operator_table[token::COMMA].m_cost = 0;
operator_table[token::EQUAL].m_cost = 0;
operator_table[token::PLUS].m_cost = 90;
operator_table[token::MINUS].m_cost = 90;
operator_table[token::TIMES].m_cost = 90;
operator_table[token::DIVIDE].m_cost = 990;
operator_table[token::UMINUS].m_cost = 70;
operator_table[token::POWER].m_cost = 1160;
operator_table[token::EXP].m_cost = 160;
operator_table[token::LOG].m_cost = 300;
operator_table[token::LOG10].m_cost = 16000;
operator_table[token::COS].m_cost = 210;
operator_table[token::SIN].m_cost = 210;
operator_table[token::TAN].m_cost = 230;
operator_table[token::ACOS].m_cost = 300;
operator_table[token::ASIN].m_cost = 310;
operator_table[token::ATAN].m_cost = 140;
operator_table[token::COSH].m_cost = 210;
operator_table[token::SINH].m_cost = 240;
operator_table[token::TANH].m_cost = 190;
operator_table[token::ACOSH].m_cost = 770;
operator_table[token::ASINH].m_cost = 460;
operator_table[token::ATANH].m_cost = 350;
operator_table[token::SQRT].m_cost = 570;
operator_table[token::NAME].m_cost = 0;
// Operator costs for C files
operator_table[token::COMMA].c_cost = 0;
operator_table[token::EQUAL].c_cost = 0;
operator_table[token::PLUS].c_cost = 4;
operator_table[token::MINUS].c_cost = 4;
operator_table[token::TIMES].c_cost = 4;
operator_table[token::DIVIDE].c_cost = 15;
operator_table[token::UMINUS].c_cost = 3;
operator_table[token::POWER].c_cost = 520;
operator_table[token::EXP].c_cost = 210;
operator_table[token::LOG].c_cost = 137;
operator_table[token::LOG10].c_cost = 139;
operator_table[token::COS].c_cost = 160;
operator_table[token::SIN].c_cost = 160;
operator_table[token::TAN].c_cost = 170;
operator_table[token::ACOS].c_cost = 190;
operator_table[token::ASIN].c_cost = 180;
operator_table[token::ATAN].c_cost = 190;
operator_table[token::COSH].c_cost = 240;
operator_table[token::SINH].c_cost = 240;
operator_table[token::TANH].c_cost = 240;
operator_table[token::ACOSH].c_cost = 210;
operator_table[token::ASINH].c_cost = 220;
operator_table[token::ATANH].c_cost = 150;
operator_table[token::SQRT].c_cost = 90;
operator_table[token::NAME].c_cost = 0;
operator_table[token::COMMA].isfunction = false;
operator_table[token::EQUAL].isfunction = false;
operator_table[token::PLUS].isfunction = false;
operator_table[token::MINUS].isfunction = false;
operator_table[token::TIMES].isfunction = false;
operator_table[token::DIVIDE].isfunction = false;
operator_table[token::UMINUS].isfunction = false;
operator_table[token::POWER].isfunction = false;
operator_table[token::EXP].isfunction = true;
operator_table[token::LOG].isfunction = true;
operator_table[token::LOG10].isfunction = true;
operator_table[token::COS].isfunction = true;
operator_table[token::SIN].isfunction = true;
operator_table[token::TAN].isfunction = true;
operator_table[token::ACOS].isfunction = true;
operator_table[token::ASIN].isfunction = true;
operator_table[token::ATAN].isfunction = true;
operator_table[token::COSH].isfunction = true;
operator_table[token::SINH].isfunction = true;
operator_table[token::TANH].isfunction = true;
operator_table[token::ACOSH].isfunction = true;
operator_table[token::ASINH].isfunction = true;
operator_table[token::ATANH].isfunction = true;
operator_table[token::SQRT].isfunction = true;
operator_table[token::NAME].isfunction = true;
}
string
OperatorTable::str(int op_code)
{
init();
return operator_table[op_code].str;
}
int
OperatorTable::precedence(int op_code)
{
init();
return operator_table[op_code].precedence;
}
bool
OperatorTable::isfunction(int op_code)
{
init();
return operator_table[op_code].isfunction;
}
int
OperatorTable::cost(int op_code, int offset)
{
init();
if (offset == 0)
return operator_table[op_code].c_cost;
else
return operator_table[op_code].m_cost;
}
parser.src/include/ModelTree.hh
View file @ c188e1e1
......@@ -11,7 +11,6 @@ using namespace std;
#include "SymbolTable.hh"
#include "NumericalConstants.hh"
#include "DataTree.hh"
#include "OperatorTable.hh"
#include "BlockTriangular.hh"
#define LCC_COMPILE 0
......
parser.src/include/OperatorTable.hh deleted 100644 → 0
View file @ 573227a0
#ifndef _OPERATORTABLE_HH
#define _OPERATORTABLE_HH
using namespace std;
#include <map>
#include <string>
#include "DynareBison.hh"
//! Shortcut to access tokens defined by Bison
typedef yy::parser::token token;
//! Stores informations about operators
class OperatorTable
{
private:
//! Stores informations about a given operator
struct Operator
{
//! Operator name for both Matlab and C
string str;
//! Operator precedence
int precedence;
//! True if operator is a function
bool isfunction;
//! Time computation cost of operator in C
int c_cost;
//! Time computation cost of operator in Matlab
int m_cost;
};
//! Type of operators map indexed by code
typedef map<int, Operator> operator_map;
//! Operator table
static operator_map operator_table;
//! Has the table been initialized ?
static bool initialized;
//! Initialize the table (or does nothing if it has already be done)
static void init();
public:
//! Get operator name
static string str(int op_code);
//! Get operator precedence
static int precedence(int op_code);
//! Is operator a function ?
static bool isfunction(int op_code);
//! Get cost of operator
static int cost(int op_code, int offset);
};
#endif
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