Parser: handle abbreviations as advertized in the manual.

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

diff --git a/ginac/parser/parse_context.cpp b/ginac/parser/parse_context.cpp
index 5c442023afa0bbaa3f59edcd456f0a9075cb0950..88b0b30ec9b298cce1652e03318b3bd2ad2590aa 100644 (file)
--- a/ginac/parser/parse_context.cpp
+++ b/ginac/parser/parse_context.cpp
@@ -3,7 +3,7 @@
  *  Implementation of the parser context. */
 
 /*
- *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,24 +22,19 @@
 
 #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(
@@ -51,4 +46,22 @@ 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