Use initializer lists to construct container<>, lst.

[ginac.git] / ginsh / ginsh_parser.ypp

diff --git a/ginsh/ginsh_parser.ypp b/ginsh/ginsh_parser.ypp
index c16c35cf42f64a240f32a58213b01f903198fcc0..3a8f06211e7b523bf97d30319415acfb4aaf1903 100644 (file)
--- a/ginsh/ginsh_parser.ypp
+++ b/ginsh/ginsh_parser.ypp
@@ -4,7 +4,7 @@
  *  This file must be processed with yacc/bison. */
 
 /*
- *  GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -218,8 +218,8 @@ line        : ';'
                cout << "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\n";
                cout << "details.\n";
                cout << "You should have received a copy of the GNU General Public License along with\n";
-               cout << "this program. If not, write to the Free Software Foundation, 675 Mass Ave,\n";
-               cout << "Cambridge, MA 02139, USA.\n";
+               cout << "this program. If not, write to the Free Software Foundation,\n";
+               cout << "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n";
        }
        | T_XYZZY               {cout << "Nothing happens.\n";}
        | T_INVENTORY           {cout << "You're not carrying anything.\n";}
@@ -279,7 +279,7 @@ exp : T_NUMBER              {$$ = $1;}
        | '[' matrix ']'        {$$ = lst_to_matrix(ex_to<lst>($2));}
        ;
 
-exprseq        : exp                   {$$ = exprseq($1);}
+exprseq        : exp                   {$$ = exprseq{$1};}
        | exprseq ',' exp       {exprseq es(ex_to<exprseq>($1)); $$ = es.append($3);}
        ;
 
@@ -287,15 +287,15 @@ list_or_empty: /* empty */        {$$ = *new lst;}
        | list                  {$$ = $1;}
        ;
 
-list   : exp                   {$$ = lst($1);}
+list   : exp                   {$$ = lst{$1};}
        | list ',' exp          {lst l(ex_to<lst>($1)); $$ = l.append($3);}
        ;
 
-matrix : '[' row ']'           {$$ = lst($2);}
+matrix : '[' row ']'           {$$ = lst{$2};}
        | matrix ',' '[' row ']' {lst l(ex_to<lst>($1)); $$ = l.append($4);}
        ;
 
-row    : exp                   {$$ = lst($1);}
+row    : exp                   {$$ = lst{$1};}
        | row ',' exp           {lst l(ex_to<lst>($1)); $$ = l.append($3);}
        ;
 
@@ -431,8 +431,8 @@ static ex f_find(const exprseq &e)
        exset found;
        e[0].find(e[1], found);
        lst l;
-       for (exset::const_iterator i = found.begin(); i != found.end(); ++i)
-               l.append(*i);
+       for (auto & i : found)
+               l.append(i);
        return l;
 }
 
@@ -472,7 +472,7 @@ class apply_map_function : public map_function {
 public:
        apply_map_function(const ex & a) : apply(a) {}
        virtual ~apply_map_function() {}
-       ex operator()(const ex & e) { return apply.subs(wild() == e, true); }
+       ex operator()(const ex & e) override { return apply.subs(wild() == e, true); }
 };
 
 static ex f_map(const exprseq &e)
@@ -486,8 +486,8 @@ static ex f_match(const exprseq &e)
        exmap repls;
        if (e[0].match(e[1], repls)) {
                lst repl_lst;
-               for (exmap::const_iterator i = repls.begin(); i != repls.end(); ++i)
-                       repl_lst.append(relational(i->first, i->second, relational::equal));
+               for (auto & i : repls)
+                       repl_lst.append(relational(i.first, i.second, relational::equal));
                return repl_lst;
        }
        throw std::runtime_error("FAIL");
@@ -736,12 +736,9 @@ static ex f_ginac_function(const exprseq &es, int serial)
 namespace GiNaC {
 static void ginsh_get_ginac_functions(void)
 {
-       vector<function_options> gfv = function::get_registered_functions();
-       vector<function_options>::const_iterator i = gfv.begin(), end = gfv.end();
        unsigned serial = 0;
-       while (i != end) {
-               fcns.insert(make_pair(i->get_name(), fcn_desc(f_ginac_function, i->get_nparams(), serial)));
-               ++i;
+       for (auto & i : function::get_registered_functions()) {
+               fcns.insert(make_pair(i.get_name(), fcn_desc(f_ginac_function, i.get_nparams(), serial)));
                serial++;
        }
 }
@@ -902,7 +899,7 @@ static void ginsh_readline_init(char* name)
 void greeting(void)
 {
     cout << "ginsh - GiNaC Interactive Shell (GiNaC V" << GINACLIB_VERSION << ")" << endl;
-    cout << "  __,  _______  Copyright (C) 1999-2011 Johannes Gutenberg University Mainz,\n"
+    cout << "  __,  _______  Copyright (C) 1999-2015 Johannes Gutenberg University Mainz,\n"
          << " (__) *       | Germany.  This is free software with ABSOLUTELY NO WARRANTY.\n"
          << "  ._) i N a C | You are welcome to redistribute it under certain conditions.\n"
          << "<-------------' For details type `warranty;'.\n" << endl;