X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh_parser.ypp;h=96a864a82cbc40b8c7fcbcb2fc4970fafb2d17f0;hb=76e6124083a8054761c1bba9fea9afd71eacb9d8;hp=3a8f06211e7b523bf97d30319415acfb4aaf1903;hpb=8f283de519668b70b2e675a7055c7f1bf7ba197c;p=ginac.git diff --git a/ginsh/ginsh_parser.ypp b/ginsh/ginsh_parser.ypp index 3a8f0621..96a864a8 100644 --- a/ginsh/ginsh_parser.ypp +++ b/ginsh/ginsh_parser.ypp @@ -242,7 +242,7 @@ exp : T_NUMBER {$$ = $1;} if (i == assigned_symbol_table.end()) $$ = $1; else - $$ = i->second.eval(); + $$ = i->second; } | '\'' T_SYMBOL '\'' {$$ = $2;} | T_LITERAL {$$ = $1;} @@ -331,7 +331,6 @@ static ex f_collect_common_factors(const exprseq &e) {return collect_common_fact static ex f_convert_H_to_Li(const exprseq &e) {return convert_H_to_Li(e[0], e[1]);} 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_eval_integ(const exprseq &e) {return e[0].eval_integ();} @@ -414,12 +413,6 @@ static ex f_divide(const exprseq &e) return fail(); } -static ex f_eval2(const exprseq &e) -{ - CHECK_ARG(1, numeric, eval); - return e[0].eval(ex_to(e[1]).to_int()); -} - static ex f_evalf2(const exprseq &e) { CHECK_ARG(1, numeric, evalf); @@ -618,8 +611,6 @@ static const fcn_init builtin_fcns[] = { {"diff", f_diff2, 2}, {"diff", f_diff3, 3}, {"divide", f_divide, 2}, - {"eval", f_eval1, 1}, - {"eval", f_eval2, 2}, {"evalf", f_evalf1, 1}, {"evalf", f_evalf2, 2}, {"evalm", f_evalm, 1}, @@ -729,7 +720,7 @@ static void insert_fcns(const fcn_init *p) static ex f_ginac_function(const exprseq &es, int serial) { - return GiNaC::function(serial, es).eval(1); + return GiNaC::function(serial, es); } // All registered GiNaC functions