X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=48d839a0490edc334f3b10bbcd29a18ba08e9927;hp=65a41f5a33a18917e56c0ea6bae303f463ad66f7;hb=f449313a24038429447cb02a4798beb7fcf8216e;hpb=5b090bb7e4951b48a28c20ba21bf9810c86eb0ca diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index 65a41f5a..48d839a0 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-2000 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,8 +84,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 +91,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_WARRANTY 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 '=' @@ -124,19 +129,34 @@ 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 { @@ -160,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;} ; @@ -172,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) { @@ -199,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);} + | T_MATRIX_BEGIN matrix T_MATRIX_END {$$ = lst_to_matrix(ex_to_lst($2));} ; exprseq : exp {$$ = exprseq($1);} @@ -269,7 +288,7 @@ 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) { @@ -280,15 +299,18 @@ 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()); + return e[0].coeff(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].collect(e[1]); +} + +static ex f_collect_distributed(const exprseq &e) +{ + return e[0].collect(e[1], true); } static ex f_content(const exprseq &e) @@ -299,8 +321,7 @@ static ex f_content(const exprseq &e) static ex f_degree(const exprseq &e) { - CHECK_ARG(1, symbol, degree); - return e[0].degree(ex_to_symbol(e[1])); + return e[0].degree(e[1]); } static ex f_determinant(const exprseq &e) @@ -337,7 +358,7 @@ static ex f_divide(const exprseq &e) if (divide(e[0], e[1], q)) return q; else - return *new fail(); + return fail(); } static ex f_eval2(const exprseq &e) @@ -371,14 +392,21 @@ static ex f_is(const exprseq &e) static ex f_lcoeff(const exprseq &e) { - CHECK_ARG(1, symbol, lcoeff); - return e[0].lcoeff(ex_to_symbol(e[1])); + return e[0].lcoeff(e[1]); } static ex f_ldegree(const exprseq &e) { - CHECK_ARG(1, symbol, ldegree); - return e[0].ldegree(ex_to_symbol(e[1])); + return e[0].ldegree(e[1]); +} + +static ex f_match(const exprseq &e) +{ + lst repl_lst; + if (e[0].match(e[1], repl_lst)) + return repl_lst; + else + return fail(); } static ex f_normal2(const exprseq &e) @@ -426,10 +454,15 @@ static ex f_series(const exprseq &e) return e[0].series(e[1], ex_to_numeric(e[2]).to_int()); } -static ex f_sqrfree(const exprseq &e) +static ex f_sqrfree1(const exprseq &e) { - CHECK_ARG(1, symbol, sqrfree); - return sqrfree(e[0], ex_to_symbol(e[1])); + return sqrfree(e[0]); +} + +static ex f_sqrfree2(const exprseq &e) +{ + CHECK_ARG(1, lst, sqrfree); + return sqrfree(e[0], ex_to_lst(e[1])); } static ex f_subs3(const exprseq &e) @@ -441,8 +474,7 @@ static ex f_subs3(const exprseq &e) static ex f_tcoeff(const exprseq &e) { - CHECK_ARG(1, symbol, tcoeff); - return e[0].tcoeff(ex_to_symbol(e[1])); + return e[0].tcoeff(e[1]); } static ex f_trace(const exprseq &e) @@ -485,6 +517,7 @@ 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)}, {"degree", fcn_desc(f_degree, 2)}, {"denom", fcn_desc(f_denom, 1)}, @@ -506,6 +539,7 @@ 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)}, @@ -517,7 +551,8 @@ static const fcn_init builtin_fcns[] = { {"quo", fcn_desc(f_quo, 3)}, {"rem", fcn_desc(f_rem, 3)}, {"series", fcn_desc(f_series, 3)}, - {"sqrfree", fcn_desc(f_sqrfree, 2)}, + {"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)}, @@ -550,11 +585,7 @@ static ex f_ginac_function(const exprseq &es, int serial) } // All registered GiNaC functions -#ifndef NO_NAMESPACE_GINAC void GiNaC::ginsh_get_ginac_functions(void) -#else // ndef NO_NAMESPACE_GINAC -void ginsh_get_ginac_functions(void) -#endif // ndef NO_NAMESPACE_GINAC { vector::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); unsigned serial = 0; @@ -572,7 +603,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) @@ -653,33 +684,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 */ @@ -711,19 +715,29 @@ 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; + 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\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"; + 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-2000 Johannes Gutenberg University Mainz,\n" + 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; @@ -733,6 +747,7 @@ void greeting(void) /* * Main program */ + int main(int argc, char **argv) { // Print banner in interactive mode