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=b8409ea0649f314f85c3f15afe346bf81fb0a71b;hb=5954e1a6b131f6f10c1ed96766af7acbd350d8bb;hpb=afdd7fa8c6c0a587f7c80789198551383e8beb7b diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index b8409ea0..fcc66f42 100644 --- a/ginsh/ginsh_parser.yy +++ b/ginsh/ginsh_parser.yy @@ -1,9 +1,10 @@ /** @file ginsh_parser.yy * * Input grammar definition for ginsh. - * This file must be processed with yacc/bison. - * - * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany + * This file must be processed with yacc/bison. */ + +/* + * GiNaC Copyright (C) 1999-2001 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 @@ -39,9 +40,15 @@ #include "ginsh.h" +#define YYERROR_VERBOSE 1 + // Original readline settings static int orig_completion_append_character; +#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2) static char *orig_basic_word_break_characters; +#else +static const char *orig_basic_word_break_characters; +#endif // Expression stack for ", "" and """ static void push(const ex &e); @@ -77,16 +84,14 @@ static help_tab help; static void print_help(const string &topic); static void print_help_topics(void); - -static ex lst2matrix(const ex &l); %} /* 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_PRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE +%token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE /* Operator precedence and associativity */ %right '=' @@ -124,21 +129,49 @@ line : ';' try { push($1); } catch (exception &e) { - cerr << e.what() << endl; + std::cerr << e.what() << endl; YYERROR; } } | T_PRINT '(' exp ')' ';' { try { - $3.printtree(cout); + $3.print(print_tree(std::cout)); + } catch (exception &e) { + std::cerr << e.what() << endl; + YYERROR; + } + } + | T_IPRINT '(' exp ')' ';' { + try { + ex e = $3; + if (!e.info(info_flags::integer)) + throw (std::invalid_argument("argument to iprint() must be an integer")); + long i = ex_to_numeric(e).to_long(); + cout << i << endl; + cout << "#o" << oct << i << endl; + cout << "#x" << hex << i << dec << endl; } catch (exception &e) { cerr << e.what() << endl; YYERROR; } } - | '?' T_SYMBOL {print_help(ex_to_symbol($2).getname());} + | '?' T_SYMBOL {print_help(ex_to_symbol($2).get_name());} + | '?' T_TIME {print_help("time");} | '?' '?' {print_help_topics();} | T_QUIT {YYACCEPT;} + | T_WARRANTY { + cout << "This program is free software; you can redistribute it and/or modify it under\n"; + cout << "the terms of the GNU General Public License as published by the Free Software\n"; + cout << "Foundation; either version 2 of the License, or (at your option) any later\n"; + cout << "version.\n"; + cout << "This program is distributed in the hope that it will be useful, but WITHOUT\n"; + cout << "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n"; + cout << "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n"; + cout << "details.\n"; + cout << "You should have received a copy of the GNU General Public License along with\n"; + cout << "this program. If not, write to the Free Software Foundation, 675 Mass Ave,\n"; + cout << "Cambridge, MA 02139, USA.\n"; + } | T_XYZZY {cout << "Nothing happens.\n";} | T_INVENTORY {cout << "You're not carrying anything.\n";} | T_LOOK {cout << "You're in a twisty little maze of passages, all alike.\n";} @@ -147,6 +180,13 @@ 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; + } | error ';' {yyclearin; yyerrok;} | error ':' {yyclearin; yyerrok;} ; @@ -159,13 +199,6 @@ exp : T_NUMBER {$$ = $1;} | T_QUOTE {$$ = exstack[0];} | T_QUOTE2 {$$ = exstack[1];} | T_QUOTE3 {$$ = exstack[2];} - | T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' { - getrusage(RUSAGE_SELF, &end_time); - $$ = (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; - } | T_SYMBOL '(' exprseq ')' { fcn_tab::const_iterator i = find_function($1, $3.nops()); if (i->second.is_ginac) { @@ -186,14 +219,13 @@ exp : T_NUMBER {$$ = $1;} | exp '-' exp {$$ = $1 - $3;} | exp '*' exp {$$ = $1 * $3;} | exp '/' exp {$$ = $1 / $3;} - | exp '%' exp {$$ = $1 % $3;} | '-' exp %prec NEG {$$ = -$2;} | '+' exp %prec NEG {$$ = $2;} | exp '^' exp {$$ = power($1, $3);} | exp '!' {$$ = factorial($1);} | '(' exp ')' {$$ = $2;} - | '[' list_or_empty ']' {$$ = $2;} - | T_MATRIX_BEGIN matrix T_MATRIX_END {$$ = lst2matrix($2);} + | '{' list_or_empty '}' {$$ = $2;} + | '[' matrix ']' {$$ = lst_to_matrix(ex_to_lst($2));} ; exprseq : exp {$$ = exprseq($1);} @@ -208,8 +240,8 @@ list : exp {$$ = lst($1);} | list ',' exp {lst l(static_cast(*($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(*($1.bp))); $$ = l.append($4);} +matrix : '[' row ']' {$$ = lst($2);} + | matrix ',' '[' row ']' {lst l(static_cast(*($1.bp))); $$ = l.append($4);} ; row : exp {$$ = lst($1);} @@ -242,22 +274,31 @@ static void push(const ex &e) * Built-in functions */ -static ex f_beta(const exprseq &e) {return gamma(e[0])*gamma(e[1])/gamma(e[0]+e[1]);} +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_power(const exprseq &e) {return power(e[0], e[1]);} +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)) +#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)) static ex f_charpoly(const exprseq &e) { @@ -268,15 +309,8 @@ static ex f_charpoly(const exprseq &e) static ex f_coeff(const exprseq &e) { - CHECK_ARG(1, symbol, coeff); CHECK_ARG(2, numeric, coeff); - return e[0].coeff(ex_to_symbol(e[1]), ex_to_numeric(e[2]).to_int()); -} - -static ex f_collect(const exprseq &e) -{ - CHECK_ARG(1, symbol, collect); - return e[0].collect(ex_to_symbol(e[1])); + return e[0].coeff(e[1], ex_to_numeric(e[2]).to_int()); } static ex f_content(const exprseq &e) @@ -285,12 +319,6 @@ static ex f_content(const exprseq &e) return e[0].content(ex_to_symbol(e[1])); } -static ex f_degree(const exprseq &e) -{ - CHECK_ARG(1, symbol, degree); - return e[0].degree(ex_to_symbol(e[1])); -} - static ex f_determinant(const exprseq &e) { CHECK_ARG(0, matrix, determinant); @@ -299,9 +327,9 @@ static ex f_determinant(const exprseq &e) static ex f_diag(const exprseq &e) { - int dim = e.nops(); + unsigned dim = e.nops(); matrix &m = *new matrix(dim, dim); - for (int i=0; i= e[0].nops()) + if (n < 0 || n >= (int)e[0].nops()) throw(std::out_of_range("second argument to op() is out of range")); return e[0].op(n); } @@ -408,29 +428,16 @@ static ex f_rem(const exprseq &e) return rem(e[0], e[1], ex_to_symbol(e[2])); } -static ex f_series2(const exprseq &e) -{ - CHECK_ARG(1, symbol, series); - return e[0].series(ex_to_symbol(e[1]), exZERO()); -} - -static ex f_series3(const exprseq &e) +static ex f_series(const exprseq &e) { - CHECK_ARG(1, symbol, series); - return e[0].series(ex_to_symbol(e[1]), e[2]); + CHECK_ARG(2, numeric, series); + return e[0].series(e[1], ex_to_numeric(e[2]).to_int()); } -static ex f_series4(const exprseq &e) +static ex f_sqrfree2(const exprseq &e) { - CHECK_ARG(1, symbol, series); - CHECK_ARG(3, numeric, series); - return e[0].series(ex_to_symbol(e[1]), e[2], ex_to_numeric(e[3]).to_int()); -} - -static ex f_sqrfree(const exprseq &e) -{ - CHECK_ARG(1, symbol, sqrfree); - return sqrfree(e[0], ex_to_symbol(e[1])); + CHECK_ARG(1, lst, sqrfree); + return sqrfree(e[0], ex_to_lst(e[1])); } static ex f_subs3(const exprseq &e) @@ -440,12 +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) -{ - CHECK_ARG(1, symbol, tcoeff); - return e[0].tcoeff(ex_to_symbol(e[1])); -} - static ex f_trace(const exprseq &e) { CHECK_ARG(0, matrix, trace); @@ -483,10 +484,10 @@ struct fcn_init { }; static const fcn_init builtin_fcns[] = { - {"beta", fcn_desc(f_beta, 2)}, {"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)}, {"degree", fcn_desc(f_degree, 2)}, {"denom", fcn_desc(f_denom, 1)}, @@ -499,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)}, @@ -508,20 +510,21 @@ static const fcn_init builtin_fcns[] = { {"lcoeff", fcn_desc(f_lcoeff, 2)}, {"ldegree", fcn_desc(f_ldegree, 2)}, {"lsolve", fcn_desc(f_lsolve, 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)}, - {"power", fcn_desc(f_power, 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_series2, 2)}, - {"series", fcn_desc(f_series3, 3)}, - {"series", fcn_desc(f_series4, 4)}, - {"sqrfree", fcn_desc(f_sqrfree, 2)}, + {"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)}, @@ -554,15 +557,12 @@ static ex f_ginac_function(const exprseq &es, int serial) } // All registered GiNaC functions -#ifndef NO_GINAC_NAMESPACE -#else // ndef NO_GINAC_NAMESPACE -void ginsh_get_ginac_functions(void) -#endif // ndef NO_GINAC_NAMESPACE +void GiNaC::ginsh_get_ginac_functions(void) { - vector::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); + vector::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); unsigned serial = 0; while (i != end) { - fcns.insert(make_pair(i->name, fcn_desc(f_ginac_function, i->nparams, serial))); + fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial))); i++; serial++; } @@ -575,7 +575,7 @@ void ginsh_get_ginac_functions(void) static fcn_tab::const_iterator find_function(const ex &sym, int req_params) { - const string &name = ex_to_symbol(sym).getname(); + const string &name = ex_to_symbol(sym).get_name(); typedef fcn_tab::const_iterator I; pair b = fcns.equal_range(name); if (b.first == b.second) @@ -656,33 +656,6 @@ static void print_help_topics(void) } -/* - * Convert list of lists to matrix - */ - -static ex lst2matrix(const ex &l) -{ - if (!is_ex_of_type(l, lst)) - throw(std::logic_error("internal error: argument to lst2matrix() is not a list")); - - // Find number of rows and columns - int rows = l.nops(), cols = 0, i, j; - for (i=0; i cols) - cols = l.op(i).nops(); - - // Allocate and fill matrix - matrix &m = *new matrix(rows, cols); - for (i=0; i j) - m.set(i, j, l.op(i).op(j)); - else - m.set(i, j, exZERO()); - return m; -} - - /* * Function name completion functions for readline */ @@ -714,15 +687,34 @@ static char **fcn_completion(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; - return completion_matches(text, filename_completion_function); + rl_completer_word_break_characters = rl_basic_word_break_characters; +#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2) + return completion_matches(text, (CPFunction *)filename_completion_function); +#else + return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function); +#endif } else { // Otherwise, complete function names rl_completion_append_character = '('; rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"; - return completion_matches(text, fcn_generator); + rl_completer_word_break_characters = rl_basic_word_break_characters; +#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2) + return completion_matches(text, (CPFunction *)fcn_generator); +#else + return rl_completion_matches(text, (CPFunction *)fcn_generator); +#endif } } +void greeting(void) +{ + cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl; + cout << " __, _______ Copyright (C) 1999-2001 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; + cout << "Type ?? for a list of help topics." << endl; +} /* * Main program @@ -731,13 +723,8 @@ static char **fcn_completion(char *text, int start, int end) int main(int argc, char **argv) { // Print banner in interactive mode - if (isatty(0)) { - cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " " << VERSION << ")\n"; - cout << "Copyright (C) 1999 Johannes Gutenberg Universitaet Mainz, Germany\n"; - cout << "This is free software, and you are welcome to redistribute it\n"; - cout << "under certain conditions; see the file COPYING for details.\n"; - cout << "Type ?? for a list of help topics.\n"; - } + if (isatty(0)) + greeting(); // Init function table insert_fcns(builtin_fcns); @@ -758,19 +745,23 @@ int main(int argc, char **argv) insert_fcn_help("atan", "inverse tangent function"); insert_fcn_help("atan2", "inverse tangent function with two arguments"); insert_fcn_help("atanh", "inverse hyperbolic tangent function"); + insert_fcn_help("beta", "Beta function"); + insert_fcn_help("binomial", "binomial function"); insert_fcn_help("cos", "cosine function"); insert_fcn_help("cosh", "hyperbolic cosine function"); + insert_fcn_help("exp", "exponential function"); + insert_fcn_help("factorial", "factorial function"); + insert_fcn_help("lgamma", "natural logarithm of Gamma function"); + insert_fcn_help("tgamma", "Gamma function"); + insert_fcn_help("log", "natural logarithm"); + insert_fcn_help("psi", "psi function\npsi(x) is the digamma function, psi(n,x) the nth polygamma function"); insert_fcn_help("sin", "sine function"); insert_fcn_help("sinh", "hyperbolic sine function"); insert_fcn_help("tan", "tangent function"); insert_fcn_help("tanh", "hyperbolic tangent function"); - insert_fcn_help("exp", "exponential function"); - insert_fcn_help("log", "natural logarithm"); + insert_fcn_help("zeta", "zeta function\nzeta(x) is Riemann's zeta function, zeta(n,x) its nth derivative"); insert_fcn_help("Li2", "dilogarithm"); insert_fcn_help("Li3", "trilogarithm"); - insert_fcn_help("binomial", "binomial function"); - insert_fcn_help("factorial", "factorial function"); - insert_fcn_help("gamma", "gamma function"); insert_fcn_help("Order", "order term function (for truncated power series)"); // Init readline completer