Added complex conjugation methods and GiNaC function "conjugate".

[ginac.git] / ginsh / ginsh_parser.yy

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 723cfccd2e1b70a72321881baa47605db510656e..a7a38efe179fc584cd67eec16ea9cce279997ec3 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -299,6 +299,7 @@ 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();}
@@ -326,8 +327,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<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)
@@ -338,14 +338,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<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)
@@ -456,26 +454,22 @@ 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], 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_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_series(const exprseq &e)
@@ -486,8 +480,7 @@ 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)
@@ -524,8 +517,7 @@ static ex f_unassign(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)
@@ -547,6 +539,7 @@ static const fcn_init builtin_fcns[] = {
        {"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},
@@ -630,9 +623,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