| 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);}
+ | T_MATRIX_BEGIN matrix T_MATRIX_END {$$ = lst_to_matrix(ex_to_lst($2));}
;
exprseq : exp {$$ = exprseq($1);}
return e[0].series(e[1], ex_to_numeric(e[2]).to_int());
}
-static ex f_sqrfree(const exprseq &e)
+static ex f_sqrfree1(const exprseq &e)
{
- CHECK_ARG(1, symbol, sqrfree);
- return sqrfree(e[0], ex_to_symbol(e[1]));
+ return sqrfree(e[0]);
+}
+
+static ex f_sqrfree2(const exprseq &e)
+{
+ CHECK_ARG(1, lst, sqrfree);
+ return sqrfree(e[0], ex_to_lst(e[1]));
}
static ex f_subs3(const exprseq &e)
{"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)},
}
// All registered GiNaC functions
-#ifndef NO_NAMESPACE_GINAC
void GiNaC::ginsh_get_ginac_functions(void)
-#else // ndef NO_NAMESPACE_GINAC
-void ginsh_get_ginac_functions(void)
-#endif // ndef NO_NAMESPACE_GINAC
{
vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
unsigned serial = 0;