X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=d792a242f9c498a788fbf1e9ecf5523945e4a6e5;hp=cbb8be21e543640218719c663ee82c5684c9c534;hb=bd2d7351b89743eb68ce7d3bfa7ab62c331f9522;hpb=72a970a6d73bd4c8c76602fe455c73052da9fdf2 diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index cbb8be21..d792a242 100644 --- a/ginsh/ginsh_parser.yy +++ b/ginsh/ginsh_parser.yy @@ -1,8 +1,9 @@ /** @file ginsh_parser.yy * * Input grammar definition for ginsh. - * This file must be processed with yacc/bison. - * + * This file must be processed with yacc/bison. */ + +/* * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify @@ -39,6 +40,8 @@ #include "ginsh.h" +#define YYERROR_VERBOSE 1 + // Original readline settings static int orig_completion_append_character; static char *orig_basic_word_break_characters; @@ -77,8 +80,6 @@ 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 @@ -86,7 +87,7 @@ static ex lst2matrix(const ex &l); %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_QUIT T_PRINT T_READ T_WRITE 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 '=' @@ -136,9 +137,37 @@ line : ';' 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_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 +176,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 +195,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) { @@ -193,7 +222,7 @@ exp : T_NUMBER {$$ = $1;} | exp '!' {$$ = factorial($1);} | '(' exp ')' {$$ = $2;} | '[' list_or_empty ']' {$$ = $2;} - | T_MATRIX_BEGIN matrix T_MATRIX_END {$$ = lst2matrix($2);} + | T_MATRIX_BEGIN matrix T_MATRIX_END {$$ = lst_to_matrix($2);} ; exprseq : exp {$$ = exprseq($1);} @@ -252,11 +281,11 @@ 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_pow(const exprseq &e) {return pow(e[0], e[1]);} static ex f_sqrt(const exprseq &e) {return sqrt(e[0]);} static ex f_subs2(const exprseq &e) {return e[0].subs(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) { @@ -407,23 +436,10 @@ 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) +static ex f_series(const exprseq &e) { - CHECK_ARG(1, symbol, series); - return e[0].series(ex_to_symbol(e[1]), ex(0)); -} - -static ex f_series3(const exprseq &e) -{ - CHECK_ARG(1, symbol, series); - return e[0].series(ex_to_symbol(e[1]), e[2]); -} - -static ex f_series4(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()); + CHECK_ARG(2, numeric, series); + return e[0].series(e[1], ex_to_numeric(e[2]).to_int()); } static ex f_sqrfree(const exprseq &e) @@ -511,14 +527,12 @@ static const fcn_init builtin_fcns[] = { {"normal", fcn_desc(f_normal2, 2)}, {"numer", fcn_desc(f_numer, 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)}, + {"series", fcn_desc(f_series, 3)}, {"sqrfree", fcn_desc(f_sqrfree, 2)}, {"sqrt", fcn_desc(f_sqrt, 1)}, {"subs", fcn_desc(f_subs2, 2)}, @@ -552,16 +566,16 @@ static ex f_ginac_function(const exprseq &es, int serial) } // All registered GiNaC functions -#ifndef NO_GINAC_NAMESPACE +#ifndef NO_NAMESPACE_GINAC void GiNaC::ginsh_get_ginac_functions(void) -#else // ndef NO_GINAC_NAMESPACE +#else // ndef NO_NAMESPACE_GINAC void ginsh_get_ginac_functions(void) -#endif // ndef NO_GINAC_NAMESPACE +#endif // ndef NO_NAMESPACE_GINAC { - 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++; } @@ -655,33 +669,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 - unsigned 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, ex(0)); - return m; -} - - /* * Function name completion functions for readline */ @@ -722,6 +709,15 @@ static char **fcn_completion(char *text, int start, int end) } } +void greeting(void) +{ + cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl; + cout << " __, _______ Copyright (C) 1999-2000 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 @@ -730,13 +726,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-2000 Johannes Gutenberg University Mainz, Germany\n"; - cout << "This is free software with ABSOLUTELY NO WARRANTY. You are welcome to\n"; - cout << "redistribute it 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); @@ -757,13 +748,14 @@ 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("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("gamma", "gamma 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");