* numeric::print(): increase precision for C source output.

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 7f78a2dd3f97ec72cd0f0d4992c8047cff825f34..c4beae09011eb8e30cfd84285271c759f23f2f6d 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-2002 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
@@ -55,7 +55,8 @@ 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 */
@@ -70,8 +71,7 @@ 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;
 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;
@@ -88,25 +88,33 @@ score                       return T_SCORE;
 \"                     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()) {
+                                       yylval = syms[yytext] = *(new symbol(yytext));
+                               } else
+                                       yylval = i->second;
                                return T_SYMBOL;
                        }
 
+                       /* wildcards */
+\${D}+                 yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
                        /* everything else */
 .                      return *yytext;