X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=ff585dab55a435f5305fc81e99f4603fa70a8d05;hp=ed093299d85067027e759cb360aa7405d99a872a;hb=0ff7856e0a2039ffe612b4fceb3e98fb3c271753;hpb=956a3ad3779759028bfd742456ed9eafc3e85063

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index ed093299..ff585dab 100644
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -55,12 +55,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;
@@ -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;
@@ -95,15 +95,21 @@ score			return T_SCORE;
 
 			/* 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;
 			}