X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=bcd963b910b2f6531ba92666c12f5aac94ea8860;hp=5fc99fd23532aff3aa281e78ae1f242135a09030;hb=44710f0b91c510114a4cf3eacc81b007ea294217;hpb=ed21ddd5e2bc0af018c10934342f526d0ae4b7a7

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 5fc99fd2..bcd963b9 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);
 %}
@@ -202,13 +203,13 @@ exp	: T_NUMBER		{$$ = $1;}
 	| 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; ex_to_nonconst_symbol($1).assign($3);}
+	| 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;}
@@ -229,7 +230,7 @@ exp	: T_NUMBER		{$$ = $1;}
 	;
 
 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;}
@@ -237,15 +238,15 @@ 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	: '[' row ']'		{$$ = lst($2);}
-	| matrix ',' '[' row ']' {lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($4);}
+	| 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);}
 	;
 
 
@@ -374,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);
@@ -386,6 +394,20 @@ static ex f_is(const exprseq &e)
 	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)
 {
 	lst repl_lst;
@@ -468,7 +490,7 @@ static ex f_transpose(const exprseq &e)
 static ex f_unassign(const exprseq &e)
 {
 	CHECK_ARG(0, symbol, unassign);
-	ex_to_nonconst_symbol(e[0]).unassign();
+	const_cast<symbol&>(ex_to<symbol>(e[0])).unassign();
 	return e[0];
 }
 
@@ -483,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;
@@ -509,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)},
@@ -517,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)},
@@ -544,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
@@ -624,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
@@ -667,7 +737,7 @@ static void print_help_topics(void)
  *  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
@@ -688,7 +758,7 @@ static char *fcn_generator(char *text, int state)
 	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
@@ -696,9 +766,9 @@ static char **fcn_completion(char *text, int start, int end)
 		rl_basic_word_break_characters = orig_basic_word_break_characters;
 		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);
+		return completion_matches(const_cast<char *>(text), (CPFunction *)filename_completion_function);
 #else
-		return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function);
+		return rl_completion_matches(text, rl_filename_completion_function);
 #endif
 	} else {
 		// Otherwise, complete function names
@@ -706,9 +776,9 @@ static char **fcn_completion(char *text, int start, int end)
 		rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
 		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);
+		return completion_matches(const_cast<char *>(text), (CPFunction *)fcn_generator);
 #else
-		return rl_completion_matches(text, (CPFunction *)fcn_generator);
+		return rl_completion_matches(text, fcn_generator);
 #endif
 	}
 }
@@ -735,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)
@@ -745,35 +816,16 @@ 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];
+#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;