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=ff585dab55a435f5305fc81e99f4603fa70a8d05;hb=7769ce49235ed6510785baa0a29801e3a59b563e;hpb=2acf71f4ed17c31f59f0449efa6793cfeb28eb85

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index ff585dab..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-2000 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);
 %}
@@ -72,11 +77,15 @@ 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;
@@ -85,13 +94,9 @@ 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}+			|
@@ -107,12 +112,23 @@ 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;
 			}
 
+			/* wildcards */
+\${D}+			yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
 			/* everything else */
 .			return *yytext;
 
@@ -131,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;