mention the "dummy()" function option

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index d27d0fe275b8917ca06b32153e9e901716e6dd0b..4194f94337af97e8ecfa155cee9c34a3c892ac61 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -4,7 +4,7 @@
  *  This file must be processed with flex. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -56,6 +56,7 @@ AN    [0-9a-zA-Z_]
 [ \t\n]+               /* skip whitespace */
 \\$                    /* skip line continuations */
 "//".*                 /* skip comments starting with "//" */
+^"#".*                 /* skip lines starting with "#" */
 ^"!".*                 system(yytext + 1);     /* execute shell command */
 
                        /* special values */
@@ -71,6 +72,8 @@ quit|exit             return T_QUIT;
 warranty               return T_WARRANTY;
 print                  return T_PRINT;
 iprint                 return T_IPRINT;
+print_latex            return T_PRINTLATEX;
+print_csrc             return T_PRINTCSRC;
 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;
@@ -84,13 +87,9 @@ score                        return T_SCORE;
 ">="                   return T_GREATEREQ;
 
                        /* last 1..3 expressions */
-\"                     return T_QUOTE;
-\"\"                   return T_QUOTE2;
-\"\"\"                 return T_QUOTE3;
-
-                       /* matrix delimiters */
-\[\[                   return T_MATRIX_BEGIN;
-\]\]                   return T_MATRIX_END;
+\%                     return T_QUOTE;
+\%\%                   return T_QUOTE2;
+\%\%\%                 return T_QUOTE3;
 
                        /* numbers */
 {D}+                   |
@@ -112,6 +111,9 @@ score                       return T_SCORE;
                                return T_SYMBOL;
                        }
 
+                       /* wildcards */
+\${D}+                 yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
                        /* everything else */
 .                      return *yytext;
 
@@ -130,7 +132,11 @@ static char *line_ptr;
 static int ginsh_input(char *buf, int max_size)
 {
        int result;
+#if defined(YY_CURRENT_BUFFER)
+       if (YY_CURRENT_BUFFER->yy_is_interactive) {
+#else
        if (yy_current_buffer->yy_is_interactive) {
+#endif
 #ifdef HAVE_LIBREADLINE
                // Do we need to read a new line?
                int actual;