- ginac.h includes version.h (created by configure script), which contains

[ginac.git] / ginsh / ginsh_parser.yy

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index fdb9bffa634fd1c6cad39ae3b12eae061473b9e3..6931d18944f3d64dbada3089b77723bb17db51fe 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -151,7 +151,6 @@ line        : ';'
                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";}
@@ -421,23 +420,10 @@ static ex f_rem(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)
-{
-       CHECK_ARG(1, symbol, series);
-       return e[0].series(ex_to_symbol(e[1]), e[2]);
-}
-
-static ex f_series4(const exprseq &e)
+static ex f_series(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)
@@ -530,9 +516,7 @@ static const fcn_init builtin_fcns[] = {
        {"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)},
@@ -774,13 +758,13 @@ int main(int argc, char **argv)
        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("Gamma", "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");