X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=896c28d34a3ae38eb91fce11cd2b95eb619dfda9;hb=c030e24444ef604e7343bda6e88b79bbfbfe6138;hp=d27d0fe275b8917ca06b32153e9e901716e6dd0b;hpb=cfe6e9424d016b19fe09ad618b8713910a46c507;p=ginac.git

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index d27d0fe2..896c28d3 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-2004 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
@@ -37,6 +37,9 @@
 // Table of all used symbols
 sym_tab syms;
 
+// Type of symbols to generate (real or complex)
+unsigned symboltype = symbol_options::complex;
+
 // lex input function
 static int ginsh_input(char *buf, int max_size);
 %}
@@ -56,6 +59,7 @@ AN	[0-9a-zA-Z_]
 [ \t\n]+		/* skip whitespace */
 \\$			/* skip line continuations */
 "//".*			/* skip comments starting with "//" */
+^"#".*			/* skip lines starting with "#" */
 ^"!".*			system(yytext + 1);	/* execute shell command */
 
 			/* special values */
@@ -71,11 +75,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;
@@ -84,13 +92,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}+			|
@@ -106,12 +110,19 @@ 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 == symbol_options::complex) {
+						yylval = syms[yytext] = *(new symbol(yytext));
+					} else {
+						yylval = syms[yytext] = *(new symbol(yytext, symbol_options::real));
+					}
 				} else
 					yylval = i->second;
 				return T_SYMBOL;
 			}
 
+			/* wildcards */
+\${D}+			yylval = wild(atoi(yytext + 1)); return T_LITERAL;
+
 			/* everything else */
 .			return *yytext;
 
@@ -130,7 +141,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;