X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=c045826754f5dc2a4c6f9d0a2f7d0a47aec4852d;hp=f2cfc769103a4a47f5e818a523d0e758d4ee2d99;hb=bba767a9045e24989c9de04a4453e5bdf1069f6a;hpb=c1e8ee3f2ae31139a94b9712bd88e8d1d2d86050 diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index f2cfc769..c0458267 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-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2004 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 @@ -50,7 +50,7 @@ static char *orig_basic_word_break_characters; static const char *orig_basic_word_break_characters; #endif -// Expression stack for ", "" and """ +// Expression stack for %, %% and %%% static void push(const ex &e); static ex exstack[3]; @@ -63,8 +63,8 @@ typedef ex (*fcnp)(const exprseq &e); typedef ex (*fcnp2)(const exprseq &e, int serial); struct fcn_desc { - fcn_desc() : p(NULL), num_params(0) {} - fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false) {} + fcn_desc() : p(NULL), num_params(0), is_ginac(false), serial(0) {} + fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false), serial(0) {} fcn_desc(fcnp2 func, int num, int ser) : p((fcnp)func), num_params(num), is_ginac(true), serial(ser) {} fcnp p; // Pointer to function @@ -92,14 +92,15 @@ static void print_help_topics(void); %token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_QUOTE T_QUOTE2 T_QUOTE3 %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ -%token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE +%token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_PRINTLATEX T_PRINTCSRC T_TIME +%token T_XYZZY T_INVENTORY T_LOOK T_SCORE T_COMPLEX_SYMBOLS T_REAL_SYMBOLS /* Operator precedence and associativity */ %right '=' %left T_EQUAL T_NOTEQ %left '<' '>' T_LESSEQ T_GREATEREQ %left '+' '-' -%left '*' '/' '%' +%left '*' '/' %nonassoc NEG %right '^' %nonassoc '!' @@ -156,8 +157,28 @@ line : ';' YYERROR; } } + | T_PRINTLATEX '(' exp ')' ';' { + try { + $3.print(print_latex(std::cout)); cout << endl; + } catch (exception &e) { + std::cerr << e.what() << endl; + YYERROR; + } + } + | T_PRINTCSRC '(' exp ')' ';' { + try { + $3.print(print_csrc_double(std::cout)); cout << endl; + } catch (exception &e) { + std::cerr << e.what() << endl; + YYERROR; + } + } | '?' T_SYMBOL {print_help(ex_to($2).get_name());} | '?' T_TIME {print_help("time");} + | '?' T_PRINT {print_help("print");} + | '?' T_IPRINT {print_help("iprint");} + | '?' T_PRINTLATEX {print_help("print_latex");} + | '?' T_PRINTCSRC {print_help("print_csrc");} | '?' '?' {print_help_topics();} | T_QUIT {YYACCEPT;} | T_WARRANTY { @@ -181,6 +202,8 @@ line : ';' cout << (syms.size() > 350 ? 350 : syms.size()); cout << " out of a possible 350.\n"; } + | 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) + @@ -203,13 +226,13 @@ exp : T_NUMBER {$$ = $1;} | T_SYMBOL '(' exprseq ')' { fcn_tab::const_iterator i = find_function($1, $3.nops()); if (i->second.is_ginac) { - $$ = ((fcnp2)(i->second.p))(static_cast(*($3.bp)), i->second.serial); + $$ = ((fcnp2)(i->second.p))(ex_to($3), i->second.serial); } else { - $$ = (i->second.p)(static_cast(*($3.bp))); + $$ = (i->second.p)(ex_to($3)); } } | T_DIGITS '=' T_NUMBER {$$ = $3; Digits = ex_to($3).to_int();} - | T_SYMBOL '=' exp {$$ = $3; ex_to_nonconst_symbol($1).assign($3);} + | T_SYMBOL '=' exp {$$ = $3; const_cast(ex_to($1)).assign($3);} | exp T_EQUAL exp {$$ = $1 == $3;} | exp T_NOTEQ exp {$$ = $1 != $3;} | exp '<' exp {$$ = $1 < $3;} @@ -230,7 +253,7 @@ exp : T_NUMBER {$$ = $1;} ; exprseq : exp {$$ = exprseq($1);} - | exprseq ',' exp {exprseq es(static_cast(*($1.bp))); $$ = es.append($3);} + | exprseq ',' exp {exprseq es(ex_to($1)); $$ = es.append($3);} ; list_or_empty: /* empty */ {$$ = *new lst;} @@ -238,15 +261,15 @@ list_or_empty: /* empty */ {$$ = *new lst;} ; list : exp {$$ = lst($1);} - | list ',' exp {lst l(static_cast(*($1.bp))); $$ = l.append($3);} + | list ',' exp {lst l(ex_to($1)); $$ = l.append($3);} ; matrix : '[' row ']' {$$ = lst($2);} - | matrix ',' '[' row ']' {lst l(static_cast(*($1.bp))); $$ = l.append($4);} + | matrix ',' '[' row ']' {lst l(ex_to($1)); $$ = l.append($4);} ; row : exp {$$ = lst($1);} - | row ',' exp {lst l(static_cast(*($1.bp))); $$ = l.append($3);} + | row ',' exp {lst l(ex_to($1)); $$ = l.append($3);} ; @@ -277,6 +300,8 @@ static void push(const ex &e) 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_collect_common_factors(const exprseq &e) {return collect_common_factors(e[0]);} +static ex f_convert_H_to_Li(const exprseq &e) {return convert_H_to_Li(e[0], e[1]);} 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();} @@ -304,8 +329,7 @@ static ex f_tcoeff(const exprseq &e) {return e[0].tcoeff(e[1]);} static ex f_charpoly(const exprseq &e) { CHECK_ARG(0, matrix, charpoly); - CHECK_ARG(1, symbol, charpoly); - return ex_to(e[0]).charpoly(ex_to(e[1])); + return ex_to(e[0]).charpoly(e[1]); } static ex f_coeff(const exprseq &e) @@ -316,14 +340,12 @@ static ex f_coeff(const exprseq &e) static ex f_content(const exprseq &e) { - CHECK_ARG(1, symbol, content); - return e[0].content(ex_to(e[1])); + return e[0].content(e[1]); } static ex f_decomp_rational(const exprseq &e) { - CHECK_ARG(1, symbol, decomp_rational); - return decomp_rational(e[0], ex_to(e[1])); + return decomp_rational(e[0], e[1]); } static ex f_determinant(const exprseq &e) @@ -334,9 +356,9 @@ static ex f_determinant(const exprseq &e) static ex f_diag(const exprseq &e) { - unsigned dim = e.nops(); + size_t dim = e.nops(); matrix &m = *new matrix(dim, dim); - for (unsigned i=0; i(e[2])); + return prem(e[0], e[1], e[2]); } static ex f_primpart(const exprseq &e) { - CHECK_ARG(1, symbol, primpart); - return e[0].primpart(ex_to(e[1])); + return e[0].primpart(e[1]); } static ex f_quo(const exprseq &e) { - CHECK_ARG(2, symbol, quo); - return quo(e[0], e[1], ex_to(e[2])); + return quo(e[0], e[1], e[2]); } static ex f_rem(const exprseq &e) { - CHECK_ARG(2, symbol, rem); - return rem(e[0], e[1], ex_to(e[2])); + return rem(e[0], e[1], e[2]); } static ex f_series(const exprseq &e) @@ -462,6 +480,11 @@ static ex f_series(const exprseq &e) return e[0].series(e[1], ex_to(e[2]).to_int()); } +static ex f_sprem(const exprseq &e) +{ + return sprem(e[0], e[1], e[2]); +} + static ex f_sqrfree2(const exprseq &e) { CHECK_ARG(1, lst, sqrfree); @@ -490,14 +513,13 @@ static ex f_transpose(const exprseq &e) static ex f_unassign(const exprseq &e) { CHECK_ARG(0, symbol, unassign); - ex_to_nonconst_symbol(e[0]).unassign(); + const_cast(ex_to(e[0])).unassign(); return e[0]; } static ex f_unit(const exprseq &e) { - CHECK_ARG(1, symbol, unit); - return e[0].unit(ex_to(e[1])); + return e[0].unit(e[1]); } static ex f_dummy(const exprseq &e) @@ -508,64 +530,72 @@ static ex f_dummy(const exprseq &e) // Tables for initializing the "fcns" map and the function help topics struct fcn_init { const char *name; - const fcn_desc desc; + fcnp p; + int num_params; }; 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)}, - {"decomp_rational", fcn_desc(f_decomp_rational, 2)}, - {"degree", fcn_desc(f_degree, 2)}, - {"denom", fcn_desc(f_denom, 1)}, - {"determinant", fcn_desc(f_determinant, 1)}, - {"diag", fcn_desc(f_diag, 0)}, - {"diff", fcn_desc(f_diff2, 2)}, - {"diff", fcn_desc(f_diff3, 3)}, - {"divide", fcn_desc(f_divide, 2)}, - {"eval", fcn_desc(f_eval1, 1)}, - {"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)}, - {"find", fcn_desc(f_find, 2)}, - {"gcd", fcn_desc(f_gcd, 2)}, - {"has", fcn_desc(f_has, 2)}, - {"inverse", fcn_desc(f_inverse, 1)}, - {"is", fcn_desc(f_is, 1)}, - {"lcm", fcn_desc(f_lcm, 2)}, - {"lcoeff", fcn_desc(f_lcoeff, 2)}, - {"ldegree", fcn_desc(f_ldegree, 2)}, - {"lsolve", fcn_desc(f_lsolve, 2)}, - {"map", fcn_desc(f_map, 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)}, - {"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_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)}, - {"tcoeff", fcn_desc(f_tcoeff, 2)}, - {"time", fcn_desc(f_dummy, 0)}, - {"trace", fcn_desc(f_trace, 1)}, - {"transpose", fcn_desc(f_transpose, 1)}, - {"unassign", fcn_desc(f_unassign, 1)}, - {"unit", fcn_desc(f_unit, 2)}, - {NULL, fcn_desc(f_dummy, 0)} // End marker + {"charpoly", f_charpoly, 2}, + {"coeff", f_coeff, 3}, + {"collect", f_collect, 2}, + {"collect_common_factors", f_collect_common_factors, 1}, + {"collect_distributed", f_collect_distributed, 2}, + {"content", f_content, 2}, + {"convert_H_to_Li", f_convert_H_to_Li, 2}, + {"decomp_rational", f_decomp_rational, 2}, + {"degree", f_degree, 2}, + {"denom", f_denom, 1}, + {"determinant", f_determinant, 1}, + {"diag", f_diag, 0}, + {"diff", f_diff2, 2}, + {"diff", f_diff3, 3}, + {"divide", f_divide, 2}, + {"eval", f_eval1, 1}, + {"eval", f_eval2, 2}, + {"evalf", f_evalf1, 1}, + {"evalf", f_evalf2, 2}, + {"evalm", f_evalm, 1}, + {"expand", f_expand, 1}, + {"find", f_find, 2}, + {"gcd", f_gcd, 2}, + {"has", f_has, 2}, + {"inverse", f_inverse, 1}, + {"iprint", f_dummy, 0}, // for Tab-completion + {"is", f_is, 1}, + {"lcm", f_lcm, 2}, + {"lcoeff", f_lcoeff, 2}, + {"ldegree", f_ldegree, 2}, + {"lsolve", f_lsolve, 2}, + {"map", f_map, 2}, + {"match", f_match, 2}, + {"nops", f_nops, 1}, + {"normal", f_normal1, 1}, + {"normal", f_normal2, 2}, + {"numer", f_numer, 1}, + {"numer_denom", f_numer_denom, 1}, + {"op", f_op, 2}, + {"pow", f_pow, 2}, + {"prem", f_prem, 3}, + {"primpart", f_primpart, 2}, + {"print", f_dummy, 0}, // for Tab-completion + {"print_csrc", f_dummy, 0}, // for Tab-completion + {"print_latex", f_dummy, 0}, // for Tab-completion + {"quo", f_quo, 3}, + {"rem", f_rem, 3}, + {"series", f_series, 3}, + {"sprem", f_sprem, 3}, + {"sqrfree", f_sqrfree1, 1}, + {"sqrfree", f_sqrfree2, 2}, + {"sqrt", f_sqrt, 1}, + {"subs", f_subs2, 2}, + {"subs", f_subs3, 3}, + {"tcoeff", f_tcoeff, 2}, + {"time", f_dummy, 0}, // for Tab-completion + {"trace", f_trace, 1}, + {"transpose", f_transpose, 1}, + {"unassign", f_unassign, 1}, + {"unit", f_unit, 2}, + {NULL, f_dummy, 0} // End marker }; struct fcn_help_init { @@ -595,9 +625,12 @@ static const fcn_help_init builtin_help[] = { {"sinh", "hyperbolic sine function"}, {"tan", "tangent function"}, {"tanh", "hyperbolic tangent function"}, - {"zeta", "zeta function\nzeta(x) is Riemann's zeta function, zeta(n,x) its nth derivative"}, + {"zeta", "zeta function\nzeta(x) is Riemann's zeta function, zetaderiv(n,x) its nth derivative.\nIf x is a GiNaC::lst, it is a multiple zeta value\nzeta(x,s) is an alternating Euler sum"}, {"Li2", "dilogarithm"}, {"Li3", "trilogarithm"}, + {"Li", "(multiple) polylogarithm"}, + {"S", "Nielsen's generalized polylogarithm"}, + {"H", "harmonic polylogarithm"}, {"Order", "order term function (for truncated power series)"}, {"Derivative", "inert differential operator"}, {NULL, NULL} // End marker @@ -614,7 +647,7 @@ static const fcn_help_init builtin_help[] = { static void insert_fcns(const fcn_init *p) { while (p->name) { - fcns.insert(make_pair(string(p->name), p->desc)); + fcns.insert(make_pair(string(p->name), fcn_desc(p->p, p->num_params))); p++; } } @@ -766,7 +799,7 @@ static char **fcn_completion(const char *text, int start, int end) 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); + return completion_matches(const_cast(text), (CPFunction *)filename_completion_function); #else return rl_completion_matches(text, rl_filename_completion_function); #endif @@ -776,7 +809,7 @@ static char **fcn_completion(const char *text, int start, int end) 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); + return completion_matches(const_cast(text), (CPFunction *)fcn_generator); #else return rl_completion_matches(text, fcn_generator); #endif @@ -786,7 +819,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-2001 Johannes Gutenberg University Mainz,\n" + cout << " __, _______ Copyright (C) 1999-2004 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; @@ -810,15 +843,21 @@ int main(int argc, char **argv) // Init help for operators (automatically generated from man page) insert_help("operators", "Operators in falling order of precedence:"); -#include "ginsh_op_help.c" +#include "ginsh_op_help.h" // Init help for built-in functions (automatically generated from man page) -#include "ginsh_fcn_help.c" +#include "ginsh_fcn_help.h" // Help for GiNaC functions is added manually insert_help(builtin_help); insert_help(extended_help); + // Help for other keywords + insert_help("print", "print(expression) - dumps the internal structure of the given expression (for debugging)"); + insert_help("iprint", "iprint(expression) - prints the given integer expression in decimal, octal, and hexadecimal bases"); + 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"); + // Init readline completer rl_readline_name = argv[0]; #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)