| '[' 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);}
;
| 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);}
;
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;
}
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)
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");
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++;
}
}