[Maxima-commits] Maxima, A Computer Algebra System branch master updated. 366ff01f321639382c8810437d7438d1f0f620f7

[Douglas <dt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Maxima, A Computer Algebra System".

The branch, master has been updated
       via  366ff01f321639382c8810437d7438d1f0f620f7 (commit)
       via  2ca62126574774a069c705a0dce3db68642b4e7f (commit)
      from  a8a130b4d75ffcdfe885366d0bc741eea02999c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 366ff01f321639382c8810437d7438d1f0f620f7
Merge: 2ca6212 a8a130b
Author: Douglas Crosher <dt...@us...>
Date:   Sun Nov 13 10:21:00 2011 +1100

    Merge branch 'master' of ssh://maxima.git.sourceforge.net/gitroot/maxima/maxima


commit 2ca62126574774a069c705a0dce3db68642b4e7f
Author: Douglas Crosher <dt...@us...>
Date:   Sun Nov 13 10:17:56 2011 +1100

    o logand, logor, logxor: use the constants boole-and, boole-ior, boole-xor,
      rather than hard coded numerical values as these vary across CL
      implementations.

diff --git a/share/simplification/functs.mac b/share/simplification/functs.mac
index c93a0e4..6090050 100644
--- a/share/simplification/functs.mac
+++ b/share/simplification/functs.mac
@@ -30,9 +30,9 @@ rational&&  rational(z):=block([n,d,cd,ratfac],
     d:rat(n/ratdisrep(d*cd)),
     if ratp(z) then d else ratdisrep(d))$
 
-logical&&  logand(x,y):=?boole(1,x,y)$
-	logor(x,y):=?boole(7,x,y)$
-	logxor(x,y):=?boole(6,x,y)$
+logical&&  logand(x,y):=?boole(boole-and,x,y)$
+	logor(x,y):=?boole(boole-ior,x,y)$
+	logxor(x,y):=?boole(boole-xor,x,y)$
 
 nonzeroandfreeof&&  nonzeroandfreeof(x,e):=is(e#0 and freeof(x,e))$
 

-----------------------------------------------------------------------

Summary of changes:
 share/simplification/functs.mac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Maxima, A Computer Algebra System