X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=005ba9e9082b9dc460707b98324be37181baeac3;hb=cbd91ff9206af199888748f0738664d320f456dd;hp=ed2fcda6671996e198f0f590f2b2f4e30c65f023;hpb=b5483c25af5d84095ca647390914e3fb63ad96a0;p=ginac.git

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index ed2fcda6..005ba9e9 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -4,7 +4,7 @@
  *  This file must be processed with yacc/bison. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 
@@ -50,6 +50,12 @@ static char *orig_basic_word_break_characters;
 static const char *orig_basic_word_break_characters;
 #endif
 
+#if (GINAC_RL_VERSION_MAJOR >= 5)
+#define GINAC_RL_COMPLETER_CAST(a) const_cast<char *>((a))
+#else
+#define GINAC_RL_COMPLETER_CAST(a) (a)
+#endif
+
 // Expression stack for %, %% and %%%
 static void push(const ex &e);
 static ex exstack[3];
@@ -307,6 +313,7 @@ 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_eval_integ(const exprseq &e) {return e[0].eval_integ();}
 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);}
@@ -404,6 +411,25 @@ static ex f_find(const exprseq &e)
 	return found;
 }
 
+static ex f_fsolve(const exprseq &e)
+{
+	CHECK_ARG(1, symbol, fsolve);
+	CHECK_ARG(2, numeric, fsolve);
+	CHECK_ARG(3, numeric, fsolve);
+	return fsolve(e[0], ex_to<symbol>(e[1]), ex_to<numeric>(e[2]), ex_to<numeric>(e[3]));
+}
+
+static ex f_integer_content(const exprseq &e)
+{
+	return e[0].expand().integer_content();
+}
+
+static ex f_integral(const exprseq &e)
+{
+	CHECK_ARG(0, symbol, integral);
+	return integral(e[0], e[1], e[2], e[3]);
+}
+
 static ex f_inverse(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, inverse);
@@ -480,6 +506,12 @@ static ex f_rem(const exprseq &e)
 	return rem(e[0], e[1], e[2]);
 }
 
+static ex f_resultant(const exprseq &e)
+{
+	CHECK_ARG(2, symbol, resultant);
+	return resultant(e[0], e[1], ex_to<symbol>(e[2]));
+}
+
 static ex f_series(const exprseq &e)
 {
 	CHECK_ARG(2, numeric, series);
@@ -561,10 +593,14 @@ static const fcn_init builtin_fcns[] = {
 	{"evalf", f_evalf1, 1},
 	{"evalf", f_evalf2, 2},
 	{"evalm", f_evalm, 1},
+	{"eval_integ", f_eval_integ, 1},
 	{"expand", f_expand, 1},
 	{"find", f_find, 2},
+	{"fsolve", f_fsolve, 4},
 	{"gcd", f_gcd, 2},
 	{"has", f_has, 2},
+	{"integer_content", f_integer_content, 1},
+	{"integral", f_integral, 4},
 	{"inverse", f_inverse, 1},
 	{"iprint", f_dummy, 0},      // for Tab-completion
 	{"is", f_is, 1},
@@ -589,6 +625,7 @@ static const fcn_init builtin_fcns[] = {
 	{"quo", f_quo, 3},
 	{"rank", f_rank, 1},
 	{"rem", f_rem, 3},
+	{"resultant", f_resultant, 3},
 	{"series", f_series, 3},
 	{"sprem", f_sprem, 3},
 	{"sqrfree", f_sqrfree1, 1},
@@ -804,7 +841,7 @@ static char **fcn_completion(const 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;
-		rl_completer_word_break_characters = rl_basic_word_break_characters;
+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(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
@@ -814,7 +851,7 @@ static char **fcn_completion(const char *text, int start, int end)
 		// Otherwise, complete function names
 		rl_completion_append_character = '(';
 		rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
-		rl_completer_word_break_characters = rl_basic_word_break_characters;
+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(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
@@ -826,7 +863,7 @@ static char **fcn_completion(const char *text, int start, int end)
 void greeting(void)
 {
     cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
-    cout << "  __,  _______  Copyright (C) 1999-2004 Johannes Gutenberg University Mainz,\n"
+    cout << "  __,  _______  Copyright (C) 1999-2005 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;