From 5364cdea258982bd68667afb1ec9ca3ac92ea89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 16 Mar 2010 12:17:17 +0100
Subject: [PATCH] Preprocessor: removed useless version of
 DataTree::AddExternalFunction()

---
 DataTree.cc      | 6 ------
 DataTree.hh      | 3 ---
 ExprNode.cc      | 4 ++--
 ParsingDriver.cc | 3 ++-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/DataTree.cc b/DataTree.cc
index c38d16ac..3026b029 100644
--- a/DataTree.cc
+++ b/DataTree.cc
@@ -469,12 +469,6 @@ DataTree::AddLocalVariable(int symb_id, NodeID value) throw (LocalVariableExcept
   local_variables_table[symb_id] = value;
 }
 
-NodeID
-DataTree::AddExternalFunction(const string &function_name, const vector<NodeID> &arguments)
-{
-  return AddExternalFunction(symbol_table.getID(function_name), arguments);
-}
-
 NodeID
 DataTree::AddExternalFunction(int symb_id, const vector<NodeID> &arguments)
 {
diff --git a/DataTree.hh b/DataTree.hh
index de50a52b..5e6e9f15 100644
--- a/DataTree.hh
+++ b/DataTree.hh
@@ -191,9 +191,6 @@ public:
   //! Adds a model local variable with its value
   void AddLocalVariable(int symb_id, NodeID value) throw (LocalVariableException);
   //! Adds an external function node
-  NodeID AddExternalFunction(const string &function_name, const vector<NodeID> &arguments);
-  //! Adds an external function node
-  /*! \todo Use a map to share identical nodes */
   NodeID AddExternalFunction(int symb_id, const vector<NodeID> &arguments);
   //! Adds an external function node for the first derivative of an external function
   NodeID AddFirstDerivExternalFunctionNode(int top_level_symb_id, const vector<NodeID> &arguments, int input_index);
diff --git a/ExprNode.cc b/ExprNode.cc
index ea87a50e..9a720b91 100644
--- a/ExprNode.cc
+++ b/ExprNode.cc
@@ -3588,7 +3588,7 @@ ExternalFunctionNode::normalizeEquation(int var_endo, vector<pair<int, pair<Node
       V_NodeID.push_back(V_arguments[V_arguments.size()-1].second);
     }
   if (!present)
-    return (make_pair(0, datatree.AddExternalFunction(datatree.symbol_table.getName(symb_id), V_NodeID)));
+    return (make_pair(0, datatree.AddExternalFunction(symb_id, V_NodeID)));
   else
     return (make_pair(1, (NodeID) NULL));
 }
@@ -3600,7 +3600,7 @@ ExternalFunctionNode::toStatic(DataTree &static_datatree) const
   for (vector<NodeID>::const_iterator it = arguments.begin();
        it != arguments.end(); it++)
     static_arguments.push_back((*it)->toStatic(static_datatree));
-  return static_datatree.AddExternalFunction(datatree.symbol_table.getName(symb_id), static_arguments);
+  return static_datatree.AddExternalFunction(symb_id, static_arguments);
 }
 
 int
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index 0582eba3..7d8f5d1c 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -1821,7 +1821,8 @@ ParsingDriver::add_model_var_or_external_function(string *function_name, bool in
     }
 
   //By this point, we're sure that this function exists in the External Functions Table and is not a mod var
-  nid = data_tree->AddExternalFunction(*function_name, stack_external_function_args.top());
+  int symb_id = mod_file->symbol_table.getID(*function_name);
+  nid = data_tree->AddExternalFunction(symb_id, stack_external_function_args.top());
   stack_external_function_args.pop();
   delete function_name;
   return nid;