* This file must be processed with yacc/bison. */
/*
- * GiNaC Copyright (C) 1999-2002 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
*
* 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
*/
%{
#include "config.h"
-
+#ifdef HAVE_RUSAGE
#include <sys/resource.h>
+#else
+#include <ctime>
+#endif
#if HAVE_UNISTD_H
#include <sys/types.h>
#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)
static const char *orig_basic_word_break_characters;
#endif
-// Expression stack for ", "" and """
+#if (GINAC_RL_VERSION_MAJOR >= 5)
+#define GINAC_RL_COMPLETER_CAST(a) const_cast<char *>((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)
%token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
%token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_PRINTLATEX T_PRINTCSRC T_TIME
-%token T_XYZZY T_INVENTORY T_LOOK T_SCORE
+%token T_XYZZY T_INVENTORY T_LOOK T_SCORE T_COMPLEX_SYMBOLS T_REAL_SYMBOLS
/* Operator precedence and associativity */
%right '='
}
| '?' T_SYMBOL {print_help(ex_to<symbol>($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 {
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;
- }
+ | T_REAL_SYMBOLS { symboltype = domain::real; }
+ | T_COMPLEX_SYMBOLS { symboltype = domain::complex; }
+ | T_TIME { START_TIMER } '(' exp ')' { STOP_TIMER PRINT_TIME_USED }
| error ';' {yyclearin; yyerrok;}
| error ':' {yyclearin; yyerrok;}
;
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();}
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_factor(const exprseq &e) {return factor(e[0]);}
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_charpoly(const exprseq &e)
{
CHECK_ARG(0, matrix, charpoly);
- CHECK_ARG(1, symbol, charpoly);
- return ex_to<matrix>(e[0]).charpoly(ex_to<symbol>(e[1]));
+ return ex_to<matrix>(e[0]).charpoly(e[1]);
}
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<symbol>(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<symbol>(e[1]));
+ return decomp_rational(e[0], e[1]);
}
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<dim; i++)
+ for (size_t i=0; i<dim; i++)
m.set(i, i, e.op(i));
return m;
}
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<symbol>(e[1]), ex_to<numeric>(e[2]), ex_to<numeric>(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);
static ex f_prem(const exprseq &e)
{
- CHECK_ARG(2, symbol, prem);
- return prem(e[0], e[1], ex_to<symbol>(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<symbol>(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<symbol>(e[2]));
+ return quo(e[0], e[1], e[2]);
+}
+
+static ex f_rank(const exprseq &e)
+{
+ CHECK_ARG(0, matrix, rank);
+ return ex_to<matrix>(e[0]).rank();
}
static ex f_rem(const exprseq &e)
{
- CHECK_ARG(2, symbol, rem);
- return rem(e[0], e[1], ex_to<symbol>(e[2]));
+ return rem(e[0], e[1], e[2]);
+}
+
+static ex f_resultant(const exprseq &e)
+{
+ CHECK_ARG(2, symbol, resultant);
+ return resultant(e[0], e[1], ex_to<symbol>(e[2]));
}
static ex f_series(const exprseq &e)
static ex f_sprem(const exprseq &e)
{
- CHECK_ARG(2, symbol, sprem);
- return sprem(e[0], e[1], ex_to<symbol>(e[2]));
+ return sprem(e[0], e[1], e[2]);
}
static ex f_sqrfree2(const exprseq &e)
static ex f_unit(const exprseq &e)
{
- CHECK_ARG(1, symbol, unit);
- return e[0].unit(ex_to<symbol>(e[1]));
+ return e[0].unit(e[1]);
}
static ex f_dummy(const exprseq &e)
{"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},
{"evalf", f_evalf1, 1},
{"evalf", f_evalf2, 2},
{"evalm", f_evalm, 1},
+ {"eval_integ", f_eval_integ, 1},
{"expand", f_expand, 1},
+ {"factor", f_factor, 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},
{"lcm", f_lcm, 2},
{"lcoeff", f_lcoeff, 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},
+ {"rank", f_rank, 1},
{"rem", f_rem, 3},
+ {"resultant", f_resultant, 3},
{"series", f_series, 3},
{"sprem", f_sprem, 3},
{"sqrfree", f_sqrfree1, 1},
{"subs", f_subs2, 2},
{"subs", f_subs3, 3},
{"tcoeff", f_tcoeff, 2},
- {"time", f_dummy, 0},
+ {"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
+ {NULL, f_dummy, 0} // End marker
};
struct fcn_help_init {
{"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
}
// All registered GiNaC functions
-void GiNaC::ginsh_get_ginac_functions(void)
+namespace GiNaC {
+void ginsh_get_ginac_functions(void)
{
vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
unsigned serial = 0;
serial++;
}
}
+}
/*
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<char *>(text), (CPFunction *)filename_completion_function);
#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;
+ 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<char *>(text), (CPFunction *)fcn_generator);
#else
#endif
}
}
+#endif // REALLY_HAVE_LIBREADLINE
void greeting(void)
{
cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
- cout << " __, _______ Copyright (C) 1999-2002 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;
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");
+
+#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)
#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;
git://www.ginac.de / ginac.git / blobdiff