X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=9682b936aa2845bc1de00236c245584e7c6a41c1;hp=7c7e548cc41d8a01a036a7c38616cec456c644c7;hb=5b44febe31956b36b62cd3650f7c5249bbe8100c;hpb=dff5209ee7cc816583f6abe27a4e784e34f0a664 diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index 7c7e548c..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-2002 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 -// Expression stack for ", "" and """ +#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) @@ -63,8 +88,8 @@ typedef ex (*fcnp)(const exprseq &e); typedef ex (*fcnp2)(const exprseq &e, int serial); struct fcn_desc { - fcn_desc() : p(NULL), num_params(0) {} - fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false) {} + fcn_desc() : p(NULL), num_params(0), is_ginac(false), serial(0) {} + fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false), serial(0) {} fcn_desc(fcnp2 func, int num, int ser) : p((fcnp)func), num_params(num), is_ginac(true), serial(ser) {} fcnp p; // Pointer to function @@ -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 '=' @@ -175,6 +200,10 @@ line : ';' } | '?' T_SYMBOL {print_help(ex_to($2).get_name());} | '?' T_TIME {print_help("time");} + | '?' T_PRINT {print_help("print");} + | '?' T_IPRINT {print_help("iprint");} + | '?' T_PRINTLATEX {print_help("print_latex");} + | '?' T_PRINTCSRC {print_help("print_csrc");} | '?' '?' {print_help_topics();} | T_QUIT {YYACCEPT;} | T_WARRANTY { @@ -198,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;} ; @@ -294,11 +319,14 @@ 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);} @@ -321,8 +349,7 @@ static ex f_tcoeff(const exprseq &e) {return e[0].tcoeff(e[1]);} static ex f_charpoly(const exprseq &e) { CHECK_ARG(0, matrix, charpoly); - CHECK_ARG(1, symbol, charpoly); - return ex_to(e[0]).charpoly(ex_to(e[1])); + return ex_to(e[0]).charpoly(e[1]); } static ex f_coeff(const exprseq &e) @@ -333,14 +360,12 @@ static ex f_coeff(const exprseq &e) static ex f_content(const exprseq &e) { - CHECK_ARG(1, symbol, content); - return e[0].content(ex_to(e[1])); + return e[0].content(e[1]); } static ex f_decomp_rational(const exprseq &e) { - CHECK_ARG(1, symbol, decomp_rational); - return decomp_rational(e[0], ex_to(e[1])); + return decomp_rational(e[0], e[1]); } static ex f_determinant(const exprseq &e) @@ -351,9 +376,9 @@ static ex f_determinant(const exprseq &e) static ex f_diag(const exprseq &e) { - unsigned dim = e.nops(); + size_t dim = e.nops(); matrix &m = *new matrix(dim, dim); - for (unsigned i=0; i(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); @@ -451,26 +495,34 @@ static ex f_op(const exprseq &e) static ex f_prem(const exprseq &e) { - CHECK_ARG(2, symbol, prem); - return prem(e[0], e[1], ex_to(e[2])); + return prem(e[0], e[1], e[2]); } static ex f_primpart(const exprseq &e) { - CHECK_ARG(1, symbol, primpart); - return e[0].primpart(ex_to(e[1])); + return e[0].primpart(e[1]); } static ex f_quo(const exprseq &e) { - CHECK_ARG(2, symbol, quo); - return quo(e[0], e[1], ex_to(e[2])); + 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) { - CHECK_ARG(2, symbol, rem); - return rem(e[0], e[1], ex_to(e[2])); + 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) @@ -479,6 +531,11 @@ static ex f_series(const exprseq &e) return e[0].series(e[1], ex_to(e[2]).to_int()); } +static ex f_sprem(const exprseq &e) +{ + return sprem(e[0], e[1], e[2]); +} + static ex f_sqrfree2(const exprseq &e) { CHECK_ARG(1, lst, sqrfree); @@ -513,8 +570,7 @@ static ex f_unassign(const exprseq &e) static ex f_unit(const exprseq &e) { - CHECK_ARG(1, symbol, unit); - return e[0].unit(ex_to(e[1])); + return e[0].unit(e[1]); } static ex f_dummy(const exprseq &e) @@ -525,64 +581,78 @@ static ex f_dummy(const exprseq &e) // Tables for initializing the "fcns" map and the function help topics struct fcn_init { const char *name; - const fcn_desc desc; + fcnp p; + int num_params; }; 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)}, - {"decomp_rational", fcn_desc(f_decomp_rational, 2)}, - {"degree", fcn_desc(f_degree, 2)}, - {"denom", fcn_desc(f_denom, 1)}, - {"determinant", fcn_desc(f_determinant, 1)}, - {"diag", fcn_desc(f_diag, 0)}, - {"diff", fcn_desc(f_diff2, 2)}, - {"diff", fcn_desc(f_diff3, 3)}, - {"divide", fcn_desc(f_divide, 2)}, - {"eval", fcn_desc(f_eval1, 1)}, - {"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)}, - {"find", fcn_desc(f_find, 2)}, - {"gcd", fcn_desc(f_gcd, 2)}, - {"has", fcn_desc(f_has, 2)}, - {"inverse", fcn_desc(f_inverse, 1)}, - {"is", fcn_desc(f_is, 1)}, - {"lcm", fcn_desc(f_lcm, 2)}, - {"lcoeff", fcn_desc(f_lcoeff, 2)}, - {"ldegree", fcn_desc(f_ldegree, 2)}, - {"lsolve", fcn_desc(f_lsolve, 2)}, - {"map", fcn_desc(f_map, 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)}, - {"primpart", fcn_desc(f_primpart, 2)}, - {"quo", fcn_desc(f_quo, 3)}, - {"rem", fcn_desc(f_rem, 3)}, - {"series", fcn_desc(f_series, 3)}, - {"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)}, - {"tcoeff", fcn_desc(f_tcoeff, 2)}, - {"time", fcn_desc(f_dummy, 0)}, - {"trace", fcn_desc(f_trace, 1)}, - {"transpose", fcn_desc(f_transpose, 1)}, - {"unassign", fcn_desc(f_unassign, 1)}, - {"unit", fcn_desc(f_unit, 2)}, - {NULL, fcn_desc(f_dummy, 0)} // End marker + {"charpoly", f_charpoly, 2}, + {"coeff", f_coeff, 3}, + {"collect", f_collect, 2}, + {"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}, + {"determinant", f_determinant, 1}, + {"diag", f_diag, 0}, + {"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}, + {"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}, + {"lcm", f_lcm, 2}, + {"lcoeff", f_lcoeff, 2}, + {"ldegree", f_ldegree, 2}, + {"lsolve", f_lsolve, 2}, + {"map", f_map, 2}, + {"match", f_match, 2}, + {"nops", f_nops, 1}, + {"normal", f_normal1, 1}, + {"normal", f_normal2, 2}, + {"numer", f_numer, 1}, + {"numer_denom", f_numer_denom, 1}, + {"op", f_op, 2}, + {"pow", f_pow, 2}, + {"prem", f_prem, 3}, + {"primpart", f_primpart, 2}, + {"print", f_dummy, 0}, // for Tab-completion + {"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}, + {"sqrfree", f_sqrfree2, 2}, + {"sqrt", f_sqrt, 1}, + {"subs", f_subs2, 2}, + {"subs", f_subs3, 3}, + {"tcoeff", f_tcoeff, 2}, + {"time", f_dummy, 0}, // for Tab-completion + {"trace", f_trace, 1}, + {"transpose", f_transpose, 1}, + {"unassign", f_unassign, 1}, + {"unit", f_unit, 2}, + {NULL, f_dummy, 0} // End marker }; struct fcn_help_init { @@ -612,9 +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"}, {"Order", "order term function (for truncated power series)"}, {"Derivative", "inert differential operator"}, {NULL, NULL} // End marker @@ -631,7 +704,7 @@ static const fcn_help_init builtin_help[] = { static void insert_fcns(const fcn_init *p) { while (p->name) { - fcns.insert(make_pair(string(p->name), p->desc)); + fcns.insert(make_pair(string(p->name), fcn_desc(p->p, p->num_params))); p++; } } @@ -781,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 @@ -791,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 @@ -803,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-2002 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; @@ -836,6 +909,12 @@ int main(int argc, char **argv) insert_help(builtin_help); insert_help(extended_help); + // Help for other keywords + insert_help("print", "print(expression) - dumps the internal structure of the given expression (for debugging)"); + insert_help("iprint", "iprint(expression) - prints the given integer expression in decimal, octal, and hexadecimal bases"); + insert_help("print_latex", "print_latex(expression) - prints a LaTeX representation of the given expression"); + insert_help("print_csrc", "print_csrc(expression) - prints a C source code representation of the given expression"); + // Init readline completer rl_readline_name = argv[0]; #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)