/** @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 "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);
typedef multimap<string, string> help_tab;
static help_tab help;
+static void insert_fcn_help(const char *name, const char *str);
static void print_help(const string &topic);
static void print_help_topics(void);
-
-static ex lst2matrix(const ex &l);
%}
/* Tokens (T_LITERAL means a literal value returned by the parser, but not
of class numeric or symbol (e.g. a constant or the FAIL object)) */
%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_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
-%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 '='
try {
push($1);
} catch (exception &e) {
- cerr << e.what() << endl;
+ std::cerr << e.what() << endl;
YYERROR;
}
}
| T_PRINT '(' exp ')' ';' {
try {
- $3.printtree(cout);
+ $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).getname());}
+ | '?' 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";}
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;}
;
| 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);
+ $$ = ((fcnp2)(i->second.p))(ex_to<exprseq>($3), i->second.serial);
} else {
- $$ = (i->second.p)(static_cast<const exprseq &>(*($3.bp)));
+ $$ = (i->second.p)(ex_to<exprseq>($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);}
+ | 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;}
| 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);}
+ | '{' list_or_empty '}' {$$ = $2;}
+ | '[' matrix ']' {$$ = lst_to_matrix(ex_to<lst>($2));}
;
exprseq : exp {$$ = exprseq($1);}
- | exprseq ',' exp {exprseq es(static_cast<exprseq &>(*($1.bp))); $$ = es.append($3);}
+ | exprseq ',' exp {exprseq es(ex_to<exprseq>($1)); $$ = es.append($3);}
;
list_or_empty: /* empty */ {$$ = *new lst;}
;
list : exp {$$ = lst($1);}
- | list ',' exp {lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($3);}
+ | list ',' exp {lst l(ex_to<lst>($1)); $$ = l.append($3);}
;
-matrix : T_MATRIX_BEGIN row T_MATRIX_END {$$ = lst($2);}
- | matrix ',' T_MATRIX_BEGIN row T_MATRIX_END {lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($4);}
+matrix : '[' row ']' {$$ = lst($2);}
+ | matrix ',' '[' row ']' {lst l(ex_to<lst>($1)); $$ = l.append($4);}
;
row : exp {$$ = lst($1);}
- | row ',' exp {lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($3);}
+ | row ',' exp {lst l(ex_to<lst>($1)); $$ = l.append($3);}
;
* 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_collect(const exprseq &e) {return e[0].collect(e[1]);}
+static ex f_collect_distributed(const exprseq &e) {return e[0].collect(e[1], true);}
+static ex f_degree(const exprseq &e) {return e[0].degree(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();}
+static ex f_evalm(const exprseq &e) {return e[0].evalm();}
static ex f_expand(const exprseq &e) {return e[0].expand();}
static ex f_gcd(const exprseq &e) {return gcd(e[0], e[1]);}
+static ex f_has(const exprseq &e) {return e[0].has(e[1]) ? ex(1) : ex(0);}
static ex f_lcm(const exprseq &e) {return lcm(e[0], e[1]);}
+static ex f_lcoeff(const exprseq &e) {return e[0].lcoeff(e[1]);}
+static ex f_ldegree(const exprseq &e) {return e[0].ldegree(e[1]);}
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_numer_denom(const exprseq &e) {return e[0].numer_denom();}
+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_sqrfree1(const exprseq &e) {return sqrfree(e[0]);}
static ex f_subs2(const exprseq &e) {return e[0].subs(e[1]);}
+static ex f_tcoeff(const exprseq &e) {return e[0].tcoeff(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_a<type>(e[num])) throw(std::invalid_argument("argument " #num " to " #fcn "() must be a " #type))
static ex f_charpoly(const exprseq &e)
{
CHECK_ARG(0, matrix, charpoly);
CHECK_ARG(1, symbol, charpoly);
- return ex_to_matrix(e[0]).charpoly(ex_to_symbol(e[1]));
+ return ex_to<matrix>(e[0]).charpoly(ex_to<symbol>(e[1]));
}
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());
-}
-
-static ex f_collect(const exprseq &e)
-{
- CHECK_ARG(1, symbol, collect);
- return e[0].collect(ex_to_symbol(e[1]));
+ return e[0].coeff(e[1], ex_to<numeric>(e[2]).to_int());
}
static ex f_content(const exprseq &e)
{
CHECK_ARG(1, symbol, content);
- return e[0].content(ex_to_symbol(e[1]));
+ return e[0].content(ex_to<symbol>(e[1]));
}
-static ex f_degree(const exprseq &e)
+static ex f_decomp_rational(const exprseq &e)
{
- CHECK_ARG(1, symbol, degree);
- return e[0].degree(ex_to_symbol(e[1]));
+ CHECK_ARG(1, symbol, decomp_rational);
+ return decomp_rational(e[0], ex_to<symbol>(e[1]));
}
static ex f_determinant(const exprseq &e)
{
CHECK_ARG(0, matrix, determinant);
- return ex_to_matrix(e[0]).determinant();
+ return ex_to<matrix>(e[0]).determinant();
}
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;
}
static ex f_diff2(const exprseq &e)
{
CHECK_ARG(1, symbol, diff);
- return e[0].diff(ex_to_symbol(e[1]));
+ return e[0].diff(ex_to<symbol>(e[1]));
}
static ex f_diff3(const exprseq &e)
{
CHECK_ARG(1, symbol, diff);
CHECK_ARG(2, numeric, diff);
- return e[0].diff(ex_to_symbol(e[1]), ex_to_numeric(e[2]).to_int());
+ return e[0].diff(ex_to<symbol>(e[1]), ex_to<numeric>(e[2]).to_int());
}
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)
{
CHECK_ARG(1, numeric, eval);
- return e[0].eval(ex_to_numeric(e[1]).to_int());
+ return e[0].eval(ex_to<numeric>(e[1]).to_int());
}
static ex f_evalf2(const exprseq &e)
{
CHECK_ARG(1, numeric, evalf);
- return e[0].evalf(ex_to_numeric(e[1]).to_int());
+ return e[0].evalf(ex_to<numeric>(e[1]).to_int());
}
-static ex f_has(const exprseq &e)
+static ex f_find(const exprseq &e)
{
- return e[0].has(e[1]) ? exONE() : exZERO();
+ lst found;
+ e[0].find(e[1], found);
+ return found;
}
static ex f_inverse(const exprseq &e)
{
CHECK_ARG(0, matrix, inverse);
- return ex_to_matrix(e[0]).inverse();
+ return ex_to<matrix>(e[0]).inverse();
}
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)
+class apply_map_function : public map_function {
+ ex apply;
+public:
+ apply_map_function(const ex & a) : apply(a) {}
+ virtual ~apply_map_function() {}
+ ex operator()(const ex & e) { return apply.subs(wild() == e, true); }
+};
+
+static ex f_map(const exprseq &e)
{
- CHECK_ARG(1, symbol, lcoeff);
- return e[0].lcoeff(ex_to_symbol(e[1]));
+ apply_map_function fcn(e[1]);
+ return e[0].map(fcn);
}
-static ex f_ldegree(const exprseq &e)
+static ex f_match(const exprseq &e)
{
- CHECK_ARG(1, symbol, ldegree);
- return e[0].ldegree(ex_to_symbol(e[1]));
+ lst repl_lst;
+ if (e[0].match(e[1], repl_lst))
+ return repl_lst;
+ else
+ return fail();
}
static ex f_normal2(const exprseq &e)
{
CHECK_ARG(1, numeric, normal);
- return e[0].normal(ex_to_numeric(e[1]).to_int());
+ return e[0].normal(ex_to<numeric>(e[1]).to_int());
}
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())
+ int n = ex_to<numeric>(e[1]).to_int();
+ 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);
}
static ex f_prem(const exprseq &e)
{
CHECK_ARG(2, symbol, prem);
- return prem(e[0], e[1], ex_to_symbol(e[2]));
+ return prem(e[0], e[1], ex_to<symbol>(e[2]));
}
static ex f_primpart(const exprseq &e)
{
CHECK_ARG(1, symbol, primpart);
- return e[0].primpart(ex_to_symbol(e[1]));
+ return e[0].primpart(ex_to<symbol>(e[1]));
}
static ex f_quo(const exprseq &e)
{
CHECK_ARG(2, symbol, quo);
- return quo(e[0], e[1], ex_to_symbol(e[2]));
+ return quo(e[0], e[1], ex_to<symbol>(e[2]));
}
static ex f_rem(const exprseq &e)
{
CHECK_ARG(2, symbol, rem);
- return rem(e[0], e[1], ex_to_symbol(e[2]));
+ 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_sqrfree2(const exprseq &e)
{
- CHECK_ARG(1, symbol, series);
- return e[0].series(ex_to_symbol(e[1]), e[2]);
-}
-
-static ex f_series4(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)
{
CHECK_ARG(1, lst, subs);
CHECK_ARG(2, lst, subs);
- return e[0].subs(ex_to_lst(e[1]), ex_to_lst(e[2]));
-}
-
-static ex f_tcoeff(const exprseq &e)
-{
- CHECK_ARG(1, symbol, tcoeff);
- return e[0].tcoeff(ex_to_symbol(e[1]));
+ return e[0].subs(ex_to<lst>(e[1]), ex_to<lst>(e[2]));
}
static ex f_trace(const exprseq &e)
{
CHECK_ARG(0, matrix, trace);
- return ex_to_matrix(e[0]).trace();
+ return ex_to<matrix>(e[0]).trace();
}
static ex f_transpose(const exprseq &e)
{
CHECK_ARG(0, matrix, transpose);
- return ex_to_matrix(e[0]).transpose();
+ return ex_to<matrix>(e[0]).transpose();
}
static ex f_unassign(const exprseq &e)
{
CHECK_ARG(0, symbol, unassign);
- (const_cast<symbol *>(&ex_to_symbol(e[0])))->unassign();
+ const_cast<symbol&>(ex_to<symbol>(e[0])).unassign();
return e[0];
}
static ex f_unit(const exprseq &e)
{
CHECK_ARG(1, symbol, unit);
- return e[0].unit(ex_to_symbol(e[1]));
+ return e[0].unit(ex_to<symbol>(e[1]));
}
static ex f_dummy(const exprseq &e)
throw(std::logic_error("dummy function called (shouldn't happen)"));
}
-// Table for initializing the "fcns" map
+// Tables for initializing the "fcns" map and the function help topics
struct fcn_init {
const char *name;
- const fcn_desc &desc;
+ const fcn_desc desc;
};
static const fcn_init builtin_fcns[] = {
- {"beta", fcn_desc(f_beta, 2)},
{"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)},
+ {"decomp_rational", fcn_desc(f_decomp_rational, 2)},
{"degree", fcn_desc(f_degree, 2)},
{"denom", fcn_desc(f_denom, 1)},
{"determinant", fcn_desc(f_determinant, 1)},
{"eval", fcn_desc(f_eval2, 2)},
{"evalf", fcn_desc(f_evalf1, 1)},
{"evalf", fcn_desc(f_evalf2, 2)},
+ {"evalm", fcn_desc(f_evalm, 1)},
{"expand", fcn_desc(f_expand, 1)},
+ {"find", fcn_desc(f_find, 2)},
{"gcd", fcn_desc(f_gcd, 2)},
{"has", fcn_desc(f_has, 2)},
{"inverse", fcn_desc(f_inverse, 1)},
{"lcoeff", fcn_desc(f_lcoeff, 2)},
{"ldegree", fcn_desc(f_ldegree, 2)},
{"lsolve", fcn_desc(f_lsolve, 2)},
+ {"map", fcn_desc(f_map, 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)},
+ {"numer_denom", fcn_desc(f_numer_denom, 1)},
{"op", fcn_desc(f_op, 2)},
- {"power", fcn_desc(f_power, 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_series2, 2)},
- {"series", fcn_desc(f_series3, 3)},
- {"series", fcn_desc(f_series4, 4)},
- {"sqrfree", fcn_desc(f_sqrfree, 2)},
+ {"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)},
{"transpose", fcn_desc(f_transpose, 1)},
{"unassign", fcn_desc(f_unassign, 1)},
{"unit", fcn_desc(f_unit, 2)},
- {NULL, fcn_desc(f_unit, 0)} // End marker
+ {NULL, fcn_desc(f_dummy, 0)} // End marker
};
+struct fcn_help_init {
+ const char *name;
+ const char *help;
+};
+
+static const fcn_help_init builtin_help[] = {
+ {"acos", "inverse cosine function"},
+ {"acosh", "inverse hyperbolic cosine function"},
+ {"asin", "inverse sine function"},
+ {"asinh", "inverse hyperbolic sine function"},
+ {"atan", "inverse tangent function"},
+ {"atan2", "inverse tangent function with two arguments"},
+ {"atanh", "inverse hyperbolic tangent function"},
+ {"beta", "Beta function"},
+ {"binomial", "binomial function"},
+ {"cos", "cosine function"},
+ {"cosh", "hyperbolic cosine function"},
+ {"exp", "exponential function"},
+ {"factorial", "factorial function"},
+ {"lgamma", "natural logarithm of Gamma function"},
+ {"tgamma", "Gamma function"},
+ {"log", "natural logarithm"},
+ {"psi", "psi function\npsi(x) is the digamma function, psi(n,x) the nth polygamma function"},
+ {"sin", "sine function"},
+ {"sinh", "hyperbolic sine function"},
+ {"tan", "tangent function"},
+ {"tanh", "hyperbolic tangent function"},
+ {"zeta", "zeta function\nzeta(x) is Riemann's zeta function, zeta(n,x) its nth derivative"},
+ {"Li2", "dilogarithm"},
+ {"Li3", "trilogarithm"},
+ {"Order", "order term function (for truncated power series)"},
+ {"Derivative", "inert differential operator"},
+ {NULL, NULL} // End marker
+};
+
+#include "ginsh_extensions.h"
+
/*
* Add functions to ginsh
// 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)));
- i++;
+ fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial)));
+ ++i;
serial++;
}
}
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)
}
}
+// Help strings for functions from fcn_help_init array
+static void insert_help(const fcn_help_init *p)
+{
+ while (p->name) {
+ insert_fcn_help(p->name, p->help);
+ p++;
+ }
+}
+
/*
* Print help to cout
}
-/*
- * Convert list of lists to matrix
- */
-
-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;
-}
-
-
/*
* Function name completion functions for readline
*/
-static char *fcn_generator(char *text, int state)
+static char *fcn_generator(const char *text, int state)
{
static int len; // Length of word to complete
static fcn_tab::const_iterator index; // Iterator to function being currently considered
// Return the next function which partially matches
while (index != fcns.end()) {
const char *fcn_name = index->first.c_str();
- index++;
+ ++index;
if (strncmp(fcn_name, text, len) == 0)
return strdup(fcn_name);
}
return NULL;
}
-static char **fcn_completion(char *text, int start, int end)
+static char **fcn_completion(const char *text, int start, int end)
{
if (rl_line_buffer[0] == '!') {
// 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(const_cast<char *>(text), (CPFunction *)filename_completion_function);
+#else
+ return rl_completion_matches(text, 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(const_cast<char *>(text), (CPFunction *)fcn_generator);
+#else
+ return rl_completion_matches(text, 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
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";
- cout << "Type ?? for a list of help topics.\n";
- }
+ if (isatty(0))
+ greeting();
// Init function table
insert_fcns(builtin_fcns);
+ insert_fcns(extended_fcns);
ginsh_get_ginac_functions();
// Init help for operators (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("cos", "cosine function");
- insert_fcn_help("cosh", "hyperbolic cosine 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("exp", "exponential function");
- insert_fcn_help("log", "natural logarithm");
- insert_fcn_help("Li2", "dilogarithm");
- insert_fcn_help("Li3", "trilogarithm");
- insert_fcn_help("binomial", "binomial function");
- insert_fcn_help("factorial", "factorial function");
- insert_fcn_help("gamma", "gamma function");
- insert_fcn_help("Order", "order term function (for truncated power series)");
+ insert_help(builtin_help);
+ insert_help(extended_help);
// Init readline completer
rl_readline_name = argv[0];
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
rl_attempted_completion_function = (CPPFunction *)fcn_completion;
+#else
+ rl_attempted_completion_function = fcn_completion;
+#endif
orig_completion_append_character = rl_completion_append_character;
orig_basic_word_break_characters = rl_basic_word_break_characters;
git://www.ginac.de / ginac.git / blobdiff