X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finput_parser.yy;h=9eab1a594cb85a0e28eebece3c7cab9339eebfe5;hb=0573a5aa2a4834b26a3d40f4160d145658988eff;hp=0bec16c75cc493c2fb4e4c32818df237c803ec48;hpb=fa792492f853255f78b3e10c6f727fd10ad45cac;p=ginac.git

diff --git a/ginac/input_parser.yy b/ginac/input_parser.yy
index 0bec16c7..9eab1a59 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -39,9 +39,7 @@
 #include "matrix.h"
 #include "inifcns.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 #define YYERROR_VERBOSE 1
 
@@ -49,7 +47,7 @@ namespace GiNaC {
 ex parsed_ex;
 
 // Last error message returned by parser
-static string parser_error;
+static std::string parser_error;
 %}
 
 /* Tokens (T_LITERAL means a literal value returned by the parser, but not
@@ -78,8 +76,8 @@ input	: exp {
 		try {
 			parsed_ex = $1;
 			YYACCEPT;
-		} catch (exception &e) {
-			parser_error = e.what();
+		} catch (std::exception &err) {
+			parser_error = err.what();
 			YYERROR;
 		}
 	}
@@ -91,12 +89,12 @@ exp	: T_NUMBER		{$$ = $1;}
 		if (is_lexer_symbol_predefined($1))
 			$$ = $1.eval();
 		else
-			throw (std::runtime_error("unknown symbol '" + ex_to_symbol($1).getname() + "'"));
+			throw (std::runtime_error("unknown symbol '" + ex_to_symbol($1).get_name() + "'"));
 	}
 	| T_LITERAL		{$$ = $1;}
 	| T_DIGITS		{$$ = $1;}
 	| T_SYMBOL '(' exprseq ')' {
-		unsigned i = function::find_function(ex_to_symbol($1).getname(), $3.nops());
+		unsigned i = function::find_function(ex_to_symbol($1).get_name(), $3.nops());
 		$$ = function(i, static_cast<const exprseq &>(*($3.bp))).eval(1);
 	}
 	| exp T_EQUAL exp	{$$ = $1 == $3;}
@@ -109,14 +107,13 @@ exp	: T_NUMBER		{$$ = $1;}
 	| exp '-' exp		{$$ = $1 - $3;}
 	| exp '*' exp		{$$ = $1 * $3;}
 	| exp '/' exp		{$$ = $1 / $3;}
-	| exp '%' exp		{$$ = $1 % $3;}
 	| '-' exp %prec NEG	{$$ = -$2;}
 	| '+' exp %prec NEG	{$$ = $2;}
 	| exp '^' exp		{$$ = pow($1, $3);}
 	| exp '!'		{$$ = factorial($1);}
 	| '(' exp ')'		{$$ = $2;}
 	| '[' list_or_empty ']'	{$$ = $2;}
-	| T_MATRIX_BEGIN matrix T_MATRIX_END	{$$ = lst_to_matrix($2);}
+	| T_MATRIX_BEGIN matrix T_MATRIX_END	{$$ = lst_to_matrix(ex_to_lst($2));}
 	;
 
 exprseq	: exp			{$$ = exprseq($1);}
@@ -146,19 +143,16 @@ row	: exp			{$$ = lst($1);}
 
 %%
 // Get last error encountered by parser
-string get_parser_error(void)
+std::string get_parser_error(void)
 {
 	return parser_error;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
 
-using GiNaC::parser_error;
-#endif // ndef NO_NAMESPACE_GINAC
-
 // Error print routine (store error string in parser_error)
 int ginac_yyerror(char *s)
 {
-	parser_error = string(s) + " at " + string(ginac_yytext);
+	GiNaC::parser_error = std::string(s) + " at " + std::string(ginac_yytext);
+	return 0;
 }