added description of wildcards
[ginac.git] / ginsh / ginsh_parser.yy
index 67d836060c3fdd93988570df40001def805e090b..48d839a0490edc334f3b10bbcd29a18ba08e9927 100644 (file)
@@ -1,9 +1,10 @@
 /** @file ginsh_parser.yy
  *
  *  Input grammar definition for ginsh.
- *  This file must be processed with yacc/bison.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  This file must be processed with yacc/bison. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2001 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
 #include <unistd.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern "C" {
-#include <readline/readline.h>
-#include <readline/history.h>
-}
-
-#include <map>
-#include <string>
 #include <stdexcept>
 
-#include <ginac/ginac.h>
 #include "ginsh.h"
 
+#define YYERROR_VERBOSE 1
+
 // Original readline settings
 static int orig_completion_append_character;
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
 static char *orig_basic_word_break_characters;
+#else
+static const char *orig_basic_word_break_characters;
+#endif
 
 // Expression stack for ", "" and """
 static void push(const ex &e);
@@ -83,7 +78,12 @@ static fcn_tab fcns;
 
 static fcn_tab::const_iterator find_function(const ex &sym, int req_params);
 
-static ex lst2matrix(const ex &l);
+// Table to map help topics to help strings
+typedef multimap<string, string> help_tab;
+static help_tab help;
+
+static void print_help(const string &topic);
+static void print_help_topics(void);
 %}
 
 /* Tokens (T_LITERAL means a literal value returned by the parser, but not
@@ -91,7 +91,7 @@ static ex lst2matrix(const ex &l);
 %token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_QUOTE T_QUOTE2 T_QUOTE3
 %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ T_MATRIX_BEGIN T_MATRIX_END
 
-%token T_QUIT T_PRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE
+%token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE
 
 /* Operator precedence and associativity */
 %right '='
@@ -116,36 +116,79 @@ input     : /* empty */
        ;
 
 line   : ';'
-       | exp ';'
-               {
-                       try {
-                               cout << $1 << endl;
-                               push($1);
-                       } catch (exception &e) {
-                               cerr << e.what() << endl;
-                               YYERROR;
-                       }
+       | exp ';' {
+               try {
+                       cout << $1 << endl;
+                       push($1);
+               } catch (exception &e) {
+                       cerr << e.what() << endl;
+                       YYERROR;
                }
-       | T_PRINT '(' exp ')' ';'
-               {
-                       try {
-                               $3.printtree(cout);
-                       } catch (exception &e) {
-                               cerr << e.what() << endl;
-                               YYERROR;
-                       }
+       }
+       | exp ':' {
+               try {
+                       push($1);
+               } catch (exception &e) {
+                       std::cerr << e.what() << endl;
+                       YYERROR;
+               }
+       }
+       | T_PRINT '(' exp ')' ';' {
+               try {
+                       $3.print(print_tree(std::cout));
+               } catch (exception &e) {
+                       std::cerr << e.what() << endl;
+                       YYERROR;
+               }
+       }
+       | T_IPRINT '(' exp ')' ';' {
+               try {
+                       ex e = $3;
+                       if (!e.info(info_flags::integer))
+                               throw (std::invalid_argument("argument to iprint() must be an integer"));
+                       long i = ex_to_numeric(e).to_long();
+                       cout << i << endl;
+                       cout << "#o" << oct << i << endl;
+                       cout << "#x" << hex << i << dec << endl;
+               } catch (exception &e) {
+                       cerr << e.what() << endl;
+                       YYERROR;
                }
+       }
+       | '?' T_SYMBOL          {print_help(ex_to_symbol($2).get_name());}
+       | '?' T_TIME            {print_help("time");}
+       | '?' '?'               {print_help_topics();}
        | T_QUIT                {YYACCEPT;}
+       | T_WARRANTY {
+               cout << "This program is free software; you can redistribute it and/or modify it under\n";
+               cout << "the terms of the GNU General Public License as published by the Free Software\n";
+               cout << "Foundation; either version 2 of the License, or (at your option) any later\n";
+               cout << "version.\n";
+               cout << "This program is distributed in the hope that it will be useful, but WITHOUT\n";
+               cout << "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n";
+               cout << "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\n";
+               cout << "details.\n";
+               cout << "You should have received a copy of the GNU General Public License along with\n";
+               cout << "this program. If not, write to the Free Software Foundation, 675 Mass Ave,\n";
+               cout << "Cambridge, MA 02139, USA.\n";
+       }
        | T_XYZZY               {cout << "Nothing happens.\n";}
        | T_INVENTORY           {cout << "You're not carrying anything.\n";}
        | T_LOOK                {cout << "You're in a twisty little maze of passages, all alike.\n";}
-       | T_SCORE
-               {
-                       cout << "If you were to quit now, you would score ";
-                       cout << (syms.size() > 350 ? 350 : syms.size());
-                       cout << " out of a possible 350.\n";
-               }
+       | T_SCORE {
+               cout << "If you were to quit now, you would score ";
+               cout << (syms.size() > 350 ? 350 : syms.size());
+               cout << " out of a possible 350.\n";
+       }
+       | T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' {
+               getrusage(RUSAGE_SELF, &end_time);
+               cout << (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +
+                       (end_time.ru_stime.tv_sec - start_time.ru_stime.tv_sec) +
+                        double(end_time.ru_utime.tv_usec - start_time.ru_utime.tv_usec) / 1e6 +
+                        double(end_time.ru_stime.tv_usec - start_time.ru_stime.tv_usec) / 1e6 << 's' << endl;
+       }
        | error ';'             {yyclearin; yyerrok;}
+       | error ':'             {yyclearin; yyerrok;}
        ;
 
 exp    : T_NUMBER              {$$ = $1;}
@@ -156,27 +199,16 @@ exp       : T_NUMBER              {$$ = $1;}
        | T_QUOTE               {$$ = exstack[0];}
        | T_QUOTE2              {$$ = exstack[1];}
        | T_QUOTE3              {$$ = exstack[2];}
-       | T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')'
-               {
-                       getrusage(RUSAGE_SELF, &end_time);
-                       $$ = (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +
-                            (end_time.ru_stime.tv_sec - start_time.ru_stime.tv_sec) +
-                            double(end_time.ru_utime.tv_usec - start_time.ru_utime.tv_usec) / 1e6 +
-                            double(end_time.ru_stime.tv_usec - start_time.ru_stime.tv_usec) / 1e6;
-               }
-       | T_SYMBOL '(' exprseq ')'
-               {
-                       fcn_tab::const_iterator i = find_function($1, $3.nops());
-                       if (i->second.is_ginac) {
-                               $$ = ((fcnp2)(i->second.p))(static_cast<const exprseq &>(*($3.bp)), i->second.serial);
-                       } else {
-                               $$ = (i->second.p)(static_cast<const exprseq &>(*($3.bp)));
-                       }
+       | T_SYMBOL '(' exprseq ')' {
+               fcn_tab::const_iterator i = find_function($1, $3.nops());
+               if (i->second.is_ginac) {
+                       $$ = ((fcnp2)(i->second.p))(static_cast<const exprseq &>(*($3.bp)), i->second.serial);
+               } else {
+                       $$ = (i->second.p)(static_cast<const exprseq &>(*($3.bp)));
                }
-       | T_DIGITS '=' T_NUMBER
-               {$$ = $3; Digits = ex_to_numeric($3).to_int();}
-       | T_SYMBOL '=' exp
-               {$$ = $3; const_cast<symbol *>(&ex_to_symbol($1))->assign($3);}
+       }
+       | T_DIGITS '=' T_NUMBER {$$ = $3; Digits = ex_to_numeric($3).to_int();}
+       | T_SYMBOL '=' exp      {$$ = $3; const_cast<symbol *>(&ex_to_symbol($1))->assign($3);}
        | exp T_EQUAL exp       {$$ = $1 == $3;}
        | exp T_NOTEQ exp       {$$ = $1 != $3;}
        | exp '<' exp           {$$ = $1 < $3;}
@@ -187,14 +219,13 @@ exp       : T_NUMBER              {$$ = $1;}
        | exp '-' exp           {$$ = $1 - $3;}
        | exp '*' exp           {$$ = $1 * $3;}
        | exp '/' exp           {$$ = $1 / $3;}
-       | exp '%' exp           {$$ = $1 % $3;}
        | '-' exp %prec NEG     {$$ = -$2;}
        | '+' exp %prec NEG     {$$ = $2;}
        | exp '^' exp           {$$ = power($1, $3);}
        | exp '!'               {$$ = factorial($1);}
        | '(' exp ')'           {$$ = $2;}
        | '[' list_or_empty ']' {$$ = $2;}
-       | T_MATRIX_BEGIN matrix T_MATRIX_END    {$$ = lst2matrix($2);}
+       | T_MATRIX_BEGIN matrix T_MATRIX_END    {$$ = lst_to_matrix(ex_to_lst($2));}
        ;
 
 exprseq        : exp                   {$$ = exprseq($1);}
@@ -243,7 +274,6 @@ static void push(const ex &e)
  *  Built-in functions
  */
 
-static ex f_beta(const exprseq &e) {return gamma(e[0])*gamma(e[1])/gamma(e[0]+e[1]);}
 static ex f_denom(const exprseq &e) {return e[0].denom();}
 static ex f_eval1(const exprseq &e) {return e[0].eval();}
 static ex f_evalf1(const exprseq &e) {return e[0].evalf();}
@@ -254,11 +284,11 @@ static ex f_lsolve(const exprseq &e) {return lsolve(e[0], e[1]);}
 static ex f_nops(const exprseq &e) {return e[0].nops();}
 static ex f_normal1(const exprseq &e) {return e[0].normal();}
 static ex f_numer(const exprseq &e) {return e[0].numer();}
-static ex f_power(const exprseq &e) {return power(e[0], e[1]);}
+static ex f_pow(const exprseq &e) {return pow(e[0], e[1]);}
 static ex f_sqrt(const exprseq &e) {return sqrt(e[0]);}
 static ex f_subs2(const exprseq &e) {return e[0].subs(e[1]);}
 
-#define CHECK_ARG(num, type, fcn) if (!is_ex_of_type(e[num], type)) throw(std::invalid_argument("argument " #num " to " #fcn " must be a " #type))
+#define CHECK_ARG(num, type, fcn) if (!is_ex_of_type(e[num], type)) throw(std::invalid_argument("argument " #num " to " #fcn "() must be a " #type))
 
 static ex f_charpoly(const exprseq &e)
 {
@@ -269,15 +299,18 @@ static ex f_charpoly(const exprseq &e)
 
 static ex f_coeff(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, coeff);
        CHECK_ARG(2, numeric, coeff);
-       return e[0].coeff(ex_to_symbol(e[1]), ex_to_numeric(e[2]).to_int());
+       return e[0].coeff(e[1], ex_to_numeric(e[2]).to_int());
 }
 
 static ex f_collect(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, collect);
-       return e[0].collect(ex_to_symbol(e[1]));
+       return e[0].collect(e[1]);
+}
+
+static ex f_collect_distributed(const exprseq &e)
+{
+       return e[0].collect(e[1], true);
 }
 
 static ex f_content(const exprseq &e)
@@ -288,8 +321,7 @@ static ex f_content(const exprseq &e)
 
 static ex f_degree(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, degree);
-       return e[0].degree(ex_to_symbol(e[1]));
+       return e[0].degree(e[1]);
 }
 
 static ex f_determinant(const exprseq &e)
@@ -300,9 +332,9 @@ static ex f_determinant(const exprseq &e)
 
 static ex f_diag(const exprseq &e)
 {
-       int dim = e.nops();
+       unsigned dim = e.nops();
        matrix &m = *new matrix(dim, dim);
-       for (int i=0; i<dim; i++)
+       for (unsigned i=0; i<dim; i++)
                m.set(i, i, e.op(i));
        return m;
 }
@@ -326,7 +358,7 @@ static ex f_divide(const exprseq &e)
        if (divide(e[0], e[1], q))
                return q;
        else
-               return *new fail();
+               return fail();
 }
 
 static ex f_eval2(const exprseq &e)
@@ -343,7 +375,7 @@ static ex f_evalf2(const exprseq &e)
 
 static ex f_has(const exprseq &e)
 {
-       return e[0].has(e[1]) ? exONE() : exZERO();
+       return e[0].has(e[1]) ? ex(1) : ex(0);
 }
 
 static ex f_inverse(const exprseq &e)
@@ -355,19 +387,26 @@ static ex f_inverse(const exprseq &e)
 static ex f_is(const exprseq &e)
 {
        CHECK_ARG(0, relational, is);
-       return (bool)ex_to_relational(e[0]) ? exONE() : exZERO();
+       return (bool)ex_to_relational(e[0]) ? ex(1) : ex(0);
 }
 
 static ex f_lcoeff(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, lcoeff);
-       return e[0].lcoeff(ex_to_symbol(e[1]));
+       return e[0].lcoeff(e[1]);
 }
 
 static ex f_ldegree(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, ldegree);
-       return e[0].ldegree(ex_to_symbol(e[1]));
+       return e[0].ldegree(e[1]);
+}
+
+static ex f_match(const exprseq &e)
+{
+       lst repl_lst;
+       if (e[0].match(e[1], repl_lst))
+               return repl_lst;
+       else
+               return fail();
 }
 
 static ex f_normal2(const exprseq &e)
@@ -380,7 +419,7 @@ static ex f_op(const exprseq &e)
 {
        CHECK_ARG(1, numeric, op);
        int n = ex_to_numeric(e[1]).to_int();
-       if (n < 0 || n >= e[0].nops())
+       if (n < 0 || n >= (int)e[0].nops())
                throw(std::out_of_range("second argument to op() is out of range"));
        return e[0].op(n);
 }
@@ -409,29 +448,21 @@ static ex f_rem(const exprseq &e)
        return rem(e[0], e[1], ex_to_symbol(e[2]));
 }
 
-static ex f_series2(const exprseq &e)
+static ex f_series(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, series);
-       return e[0].series(ex_to_symbol(e[1]), exZERO());
+       CHECK_ARG(2, numeric, series);
+       return e[0].series(e[1], ex_to_numeric(e[2]).to_int());
 }
 
-static ex f_series3(const exprseq &e)
+static ex f_sqrfree1(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, series);
-       return e[0].series(ex_to_symbol(e[1]), e[2]);
+       return sqrfree(e[0]);
 }
 
-static ex f_series4(const exprseq &e)
+static ex f_sqrfree2(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, series);
-       CHECK_ARG(3, numeric, series);
-       return e[0].series(ex_to_symbol(e[1]), e[2], ex_to_numeric(e[3]).to_int());
-}
-
-static ex f_sqrfree(const exprseq &e)
-{
-       CHECK_ARG(1, symbol, sqrfree);
-       return sqrfree(e[0], ex_to_symbol(e[1]));
+       CHECK_ARG(1, lst, sqrfree);
+       return sqrfree(e[0], ex_to_lst(e[1]));
 }
 
 static ex f_subs3(const exprseq &e)
@@ -443,8 +474,7 @@ static ex f_subs3(const exprseq &e)
 
 static ex f_tcoeff(const exprseq &e)
 {
-       CHECK_ARG(1, symbol, tcoeff);
-       return e[0].tcoeff(ex_to_symbol(e[1]));
+       return e[0].tcoeff(e[1]);
 }
 
 static ex f_trace(const exprseq &e)
@@ -477,22 +507,90 @@ static ex f_dummy(const exprseq &e)
        throw(std::logic_error("dummy function called (shouldn't happen)"));
 }
 
+// Table for initializing the "fcns" map
+struct fcn_init {
+       const char *name;
+       const fcn_desc desc;
+};
+
+static const fcn_init builtin_fcns[] = {
+       {"charpoly", fcn_desc(f_charpoly, 2)},
+       {"coeff", fcn_desc(f_coeff, 3)},
+       {"collect", fcn_desc(f_collect, 2)},
+       {"collect_distributed", fcn_desc(f_collect_distributed, 2)},
+       {"content", fcn_desc(f_content, 2)},
+       {"degree", fcn_desc(f_degree, 2)},
+       {"denom", fcn_desc(f_denom, 1)},
+       {"determinant", fcn_desc(f_determinant, 1)},
+       {"diag", fcn_desc(f_diag, 0)},
+       {"diff", fcn_desc(f_diff2, 2)},
+       {"diff", fcn_desc(f_diff3, 3)},
+       {"divide", fcn_desc(f_divide, 2)},
+       {"eval", fcn_desc(f_eval1, 1)},
+       {"eval", fcn_desc(f_eval2, 2)},
+       {"evalf", fcn_desc(f_evalf1, 1)},
+       {"evalf", fcn_desc(f_evalf2, 2)},
+       {"expand", fcn_desc(f_expand, 1)},
+       {"gcd", fcn_desc(f_gcd, 2)},
+       {"has", fcn_desc(f_has, 2)},
+       {"inverse", fcn_desc(f_inverse, 1)},
+       {"is", fcn_desc(f_is, 1)},
+       {"lcm", fcn_desc(f_lcm, 2)},
+       {"lcoeff", fcn_desc(f_lcoeff, 2)},
+       {"ldegree", fcn_desc(f_ldegree, 2)},
+       {"lsolve", fcn_desc(f_lsolve, 2)},
+       {"match", fcn_desc(f_match, 2)},
+       {"nops", fcn_desc(f_nops, 1)},
+       {"normal", fcn_desc(f_normal1, 1)},
+       {"normal", fcn_desc(f_normal2, 2)},
+       {"numer", fcn_desc(f_numer, 1)},
+       {"op", fcn_desc(f_op, 2)},
+       {"pow", fcn_desc(f_pow, 2)},
+       {"prem", fcn_desc(f_prem, 3)},
+       {"primpart", fcn_desc(f_primpart, 2)},
+       {"quo", fcn_desc(f_quo, 3)},
+       {"rem", fcn_desc(f_rem, 3)},
+       {"series", fcn_desc(f_series, 3)},
+       {"sqrfree", fcn_desc(f_sqrfree1, 1)},
+       {"sqrfree", fcn_desc(f_sqrfree2, 2)},
+       {"sqrt", fcn_desc(f_sqrt, 1)},
+       {"subs", fcn_desc(f_subs2, 2)},
+       {"subs", fcn_desc(f_subs3, 3)},
+       {"tcoeff", fcn_desc(f_tcoeff, 2)},
+       {"time", fcn_desc(f_dummy, 0)},
+       {"trace", fcn_desc(f_trace, 1)},
+       {"transpose", fcn_desc(f_transpose, 1)},
+       {"unassign", fcn_desc(f_unassign, 1)},
+       {"unit", fcn_desc(f_unit, 2)},
+       {NULL, fcn_desc(f_dummy, 0)}    // End marker
+};
+
 
 /*
- *  Add all registered GiNaC functions to ginsh
+ *  Add functions to ginsh
  */
 
+// Functions from fcn_init array
+static void insert_fcns(const fcn_init *p)
+{
+       while (p->name) {
+               fcns.insert(make_pair(string(p->name), p->desc));
+               p++;
+       }
+}
+
 static ex f_ginac_function(const exprseq &es, int serial)
 {
        return function(serial, es).eval(1);
 }
 
-void ginsh_get_ginac_functions(void)
+// All registered GiNaC functions
+void GiNaC::ginsh_get_ginac_functions(void)
 {
-       vector<registered_function_info>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
+       vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
        unsigned serial = 0;
        while (i != end) {
-               fcns.insert(make_pair(i->name, fcn_desc(f_ginac_function, i->nparams, serial)));
+               fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial)));
                i++;
                serial++;
        }
@@ -505,7 +603,7 @@ void ginsh_get_ginac_functions(void)
 
 static fcn_tab::const_iterator find_function(const ex &sym, int req_params)
 {
-       const string &name = ex_to_symbol(sym).getname();
+       const string &name = ex_to_symbol(sym).get_name();
        typedef fcn_tab::const_iterator I;
        pair<I, I> b = fcns.equal_range(name);
        if (b.first == b.second)
@@ -520,29 +618,69 @@ static fcn_tab::const_iterator find_function(const ex &sym, int req_params)
 
 
 /*
- *  Convert list of lists to matrix
+ *  Insert help strings
  */
 
-static ex lst2matrix(const ex &l)
-{
-       if (!is_ex_of_type(l, lst))
-               throw(std::logic_error("internal error: argument to lst2matrix() is not a list"));
-
-       // Find number of rows and columns
-       int rows = l.nops(), cols = 0, i, j;
-       for (i=0; i<rows; i++)
-               if (l.op(i).nops() > cols)
-                       cols = l.op(i).nops();
-
-       // Allocate and fill matrix
-       matrix &m = *new matrix(rows, cols);
-       for (i=0; i<rows; i++)
-               for (j=0; j<cols; j++)
-                       if (l.op(i).nops() > j)
-                               m.set(i, j, l.op(i).op(j));
-                       else
-                               m.set(i, j, exZERO());
-       return m;
+// Normal help string
+static void insert_help(const char *topic, const char *str)
+{
+       help.insert(make_pair(string(topic), string(str)));
+}
+
+// Help string for functions, automatically generates synopsis
+static void insert_fcn_help(const char *name, const char *str)
+{
+       typedef fcn_tab::const_iterator I;
+       pair<I, I> b = fcns.equal_range(name);
+       if (b.first != b.second) {
+               string help_str = string(name) + "(";
+               for (int i=0; i<b.first->second.num_params; i++) {
+                       if (i)
+                               help_str += ", ";
+                       help_str += "expression";
+               }
+               help_str += ") - ";
+               help_str += str;
+               help.insert(make_pair(string(name), help_str));
+       }
+}
+
+
+/*
+ *  Print help to cout
+ */
+
+// Help for a given topic
+static void print_help(const string &topic)
+{
+       typedef help_tab::const_iterator I;
+       pair<I, I> b = help.equal_range(topic);
+       if (b.first == b.second)
+               cout << "no help for '" << topic << "'\n";
+       else {
+               for (I i=b.first; i!=b.second; i++)
+                       cout << i->second << endl;
+       }
+}
+
+// List of help topics
+static void print_help_topics(void)
+{
+       cout << "Available help topics:\n";
+       help_tab::const_iterator i;
+       string last_name = string("*");
+       int num = 0;
+       for (i=help.begin(); i!=help.end(); i++) {
+               // Don't print duplicates
+               if (i->first != last_name) {
+                       if (num)
+                               cout << ", ";
+                       num++;
+                       cout << i->first;
+                       last_name = i->first;
+               }
+       }
+       cout << "\nTo get help for a certain topic, type ?topic\n";
 }
 
 
@@ -577,15 +715,34 @@ static char **fcn_completion(char *text, int start, int end)
                // For shell commands, revert back to filename completion
                rl_completion_append_character = orig_completion_append_character;
                rl_basic_word_break_characters = orig_basic_word_break_characters;
-               return completion_matches(text, filename_completion_function);
+               rl_completer_word_break_characters = rl_basic_word_break_characters;
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
+               return completion_matches(text, (CPFunction *)filename_completion_function);
+#else
+               return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function);
+#endif
        } else {
                // Otherwise, complete function names
                rl_completion_append_character = '(';
                rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
-               return completion_matches(text, fcn_generator);
+               rl_completer_word_break_characters = rl_basic_word_break_characters;
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
+               return completion_matches(text, (CPFunction *)fcn_generator);
+#else
+               return rl_completion_matches(text, (CPFunction *)fcn_generator);
+#endif
        }
 }
 
+void greeting(void)
+{
+    cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
+    cout << "  __,  _______  Copyright (C) 1999-2001 Johannes Gutenberg University Mainz,\n"
+         << " (__) *       | Germany.  This is free software with ABSOLUTELY NO WARRANTY.\n"
+         << "  ._) i N a C | You are welcome to redistribute it under certain conditions.\n"
+         << "<-------------' For details type `warranty;'.\n" << endl;
+    cout << "Type ?? for a list of help topics." << endl;
+}
 
 /*
  *  Main program
@@ -594,70 +751,66 @@ static char **fcn_completion(char *text, int start, int end)
 int main(int argc, char **argv)
 {
        // Print banner in interactive mode
-       if (isatty(0)) {
-               cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " " << VERSION << ")\n";
-               cout << "Copyright (C) 1999 Johannes Gutenberg Universitaet Mainz, Germany\n";
-               cout << "This is free software, and you are welcome to redistribute it\n";
-               cout << "under certain conditions; see the file COPYING for details.\n"; 
-       }
+       if (isatty(0)) 
+               greeting();
 
-       // Init table of built-in functions
-       fcns.insert(make_pair(string("beta"), fcn_desc(f_beta, 2)));
-       fcns.insert(make_pair(string("charpoly"), fcn_desc(f_charpoly, 2)));
-       fcns.insert(make_pair(string("coeff"), fcn_desc(f_coeff, 3)));
-       fcns.insert(make_pair(string("collect"), fcn_desc(f_collect, 2)));
-       fcns.insert(make_pair(string("content"), fcn_desc(f_content, 2)));
-       fcns.insert(make_pair(string("degree"), fcn_desc(f_degree, 2)));
-       fcns.insert(make_pair(string("denom"), fcn_desc(f_denom, 1)));
-       fcns.insert(make_pair(string("determinant"), fcn_desc(f_determinant, 1)));
-       fcns.insert(make_pair(string("diag"), fcn_desc(f_diag, 0)));
-       fcns.insert(make_pair(string("diff"), fcn_desc(f_diff2, 2)));
-       fcns.insert(make_pair(string("diff"), fcn_desc(f_diff3, 3)));
-       fcns.insert(make_pair(string("divide"), fcn_desc(f_divide, 2)));
-       fcns.insert(make_pair(string("eval"), fcn_desc(f_eval1, 1)));
-       fcns.insert(make_pair(string("eval"), fcn_desc(f_eval2, 2)));
-       fcns.insert(make_pair(string("evalf"), fcn_desc(f_evalf1, 1)));
-       fcns.insert(make_pair(string("evalf"), fcn_desc(f_evalf2, 2)));
-       fcns.insert(make_pair(string("expand"), fcn_desc(f_expand, 1)));
-       fcns.insert(make_pair(string("gcd"), fcn_desc(f_gcd, 2)));
-       fcns.insert(make_pair(string("has"), fcn_desc(f_has, 2)));
-       fcns.insert(make_pair(string("inverse"), fcn_desc(f_inverse, 1)));
-       fcns.insert(make_pair(string("is"), fcn_desc(f_is, 1)));
-       fcns.insert(make_pair(string("lcm"), fcn_desc(f_lcm, 2)));
-       fcns.insert(make_pair(string("lcoeff"), fcn_desc(f_lcoeff, 2)));
-       fcns.insert(make_pair(string("ldegree"), fcn_desc(f_ldegree, 2)));
-       fcns.insert(make_pair(string("lsolve"), fcn_desc(f_lsolve, 2)));
-       fcns.insert(make_pair(string("nops"), fcn_desc(f_nops, 1)));
-       fcns.insert(make_pair(string("normal"), fcn_desc(f_normal1, 1)));
-       fcns.insert(make_pair(string("normal"), fcn_desc(f_normal2, 2)));
-       fcns.insert(make_pair(string("numer"), fcn_desc(f_numer, 1)));
-       fcns.insert(make_pair(string("op"), fcn_desc(f_op, 2)));
-       fcns.insert(make_pair(string("power"), fcn_desc(f_power, 2)));
-       fcns.insert(make_pair(string("prem"), fcn_desc(f_prem, 3)));
-       fcns.insert(make_pair(string("primpart"), fcn_desc(f_primpart, 2)));
-       fcns.insert(make_pair(string("quo"), fcn_desc(f_quo, 3)));
-       fcns.insert(make_pair(string("rem"), fcn_desc(f_rem, 3)));
-       fcns.insert(make_pair(string("series"), fcn_desc(f_series2, 2)));
-       fcns.insert(make_pair(string("series"), fcn_desc(f_series3, 3)));
-       fcns.insert(make_pair(string("series"), fcn_desc(f_series4, 4)));
-       fcns.insert(make_pair(string("sqrfree"), fcn_desc(f_sqrfree, 2)));
-       fcns.insert(make_pair(string("sqrt"), fcn_desc(f_sqrt, 1)));
-       fcns.insert(make_pair(string("subs"), fcn_desc(f_subs2, 2)));
-       fcns.insert(make_pair(string("subs"), fcn_desc(f_subs3, 3)));
-       fcns.insert(make_pair(string("tcoeff"), fcn_desc(f_tcoeff, 2)));
-       fcns.insert(make_pair(string("time"), fcn_desc(f_dummy, 0)));
-       fcns.insert(make_pair(string("trace"), fcn_desc(f_trace, 1)));
-       fcns.insert(make_pair(string("transpose"), fcn_desc(f_transpose, 1)));
-       fcns.insert(make_pair(string("unassign"), fcn_desc(f_unassign, 1)));
-       fcns.insert(make_pair(string("unit"), fcn_desc(f_unit, 2)));
+       // Init function table
+       insert_fcns(builtin_fcns);
        ginsh_get_ginac_functions();
 
+       // Init help for operators (automatically generated from man page)
+       insert_help("operators", "Operators in falling order of precedence:");
+#include "ginsh_op_help.c"
+
+       // Init help for built-in functions (automatically generated from man page)
+#include "ginsh_fcn_help.c"
+
+       // Help for GiNaC functions is added manually
+       insert_fcn_help("acos", "inverse cosine function");
+       insert_fcn_help("acosh", "inverse hyperbolic cosine function");
+       insert_fcn_help("asin", "inverse sine function");
+       insert_fcn_help("asinh", "inverse hyperbolic sine function");
+       insert_fcn_help("atan", "inverse tangent function");
+       insert_fcn_help("atan2", "inverse tangent function with two arguments");
+       insert_fcn_help("atanh", "inverse hyperbolic tangent function");
+       insert_fcn_help("beta", "Beta function");
+       insert_fcn_help("binomial", "binomial function");
+       insert_fcn_help("cos", "cosine function");
+       insert_fcn_help("cosh", "hyperbolic cosine function");
+       insert_fcn_help("exp", "exponential function");
+       insert_fcn_help("factorial", "factorial function");
+       insert_fcn_help("lgamma", "natural logarithm of Gamma function");
+       insert_fcn_help("tgamma", "Gamma function");
+       insert_fcn_help("log", "natural logarithm");
+       insert_fcn_help("psi", "psi function\npsi(x) is the digamma function, psi(n,x) the nth polygamma function");
+       insert_fcn_help("sin", "sine function");
+       insert_fcn_help("sinh", "hyperbolic sine function");
+       insert_fcn_help("tan", "tangent function");
+       insert_fcn_help("tanh", "hyperbolic tangent function");
+       insert_fcn_help("zeta", "zeta function\nzeta(x) is Riemann's zeta function, zeta(n,x) its nth derivative");
+       insert_fcn_help("Li2", "dilogarithm");
+       insert_fcn_help("Li3", "trilogarithm");
+       insert_fcn_help("Order", "order term function (for truncated power series)");
+
        // Init readline completer
        rl_readline_name = argv[0];
        rl_attempted_completion_function = (CPPFunction *)fcn_completion;
        orig_completion_append_character = rl_completion_append_character;
        orig_basic_word_break_characters = rl_basic_word_break_characters;
 
+       // Init input file list, open first file
+       num_files = argc - 1;
+       file_list = argv + 1;
+       if (num_files) {
+               yyin = fopen(*file_list, "r");
+               if (yyin == NULL) {
+                       cerr << "Can't open " << *file_list << endl;
+                       exit(1);
+               }
+               num_files--;
+               file_list++;
+       }
+
        // Parse input, catch all remaining exceptions
        int result;
 again: try {