X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=79ae94cee86b8d576eac497ec44e1b26d2705272;hp=00aaea3e277eca841256471db8ae153835a5386f;hb=da64e515abf7243bc4c84ca3631470931c4e6691;hpb=c030e24444ef604e7343bda6e88b79bbfbfe6138 diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index 00aaea3e..79ae94ce 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-2004 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 */ @@ -50,6 +50,12 @@ 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]; @@ -202,8 +208,8 @@ line : ';' cout << (syms.size() > 350 ? 350 : syms.size()); cout << " out of a possible 350.\n"; } - | T_REAL_SYMBOLS { symboltype = symbol_options::real; } - | T_COMPLEX_SYMBOLS { symboltype = symbol_options::complex; } + | T_REAL_SYMBOLS { symboltype = domain::real; } + | T_COMPLEX_SYMBOLS { symboltype = domain::complex; } | 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) + @@ -307,6 +313,7 @@ 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);} @@ -404,6 +411,17 @@ static ex f_find(const exprseq &e) return found; } +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); @@ -469,11 +487,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); @@ -555,10 +585,13 @@ 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}, {"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}, @@ -581,7 +614,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}, @@ -797,7 +832,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 @@ -807,7 +842,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 @@ -819,7 +854,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-2004 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;