X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.cpp;h=4ec5bcefca4e1f559a7b326f9b9c400fc5f55f4f;hp=993eacf119f7583903747f2a92577f59fa508841;hb=f4f7f966d313edf65d46216c7eb48d0791c6537c;hpb=dd0ad1ce94bfa190453ed4e958fddba0c4ee2c4f

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 993eacf1..4ec5bcef 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -952,11 +952,13 @@ ex power::series(const relational & r, int order, unsigned options) const
 	}
 
 	// Is the expression of type something^(-int)?
-	if (!must_expand_basis && !exponent.info(info_flags::negint) && !is_a<add>(basis))
+	if (!must_expand_basis && !exponent.info(info_flags::negint)
+	 && (!is_a<add>(basis) || !is_a<numeric>(exponent)))
 		return basic::series(r, order, options);
 
 	// Is the expression of type 0^something?
-	if (!must_expand_basis && !basis.subs(r, subs_options::no_pattern).is_zero() && !is_a<add>(basis))
+	if (!must_expand_basis && !basis.subs(r, subs_options::no_pattern).is_zero()
+	 && (!is_a<add>(basis) || !is_a<numeric>(exponent)))
 		return basic::series(r, order, options);
 
 	// Singularity encountered, is the basis equal to (var - point)?