diff --git a/parser.src/DataTree.cc b/parser.src/DataTree.cc
index f8a340a75afb657f0dbabb2dbfd7fe6536e8b993..e903afb2b855da716417dc91ab90ab6daf045428 100644
--- a/parser.src/DataTree.cc
+++ b/parser.src/DataTree.cc
@@ -376,6 +376,12 @@ DataTree::AddEqual(NodeID iArg1, NodeID iArg2)
void
DataTree::AddLocalParameter(const string &name, NodeID value) throw (LocalParameterException)
{
+ if (!symbol_table.Exist(name))
+ {
+ cerr << "Unknown symbol: " << name << endl;
+ exit(-1);
+ }
+
int id = symbol_table.getID(name);
// Throw an exception if symbol already declared
@@ -389,5 +395,19 @@ DataTree::AddLocalParameter(const string &name, NodeID value) throw (LocalParame
NodeID
DataTree::AddUnknownFunction(const string &function_name, const vector<NodeID> &arguments)
{
- return new UnknownFunctionNode(*this, function_name, arguments);
+ if (!symbol_table.Exist(function_name))
+ {
+ cerr << "Unknown symbol: " << function_name << endl;
+ exit(-1);
+ }
+
+ if (symbol_table.getType(function_name) != eUnknownFunction)
+ {
+ cerr << "Symbol " << function_name << " is not a function name!";
+ exit(-1);
+ }
+
+ int id = symbol_table.getID(function_name);
+
+ return new UnknownFunctionNode(*this, id, arguments);
}
diff --git a/parser.src/ExprNode.cc b/parser.src/ExprNode.cc
index 5bb6df36da8bbab3d88b38ddf3f654dc2bb8d078..5e4dff284671b765adba5dd067a75d6ce3db9b81 100644
--- a/parser.src/ExprNode.cc
+++ b/parser.src/ExprNode.cc
@@ -195,6 +195,9 @@ VariableNode::VariableNode(DataTree &datatree_arg, int symb_id_arg, Type type_ar
case eModFileLocalVariable:
// Such a variable is never derived
break;
+ case eUnknownFunction:
+ cerr << "Attempt to construct a VariableNode with an unknown function name" << endl;
+ exit(-1);
}
}
@@ -218,6 +221,9 @@ VariableNode::computeDerivative(int varID)
case eModFileLocalVariable:
cerr << "ModFileLocalVariable is not derivable" << endl;
exit(-1);
+ case eUnknownFunction:
+ cerr << "Impossible case!" << endl;
+ exit(-1);
}
cerr << "Impossible case!" << endl;
exit(-1);
@@ -358,6 +364,9 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
case eRecursiveVariable:
cerr << "Recursive variable not implemented" << endl;
exit(-1);
+ case eUnknownFunction:
+ cerr << "Impossible case" << endl;
+ exit(-1);
}
}
@@ -433,6 +442,9 @@ VariableNode::compile(ofstream &CompileCode, bool lhs_rhs, ExprNodeOutputType ou
case eModFileLocalVariable:
cerr << "VariableNode::compile: unhandled variable type" << endl;
exit(-1);
+ case eUnknownFunction:
+ cerr << "Impossible case" << endl;
+ exit(-1);
}
}
/*EndNew*/
@@ -1121,9 +1133,10 @@ BinaryOpNode::eval_opcode(double v1, BinaryOpcode op_code, double v2) throw (Eva
case oDifferent:
return( v1!= v2 ? 1.0 : 0.0);
case oEqual:
- default:
throw EvalException();
}
+ cerr << "Impossible case!" << endl;
+ exit(-1);
}
double
@@ -1289,10 +1302,10 @@ BinaryOpNode::collectEndogenous(NodeID &Id)
}
UnknownFunctionNode::UnknownFunctionNode(DataTree &datatree_arg,
- const string &function_name_arg,
+ int symb_id_arg,
const vector<NodeID> &arguments_arg) :
ExprNode(datatree_arg),
- function_name(function_name_arg),
+ symb_id(symb_id_arg),
arguments(arguments_arg)
{
}
@@ -1316,7 +1329,7 @@ UnknownFunctionNode::computeTemporaryTerms(map<NodeID, int> &reference_count,
void UnknownFunctionNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
const temporary_terms_type &temporary_terms) const
{
- output << function_name << "(";
+ output << datatree.symbol_table.getNameByID(eUnknownFunction, symb_id) << "(";
for(vector<NodeID>::const_iterator it = arguments.begin();
it != arguments.end(); it++)
{
diff --git a/parser.src/ParsingDriver.cc b/parser.src/ParsingDriver.cc
index 5c3f1caab3f78118597ce89b79e25e58ba0a45c1..9085fa262cded268754c37c8433dbeb83d1c9bc2 100644
--- a/parser.src/ParsingDriver.cc
+++ b/parser.src/ParsingDriver.cc
@@ -1209,6 +1209,14 @@ ParsingDriver::add_unknown_function_arg(NodeID arg)
NodeID
ParsingDriver::add_unknown_function(string *function_name)
{
+ if (mod_file->symbol_table.Exist(*function_name))
+ {
+ if (mod_file->symbol_table.getType(*function_name) != eUnknownFunction)
+ error("Symbol " + *function_name + " is not a function name.");
+ }
+ else
+ mod_file->symbol_table.AddSymbolDeclar(*function_name, eUnknownFunction, *function_name);
+
NodeID id = data_tree->AddUnknownFunction(*function_name, unknown_function_args);
unknown_function_args.clear();
return id;
diff --git a/parser.src/SymbolTable.cc b/parser.src/SymbolTable.cc
index 4e805f824ab9af071a5ede1015e3543584c8aaaf..8c708f90e9c88e42ed83c6960f116cea06ffe4e5 100644
--- a/parser.src/SymbolTable.cc
+++ b/parser.src/SymbolTable.cc
@@ -14,7 +14,7 @@ using namespace std;
SymbolTable::SymbolTable() : endo_nbr(0), exo_nbr(0), exo_det_nbr(0), parameter_nbr(0),
model_local_variable_nbr(0), modfile_local_variable_nbr(0),
- recur_nbr(0)
+ recur_nbr(0), unknown_function_nbr(0)
{
name_table.resize(20);
tex_name_table.resize(20);
@@ -49,6 +49,9 @@ int SymbolTable::AddSymbol(string name,Type type, string tex_name)
case eModFileLocalVariable:
symboltable[name].id = modfile_local_variable_nbr;
return modfile_local_variable_nbr++;
+ case eUnknownFunction:
+ symboltable[name].id = unknown_function_nbr;
+ return unknown_function_nbr++;
}
// should never happen
return -1;
diff --git a/parser.src/include/DataTree.hh b/parser.src/include/DataTree.hh
index e753665827e4214050f0fc00d1c0b945d6284eb5..8150b67909875fdc11adb5d541c2471c8f1ceb37 100644
--- a/parser.src/include/DataTree.hh
+++ b/parser.src/include/DataTree.hh
@@ -20,6 +20,7 @@ class DataTree
friend class VariableNode;
friend class UnaryOpNode;
friend class BinaryOpNode;
+ friend class UnknownFunctionNode;
protected:
//! A reference to the symbol table
SymbolTable &symbol_table;
diff --git a/parser.src/include/ExprNode.hh b/parser.src/include/ExprNode.hh
index 605810d66f292ea57828efc2b32e79d0341a84ad..deddcfc595567f7ae4783531ea0d57e239c59137 100644
--- a/parser.src/include/ExprNode.hh
+++ b/parser.src/include/ExprNode.hh
@@ -285,14 +285,16 @@ public:
/*EndNew*/
};
+//! Unknown function node
class UnknownFunctionNode : public ExprNode
{
private:
- const string function_name;
+ //! Symbol ID (no need to store type: it is necessary eUnknownFunction)
+ const int symb_id;
const vector<NodeID> arguments;
virtual NodeID computeDerivative(int varID);
public:
- UnknownFunctionNode(DataTree &datatree_arg, const string &function_name_arg,
+ UnknownFunctionNode(DataTree &datatree_arg, int symb_id_arg,
const vector<NodeID> &arguments_arg);
virtual void computeTemporaryTerms(map<NodeID, int> &reference_count, temporary_terms_type &temporary_terms, bool is_matlab) const;
virtual void writeOutput(ostream &output, ExprNodeOutputType output_type, const temporary_terms_type &temporary_terms) const;
diff --git a/parser.src/include/SymbolTable.hh b/parser.src/include/SymbolTable.hh
index d5abd0599bc6ce90aada26fd8453d657d41d4157..2fde7c3c9a7088a1187fa1ade37d8b106b36b76d 100644
--- a/parser.src/include/SymbolTable.hh
+++ b/parser.src/include/SymbolTable.hh
@@ -61,6 +61,8 @@ public :
int modfile_local_variable_nbr;
//! Number of declared recursive variables
int recur_nbr;
+ //! Number of unknown functions
+ int unknown_function_nbr;
/*! Pointer to error function of parser class */
void (* error) (const char* m);
/*! Adds a symbol apearing in declaration
diff --git a/parser.src/include/SymbolTableTypes.hh b/parser.src/include/SymbolTableTypes.hh
index 551cb4cfcf73b76e4ca770dc58acc9cb63c602e0..b9e7e6dbdeb0ab96c67d91c1cb31ed07d5934680 100644
--- a/parser.src/include/SymbolTableTypes.hh
+++ b/parser.src/include/SymbolTableTypes.hh
@@ -10,7 +10,8 @@ enum Type
eRecursiveVariable = 3, //!< Recursive variable (reserved for future use)
eParameter = 4, //!< Parameter
eModelLocalVariable = 10, //!< Local variable whose scope is model (pound expression)
- eModFileLocalVariable = 11 //!< Local variable whose scope is mod file (model excluded)
+ eModFileLocalVariable = 11, //!< Local variable whose scope is mod file (model excluded)
+ eUnknownFunction = 12 //!< Function unknown to the preprocessor
};
struct Symbol