X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=48d839a0490edc334f3b10bbcd29a18ba08e9927;hp=62418496f28e10f3728dfa28f37e0ea4d470f0dd;hb=f449313a24038429447cb02a4798beb7fcf8216e;hpb=9e027882daaed818363bb4dc0e23d104b25ff5dc

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 62418496..48d839a0 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -44,7 +44,11 @@
 
 // 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);
@@ -125,15 +129,15 @@ line	: ';'
 		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) {
-			cerr << e.what() << endl;
+			std::cerr << e.what() << endl;
 			YYERROR;
 		}
 	}
@@ -151,7 +155,7 @@ line	: ';'
 			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;}
@@ -215,14 +219,13 @@ exp	: T_NUMBER		{$$ = $1;}
 	| 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	{$$ = lst_to_matrix($2);}
+	| T_MATRIX_BEGIN matrix T_MATRIX_END	{$$ = lst_to_matrix(ex_to_lst($2));}
 	;
 
 exprseq	: exp			{$$ = exprseq($1);}
@@ -296,15 +299,18 @@ static ex f_charpoly(const exprseq &e)
 
 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());
+	return e[0].coeff(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].collect(e[1]);
+}
+
+static ex f_collect_distributed(const exprseq &e)
+{
+	return e[0].collect(e[1], true);
 }
 
 static ex f_content(const exprseq &e)
@@ -315,8 +321,7 @@ static ex f_content(const exprseq &e)
 
 static ex f_degree(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, degree);
-	return e[0].degree(ex_to_symbol(e[1]));
+	return e[0].degree(e[1]);
 }
 
 static ex f_determinant(const exprseq &e)
@@ -353,7 +358,7 @@ 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)
@@ -387,14 +392,21 @@ static ex f_is(const exprseq &e)
 
 static ex f_lcoeff(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, lcoeff);
-	return e[0].lcoeff(ex_to_symbol(e[1]));
+	return e[0].lcoeff(e[1]);
 }
 
 static ex f_ldegree(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, ldegree);
-	return e[0].ldegree(ex_to_symbol(e[1]));
+	return e[0].ldegree(e[1]);
+}
+
+static ex f_match(const exprseq &e)
+{
+	lst repl_lst;
+	if (e[0].match(e[1], repl_lst))
+		return repl_lst;
+	else
+		return fail();
 }
 
 static ex f_normal2(const exprseq &e)
@@ -442,10 +454,15 @@ static ex f_series(const exprseq &e)
 	return e[0].series(e[1], ex_to_numeric(e[2]).to_int());
 }
 
-static ex f_sqrfree(const exprseq &e)
+static ex f_sqrfree1(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, sqrfree);
-	return sqrfree(e[0], ex_to_symbol(e[1]));
+	return sqrfree(e[0]);
+}
+
+static ex f_sqrfree2(const exprseq &e)
+{
+	CHECK_ARG(1, lst, sqrfree);
+	return sqrfree(e[0], ex_to_lst(e[1]));
 }
 
 static ex f_subs3(const exprseq &e)
@@ -457,8 +474,7 @@ static ex f_subs3(const exprseq &e)
 
 static ex f_tcoeff(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, tcoeff);
-	return e[0].tcoeff(ex_to_symbol(e[1]));
+	return e[0].tcoeff(e[1]);
 }
 
 static ex f_trace(const exprseq &e)
@@ -501,6 +517,7 @@ static const fcn_init builtin_fcns[] = {
 	{"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)},
 	{"degree", fcn_desc(f_degree, 2)},
 	{"denom", fcn_desc(f_denom, 1)},
@@ -522,6 +539,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)},
+	{"match", fcn_desc(f_match, 2)},
 	{"nops", fcn_desc(f_nops, 1)},
 	{"normal", fcn_desc(f_normal1, 1)},
 	{"normal", fcn_desc(f_normal2, 2)},
@@ -533,7 +551,8 @@ static const fcn_init builtin_fcns[] = {
 	{"quo", fcn_desc(f_quo, 3)},
 	{"rem", fcn_desc(f_rem, 3)},
 	{"series", fcn_desc(f_series, 3)},
-	{"sqrfree", fcn_desc(f_sqrfree, 2)},
+	{"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)},
@@ -566,11 +585,7 @@ static ex f_ginac_function(const exprseq &es, int serial)
 }
 
 // All registered GiNaC functions
-#ifndef NO_NAMESPACE_GINAC
 void GiNaC::ginsh_get_ginac_functions(void)
-#else // ndef NO_NAMESPACE_GINAC
-void ginsh_get_ginac_functions(void)
-#endif // ndef NO_NAMESPACE_GINAC
 {
 	vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
 	unsigned serial = 0;
@@ -588,7 +603,7 @@ void 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).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)
@@ -701,13 +716,21 @@ static char **fcn_completion(char *text, int start, int end)
 		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;
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
 		return completion_matches(text, (CPFunction *)filename_completion_function);
+#else
+		return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function);
+#endif
 	} else {
 		// 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;
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
 		return completion_matches(text, (CPFunction *)fcn_generator);
+#else
+		return rl_completion_matches(text, (CPFunction *)fcn_generator);
+#endif
 	}
 }