X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=bca29dd53a28a54d797e3a33bfd663a75cc72c72;hp=fcc66f42a7442fe0a751b7b935ebf43d2df16759;hb=4f18eb00180c256681072f10d9e2e08dbf84ff0b;hpb=abc4512627b3eb04732698e48dc88771d7904e71;ds=sidebyside

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index fcc66f42..bca29dd5 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -82,6 +82,7 @@ static fcn_tab::const_iterator find_function(const ex &sym, int req_params);
 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);
 %}
@@ -146,7 +147,7 @@ line	: ';'
 			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();
+			long i = ex_to<numeric>(e).to_long();
 			cout << i << endl;
 			cout << "#o" << oct << i << endl;
 			cout << "#x" << hex << i << dec << endl;
@@ -155,7 +156,7 @@ line	: ';'
 			YYERROR;
 		}
 	}
-	| '?' T_SYMBOL 		{print_help(ex_to_symbol($2).get_name());}
+	| '?' T_SYMBOL 		{print_help(ex_to<symbol>($2).get_name());}
 	| '?' T_TIME		{print_help("time");}
 	| '?' '?'		{print_help_topics();}
 	| T_QUIT		{YYACCEPT;}
@@ -207,8 +208,8 @@ exp	: T_NUMBER		{$$ = $1;}
 			$$ = (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; ex_to_nonconst_symbol($1).assign($3);}
 	| exp T_EQUAL exp	{$$ = $1 == $3;}
 	| exp T_NOTEQ exp	{$$ = $1 != $3;}
 	| exp '<' exp		{$$ = $1 < $3;}
@@ -225,7 +226,7 @@ exp	: T_NUMBER		{$$ = $1;}
 	| exp '!'		{$$ = factorial($1);}
 	| '(' exp ')'		{$$ = $2;}
 	| '{' list_or_empty '}'	{$$ = $2;}
-	| '[' matrix ']'	{$$ = lst_to_matrix(ex_to_lst($2));}
+	| '[' matrix ']'	{$$ = lst_to_matrix(ex_to<lst>($2));}
 	;
 
 exprseq	: exp			{$$ = exprseq($1);}
@@ -298,31 +299,37 @@ 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(2, numeric, coeff);
-	return e[0].coeff(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_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_decomp_rational(const exprseq &e)
+{
+	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)
@@ -337,14 +344,14 @@ static ex f_diag(const exprseq &e)
 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)
@@ -359,25 +366,46 @@ static ex f_divide(const exprseq &e)
 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_find(const exprseq &e)
+{
+	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]) ? ex(1) : ex(0);
+	return (bool)ex_to<relational>(e[0]) ? ex(1) : ex(0);
+}
+
+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)
+{
+	apply_map_function fcn(e[1]);
+	return e[0].map(fcn);
 }
 
 static ex f_match(const exprseq &e)
@@ -392,13 +420,13 @@ static ex f_match(const exprseq &e)
 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();
+	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);
@@ -407,69 +435,69 @@ static ex f_op(const exprseq &e)
 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_series(const exprseq &e)
 {
 	CHECK_ARG(2, numeric, series);
-	return e[0].series(e[1], ex_to_numeric(e[2]).to_int());
+	return e[0].series(e[1], ex_to<numeric>(e[2]).to_int());
 }
 
 static ex f_sqrfree2(const exprseq &e)
 {
 	CHECK_ARG(1, lst, sqrfree);
-	return sqrfree(e[0], ex_to_lst(e[1]));
+	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]));
+	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();
+	ex_to_nonconst_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)
@@ -477,7 +505,7 @@ 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;
@@ -489,6 +517,7 @@ static const fcn_init builtin_fcns[] = {
 	{"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)},
@@ -502,6 +531,7 @@ static const fcn_init builtin_fcns[] = {
 	{"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)},
@@ -510,6 +540,7 @@ static const fcn_init builtin_fcns[] = {
 	{"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)},
@@ -537,6 +568,43 @@ static const fcn_init builtin_fcns[] = {
 	{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
@@ -563,7 +631,7 @@ void GiNaC::ginsh_get_ginac_functions(void)
 	unsigned serial = 0;
 	while (i != end) {
 		fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial)));
-		i++;
+		++i;
 		serial++;
 	}
 }
@@ -575,7 +643,7 @@ void GiNaC::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).get_name();
+	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)
@@ -617,6 +685,15 @@ static void insert_fcn_help(const char *name, const char *str)
 	}
 }
 
+// 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
@@ -674,7 +751,7 @@ static char *fcn_generator(char *text, int state)
 	// 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);
 	}
@@ -728,6 +805,7 @@ int main(int argc, char **argv)
 
 	// Init function table
 	insert_fcns(builtin_fcns);
+	insert_fcns(extended_fcns);
 	ginsh_get_ginac_functions();
 
 	// Init help for operators (automatically generated from man page)
@@ -738,31 +816,8 @@ int main(int argc, char **argv)
 #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)");
+	insert_help(builtin_help);
+	insert_help(extended_help);
 
 	// Init readline completer
 	rl_readline_name = argv[0];