From 23b2a1c9e6c8e0222cb9dbc9d73d3ca822d75912 Mon Sep 17 00:00:00 2001 From: Bob Burger Date: Tue, 20 Aug 2024 10:30:39 -0400 Subject: [PATCH] report "non-flonum found in flvector", not non-fixnum --- mats/root-experr-compile-0-f-f-f | 12 ++++++------ s/read.ss | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mats/root-experr-compile-0-f-f-f b/mats/root-experr-compile-0-f-f-f index 6bffb9a10..0eb2b407a 100644 --- a/mats/root-experr-compile-0-f-f-f +++ b/mats/root-experr-compile-0-f-f-f @@ -4727,8 +4727,8 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #< 6.mo:Expected error in mat read-test: "read: non-fixnum found in fxvector at line 3, char 23 of testfile.ss". 6.mo:Expected error in mat read-test: "read: non-fixnum found in fxvector at line 3, char 24 of testfile.ss". 6.mo:Expected error in mat read-test: "read: too many flvector elements supplied at line 3, char 16 of testfile.ss". -6.mo:Expected error in mat read-test: "read: non-fixnum found in flvector at line 3, char 25 of testfile.ss". -6.mo:Expected error in mat read-test: "read: non-fixnum found in flvector at line 3, char 26 of testfile.ss". +6.mo:Expected error in mat read-test: "read: non-flonum found in flvector at line 3, char 25 of testfile.ss". +6.mo:Expected error in mat read-test: "read: non-flonum found in flvector at line 3, char 26 of testfile.ss". 6.mo:Expected error in mat read-test: "read: too many fxvector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat read-test: "read: too many stencil vector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat read-test: "read: not enough stencil vector elements supplied at line 3, char 24 of testfile.ss". @@ -5556,8 +5556,8 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #< 6.mo:Expected error in mat load-test: "read: non-fixnum found in fxvector at line 3, char 23 of testfile.ss". 6.mo:Expected error in mat load-test: "read: non-fixnum found in fxvector at line 3, char 24 of testfile.ss". 6.mo:Expected error in mat load-test: "read: too many flvector elements supplied at line 3, char 16 of testfile.ss". -6.mo:Expected error in mat load-test: "read: non-fixnum found in flvector at line 3, char 25 of testfile.ss". -6.mo:Expected error in mat load-test: "read: non-fixnum found in flvector at line 3, char 26 of testfile.ss". +6.mo:Expected error in mat load-test: "read: non-flonum found in flvector at line 3, char 25 of testfile.ss". +6.mo:Expected error in mat load-test: "read: non-flonum found in flvector at line 3, char 26 of testfile.ss". 6.mo:Expected error in mat load-test: "read: too many fxvector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat load-test: "read: too many stencil vector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat load-test: "read: not enough stencil vector elements supplied at line 3, char 24 of testfile.ss". @@ -6385,8 +6385,8 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #< 6.mo:Expected error in mat compile-test: "read: non-fixnum found in fxvector at line 3, char 23 of testfile.ss". 6.mo:Expected error in mat compile-test: "read: non-fixnum found in fxvector at line 3, char 24 of testfile.ss". 6.mo:Expected error in mat compile-test: "read: too many flvector elements supplied at line 3, char 16 of testfile.ss". -6.mo:Expected error in mat compile-test: "read: non-fixnum found in flvector at line 3, char 25 of testfile.ss". -6.mo:Expected error in mat compile-test: "read: non-fixnum found in flvector at line 3, char 26 of testfile.ss". +6.mo:Expected error in mat compile-test: "read: non-flonum found in flvector at line 3, char 25 of testfile.ss". +6.mo:Expected error in mat compile-test: "read: non-flonum found in flvector at line 3, char 26 of testfile.ss". 6.mo:Expected error in mat compile-test: "read: too many fxvector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat compile-test: "read: too many stencil vector elements supplied at line 3, char 16 of testfile.ss". 6.mo:Expected error in mat compile-test: "read: not enough stencil vector elements supplied at line 3, char 24 of testfile.ss". diff --git a/s/read.ss b/s/read.ss index ac0a94d5b..543cbe88f 100644 --- a/s/read.ss +++ b/s/read.ss @@ -1501,7 +1501,7 @@ [(eof) (let ([bfp expr-bfp]) (xcall rd-eof-error "flvector"))] [else (unless (and (eq? type 'atomic) (flonum? value)) - (xcall rd-error #f #t "non-fixnum found in flvector")) + (xcall rd-error #f #t "non-flonum found in flvector")) (xmvlet ((v) (xcall rd-flvector expr-bfp (fx+ i 1))) (flvector-set! v i value) (xvalues v))]))) @@ -1525,7 +1525,7 @@ [(eof) (let ([bfp expr-bfp]) (xcall rd-eof-error "flvector"))] [else (unless (and (eq? type 'atomic) (flonum? value)) - (xcall rd-error #f #t "non-fixnum found in flvector")) + (xcall rd-error #f #t "non-flonum found in flvector")) (unless (fx< i n) (let ([bfp expr-bfp]) (xcall rd-error #f #t "too many flvector elements supplied")))