From: Robert D. <rob...@us...> - 2007-09-30 03:06:54
|
Update of /cvsroot/maxima/maxima/tests In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13803/tests Modified Files: Tag: strings-are-lisp-strings-branch rtest_equal.mac rtest_rules.mac rtestlabels.mac testsuite.lisp Log Message: Cut out more stuff related to distinction between Lisp and Maxima strings. Index: rtest_equal.mac =================================================================== RCS file: /cvsroot/maxima/maxima/tests/rtest_equal.mac,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -u -d -r1.4.4.1 -r1.4.4.2 --- rtest_equal.mac 29 Sep 2007 19:06:41 -0000 1.4.4.1 +++ rtest_equal.mac 30 Sep 2007 03:06:45 -0000 1.4.4.2 @@ -457,13 +457,9 @@ * Maxima undeclared array */ -(mstring1a : "FOO", - mstring1b : "FOO", - mstring2 : "BAR", - - lstring1a : sconcat ("FOO"), - lstring1b : sconcat ("FOO"), - lstring2 : sconcat ("BAR"), +(string1a : "FOO", + string1b : "FOO", + string2 : "BAR", larray1a : make_array (any, 5), fillarray (larray1a, makelist (i, i, 1, 5)), @@ -522,16 +518,10 @@ /* Comparisons to same type */ -is (equal (mstring1a, mstring1b)); -true; - -is (equal (mstring1a, mstring2)); -false; - -is (equal (lstring1a, lstring1b)); +is (equal (string1a, string1b)); true; -is (equal (lstring1a, lstring2)); +is (equal (string1a, string2)); false; is (equal (larray1a, larray1b)); @@ -590,45 +580,21 @@ /* Comparisons to different type */ /* No automatic type conversion */ -is (equal (mstring1a, lstring1a)); -true; - -is (equal (mstring1a, larray1a)); -false; - -is (equal (mstring1a, 1234)); -false; - -/* No automatic type conversion */ -is (equal (mstring1a, 'FOO)); -false; - -is (equal (mstring1a, sin('x))); -false; - - -/* No automatic type conversion */ -is (equal (lstring1a, mstring1a)); -true; - -is (equal (lstring1a, larray1a)); +is (equal (string1a, larray1a)); false; -is (equal (lstring1a, 1234)); +is (equal (string1a, 1234)); false; /* No automatic type conversion */ -is (equal (lstring1a, 'FOO)); +is (equal (string1a, 'FOO)); false; -is (equal (lstring1a, sin('x))); +is (equal (string1a, sin('x))); false; -is (equal (larray1a, mstring1a)); -false; - -is (equal (larray1a, lstring1a)); +is (equal (larray1a, string1a)); false; is (equal (larray1a, 1234)); @@ -667,16 +633,10 @@ /* Comparisons to same type */ -is (mstring1a = mstring1b); -true; - -is (mstring1a = mstring2); -false; - -is (lstring1a = lstring1b); +is (string1a = string1b); true; -is (lstring1a = lstring2); +is (string1a = string2); false; is (larray1a = larray1b); @@ -692,45 +652,22 @@ /* Comparisons to different type */ /* No automatic type conversion */ -is (mstring1a = lstring1a); -true; - -is (mstring1a = larray1a); +is (string1a = larray1a); false; -is (mstring1a = 1234); +is (string1a = 1234); false; /* No automatic type conversion */ -is (mstring1a = 'FOO); -false; - -is (mstring1a = sin('x)); +is (string1a = 'FOO); false; - -/* No automatic type conversion */ -is (lstring1a = mstring1a); -true; - -is (lstring1a = larray1a); +is (string1a = sin('x)); false; -is (lstring1a = 1234); -false; /* No automatic type conversion */ -is (lstring1a = 'FOO); -false; - -is (lstring1a = sin('x)); -false; - - -is (larray1a = mstring1a); -false; - -is (larray1a = lstring1a); +is (larray1a = string1a); false; is (larray1a = 1234); Index: rtest_rules.mac =================================================================== RCS file: /cvsroot/maxima/maxima/tests/rtest_rules.mac,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -u -d -r1.4 -r1.4.8.1 --- rtest_rules.mac 27 Dec 2006 18:34:18 -0000 1.4 +++ rtest_rules.mac 30 Sep 2007 03:06:45 -0000 1.4.8.1 @@ -62,7 +62,7 @@ [px (yy), p1 (2), ps ("string2"), pfloat (29.0), ptrue (truly), pfalse (falsely)]; [false, false, false, false, false, false]; -(matchdeclare (aa, atom, ii, integerp, ss, ?mstringp, ff, floatnump, bb, booleanp), +(matchdeclare (aa, atom, ii, integerp, ss, stringp, ff, floatnump, bb, booleanp), booleanp (e) := atom (e) and (e = true or e = false), defrule (ra, aa, [aa]), Index: rtestlabels.mac =================================================================== RCS file: /cvsroot/maxima/maxima/tests/rtestlabels.mac,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -d -r1.3 -r1.3.4.1 --- rtestlabels.mac 14 Apr 2007 21:52:10 -0000 1.3 +++ rtestlabels.mac 30 Sep 2007 03:06:46 -0000 1.3.4.1 @@ -138,7 +138,7 @@ 0); 0; -(ensure_string (x) := if ?mstringp (x) then x else string (x), +(ensure_string (x) := if stringp (x) then x else string (x), my_every (p, L) := apply ("and", map (is, map (p, L))), my_some (p, L) := apply ("or", map (is, map (p, L))), my_none (p, L) := apply ("and", map ("not", map (is, map (p, L)))), Index: testsuite.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/tests/testsuite.lisp,v retrieving revision 1.60 retrieving revision 1.60.2.1 diff -u -d -r1.60 -r1.60.2.1 --- testsuite.lisp 19 Sep 2007 00:26:21 -0000 1.60 +++ testsuite.lisp 30 Sep 2007 03:06:46 -0000 1.60.2.1 @@ -32,7 +32,7 @@ "rtest_everysome" "rtestint" "rtestifactor" - ((mlist) "rtest_equal" 159 162) + ((mlist) "rtest_equal" 157 160) ((mlist) "rtest_abs" 42 43) ((mlist) "rtest_taylor" 66 67 72 88 89 90 91 94 96 99 104 110 113 118 119 120 121 122 123 124) ((mlist) "rtest_dot") |