merging 1.2 branch into main trunk

[ginac.git] / ginsh / ginsh_parser.yy

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index c22eafe8e6f0cfdcb7f81c078e7727fadbfbd299..723cfccd2e1b70a72321881baa47605db510656e 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -50,7 +50,7 @@ static char *orig_basic_word_break_characters;
 static const char *orig_basic_word_break_characters;
 #endif
 
-// Expression stack for ", "" and """
+// Expression stack for %, %% and %%%
 static void push(const ex &e);
 static ex exstack[3];
 
@@ -175,6 +175,10 @@ line       : ';'
        }
        | '?' T_SYMBOL          {print_help(ex_to<symbol>($2).get_name());}
        | '?' T_TIME            {print_help("time");}
+       | '?' T_PRINT           {print_help("print");}
+       | '?' T_IPRINT          {print_help("iprint");}
+       | '?' T_PRINTLATEX      {print_help("print_latex");}
+       | '?' T_PRINTCSRC       {print_help("print_csrc");}
        | '?' '?'               {print_help_topics();}
        | T_QUIT                {YYACCEPT;}
        | T_WARRANTY {
@@ -352,9 +356,9 @@ static ex f_determinant(const exprseq &e)
 
 static ex f_diag(const exprseq &e)
 {
-       unsigned dim = e.nops();
+       size_t dim = e.nops();
        matrix &m = *new matrix(dim, dim);
-       for (unsigned i=0; i<dim; i++)
+       for (size_t i=0; i<dim; i++)
                m.set(i, i, e.op(i));
        return m;
 }
@@ -561,6 +565,7 @@ static const fcn_init builtin_fcns[] = {
        {"gcd", f_gcd, 2},
        {"has", f_has, 2},
        {"inverse", f_inverse, 1},
+       {"iprint", f_dummy, 0},      // for Tab-completion
        {"is", f_is, 1},
        {"lcm", f_lcm, 2},
        {"lcoeff", f_lcoeff, 2},
@@ -577,6 +582,9 @@ static const fcn_init builtin_fcns[] = {
        {"pow", f_pow, 2},
        {"prem", f_prem, 3},
        {"primpart", f_primpart, 2},
+       {"print", f_dummy, 0},       // for Tab-completion
+       {"print_csrc", f_dummy, 0},  // for Tab-completion
+       {"print_latex", f_dummy, 0}, // for Tab-completion
        {"quo", f_quo, 3},
        {"rem", f_rem, 3},
        {"series", f_series, 3},
@@ -587,12 +595,12 @@ static const fcn_init builtin_fcns[] = {
        {"subs", f_subs2, 2},
        {"subs", f_subs3, 3},
        {"tcoeff", f_tcoeff, 2},
-       {"time", f_dummy, 0},
+       {"time", f_dummy, 0},        // for Tab-completion
        {"trace", f_trace, 1},
        {"transpose", f_transpose, 1},
        {"unassign", f_unassign, 1},
        {"unit", f_unit, 2},
-       {NULL, f_dummy, 0}      // End marker
+       {NULL, f_dummy, 0}           // End marker
 };
 
 struct fcn_help_init {
@@ -846,6 +854,12 @@ int main(int argc, char **argv)
        insert_help(builtin_help);
        insert_help(extended_help);
 
+       // Help for other keywords
+       insert_help("print", "print(expression) - dumps the internal structure of the given expression (for debugging)");
+       insert_help("iprint", "iprint(expression) - prints the given integer expression in decimal, octal, and hexadecimal bases");
+       insert_help("print_latex", "print_latex(expression) - prints a LaTeX representation of the given expression");
+       insert_help("print_csrc", "print_csrc(expression) - prints a C source code representation of the given expression");
+
        // Init readline completer
        rl_readline_name = argv[0];
 #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)