X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finput_parser.yy;h=1685c796fec666086f8d44cf8687c91092cd43de;hb=85ce9664ddba79c28a6945b1e5b4e2b71f77cb51;hp=d1e876690967227869fa4bc18007351a443f877c;hpb=b1f684b10d31daafc4e4a5bdaee02ba455abe747;p=ginac.git diff --git a/ginac/input_parser.yy b/ginac/input_parser.yy index d1e87669..1685c796 100644 --- a/ginac/input_parser.yy +++ b/ginac/input_parser.yy @@ -91,12 +91,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(*($3.bp))).eval(1); } | exp T_EQUAL exp {$$ = $1 == $3;} @@ -115,7 +115,7 @@ exp : T_NUMBER {$$ = $1;} | 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);}