Updated NEWS.

[ginac.git] / ginsh / ginsh_parser.yy

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 1ecaf6b57dd3e706ac2fa0bdbeccf1f819997d50..a93808e8a0c12838c0ed1e6ba12b235d5ec388e9 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -4,7 +4,7 @@
  *  This file must be processed with yacc/bison. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -50,6 +50,12 @@ static char *orig_basic_word_break_characters;
 static const char *orig_basic_word_break_characters;
 #endif
 
+#if (GINAC_RL_VERSION_MAJOR >= 5)
+#define GINAC_RL_COMPLETER_CAST(a) const_cast<char *>((a))
+#else
+#define GINAC_RL_COMPLETER_CAST(a) (a)
+#endif
+
 // Expression stack for %, %% and %%%
 static void push(const ex &e);
 static ex exstack[3];
@@ -93,7 +99,7 @@ static void print_help_topics(void);
 %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
 
 %token T_QUIT T_WARRANTY T_PRINT T_IPRINT T_PRINTLATEX T_PRINTCSRC T_TIME
-%token T_XYZZY T_INVENTORY T_LOOK T_SCORE
+%token T_XYZZY T_INVENTORY T_LOOK T_SCORE T_COMPLEX_SYMBOLS T_REAL_SYMBOLS
 
 /* Operator precedence and associativity */
 %right '='
@@ -202,6 +208,8 @@ line        : ';'
                cout << (syms.size() > 350 ? 350 : syms.size());
                cout << " out of a possible 350.\n";
        }
+       | T_REAL_SYMBOLS { symboltype = domain::real; }
+       | T_COMPLEX_SYMBOLS { symboltype = domain::complex; }
        | T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' {
                getrusage(RUSAGE_SELF, &end_time);
                cout << (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +
@@ -299,7 +307,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_notation(const exprseq &e) {return convert_H_notation(e[0], e[1]);}
+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();}
@@ -402,6 +410,11 @@ static ex f_find(const exprseq &e)
        return found;
 }
 
+static ex f_integer_content(const exprseq &e)
+{
+       return e[0].expand().integer_content();
+}
+
 static ex f_inverse(const exprseq &e)
 {
        CHECK_ARG(0, matrix, inverse);
@@ -467,11 +480,23 @@ static ex f_quo(const exprseq &e)
        return quo(e[0], e[1], e[2]);
 }
 
+static ex f_rank(const exprseq &e)
+{
+       CHECK_ARG(0, matrix, rank);
+       return ex_to<matrix>(e[0]).rank();
+}
+
 static ex f_rem(const exprseq &e)
 {
        return rem(e[0], e[1], e[2]);
 }
 
+static ex f_resultant(const exprseq &e)
+{
+       CHECK_ARG(2, symbol, resultant);
+       return resultant(e[0], e[1], ex_to<symbol>(e[2]));
+}
+
 static ex f_series(const exprseq &e)
 {
        CHECK_ARG(2, numeric, series);
@@ -539,7 +564,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_notation", f_convert_H_notation, 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},
@@ -557,6 +582,7 @@ static const fcn_init builtin_fcns[] = {
        {"find", f_find, 2},
        {"gcd", f_gcd, 2},
        {"has", f_has, 2},
+       {"integer_content", f_integer_content, 1},
        {"inverse", f_inverse, 1},
        {"iprint", f_dummy, 0},      // for Tab-completion
        {"is", f_is, 1},
@@ -579,7 +605,9 @@ static const fcn_init builtin_fcns[] = {
        {"print_csrc", f_dummy, 0},  // for Tab-completion
        {"print_latex", f_dummy, 0}, // for Tab-completion
        {"quo", f_quo, 3},
+       {"rank", f_rank, 1},
        {"rem", f_rem, 3},
+       {"resultant", f_resultant, 3},
        {"series", f_series, 3},
        {"sprem", f_sprem, 3},
        {"sqrfree", f_sqrfree1, 1},
@@ -795,7 +823,7 @@ static char **fcn_completion(const char *text, int start, int end)
                // For shell commands, revert back to filename completion
                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;
+               rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
 #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
                return completion_matches(const_cast<char *>(text), (CPFunction *)filename_completion_function);
 #else
@@ -805,7 +833,7 @@ static char **fcn_completion(const char *text, int start, int end)
                // 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;
+               rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
 #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
                return completion_matches(const_cast<char *>(text), (CPFunction *)fcn_generator);
 #else
@@ -817,7 +845,7 @@ static char **fcn_completion(const char *text, int start, int end)
 void greeting(void)
 {
     cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
-    cout << "  __,  _______  Copyright (C) 1999-2003 Johannes Gutenberg University Mainz,\n"
+    cout << "  __,  _______  Copyright (C) 1999-2004 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;