X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finput_parser.yy;h=aac43ecb98595c1a59030ba536afb42484629ad6;hp=d3ffd1955abc312cb7d636cf7fbbca3a5be47bdf;hb=ae7c2d39ba090f4425995d0d1eb9fff1c91a9489;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7

diff --git a/ginac/input_parser.yy b/ginac/input_parser.yy
index d3ffd195..aac43ecb 100644
--- a/ginac/input_parser.yy
+++ b/ginac/input_parser.yy
@@ -4,7 +4,7 @@
  *  This file must be processed with yacc/bison. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 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
  */
 
 
@@ -29,13 +29,16 @@
 %{
 #include <stdexcept>
 
-#include "input_lexer.h"
 #include "ex.h"
+#include "input_lexer.h"
 #include "relational.h"
+#include "operators.h"
 #include "symbol.h"
 #include "lst.h"
 #include "power.h"
 #include "exprseq.h"
+#include "idx.h"
+#include "indexed.h"
 #include "matrix.h"
 #include "inifcns.h"
 
@@ -48,11 +51,14 @@ ex parsed_ex;
 
 // Last error message returned by parser
 static std::string parser_error;
+
+// Prototypes
+ex attach_index(const ex & base, ex i, bool covariant);
 %}
 
 /* Tokens (T_LITERAL means a literal value returned by the parser, but not
    of class numeric or symbol (e.g. a constant or the FAIL object)) */
-%token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
+%token T_EOF T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ
 
 /* Operator precedence and associativity */
 %right '='
@@ -62,6 +68,7 @@ static std::string parser_error;
 %left '*' '/' '%'
 %nonassoc NEG
 %right '^'
+%left '.' '~'
 %nonassoc '!'
 
 %start input
@@ -72,7 +79,7 @@ static std::string parser_error;
  */
 
 %%
-input	: exp {
+input	: exp T_EOF {
 		try {
 			parsed_ex = $1;
 			YYACCEPT;
@@ -81,7 +88,6 @@ input	: exp {
 			YYERROR;
 		}
 	}
-	| error		{yyclearin; yyerrok;}
 	;
 
 exp	: T_NUMBER		{$$ = $1;}
@@ -89,12 +95,12 @@ exp	: T_NUMBER		{$$ = $1;}
 		if (is_lexer_symbol_predefined($1))
 			$$ = $1.eval();
 		else
-			throw (std::runtime_error("unknown symbol '" + ex_to<symbol>($1).get_name() + "'"));
+			throw (std::runtime_error("unknown symbol '" + get_symbol_name($1) + "'"));
 	}
 	| T_LITERAL		{$$ = $1;}
 	| T_DIGITS		{$$ = $1;}
 	| T_SYMBOL '(' exprseq ')' {
-		std::string n = ex_to<symbol>($1).get_name();
+		std::string n = get_symbol_name($1);
 		if (n == "sqrt") {
 			if ($3.nops() != 1)
 				throw (std::runtime_error("too many arguments to sqrt()"));
@@ -117,6 +123,8 @@ exp	: T_NUMBER		{$$ = $1;}
 	| '-' exp %prec NEG	{$$ = -$2;}
 	| '+' exp %prec NEG	{$$ = $2;}
 	| exp '^' exp		{$$ = pow($1, $3);}
+	| exp '.' exp		{$$ = attach_index($1, $3, true);}
+	| exp '~' exp		{$$ = attach_index($1, $3, false);}
 	| exp '!'		{$$ = factorial($1);}
 	| '(' exp ')'		{$$ = $2;}
 	| '{' list_or_empty '}'	{$$ = $2;}
@@ -149,6 +157,30 @@ row	: exp			{$$ = lst($1);}
  */
 
 %%
+// Attach index to expression
+ex attach_index(const ex & base, ex i, bool covariant)
+{
+	// Toggle index variance if necessary
+	if (is_a<varidx>(i)) {
+		const varidx &vi = ex_to<varidx>(i);
+		if (vi.is_covariant() != covariant)
+			i = vi.toggle_variance();
+	} else if (!covariant)
+		throw (std::runtime_error("index '" + get_symbol_name(i) + "' is not a varidx and cannot be contravariant"));
+
+	// Add index to an existing indexed object, or create a new indexed
+	// object if there are no indices yet
+	if (is_a<indexed>(base)) {
+		const ex &b = base.op(0);
+		exvector iv;
+		for (unsigned n=1; n<base.nops(); n++)
+			iv.push_back(base.op(n));
+		iv.push_back(i);
+		return indexed(b, iv);
+	} else
+		return indexed(base, i);
+}
+
 // Get last error encountered by parser
 std::string get_parser_error(void)
 {