/** @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
#include "ginsh.h"
+#define YYERROR_VERBOSE 1
+
// Original readline settings
static int orig_completion_append_character;
static char *orig_basic_word_break_characters;
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
%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 '='
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());}
| '?' '?' {print_help_topics();}
| T_QUIT {YYACCEPT;}
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";}
| 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);}
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)
{
return rem(e[0], e[1], ex_to_symbol(e[2]));
}
-static ex f_series2(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)
+static ex f_series(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)
{"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)},
}
-/*
- * 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<rows; i++)
- if (l.op(i).nops() > cols)
- cols = l.op(i).nops();
-
- // Allocate and fill matrix
- matrix &m = *new matrix(rows, cols);
- for (i=0; i<rows; i++)
- for (j=0; j<cols; j++)
- if (l.op(i).nops() > 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
*/
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"
- << "<-------------' see the file COPYING for details.\n" << endl;
+ << " ._) 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
*/
+
int main(int argc, char **argv)
{
// Print banner in interactive mode
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");