fixes for gcc 3.4

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index d9329bfe36e549f5d8210b47e5cd8c83acb8d1b3..15185d66a56b85c86813959c29f01f0871f4ef94 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-2001 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
@@ -37,6 +37,9 @@
 // Table of all used symbols
 sym_tab syms;
 
+// Type of symbols to generate (real or complex)
+unsigned symboltype = domain::complex;
+
 // lex input function
 static int ginsh_input(char *buf, int max_size);
 %}
@@ -72,11 +75,15 @@ 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;
 look                   return T_LOOK;
 score                  return T_SCORE;
+complex_symbols return T_COMPLEX_SYMBOLS;
+real_symbols    return T_REAL_SYMBOLS;
 
                        /* comparison */
 "=="                   return T_EQUAL;
@@ -85,9 +92,6 @@ score                 return T_SCORE;
 ">="                   return T_GREATEREQ;
 
                        /* last 1..3 expressions */
-\"                     return T_QUOTE;
-\"\"                   return T_QUOTE2;
-\"\"\"                 return T_QUOTE3;
 \%                     return T_QUOTE;
 \%\%                   return T_QUOTE2;
 \%\%\%                 return T_QUOTE3;
@@ -106,7 +110,11 @@ score                      return T_SCORE;
 {A}{AN}*               {
                                sym_tab::const_iterator i = syms.find(yytext);
                                if (i == syms.end()) {
-                                       yylval = syms[yytext] = *(new symbol(yytext));
+                                       if (symboltype == domain::complex) {
+                                               yylval = syms[yytext] = *(new symbol(yytext));
+                                       } else {
+                                               yylval = syms[yytext] = *(new symbol(yytext, domain::real));
+                                       }
                                } else
                                        yylval = i->second;
                                return T_SYMBOL;
@@ -133,7 +141,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;