Improve method of setting status_flags::dynallocated.

[ginac.git] / ginac / parser / parse_binop_rhs.cpp

diff --git a/ginac/parser/parse_binop_rhs.cpp b/ginac/parser/parse_binop_rhs.cpp
index b506ad81e9b1282c90975a133a81673daafbacc9..aad3a712cba598a4b98e3d2aba7ecde041bb644f 100644 (file)
--- a/ginac/parser/parse_binop_rhs.cpp
+++ b/ginac/parser/parse_binop_rhs.cpp
@@ -121,9 +121,9 @@ static ex make_minus_expr(const exvector& args)
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));

-       ex rest_base = (new add(rest_args))->setflag(status_flags::dynallocated);
-       ex rest = (new mul(rest_base, *_num_1_p))->setflag(status_flags::dynallocated);
-       ex ret = (new add(args[0], rest))->setflag(status_flags::dynallocated);
+       ex rest_base = dynallocate<add>(rest_args);
+       ex rest = dynallocate<mul>(rest_base, *_num_1_p);
+       ex ret = dynallocate<add>(args[0], rest);

        return ret;
 }
 
        return ret;
 }
 


@@ -132,20 +132,20 @@ static ex make_divide_expr(const exvector& args)
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));

-       ex rest_base = (new mul(rest_args))->setflag(status_flags::dynallocated);
+       ex rest_base = dynallocate<mul>(rest_args);

        ex rest = pow(rest_base, *_num_1_p);
        ex rest = pow(rest_base, *_num_1_p);

-       return (new mul(args[0], rest))->setflag(status_flags::dynallocated);
+       return dynallocate<mul>(args[0], rest);

 }
 
 static ex make_binop_expr(const int binop, const exvector& args)
 {
        switch (binop) {
                case '+':
 }
 
 static ex make_binop_expr(const int binop, const exvector& args)
 {
        switch (binop) {
                case '+':

-                       return (new add(args))->setflag(status_flags::dynallocated);
+                       return dynallocate<add>(args);

                case '-':
                        return make_minus_expr(args);
                case '*':
                case '-':
                        return make_minus_expr(args);
                case '*':

-                       return (new mul(args))->setflag(status_flags::dynallocated);
+                       return dynallocate<mul>(args);

                case '/':
                        return make_divide_expr(args);
                case '^':
                case '/':
                        return make_divide_expr(args);
                case '^':