X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=5fc99fd23532aff3aa281e78ae1f242135a09030;hb=ed21ddd5e2bc0af018c10934342f526d0ae4b7a7;hp=a83bbc32a444ecbd7ee0cede115558c16876b95f;hpb=9711eff3300caffadf44b3b1bf7c6e096f26bfaa;p=ginac.git diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index a83bbc32..5fc99fd2 100644 --- a/ginsh/ginsh_parser.yy +++ b/ginsh/ginsh_parser.yy @@ -44,7 +44,11 @@ // 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); @@ -85,7 +89,7 @@ static void print_help_topics(void); /* Tokens (T_LITERAL means a literal value returned by the parser, but not of class numeric or symbol (e.g. a constant or the FAIL object)) */ %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_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 @@ -125,15 +129,15 @@ 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) { - cerr << e.what() << endl; + std::cerr << e.what() << endl; YYERROR; } } @@ -142,7 +146,7 @@ line : ';' 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(); + long i = ex_to(e).to_long(); cout << i << endl; cout << "#o" << oct << i << endl; cout << "#x" << hex << i << dec << endl; @@ -151,7 +155,7 @@ line : ';' YYERROR; } } - | '?' T_SYMBOL {print_help(ex_to_symbol($2).getname());} + | '?' T_SYMBOL {print_help(ex_to($2).get_name());} | '?' T_TIME {print_help("time");} | '?' '?' {print_help_topics();} | T_QUIT {YYACCEPT;} @@ -203,8 +207,8 @@ exp : T_NUMBER {$$ = $1;} $$ = (i->second.p)(static_cast(*($3.bp))); } } - | T_DIGITS '=' T_NUMBER {$$ = $3; Digits = ex_to_numeric($3).to_int();} - | T_SYMBOL '=' exp {$$ = $3; const_cast(&ex_to_symbol($1))->assign($3);} + | T_DIGITS '=' T_NUMBER {$$ = $3; Digits = ex_to($3).to_int();} + | T_SYMBOL '=' exp {$$ = $3; ex_to_nonconst_symbol($1).assign($3);} | exp T_EQUAL exp {$$ = $1 == $3;} | exp T_NOTEQ exp {$$ = $1 != $3;} | exp '<' exp {$$ = $1 < $3;} @@ -215,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 {$$ = lst_to_matrix($2);} + | '{' list_or_empty '}' {$$ = $2;} + | '[' matrix ']' {$$ = lst_to_matrix(ex_to($2));} ; exprseq : exp {$$ = exprseq($1);} @@ -237,8 +240,8 @@ list : exp {$$ = lst($1);} | list ',' exp {lst l(static_cast(*($1.bp))); $$ = l.append($3);} ; -matrix : T_MATRIX_BEGIN row T_MATRIX_END {$$ = lst($2);} - | matrix ',' T_MATRIX_BEGIN row T_MATRIX_END {lst l(static_cast(*($1.bp))); $$ = l.append($4);} +matrix : '[' row ']' {$$ = lst($2);} + | matrix ',' '[' row ']' {lst l(static_cast(*($1.bp))); $$ = l.append($4);} ; row : exp {$$ = lst($1);} @@ -271,58 +274,61 @@ static void push(const ex &e) * Built-in functions */ +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_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_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);} static ex f_lcm(const exprseq &e) {return lcm(e[0], e[1]);} +static ex f_lcoeff(const exprseq &e) {return e[0].lcoeff(e[1]);} +static ex f_ldegree(const exprseq &e) {return e[0].ldegree(e[1]);} static ex f_lsolve(const exprseq &e) {return lsolve(e[0], e[1]);} static ex f_nops(const exprseq &e) {return e[0].nops();} static ex f_normal1(const exprseq &e) {return e[0].normal();} static ex f_numer(const exprseq &e) {return e[0].numer();} +static ex f_numer_denom(const exprseq &e) {return e[0].numer_denom();} 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_sqrfree1(const exprseq &e) {return sqrfree(e[0]);} static ex f_subs2(const exprseq &e) {return e[0].subs(e[1]);} +static ex f_tcoeff(const exprseq &e) {return e[0].tcoeff(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_a(e[num])) throw(std::invalid_argument("argument " #num " to " #fcn "() must be a " #type)) 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(e[0]).charpoly(ex_to(e[1])); } 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()); -} - -static ex f_collect(const exprseq &e) -{ - CHECK_ARG(1, symbol, collect); - return e[0].collect(ex_to_symbol(e[1])); + return e[0].coeff(e[1], ex_to(e[2]).to_int()); } 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(ex_to(e[1])); } -static ex f_degree(const exprseq &e) +static ex f_decomp_rational(const exprseq &e) { - CHECK_ARG(1, symbol, degree); - return e[0].degree(ex_to_symbol(e[1])); + CHECK_ARG(1, symbol, decomp_rational); + return decomp_rational(e[0], ex_to(e[1])); } static ex f_determinant(const exprseq &e) { CHECK_ARG(0, matrix, determinant); - return ex_to_matrix(e[0]).determinant(); + return ex_to(e[0]).determinant(); } static ex f_diag(const exprseq &e) @@ -337,14 +343,14 @@ static ex f_diag(const exprseq &e) static ex f_diff2(const exprseq &e) { CHECK_ARG(1, symbol, diff); - return e[0].diff(ex_to_symbol(e[1])); + return e[0].diff(ex_to(e[1])); } static ex f_diff3(const exprseq &e) { CHECK_ARG(1, symbol, diff); CHECK_ARG(2, numeric, diff); - return e[0].diff(ex_to_symbol(e[1]), ex_to_numeric(e[2]).to_int()); + return e[0].diff(ex_to(e[1]), ex_to(e[2]).to_int()); } static ex f_divide(const exprseq &e) @@ -353,60 +359,52 @@ 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) { CHECK_ARG(1, numeric, eval); - return e[0].eval(ex_to_numeric(e[1]).to_int()); + return e[0].eval(ex_to(e[1]).to_int()); } static ex f_evalf2(const exprseq &e) { CHECK_ARG(1, numeric, evalf); - return e[0].evalf(ex_to_numeric(e[1]).to_int()); -} - -static ex f_has(const exprseq &e) -{ - return e[0].has(e[1]) ? ex(1) : ex(0); + return e[0].evalf(ex_to(e[1]).to_int()); } static ex f_inverse(const exprseq &e) { CHECK_ARG(0, matrix, inverse); - return ex_to_matrix(e[0]).inverse(); + return ex_to(e[0]).inverse(); } static ex f_is(const exprseq &e) { CHECK_ARG(0, relational, is); - return (bool)ex_to_relational(e[0]) ? ex(1) : ex(0); + return (bool)ex_to(e[0]) ? ex(1) : ex(0); } -static ex f_lcoeff(const exprseq &e) +static ex f_match(const exprseq &e) { - CHECK_ARG(1, symbol, lcoeff); - return e[0].lcoeff(ex_to_symbol(e[1])); -} - -static ex f_ldegree(const exprseq &e) -{ - CHECK_ARG(1, symbol, ldegree); - return e[0].ldegree(ex_to_symbol(e[1])); + lst repl_lst; + if (e[0].match(e[1], repl_lst)) + return repl_lst; + else + return fail(); } static ex f_normal2(const exprseq &e) { CHECK_ARG(1, numeric, normal); - return e[0].normal(ex_to_numeric(e[1]).to_int()); + return e[0].normal(ex_to(e[1]).to_int()); } static ex f_op(const exprseq &e) { CHECK_ARG(1, numeric, op); - int n = ex_to_numeric(e[1]).to_int(); + int n = ex_to(e[1]).to_int(); if (n < 0 || n >= (int)e[0].nops()) throw(std::out_of_range("second argument to op() is out of range")); return e[0].op(n); @@ -415,75 +413,69 @@ static ex f_op(const exprseq &e) 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], ex_to(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(ex_to(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], ex_to(e[2])); } 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], ex_to(e[2])); } static ex f_series(const exprseq &e) { CHECK_ARG(2, numeric, series); - return e[0].series(e[1], ex_to_numeric(e[2]).to_int()); + return e[0].series(e[1], ex_to(e[2]).to_int()); } -static ex f_sqrfree(const exprseq &e) +static ex f_sqrfree2(const exprseq &e) { - CHECK_ARG(1, symbol, sqrfree); - return sqrfree(e[0], ex_to_symbol(e[1])); + CHECK_ARG(1, lst, sqrfree); + return sqrfree(e[0], ex_to(e[1])); } static ex f_subs3(const exprseq &e) { CHECK_ARG(1, lst, subs); CHECK_ARG(2, lst, subs); - return e[0].subs(ex_to_lst(e[1]), ex_to_lst(e[2])); -} - -static ex f_tcoeff(const exprseq &e) -{ - CHECK_ARG(1, symbol, tcoeff); - return e[0].tcoeff(ex_to_symbol(e[1])); + return e[0].subs(ex_to(e[1]), ex_to(e[2])); } static ex f_trace(const exprseq &e) { CHECK_ARG(0, matrix, trace); - return ex_to_matrix(e[0]).trace(); + return ex_to(e[0]).trace(); } static ex f_transpose(const exprseq &e) { CHECK_ARG(0, matrix, transpose); - return ex_to_matrix(e[0]).transpose(); + return ex_to(e[0]).transpose(); } static ex f_unassign(const exprseq &e) { CHECK_ARG(0, symbol, unassign); - (const_cast(&ex_to_symbol(e[0])))->unassign(); + ex_to_nonconst_symbol(e[0]).unassign(); return e[0]; } 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(ex_to(e[1])); } static ex f_dummy(const exprseq &e) @@ -501,7 +493,9 @@ 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)}, @@ -513,6 +507,7 @@ static const fcn_init builtin_fcns[] = { {"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)}, {"gcd", fcn_desc(f_gcd, 2)}, {"has", fcn_desc(f_has, 2)}, @@ -522,10 +517,12 @@ 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)}, {"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)}, @@ -533,7 +530,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)}, @@ -572,7 +570,7 @@ void GiNaC::ginsh_get_ginac_functions(void) unsigned serial = 0; while (i != end) { fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial))); - i++; + ++i; serial++; } } @@ -584,7 +582,7 @@ void GiNaC::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(sym).get_name(); typedef fcn_tab::const_iterator I; pair b = fcns.equal_range(name); if (b.first == b.second) @@ -683,7 +681,7 @@ static char *fcn_generator(char *text, int state) // Return the next function which partially matches while (index != fcns.end()) { const char *fcn_name = index->first.c_str(); - index++; + ++index; if (strncmp(fcn_name, text, len) == 0) return strdup(fcn_name); } @@ -697,13 +695,21 @@ static char **fcn_completion(char *text, int start, int end) 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 } }