X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=4194f94337af97e8ecfa155cee9c34a3c892ac61;hp=314db61307e7a6356899b073e1dc4cdb18cf9f4b;hb=f78b1f296310b5f1c01b74c9fb10dd33af2a8f4a;hpb=52fec0ff3ba58d05dcaa8401c972f7d9263217c7

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 314db613..4194f943 100644
--- 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-2003 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
@@ -54,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;
-EulerGamma		yylval = EulerGamma; 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;
@@ -67,7 +69,11 @@ Digits			yylval = (long)Digits; return T_DIGITS;
 
 			/* keywords */
 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;
@@ -81,28 +87,33 @@ 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()) {
+					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;
 
@@ -121,7 +132,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;