Added get_builtin_reader() that parses only the builtin GiNaC functions

[ginac.git] / ginac / parser / parse_context.cpp

diff --git a/ginac/parser/parse_context.cpp b/ginac/parser/parse_context.cpp
index 1b1d38f7979cc160de030c244887c11f05a9163e..2230d614913fe56fe9a7feb82d5a1070d363092a 100644 (file)
--- a/ginac/parser/parse_context.cpp
+++ b/ginac/parser/parse_context.cpp
@@ -22,26 +22,17 @@
 
 #include "parse_context.h"
 
-#include "function.h"
-
 #include <sstream>
 #include <stdexcept>
 
 namespace GiNaC {
 
-symbol
+ex
 find_or_insert_symbol(const std::string& name, symtab& syms, const bool strict)
 {
        symtab::const_iterator p = syms.find(name);
-       if (p != syms.end()) {
-               if (is_a<symbol>(p->second))
-                       return ex_to<symbol>(p->second);
-               else
-                       throw std::invalid_argument(
-                               std::string("find_or_insert_symbol: name \"")
-                               + name + "\" does not correspond to a symbol");
-       }
-
+       if (p != syms.end())
+               return p->second;
 
        if (strict)
                throw std::invalid_argument(
@@ -53,22 +44,4 @@ find_or_insert_symbol(const std::string& name, symtab& syms, const bool strict)
        return sy;
 }
 
-const prototype_table& get_default_reader(bool force_init)
-{
-       using std::make_pair;
-       static bool initialized = false;
-       static prototype_table reader;
-       if ( !initialized || force_init ) {
-               std::vector<function_options> flist = function::get_registered_functions();
-               std::vector<function_options>::iterator i = flist.begin(), end = flist.end();
-               for ( ; i != end; ++i ) {
-                       std::string name = i->get_name();
-                       unsigned narg = i->get_nparams();
-                       reader[make_pair(name, narg)] = function::find_function(name, narg);
-               }
-               initialized = true;
-       }
-       return reader;
-}
-
 } // namespace GiNaC