--- Begin Message ---
|
Subject: |
(rnrs hashtables): Mutation of immutable hashtable ignored |
|
Date: |
Sat, 23 Jan 2016 23:57:03 +0100 |
I couldn't find explicit wording in R6RS on what should happen, but I
would generally expect an attempt to mutate an immutable object to
raise an error. In Guile,
(hashtable-set! (hashtable-copy (make-eq-hashtable)) 'foo 'bar)
is silently ignored.
Attached is a simple patch that raises an assertion violation when the
hashtable is immutable.
Taylan
===File
/home/taylan/src/guile/guile-stable-2.0/0001-Hashtable-set-errors-on-immutable-hashtable.patch===
>From dd6c4bbbe85a57fcbb08bdc7847075bddc1f0d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<address@hidden>
Date: Sat, 23 Jan 2016 22:35:24 +0100
Subject: [PATCH] Hashtable-set! errors on immutable hashtable.
* module/rnrs/hashtables.scm (hashtable-set!): Raise an assertion
violation error when the hashtable is immutable.
---
module/rnrs/hashtables.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/module/rnrs/hashtables.scm b/module/rnrs/hashtables.scm
index 98d2d76..5773eb1 100644
--- a/module/rnrs/hashtables.scm
+++ b/module/rnrs/hashtables.scm
@@ -122,8 +122,9 @@
(define (hashtable-set! hashtable key obj)
(if (r6rs:hashtable-mutable? hashtable)
- (hash-table-set! (r6rs:hashtable-wrapped-table hashtable) key obj))
- *unspecified*)
+ (hash-table-set! (r6rs:hashtable-wrapped-table hashtable) key obj)
+ (assertion-violation
+ 'hashtable-set! "Hashtable is immutable." hashtable)))
(define (hashtable-delete! hashtable key)
(if (r6rs:hashtable-mutable? hashtable)
--
2.6.3
============================================================
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: (rnrs hashtables): Mutation of immutable hashtable ignored |
|
Date: |
Tue, 21 Jun 2016 09:47:29 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Applied to master, thanks :)
Andy
On Tue 21 Jun 2016 00:33, address@hidden (Taylan Ulrich "Bayırlı/Kammer")
writes:
> Pinging this thread with a (very slightly) updated patch. :-)
>
>
> From 7f35d515d711e255bba5a89a013d9d92034edf41 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <address@hidden>
> Date: Tue, 21 Jun 2016 00:25:19 +0200
> Subject: [PATCH] Hashtable-set! errors on immutable hashtable.
>
> * module/rnrs/hashtables.scm (hashtable-set!): Raise an assertion
> violation error when the hashtable is immutable.
> * test-suite/tests/r6rs-hashtables.test: Fix accordingly.
> ---
> module/rnrs/hashtables.scm | 5 +++--
> test-suite/tests/r6rs-hashtables.test | 6 ++++--
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/module/rnrs/hashtables.scm b/module/rnrs/hashtables.scm
> index 08f37e2..22bae7f 100644
> --- a/module/rnrs/hashtables.scm
> +++ b/module/rnrs/hashtables.scm
> @@ -127,8 +127,9 @@
>
> (define (hashtable-set! hashtable key obj)
> (if (r6rs:hashtable-mutable? hashtable)
> - (hash-table-set! (r6rs:hashtable-wrapped-table hashtable) key obj))
> - *unspecified*)
> + (hash-table-set! (r6rs:hashtable-wrapped-table hashtable) key obj)
> + (assertion-violation
> + 'hashtable-set! "Hashtable is immutable." hashtable)))
>
> (define (hashtable-delete! hashtable key)
> (if (r6rs:hashtable-mutable? hashtable)
> diff --git a/test-suite/tests/r6rs-hashtables.test
> b/test-suite/tests/r6rs-hashtables.test
> index fbc50c9..e2cbc2a 100644
> --- a/test-suite/tests/r6rs-hashtables.test
> +++ b/test-suite/tests/r6rs-hashtables.test
> @@ -20,6 +20,7 @@
> (define-module (test-suite test-rnrs-hashtable)
> :use-module (ice-9 receive)
> :use-module ((rnrs hashtables) :version (6))
> + :use-module ((rnrs exceptions) :version (6))
> :use-module (srfi srfi-1)
> :use-module (test-suite lib))
>
> @@ -130,8 +131,9 @@
>
> (pass-if "hashtable-copy with mutability #f produces immutable copy"
> (let ((copied-table (hashtable-copy (make-eq-hashtable) #f)))
> - (hashtable-set! copied-table 'foo 1)
> - (not (hashtable-ref copied-table 'foo #f)))))
> + (guard (exc (else #t))
> + (hashtable-set! copied-table 'foo 1)
> + #f))))
>
> (with-test-prefix "hashtable-clear!"
> (pass-if "hashtable-clear! removes all values from hashtable"
--- End Message ---