adapted to change symbol::getname() -> symbol::get_name()

diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll
index f8fc4e20be34372d7179fc62ac96171dd24bb1dd..34cba11f045fe7921e9122be3e93f7d8ee83ee0a 100644 (file)
--- a/ginac/input_lexer.ll
+++ b/ginac/input_lexer.ll
@@ -183,14 +183,14 @@ void set_lexer_symbols(ex l)
                return;
        for (int i=0; i<l.nops(); i++) {
                if (is_ex_exactly_of_type(l.op(i), symbol))
                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)).getname()] = sym_def(l.op(i), true);
+                       syms[ex_to_symbol(l.op(i)).get_name()] = sym_def(l.op(i), true);

        }
 }
 
 // Check whether symbol was predefined
 bool is_lexer_symbol_predefined(const ex &s)
 {
        }
 }
 
 // Check whether symbol was predefined
 bool is_lexer_symbol_predefined(const ex &s)
 {

-       sym_tab::const_iterator i = syms.find(ex_to_symbol(s).getname());
+       sym_tab::const_iterator i = syms.find(ex_to_symbol(s).get_name());

        if (i == syms.end())
                return false;
        else
        if (i == syms.end())
                return false;
        else

diff --git a/ginac/input_parser.yy b/ginac/input_parser.yy
index 9c4ffd971ac66b89902631818862e949368f7900..1685c796fec666086f8d44cf8687c91092cd43de 100644 (file)
--- 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
                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 ')' {
        }
        | 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;}
                $$ = function(i, static_cast<const exprseq &>(*($3.bp))).eval(1);
        }
        | exp T_EQUAL exp       {$$ = $1 == $3;}

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index d66174eaa08a5108686c4358f626baff92af81e4..1a4e7e0ad01736861afc3cfd74a84a5c0e3fce18 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -151,7 +151,7 @@ line        : ';'
                        YYERROR;
                }
        }
                        YYERROR;
                }
        }

-       | '?' T_SYMBOL          {print_help(ex_to_symbol($2).getname());}
+       | '?' T_SYMBOL          {print_help(ex_to_symbol($2).get_name());}

        | '?' T_TIME            {print_help("time");}
        | '?' '?'               {print_help_topics();}
        | T_QUIT                {YYACCEPT;}
        | '?' T_TIME            {print_help("time");}
        | '?' '?'               {print_help_topics();}
        | T_QUIT                {YYACCEPT;}


@@ -589,7 +589,7 @@ void GiNaC::ginsh_get_ginac_functions(void)
 
 static fcn_tab::const_iterator find_function(const ex &sym, int req_params)
 {
 
 static fcn_tab::const_iterator find_function(const ex &sym, int req_params)
 {

-       const string &name = ex_to_symbol(sym).getname();
+       const string &name = ex_to_symbol(sym).get_name();

        typedef fcn_tab::const_iterator I;
        pair<I, I> b = fcns.equal_range(name);
        if (b.first == b.second)
        typedef fcn_tab::const_iterator I;
        pair<I, I> b = fcns.equal_range(name);
        if (b.first == b.second)