Synced to HEAD:

* Fix optimization opportunities missed by Alexei's patch.

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 4e95a638310e313444c45736af5b1d090a8f6076..c4cb2e3b90f72026c02a4b19cfd25c07efe66946 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -994,12 +994,14 @@ bool mul::can_be_further_expanded(const ex & e)
 ex mul::expand(unsigned options) const
 {
        {
-       // trivial case: expanding the monomial (~ 30% of all calls)
+       // trivial case: expanding the monomial (~ 30% of all calls)
                epvector::const_iterator i = seq.begin(), seq_end = seq.end();
                while ((i != seq.end()) &&  is_a<symbol>(i->rest) && i->coeff.info(info_flags::integer))
                        ++i;
-               if (i == seq_end)
-                       return (new mul(*this))->setflag(status_flags::dynallocated | status_flags::expanded);
+               if (i == seq_end) {
+                       setflag(status_flags::expanded);
+                       return *this;
+               }
        }
 
        // do not rename indices if the object has no indices at all

diff --git a/ginac/power.cpp b/ginac/power.cpp
index 7d909e8539b9b5b599ab3e3d84f10c1da45dc5c4..9ff790951490f9b71ac25bcc460753381a0020d7 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -771,12 +771,12 @@ tinfo_t power::return_type_tinfo() const
 
 ex power::expand(unsigned options) const
 {
-       if (is_a<symbol>(basis) && exponent.info(info_flags::integer))
-               return (new power(*this))->setflag(status_flags::dynallocated | status_flags::expanded);
-
-       if (options == 0 && (flags & status_flags::expanded))
+       if (is_a<symbol>(basis) && exponent.info(info_flags::integer)) {
+               // A special case worth optimizing.
+               setflag(status_flags::expanded);
                return *this;
-       
+       }
+
        const ex expanded_basis = basis.expand(options);
        const ex expanded_exponent = exponent.expand(options);