Synced to HEAD

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 94bff017b1de95c3c130210ce3377433c4a556b7..15185d66a56b85c86813959c29f01f0871f4ef94 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -1,9 +1,10 @@
 /** @file ginsh_lexer.ll
  *
  *  Lexical analyzer definition for ginsh.
- *  This file must be processed with flex.
- *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  This file must be processed with flex. */
+
+/*
+ *  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
@@ -36,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);
 %}
@@ -54,12 +58,13 @@ AN  [0-9a-zA-Z_]
 %%
 [ \t\n]+               /* skip whitespace */
 \\$                    /* skip line continuations */
-"#".*                  /* skip comments starting with "#" */
+"//".*                 /* skip comments starting with "//" */
+^"#".*                 /* skip lines starting with "#" */
 ^"!".*                 system(yytext + 1);     /* execute shell command */
 
                        /* special values */
 Pi                     yylval = Pi; return T_LITERAL;
-gamma                  yylval = gamma; return T_LITERAL;
+Euler                  yylval = Euler; return T_LITERAL;
 Catalan                        yylval = Catalan; return T_LITERAL;
 FAIL                   yylval = *new fail(); return T_LITERAL;
 I                      yylval = I; return T_NUMBER;
@@ -69,13 +74,16 @@ Digits                      yylval = (long)Digits; return T_DIGITS;
 quit|exit              return T_QUIT;
 warranty               return T_WARRANTY;
 print                  return T_PRINT;
-read                   return T_READ;
-write                  return T_WRITE;
+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;
@@ -84,28 +92,37 @@ 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}+                   |
+"#"{D}+"R"{AN}+                |
+"#b"([01])+            |
+"#o"[0-7]+             |
+"#x"[0-9a-fA-F]+       |
 {D}+"."{D}*({E})?      |
 {D}*"."{D}+({E})?      |
 {D}+{E}                        yylval = numeric(yytext); return T_NUMBER;
 
                        /* symbols */
 {A}{AN}*               {
-                               if (syms.find(yytext) == syms.end())
-                                       syms[yytext] = *(new symbol(yytext));
-                               yylval = syms[yytext];
+                               sym_tab::const_iterator i = syms.find(yytext);
+                               if (i == syms.end()) {
+                                       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;
                        }
 
+                       /* wildcards */
+\${D}+                 yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
                        /* everything else */
 .                      return *yytext;
 
@@ -124,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;