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=48d839a0490edc334f3b10bbcd29a18ba08e9927;hb=5954e1a6b131f6f10c1ed96766af7acbd350d8bb;hpb=b9cd4b49ffbfbf3e1c36a2b594ec3148a5baca64

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 48d839a0..fcc66f42 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -89,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
 
@@ -224,8 +224,8 @@ exp	: T_NUMBER		{$$ = $1;}
 	| exp '^' exp		{$$ = power($1, $3);}
 	| exp '!'		{$$ = factorial($1);}
 	| '(' exp ')'		{$$ = $2;}
-	| '[' list_or_empty ']'	{$$ = $2;}
-	| T_MATRIX_BEGIN matrix T_MATRIX_END	{$$ = lst_to_matrix(ex_to_lst($2));}
+	| '{' list_or_empty '}'	{$$ = $2;}
+	| '[' matrix ']'	{$$ = lst_to_matrix(ex_to_lst($2));}
 	;
 
 exprseq	: exp			{$$ = exprseq($1);}
@@ -240,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);}
@@ -274,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))
 
@@ -303,27 +313,12 @@ static ex f_coeff(const exprseq &e)
 	return e[0].coeff(e[1], ex_to_numeric(e[2]).to_int());
 }
 
-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_content(const exprseq &e)
 {
 	CHECK_ARG(1, symbol, content);
 	return e[0].content(ex_to_symbol(e[1]));
 }
 
-static ex f_degree(const exprseq &e)
-{
-	return e[0].degree(e[1]);
-}
-
 static ex f_determinant(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, determinant);
@@ -373,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);
@@ -390,16 +380,6 @@ 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)
-{
-	return e[0].lcoeff(e[1]);
-}
-
-static ex f_ldegree(const exprseq &e)
-{
-	return e[0].ldegree(e[1]);
-}
-
 static ex f_match(const exprseq &e)
 {
 	lst repl_lst;
@@ -454,11 +434,6 @@ static ex f_series(const exprseq &e)
 	return e[0].series(e[1], ex_to_numeric(e[2]).to_int());
 }
 
-static ex f_sqrfree1(const exprseq &e)
-{
-	return sqrfree(e[0]);
-}
-
 static ex f_sqrfree2(const exprseq &e)
 {
 	CHECK_ARG(1, lst, sqrfree);
@@ -472,11 +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)
-{
-	return e[0].tcoeff(e[1]);
-}
-
 static ex f_trace(const exprseq &e)
 {
 	CHECK_ARG(0, matrix, trace);
@@ -530,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)},
@@ -544,6 +515,7 @@ static const fcn_init builtin_fcns[] = {
 	{"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)},