X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_misc.cpp;h=13152f2707ed183e281c2758b4e07f62b7385d5d;hp=9dbfd6bc41d71850566681b337c004d3fea647cc;hb=f7884835d397de85e648d1957c058b7d4c0948ba;hpb=95ede03f00106be5fb087d76c86ca5c27edb9122

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 9dbfd6bc..13152f27 100644
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -96,7 +96,7 @@ static unsigned exam_sqrfree()
 	ex e1, e2;
 	
 	e1 = (1+x)*pow((2+x),2)*pow((3+x),3)*pow((4+x),4);
-	e2 = sqrfree(expand(e1),lst(x));
+	e2 = sqrfree(expand(e1),lst{x});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << ")) erroneously returned "
 		     << e2 << endl;
@@ -110,19 +110,19 @@ static unsigned exam_sqrfree()
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(x));
+	e2 = sqrfree(expand(e1),lst{x});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[x]) erroneously returned "
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(y));
+	e2 = sqrfree(expand(e1),lst{y});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[y]) erroneously returned "
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(x,y));
+	e2 = sqrfree(expand(e1),lst{x,y});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[x,y]) erroneously returned "
 		     << e2 << endl;
@@ -164,7 +164,7 @@ static unsigned exam_operator_semantics()
 		++result;
 	}
 	
-	// Prefix/postfix increment/decrement behaviour:
+	// Prefix/postfix increment/decrement behavior:
 	e1 = 7; e2 = 4;
 	i1 = 7; i2 = 4;
 	e1 = (--e2 = 2)++;
@@ -219,6 +219,15 @@ static unsigned exam_subs()
 		++result;
 	}
 
+	// And this used to fail in GiNaC 1.5.8 because it first substituted
+	// exp(x) -> exp(log(x)) -> x, and then substituted again x -> log(x)
+	e1 = exp(x);
+	e2 = e1.subs(x == log(x));
+	if (!e2.is_equal(x)) {
+		clog << "exp(x).subs(x==log(x)) erroneously returned " << e2 << " instead of x" << endl;
+		++result;
+	}
+
 	e1 = sin(1+sin(x));
 	e2 = e1.subs(sin(wild()) == cos(wild()));
 	if (!e2.is_equal(cos(1+cos(x)))) {