X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=fcc66f42a7442fe0a751b7b935ebf43d2df16759;hp=646cb020b2094283823319764d591830557c50bc;hb=5954e1a6b131f6f10c1ed96766af7acbd350d8bb;hpb=a84b7dfa6a621b358527671949cc5d9845b0bcb9

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 646cb020..fcc66f42 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -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);
@@ -85,7 +89,7 @@ static void print_help_topics(void);
 /* Tokens (T_LITERAL means a literal value returned by the parser, but not
    of class numeric or symbol (e.g. a constant or the FAIL object)) */
 %token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_QUOTE T_QUOTE2 T_QUOTE3
-%token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ T_MATRIX_BEGIN T_MATRIX_END
+%token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
 
 %token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE
 
@@ -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;}
@@ -176,6 +180,13 @@ line	: ';'
 		cout << (syms.size() > 350 ? 350 : syms.size());
 		cout << " out of a possible 350.\n";
 	}
+	| T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' {
+		getrusage(RUSAGE_SELF, &end_time);
+		cout << (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +
+			(end_time.ru_stime.tv_sec - start_time.ru_stime.tv_sec) +
+			 double(end_time.ru_utime.tv_usec - start_time.ru_utime.tv_usec) / 1e6 +
+			 double(end_time.ru_stime.tv_usec - start_time.ru_stime.tv_usec) / 1e6 << 's' << endl;
+	}
 	| error ';'		{yyclearin; yyerrok;}
 	| error ':'		{yyclearin; yyerrok;}
 	;
@@ -188,13 +199,6 @@ exp	: T_NUMBER		{$$ = $1;}
 	| T_QUOTE		{$$ = exstack[0];}
 	| T_QUOTE2		{$$ = exstack[1];}
 	| T_QUOTE3		{$$ = exstack[2];}
-	| T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' {
-		getrusage(RUSAGE_SELF, &end_time);
-		$$ = (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +
-		     (end_time.ru_stime.tv_sec - start_time.ru_stime.tv_sec) +
-		     double(end_time.ru_utime.tv_usec - start_time.ru_utime.tv_usec) / 1e6 +
-		     double(end_time.ru_stime.tv_usec - start_time.ru_stime.tv_usec) / 1e6;
-	}
 	| T_SYMBOL '(' exprseq ')' {
 		fcn_tab::const_iterator i = find_function($1, $3.nops());
 		if (i->second.is_ginac) {
@@ -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);}
+	| '{' list_or_empty '}'	{$$ = $2;}
+	| '[' matrix ']'	{$$ = lst_to_matrix(ex_to_lst($2));}
 	;
 
 exprseq	: exp			{$$ = exprseq($1);}
@@ -237,8 +240,8 @@ list	: exp			{$$ = lst($1);}
 	| list ',' exp		{lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($3);}
 	;
 
-matrix	: T_MATRIX_BEGIN row T_MATRIX_END		{$$ = lst($2);}
-	| matrix ',' T_MATRIX_BEGIN row	T_MATRIX_END	{lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($4);}
+matrix	: '[' row ']'		{$$ = lst($2);}
+	| matrix ',' '[' row ']' {lst l(static_cast<lst &>(*($1.bp))); $$ = l.append($4);}
 	;
 
 row	: exp			{$$ = lst($1);}
@@ -271,19 +274,29 @@ static void push(const ex &e)
  *  Built-in functions
  */
 
+static ex f_collect(const exprseq &e) {return e[0].collect(e[1]);}
+static ex f_collect_distributed(const exprseq &e) {return e[0].collect(e[1], true);}
+static ex f_degree(const exprseq &e) {return e[0].degree(e[1]);}
 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_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);}
 static ex f_lcm(const exprseq &e) {return lcm(e[0], e[1]);}
+static ex f_lcoeff(const exprseq &e) {return e[0].lcoeff(e[1]);}
+static ex f_ldegree(const exprseq &e) {return e[0].ldegree(e[1]);}
 static ex f_lsolve(const exprseq &e) {return lsolve(e[0], e[1]);}
 static ex f_nops(const exprseq &e) {return e[0].nops();}
 static ex f_normal1(const exprseq &e) {return e[0].normal();}
 static ex f_numer(const exprseq &e) {return e[0].numer();}
+static ex f_numer_denom(const exprseq &e) {return e[0].numer_denom();}
 static ex f_pow(const exprseq &e) {return pow(e[0], e[1]);}
 static ex f_sqrt(const exprseq &e) {return sqrt(e[0]);}
+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))
 
@@ -296,15 +309,8 @@ 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());
-}
-
-static ex f_collect(const exprseq &e)
-{
-	CHECK_ARG(1, symbol, collect);
-	return e[0].collect(ex_to_symbol(e[1]));
+	return e[0].coeff(e[1], ex_to_numeric(e[2]).to_int());
 }
 
 static ex f_content(const exprseq &e)
@@ -313,12 +319,6 @@ static ex f_content(const exprseq &e)
 	return e[0].content(ex_to_symbol(e[1]));
 }
 
-static ex f_degree(const exprseq &e)
-{
-	CHECK_ARG(1, symbol, degree);
-	return e[0].degree(ex_to_symbol(e[1]));
-}
-
 static ex f_determinant(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, determinant);
@@ -353,7 +353,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)
@@ -368,11 +368,6 @@ static ex f_evalf2(const exprseq &e)
 	return e[0].evalf(ex_to_numeric(e[1]).to_int());
 }
 
-static ex f_has(const exprseq &e)
-{
-	return e[0].has(e[1]) ? ex(1) : ex(0);
-}
-
 static ex f_inverse(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, inverse);
@@ -385,16 +380,13 @@ static ex f_is(const exprseq &e)
 	return (bool)ex_to_relational(e[0]) ? ex(1) : ex(0);
 }
 
-static ex f_lcoeff(const exprseq &e)
-{
-	CHECK_ARG(1, symbol, lcoeff);
-	return e[0].lcoeff(ex_to_symbol(e[1]));
-}
-
-static ex f_ldegree(const exprseq &e)
+static ex f_match(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, ldegree);
-	return e[0].ldegree(ex_to_symbol(e[1]));
+	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 +434,10 @@ 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_sqrfree2(const exprseq &e)
 {
-	CHECK_ARG(1, symbol, sqrfree);
-	return sqrfree(e[0], ex_to_symbol(e[1]));
+	CHECK_ARG(1, lst, sqrfree);
+	return sqrfree(e[0], ex_to_lst(e[1]));
 }
 
 static ex f_subs3(const exprseq &e)
@@ -455,12 +447,6 @@ static ex f_subs3(const exprseq &e)
 	return e[0].subs(ex_to_lst(e[1]), ex_to_lst(e[2]));
 }
 
-static ex f_tcoeff(const exprseq &e)
-{
-	CHECK_ARG(1, symbol, tcoeff);
-	return e[0].tcoeff(ex_to_symbol(e[1]));
-}
-
 static ex f_trace(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, trace);
@@ -501,6 +487,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)},
@@ -513,6 +500,7 @@ static const fcn_init builtin_fcns[] = {
 	{"eval", fcn_desc(f_eval2, 2)},
 	{"evalf", fcn_desc(f_evalf1, 1)},
 	{"evalf", fcn_desc(f_evalf2, 2)},
+	{"evalm", fcn_desc(f_evalm, 1)},
 	{"expand", fcn_desc(f_expand, 1)},
 	{"gcd", fcn_desc(f_gcd, 2)},
 	{"has", fcn_desc(f_has, 2)},
@@ -522,10 +510,12 @@ 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)},
 	{"numer", fcn_desc(f_numer, 1)},
+	{"numer_denom", fcn_desc(f_numer_denom, 1)},
 	{"op", fcn_desc(f_op, 2)},
 	{"pow", fcn_desc(f_pow, 2)},
 	{"prem", fcn_desc(f_prem, 3)},
@@ -533,7 +523,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 +557,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 +575,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)
@@ -700,19 +687,29 @@ static char **fcn_completion(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;
+#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
 	}
 }
 
 void greeting(void)
 {
     cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
-    cout << "  __,  _______  Copyright (C) 1999-2000 Johannes Gutenberg University Mainz,\n"
+    cout << "  __,  _______  Copyright (C) 1999-2001 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;