X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=a94b92c775b1b71ec20178bdb3d8fcb65f18846e;hp=be3f6862d1dae63c3636c1b15d6886a41c1b5410;hb=708e9e647029af699333fceffc0a76bef70a4709;hpb=591b85b0697370f2f5f25a29a1e94ff831a02c12

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index be3f6862..a94b92c7 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);
 %}
@@ -208,7 +209,7 @@ exp	: T_NUMBER		{$$ = $1;}
 		}
 	}
 	| 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_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;}
@@ -319,6 +320,12 @@ static ex f_content(const exprseq &e)
 	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);
@@ -368,6 +375,13 @@ static ex f_evalf2(const exprseq &e)
 	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);
@@ -462,7 +476,7 @@ static ex f_transpose(const exprseq &e)
 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];
 }
 
@@ -477,7 +491,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 +503,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 +517,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)},
@@ -537,6 +553,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 +616,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++;
 	}
 }
@@ -617,6 +670,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 +736,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 +790,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 +801,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];