X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginsh%2Fginsh_parser.yy;h=9682b936aa2845bc1de00236c245584e7c6a41c1;hb=37f28c653db4b48a89641b0d195f8f0c3c7ab426;hp=5dc2228ba630a3e45e968f8a1ffc52184bbc6446;hpb=45cd108bc8c2573ba934c59c13c71671b86ec859;p=ginac.git diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index 5dc2228b..9682b936 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-2003 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 */ @@ -28,8 +28,11 @@ %{ #include "config.h" - +#ifdef HAVE_RUSAGE #include +#else +#include +#endif #if HAVE_UNISTD_H #include @@ -50,12 +53,34 @@ 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((a)) +#else +#define GINAC_RL_COMPLETER_CAST(a) (a) +#endif + // Expression stack for %, %% and %%% static void push(const ex &e); static ex exstack[3]; // Start and end time for the time() function +#ifdef HAVE_RUSAGE static struct rusage start_time, end_time; +#define START_TIMER getrusage(RUSAGE_SELF, &start_time); +#define STOP_TIMER getrusage(RUSAGE_SELF, &end_time); +#define PRINT_TIME_USED 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; +#else +static std::clock_t start_time, end_time; +#define START_TIMER start_time = std::clock(); +#define STOP_TIMER end_time = std::clock(); +#define PRINT_TIME_USED \ + cout << double(end_time - start_time)/CLOCKS_PER_SEC << 's' << endl; +#endif // Table of functions (a multimap, because one function may appear with different // numbers of parameters) @@ -93,7 +118,7 @@ static void print_help_topics(void); %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ %token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_PRINTLATEX T_PRINTCSRC T_TIME -%token T_XYZZY T_INVENTORY T_LOOK T_SCORE +%token T_XYZZY T_INVENTORY T_LOOK T_SCORE T_COMPLEX_SYMBOLS T_REAL_SYMBOLS /* Operator precedence and associativity */ %right '=' @@ -202,13 +227,9 @@ 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; - } + | T_REAL_SYMBOLS { symboltype = domain::real; } + | T_COMPLEX_SYMBOLS { symboltype = domain::complex; } + | T_TIME { START_TIMER } '(' exp ')' { STOP_TIMER PRINT_TIME_USED } | error ';' {yyclearin; yyerrok;} | error ':' {yyclearin; yyerrok;} ; @@ -299,11 +320,13 @@ static void push(const ex &e) 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_collect_common_factors(const exprseq &e) {return collect_common_factors(e[0]);} +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();} 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);} @@ -401,6 +424,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(e[1]), ex_to(e[2]), ex_to(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); @@ -466,11 +508,23 @@ static ex f_quo(const exprseq &e) return quo(e[0], e[1], e[2]); } +static ex f_rank(const exprseq &e) +{ + CHECK_ARG(0, matrix, rank); + return ex_to(e[0]).rank(); +} + 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(e[2])); +} + static ex f_series(const exprseq &e) { CHECK_ARG(2, numeric, series); @@ -538,6 +592,7 @@ static const fcn_init builtin_fcns[] = { {"collect_common_factors", f_collect_common_factors, 1}, {"collect_distributed", f_collect_distributed, 2}, {"content", f_content, 2}, + {"convert_H_to_Li", f_convert_H_to_Li, 2}, {"decomp_rational", f_decomp_rational, 2}, {"degree", f_degree, 2}, {"denom", f_denom, 1}, @@ -551,10 +606,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}, @@ -577,7 +636,9 @@ static const fcn_init builtin_fcns[] = { {"print_csrc", f_dummy, 0}, // for Tab-completion {"print_latex", f_dummy, 0}, // for Tab-completion {"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}, @@ -621,13 +682,12 @@ static const fcn_help_init builtin_help[] = { {"sinh", "hyperbolic sine function"}, {"tan", "tangent function"}, {"tanh", "hyperbolic tangent function"}, - {"zeta", "zeta function\nzeta(x) is Riemann's zeta function, zeta(n,x) its nth derivative"}, + {"zeta", "zeta function\nzeta(x) is Riemann's zeta function, zetaderiv(n,x) its nth derivative.\nIf x is a GiNaC::lst, it is a multiple zeta value\nzeta(x,s) is an alternating Euler sum"}, {"Li2", "dilogarithm"}, {"Li3", "trilogarithm"}, {"Li", "(multiple) polylogarithm"}, {"S", "Nielsen's generalized polylogarithm"}, {"H", "harmonic polylogarithm"}, - {"mZeta", "multiple zeta value"}, {"Order", "order term function (for truncated power series)"}, {"Derivative", "inert differential operator"}, {NULL, NULL} // End marker @@ -794,7 +854,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(text), (CPFunction *)filename_completion_function); #else @@ -804,7 +864,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(text), (CPFunction *)fcn_generator); #else @@ -816,7 +876,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-2003 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;