X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=a2ab36bdfe7aa19662731447e43f77d4bfc238e9;hp=3c6f0dfb723aa11db52823bb244e33b985bd53ac;hb=866b3eb23253a272788d8791b1ed023e63674d50;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 3c6f0dfb..a2ab36bd 100644
--- 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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
@@ -18,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
  */
 
 
@@ -26,6 +26,8 @@
  *  Definitions
  */
 
+%pointer
+
 %{
 #include "config.h"
 
@@ -37,6 +39,9 @@
 // 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);
 %}
@@ -79,6 +84,8 @@ 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;
@@ -87,9 +94,6 @@ score			return T_SCORE;
 ">="			return T_GREATEREQ;
 
 			/* last 1..3 expressions */
-\"			return T_QUOTE;
-\"\"			return T_QUOTE2;
-\"\"\"			return T_QUOTE3;
 \%			return T_QUOTE;
 \%\%			return T_QUOTE2;
 \%\%\%			return T_QUOTE3;
@@ -108,7 +112,15 @@ score			return T_SCORE;
 {A}{AN}*		{
 				sym_tab::const_iterator i = syms.find(yytext);
 				if (i == syms.end()) {
-					yylval = syms[yytext] = *(new symbol(yytext));
+					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;
@@ -135,7 +147,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;