X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finput_lexer.ll;h=84998d6cb25292493a90ab8abd3618564a7d6fa3;hp=34cba11f045fe7921e9122be3e93f7d8ee83ee0a;hb=0160f9ab1da453641e30539abcf0eaa4162582eb;hpb=3ab9a310275c0289ec5ae6deaf3b970aca6904e9

diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll
index 34cba11f..84998d6c 100644
--- a/ginac/input_lexer.ll
+++ b/ginac/input_lexer.ll
@@ -4,7 +4,7 @@
  *  This file must be processed with flex. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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 <iostream>
 #include <string>
@@ -38,19 +40,17 @@
 #include "fail.h"
 #include "numeric.h"
 #include "symbol.h"
+#include "lst.h"
+#include "idx.h"
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 #include "input_parser.h"
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
-// Table of all used symbols
+// Table of all used symbols/indices
 struct sym_def {
 	sym_def() : predefined(false) {}
 	sym_def(const ex &s, bool predef) : sym(s), predefined(predef) {}
@@ -89,7 +89,7 @@ AN	[0-9a-zA-Z_]
  */
 
 %%
-[ \t]+			/* skip whitespace */
+[ \t\n]+		/* skip whitespace */
 
 			/* special values */
 Pi			ginac_yylval = Pi; return T_LITERAL;
@@ -105,10 +105,6 @@ Digits			ginac_yylval = (long)Digits; return T_DIGITS;
 "<="			return T_LESSEQ;
 ">="			return T_GREATEREQ;
 
-			/* matrix delimiters */
-\[\[			return T_MATRIX_BEGIN;
-\]\]			return T_MATRIX_END;
-
 			/* numbers */
 {D}+			|
 "#"{D}+"R"{AN}+		|
@@ -129,6 +125,9 @@ Digits			ginac_yylval = (long)Digits; return T_DIGITS;
 				return T_SYMBOL;
 			}
 
+			/* end of input */
+<<EOF>>			return T_EOF;
+
 			/* everything else */
 .			return *yytext;
 
@@ -164,9 +163,7 @@ int ginac_yywrap()
 	return 1;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 // Set the input string
 void set_lexer_string(const std::string &s)
@@ -175,28 +172,38 @@ void set_lexer_string(const std::string &s)
 	curr_pos = 0;
 }
 
-// Set the list of predefined symbols
+// Get name of symbol/index
+std::string get_symbol_name(const ex & s)
+{
+	if (is_a<symbol>(s))
+		return ex_to<symbol>(s).get_name();
+	else if (is_a<idx>(s) && is_a<symbol>(s.op(0)))
+		return ex_to<symbol>(s.op(0)).get_name();
+	else
+		throw (std::runtime_error("get_symbol_name(): unexpected expression type"));
+}
+
+// Set the list of predefined symbols/indices
 void set_lexer_symbols(ex l)
 {
 	syms.clear();
-	if (!is_ex_exactly_of_type(l, lst))
+	if (!is_exactly_a<lst>(l))
 		return;
-	for (int i=0; i<l.nops(); i++) {
-		if (is_ex_exactly_of_type(l.op(i), symbol))
-			syms[ex_to_symbol(l.op(i)).get_name()] = sym_def(l.op(i), true);
+	for (unsigned i=0; i<l.nops(); i++) {
+		const ex &o = l.op(i);
+		if (is_a<symbol>(o) || (is_a<idx>(o) && is_a<symbol>(o.op(0))))
+			syms[get_symbol_name(o)] = sym_def(o, true);
 	}
 }
 
-// Check whether symbol was predefined
+// Check whether symbol/index was predefined
 bool is_lexer_symbol_predefined(const ex &s)
 {
-	sym_tab::const_iterator i = syms.find(ex_to_symbol(s).get_name());
+	sym_tab::const_iterator i = syms.find(get_symbol_name(s));
 	if (i == syms.end())
 		return false;
 	else
 		return (*i).second.predefined;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC