]> www.ginac.de Git - ginac.git/blobdiff - ginsh/ginsh_parser.ypp
[BUGFIX] Fix crash in parser.
[ginac.git] / ginsh / ginsh_parser.ypp
index 4813f63a37de2410a4f2af11d2a407bf21de35a9..a142f4bba25109c139b50b33284dac2d8afd9e6d 100644 (file)
@@ -4,7 +4,7 @@
  *  This file must be processed with yacc/bison. */
 
 /*
- *  GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2024 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
@@ -45,6 +45,9 @@
 
 #include "ginsh.h"
 
+using namespace std;
+using namespace GiNaC;
+
 #define YYERROR_VERBOSE 1
 
 #ifdef HAVE_LIBREADLINE
@@ -238,7 +241,7 @@ line        : ';'
 
 exp    : T_NUMBER              {$$ = $1;}
        | T_SYMBOL              {
-               exmap::const_iterator i = assigned_symbol_table.find($1);
+               auto i = assigned_symbol_table.find($1);
                if (i == assigned_symbol_table.end())
                        $$ = $1;
                else
@@ -251,7 +254,7 @@ exp : T_NUMBER              {$$ = $1;}
        | T_QUOTE2              {$$ = exstack[1];}
        | T_QUOTE3              {$$ = exstack[2];}
        | T_SYMBOL '(' exprseq ')' {
-               fcn_tab::const_iterator i = find_function($1, $3.nops());
+               auto i = find_function($1, $3.nops());
                if (i->second.is_ginac) {
                        $$ = ((fcnp2)(i->second.p))(ex_to<exprseq>($3), i->second.serial);
                } else {
@@ -439,7 +442,7 @@ static ex f_integer_content(const exprseq &e)
 static ex f_integral(const exprseq &e)
 {
        CHECK_ARG(0, symbol, integral);
-       return integral(e[0], e[1], e[2], e[3]);
+       return GiNaC::integral(e[0], e[1], e[2], e[3]);
 }
 
 static ex f_inverse(const exprseq &e)
@@ -527,6 +530,12 @@ static ex f_series(const exprseq &e)
        return e[0].series(e[1], ex_to<numeric>(e[2]).to_int());
 }
 
+static ex f_series_to_poly(const exprseq &e)
+{
+       CHECK_ARG(0, pseries, series_to_poly);
+       return series_to_poly(ex_to<pseries>(e[0]));
+}
+
 static ex f_sprem(const exprseq &e)
 {
        return sprem(e[0], e[1], e[2]);
@@ -538,6 +547,11 @@ static ex f_sqrfree2(const exprseq &e)
        return sqrfree(e[0], ex_to<lst>(e[1]));
 }
 
+static ex f_sqrfree_parfrac(const exprseq &e)
+{
+       return sqrfree_parfrac(e[0], ex_to<symbol>(e[1]));
+}
+
 static ex f_subs3(const exprseq &e)
 {
        CHECK_ARG(1, lst, subs);
@@ -571,6 +585,105 @@ static ex f_unit(const exprseq &e)
        return e[0].unit(e[1]);
 }
 
+static ex f_basic_log_kernel(const exprseq &e)
+{
+       return basic_log_kernel();      
+}
+
+static ex f_multiple_polylog_kernel(const exprseq &e)
+{
+       return multiple_polylog_kernel(e[0]);   
+}
+
+static ex f_ELi_kernel(const exprseq &e)
+{
+       return ELi_kernel(e[0],e[1],e[2],e[3]); 
+}
+
+static ex f_Ebar_kernel(const exprseq &e)
+{
+       return Ebar_kernel(e[0],e[1],e[2],e[3]);        
+}
+
+static ex f_Kronecker_dtau_kernel_4(const exprseq &e)
+{
+       return Kronecker_dtau_kernel(e[0],e[1],e[2],e[3]);      
+}
+
+static ex f_Kronecker_dtau_kernel_3(const exprseq &e)
+{
+       return Kronecker_dtau_kernel(e[0],e[1],e[2]);   
+}
+
+static ex f_Kronecker_dtau_kernel_2(const exprseq &e)
+{
+       return Kronecker_dtau_kernel(e[0],e[1]);        
+}
+
+static ex f_Kronecker_dz_kernel_5(const exprseq &e)
+{
+       return Kronecker_dz_kernel(e[0],e[1],e[2],e[3],e[4]);   
+}
+
+static ex f_Kronecker_dz_kernel_4(const exprseq &e)
+{
+       return Kronecker_dz_kernel(e[0],e[1],e[2],e[3]);        
+}
+
+static ex f_Kronecker_dz_kernel_3(const exprseq &e)
+{
+       return Kronecker_dz_kernel(e[0],e[1],e[2]);     
+}
+
+static ex f_Eisenstein_kernel_6(const exprseq &e)
+{
+       return Eisenstein_kernel(e[0],e[1],e[2],e[3],e[4],e[5]);        
+}
+
+static ex f_Eisenstein_kernel_5(const exprseq &e)
+{
+       return Eisenstein_kernel(e[0],e[1],e[2],e[3],e[4]);     
+}
+
+static ex f_Eisenstein_h_kernel_5(const exprseq &e)
+{
+       return Eisenstein_h_kernel(e[0],e[1],e[2],e[3],e[4]);   
+}
+
+static ex f_Eisenstein_h_kernel_4(const exprseq &e)
+{
+       return Eisenstein_h_kernel(e[0],e[1],e[2],e[3]);        
+}
+
+static ex f_modular_form_kernel_3(const exprseq &e)
+{
+       return modular_form_kernel(e[0],e[1],e[2]);     
+}
+
+static ex f_modular_form_kernel_2(const exprseq &e)
+{
+       return modular_form_kernel(e[0],e[1]);  
+}
+
+static ex f_user_defined_kernel(const exprseq &e)
+{
+       return user_defined_kernel(e[0],e[1]);  
+}
+
+static ex f_q_expansion_modular_form(const exprseq &e)
+{
+       if ( is_a<Eisenstein_kernel>(e[0]) ) {
+               return ex_to<Eisenstein_kernel>(e[0]).q_expansion_modular_form(e[1], ex_to<numeric>(e[2]).to_int());
+       }       
+       if ( is_a<Eisenstein_h_kernel>(e[0]) ) {
+               return ex_to<Eisenstein_h_kernel>(e[0]).q_expansion_modular_form(e[1], ex_to<numeric>(e[2]).to_int());
+       }       
+       if ( is_a<modular_form_kernel>(e[0]) ) {
+               return ex_to<modular_form_kernel>(e[0]).q_expansion_modular_form(e[1], ex_to<numeric>(e[2]).to_int());
+       }       
+       throw(std::invalid_argument("first argument must be a modular form"));
+}
+
 static ex f_dummy(const exprseq &e)
 {
        throw(std::logic_error("dummy function called (shouldn't happen)"));
@@ -635,9 +748,11 @@ static const fcn_init builtin_fcns[] = {
        {"rem", f_rem, 3},
        {"resultant", f_resultant, 3},
        {"series", f_series, 3},
+       {"series_to_poly", f_series_to_poly, 1},
        {"sprem", f_sprem, 3},
        {"sqrfree", f_sqrfree1, 1},
        {"sqrfree", f_sqrfree2, 2},
+       {"sqrfree_parfrac", f_sqrfree_parfrac, 2},
        {"sqrt", f_sqrt, 1},
        {"subs", f_subs2, 2},
        {"subs", f_subs3, 3},
@@ -647,6 +762,24 @@ static const fcn_init builtin_fcns[] = {
        {"transpose", f_transpose, 1},
        {"unassign", f_unassign, 1},
        {"unit", f_unit, 2},
+       {"basic_log_kernel", f_basic_log_kernel, 0},
+       {"multiple_polylog_kernel", f_multiple_polylog_kernel, 1},
+       {"ELi_kernel", f_ELi_kernel, 4},
+       {"Ebar_kernel", f_Ebar_kernel, 4},
+       {"Kronecker_dtau_kernel", f_Kronecker_dtau_kernel_4, 4},
+       {"Kronecker_dtau_kernel", f_Kronecker_dtau_kernel_3, 3},
+       {"Kronecker_dtau_kernel", f_Kronecker_dtau_kernel_2, 2},
+       {"Kronecker_dz_kernel", f_Kronecker_dz_kernel_5, 5},
+       {"Kronecker_dz_kernel", f_Kronecker_dz_kernel_4, 4},
+       {"Kronecker_dz_kernel", f_Kronecker_dz_kernel_3, 3},
+       {"Eisenstein_kernel", f_Eisenstein_kernel_6, 6},
+       {"Eisenstein_kernel", f_Eisenstein_kernel_5, 5},
+       {"Eisenstein_h_kernel", f_Eisenstein_h_kernel_5, 5},
+       {"Eisenstein_h_kernel", f_Eisenstein_h_kernel_4, 4},
+       {"modular_form_kernel", f_modular_form_kernel_3, 3},
+       {"modular_form_kernel", f_modular_form_kernel_2, 2},
+       {"user_defined_kernel", f_user_defined_kernel, 2},
+       {"q_expansion_modular_form", f_q_expansion_modular_form, 3},
        {nullptr, f_dummy, 0}        // End marker
 };
 
@@ -678,11 +811,15 @@ static const fcn_help_init builtin_help[] = {
        {"tan", "tangent function"},
        {"tanh", "hyperbolic tangent function"},
        {"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"},
+       {"G", "multiple polylogarithm (integral representation)"},
        {"Li2", "dilogarithm"},
        {"Li3", "trilogarithm"},
        {"Li", "(multiple) polylogarithm"},
        {"S", "Nielsen's generalized polylogarithm"},
        {"H", "harmonic polylogarithm"},
+       {"EllipticK", "complete elliptic integral of the first kind"},
+       {"EllipticE", "complete elliptic integral of the second kind"},
+       {"iterated_integral", "iterated integral"},
        {"Order", "order term function (for truncated power series)"},
        {"Derivative", "inert differential operator"},
        {nullptr, nullptr}  // End marker
@@ -876,7 +1013,7 @@ static void ginsh_readline_init(char* name)
 void greeting(void)
 {
     cout << "ginsh - GiNaC Interactive Shell (GiNaC V" << GINACLIB_VERSION << ")" << endl;
-    cout << "  __,  _______  Copyright (C) 1999-2016 Johannes Gutenberg University Mainz,\n"
+    cout << "  __,  _______  Copyright (C) 1999-2024 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;