added description of wildcards

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index ed093299d85067027e759cb360aa7405d99a872a..a8a2b10e15dc0f4da964eabdfb7fceafd6cda26b 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -4,7 +4,7 @@
  *  This file must be processed with flex. */
 
 /*
  *  This file must be processed with flex. */
 
 /*

- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
  *
  *  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,12 +55,13 @@ AN  [0-9a-zA-Z_]
 %%
 [ \t\n]+               /* skip whitespace */
 \\$                    /* skip line continuations */
 %%
 [ \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;
 ^"!".*                 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;
 Catalan                        yylval = Catalan; return T_LITERAL;
 FAIL                   yylval = *new fail(); return T_LITERAL;
 I                      yylval = I; return T_NUMBER;


@@ -70,8 +71,7 @@ Digits                        yylval = (long)Digits; return T_DIGITS;
 quit|exit              return T_QUIT;
 warranty               return T_WARRANTY;
 print                  return T_PRINT;
 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;
 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;


@@ -95,18 +95,27 @@ score                       return T_SCORE;
 
                        /* numbers */
 {D}+                   |
 
                        /* 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}*               {
 {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;
                        }
 
                                return T_SYMBOL;
                        }
 

+                       /* wildcards */
+\${D}+                 yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+

                        /* everything else */
 .                      return *yytext;
 
                        /* everything else */
 .                      return *yytext;