X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=e2913724de4b04ee03653db50f1ffbda5655ae16;hp=be65cf8e0f8f2a81d32d438b1edfdb39362d19a0;hb=83a7ee99a947cbbf331018b803ad6be43a9ccd45;hpb=3cbd851611c82629116046ecbe36fd85f373496c diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index be65cf8e..e2913724 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-2008 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 @@ -42,6 +45,7 @@ #define YYERROR_VERBOSE 1 +#ifdef REALLY_HAVE_LIBREADLINE // 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) @@ -50,12 +54,35 @@ 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 +#endif // REALLY_HAVE_LIBREADLINE + // 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) @@ -204,13 +231,7 @@ line : ';' } | 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) + - (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_TIME { START_TIMER } '(' exp ')' { STOP_TIMER PRINT_TIME_USED } | error ';' {yyclearin; yyerrok;} | error ':' {yyclearin; yyerrok;} ; @@ -307,6 +328,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 +426,25 @@ static ex f_find(const exprseq &e) return found; } +static ex f_fsolve(const exprseq &e) +{ + CHECK_ARG(1, symbol, fsolve); + CHECK_ARG(2, numeric, fsolve); + CHECK_ARG(3, numeric, fsolve); + return fsolve(e[0], ex_to(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); @@ -567,10 +608,14 @@ 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}, + {"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}, @@ -672,7 +717,8 @@ static ex f_ginac_function(const exprseq &es, int serial) } // All registered GiNaC functions -void GiNaC::ginsh_get_ginac_functions(void) +namespace GiNaC { +void ginsh_get_ginac_functions(void) { vector::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); unsigned serial = 0; @@ -682,6 +728,7 @@ void GiNaC::ginsh_get_ginac_functions(void) serial++; } } +} /* @@ -805,13 +852,14 @@ static char *fcn_generator(const char *text, int state) return NULL; } +#ifdef REALLY_HAVE_LIBREADLINE static char **fcn_completion(const char *text, int start, int end) { if (rl_line_buffer[0] == '!') { // 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 @@ -821,7 +869,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 @@ -829,11 +877,12 @@ static char **fcn_completion(const char *text, int start, int end) #endif } } +#endif // REALLY_HAVE_LIBREADLINE 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-2008 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; @@ -872,6 +921,7 @@ int main(int argc, char **argv) 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"); +#ifdef REALLY_HAVE_LIBREADLINE // Init readline completer rl_readline_name = argv[0]; #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2) @@ -881,6 +931,7 @@ int main(int argc, char **argv) #endif orig_completion_append_character = rl_completion_append_character; orig_basic_word_break_characters = rl_basic_word_break_characters; +#endif // Init input file list, open first file num_files = argc - 1;