patch for readline 5.0 [Howard B. Golden]

[ginac.git] / ginsh / ginsh_parser.yy

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index be65cf8e0f8f2a81d32d438b1edfdb39362d19a0..a93808e8a0c12838c0ed1e6ba12b235d5ec388e9 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -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];
@@ -404,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);
@@ -571,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},
@@ -811,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
@@ -821,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