Allow user defined functions to be parsed.

[ginac.git] / ginac / parser / default_reader.tpl

diff --git a/ginac/parser/default_reader.tpl b/ginac/parser/default_reader.tpl
index 3ae6ff832c06ec49a4a662c1d340ca34b8440069..244074fa17fb731ff49e6f448ff8f905fd114911 100644 (file)
--- a/ginac/parser/default_reader.tpl
+++ b/ginac/parser/default_reader.tpl
@@ -37,11 +37,22 @@ const prototype_table& get_default_reader()
        static bool initialized = false;
        static prototype_table reader;
        if (!initialized) {
-[+ FOR function +]
-               reader[make_pair("[+ (get "name") +]", [+ 
-                                   (if (exist? "args") (get "args") "1")
-                                +])] = [+ (get "name") +]_reader;[+
-   ENDFOR +]
+               try {
+                       for ( unsigned ser=0; ; ++ser ) {
+                               GiNaC::function f(ser);
+                               std::string name = f.get_name();
+                               for ( std::size_t nargs=0; ; ++nargs ) {
+                                       try {
+                                               function::find_function(name, nargs);
+                                               prototype proto = std::pair<std::string, std::size_t>(name, nargs);
+                                               std::pair<prototype_table::iterator, bool> ins = reader.insert(std::pair<prototype,reader_func>(proto, (reader_func)ser));
+                                               if ( ins.second ) break;
+                                       }
+                                       catch ( std::runtime_error ) { }
+                               }
+                       }
+               }
+               catch ( std::runtime_error ) { }
                initialized = true;
        }
        return reader;