From 02c0213ab823a0c838d295017298cf8cd3493342 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 25 Nov 2009 20:27:05 -0500 Subject: Add vector promotion. --- tests/dimension/arithexp.pov | 4 ++-- tests/dimension/arithexp.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/dimension') diff --git a/tests/dimension/arithexp.pov b/tests/dimension/arithexp.pov index dd055a4..2cdedb6 100644 --- a/tests/dimension/arithexp.pov +++ b/tests/dimension/arithexp.pov @@ -17,9 +17,9 @@ * along with this program. If not, see . * *************************************************************************/ -// Render demo scene +// Test arithmetic expression handling sphere { - <<2.0 - 1.0, 3.0, 4.0>.x, (1.0 + 2)*2 - 5, 1.0 + 2*2 - 4> - -<0, 0, 1>, + 2*<<2.0 - 1.0, 3.0, 4.0>.x, (1.0 + 2)*2 - 5, 1.0 + 2*2 - 4> - -<0, 0, 1>, 2.25 - 1*2 } diff --git a/tests/dimension/arithexp.sh b/tests/dimension/arithexp.sh index 4b2fbba..66ecd8e 100755 --- a/tests/dimension/arithexp.sh +++ b/tests/dimension/arithexp.sh @@ -22,6 +22,7 @@ arithexp=$(${top_builddir}/dimension/dimension --tokenize --parse ${srcdir}/arithexp.pov) arithexp_exp="$(echo -n \ '(sphere { + (integer "2") * < < (float "2.0") - (float "1.0") , (float "3.0") , (float "4.0") > . x , \( (float "1.0") + (integer "2") \) * (integer "2") - (integer "5") , (float "1.0") + (integer "2") * (integer "2") - (integer "4") > @@ -32,7 +33,7 @@ arithexp_exp="$(echo -n \ | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g') $(echo -n \ '((sphere - (vector (float 1) (float 1) (float 2) (integer 0) (integer 0)) + (vector (float 2) (float 2) (float 3) (integer 0) (integer 0)) (float 0.25) object-modifiers))' \ | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')" -- cgit v1.2.3