X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=cdb4237be29839949b63be81a32981a5340e8001;hp=42a432b8afbb0c3ed257df0c1a05aa879bc7a628;hb=3627c2c0f2fe8fe04816703c5fc6dad9c96fb0a6;hpb=a5928fbda28b1b7f5b5939a9d49754660a0d546c

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 42a432b8..cdb4237b 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 Johannes Gutenberg University Mainz, Germany
+ *  This file must be processed with flex. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -17,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 
@@ -25,19 +26,12 @@
  *  Definitions
  */
 
+%pointer
+
 %{
 #include "config.h"
 
-#include <stdio.h>
-extern "C" {
-#include <readline/readline.h>
-#include <readline/history.h>
-}
-#include <map>
-
-#include <ginac/ginac.h>
 #include "ginsh.h"
-
 #include "ginsh_parser.h"
 
 #define YY_INPUT(buf, result, max_size) (result = ginsh_input(buf, max_size))
@@ -45,6 +39,9 @@ extern "C" {
 // 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);
 %}
@@ -63,12 +60,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;
@@ -76,12 +74,18 @@ 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;
 look			return T_LOOK;
 score			return T_SCORE;
+complex_symbols return T_COMPLEX_SYMBOLS;
+real_symbols    return T_REAL_SYMBOLS;
 
 			/* comparison */
 "=="			return T_EQUAL;
@@ -90,28 +94,41 @@ 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) {
+						symbol tmp(yytext);
+						syms[yytext] = tmp;
+						yylval = tmp;
+					} else {
+						realsymbol tmp(yytext);
+						syms[yytext] = tmp;
+						yylval = tmp;
+					}
+				} else
+					yylval = i->second;
 				return T_SYMBOL;
 			}
 
+			/* wildcards */
+\${D}+			yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
 			/* everything else */
 .			return *yytext;
 
@@ -130,10 +147,14 @@ 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) {
-		int actual;
-
+#endif
+#ifdef HAVE_LIBREADLINE
 		// Do we need to read a new line?
+		int actual;
 		if (line_length == 0) {
 
 			// Free old line
@@ -164,7 +185,17 @@ static int ginsh_input(char *buf, int max_size)
 		line_length -= actual;
 		line_ptr += actual;
 		result = actual;
-
+#else
+		printf("> "); fflush(stdout);
+		int c = '*', n;
+		for (n = 0; n < max_size && (c = getc(yyin)) != EOF && c != '\n'; ++n)
+			buf[n] = (char)c;
+		if (c == '\n')
+			buf[n++] = (char)c;
+		if (c == EOF && ferror(yyin))
+			YY_FATAL_ERROR("input in flex scanner failed");
+		result = n;
+#endif
 	} else if (((result = fread(buf, 1, max_size, yyin)) == 0) && ferror(yyin))
 		YY_FATAL_ERROR("input in flex scanner failed");