[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-78-g3d01c1
From: |
Mark H Weaver |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-78-g3d01c19 |
Date: |
Sat, 10 Nov 2012 21:07:09 +0000 |
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 "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=3d01c19a78929b89df2c3d1368cb435268259856
The branch, stable-2.0 has been updated
via 3d01c19a78929b89df2c3d1368cb435268259856 (commit)
from 46954839017812d1c05995a9050f37705a5d724e (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 3d01c19a78929b89df2c3d1368cb435268259856
Author: Mark H Weaver <address@hidden>
Date: Sat Nov 10 16:05:24 2012 -0500
Change the argument order of 'set-fields' to match that of 'set-fields'.
* module/srfi/srfi-9/gnu.scm (set-fields): Swap order of first two
arguments.
* test-suite/tests/srfi-9.test: Update tests.
-----------------------------------------------------------------------
Summary of changes:
module/srfi/srfi-9/gnu.scm | 4 ++--
test-suite/tests/srfi-9.test | 34 +++++++++++++++++-----------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/module/srfi/srfi-9/gnu.scm b/module/srfi/srfi-9/gnu.scm
index 6322756..eb35064 100644
--- a/module/srfi/srfi-9/gnu.scm
+++ b/module/srfi/srfi-9/gnu.scm
@@ -39,8 +39,8 @@
#t (define-immutable-record-type name ctor pred fields ...)
name ctor pred fields ...))
-(define-syntax-rule (set-field (getter ...) s expr)
- (%set-fields #t (set-field (getter ...) s expr) ()
+(define-syntax-rule (set-field s (getter ...) expr)
+ (%set-fields #t (set-field s (getter ...) expr) ()
s ((getter ...) expr)))
(define-syntax-rule (set-fields s . rest)
diff --git a/test-suite/tests/srfi-9.test b/test-suite/tests/srfi-9.test
index cd313ac..6179b90 100644
--- a/test-suite/tests/srfi-9.test
+++ b/test-suite/tests/srfi-9.test
@@ -103,9 +103,9 @@
(pass-if "set-field"
(let ((s (make-foo (make-bar 1 2))))
- (and (equal? (set-field (foo-x bar-j) s 3)
+ (and (equal? (set-field s (foo-x bar-j) 3)
(make-foo (make-bar 1 3)))
- (equal? (set-field (foo-z) s 'bar)
+ (equal? (set-field s (foo-z) 'bar)
(let ((s2 (make-foo (make-bar 1 2))))
(set-foo-z! s2 'bar)
s2))
@@ -113,19 +113,19 @@
(pass-if-exception "set-field on wrong struct type" exception:wrong-type-arg
(let ((s (make-bar (make-foo 5) 2)))
- (set-field (foo-x bar-j) s 3)))
+ (set-field s (foo-x bar-j) 3)))
(pass-if-exception "set-field on number" exception:wrong-type-arg
- (set-field (foo-x bar-j) 4 3))
+ (set-field 4 (foo-x bar-j) 3))
(pass-if-equal "set-field with unknown first getter"
'(syntax-error set-fields "unknown getter"
- (set-field (blah) s 3)
+ (set-field s (blah) 3)
blah)
(catch 'syntax-error
(lambda ()
(compile '(let ((s (make-bar (make-foo 5) 2)))
- (set-field (blah) s 3))
+ (set-field s (blah) 3))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
@@ -133,12 +133,12 @@
(pass-if-equal "set-field with unknown second getter"
'(syntax-error set-fields "unknown getter"
- (set-field (bar-j blah) s 3)
+ (set-field s (bar-j blah) 3)
blah)
(catch 'syntax-error
(lambda ()
(compile '(let ((s (make-bar (make-foo 5) 2)))
- (set-field (bar-j blah) s 3))
+ (set-field s (bar-j blah) 3))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
@@ -146,7 +146,7 @@
(pass-if "set-fields"
(let ((s (make-foo (make-bar 1 2))))
- (and (equal? (set-field (foo-x bar-j) s 3)
+ (and (equal? (set-field s (foo-x bar-j) 3)
(make-foo (make-bar 1 3)))
(equal? (set-fields s
((foo-x bar-j) 3)
@@ -262,18 +262,18 @@
(pass-if "set-field"
(let ((s (make-foo (make-bar 1 2))))
- (and (equal? (set-field (foo-x bar-j) s 3)
+ (and (equal? (set-field s (foo-x bar-j) 3)
(make-foo (make-bar 1 3)))
- (equal? (set-field (foo-z) s 'bar)
+ (equal? (set-field s (foo-z) 'bar)
(let ((s2 (make-foo (make-bar 1 2))))
(set-foo-z! s2 'bar)
s2))
(equal? s (make-foo (make-bar 1 2)))))))
- (pass-if "set-fields"
+ (pass-if "set-fieldss "
(let ((s (make-foo (make-bar 1 2))))
- (and (equal? (set-field (foo-x bar-j) s 3)
+ (and (equal? (set-field s (foo-x bar-j) 3)
(make-foo (make-bar 1 3)))
(equal? (set-fields s
((foo-x bar-j) 3)
@@ -340,10 +340,10 @@
(pass-if "set-field"
(let ((p (make-person 30 "address@hidden"
(make-address "Foo" "Paris" "France"))))
- (and (equal? (set-field (person-address address-street) p "Bar")
+ (and (equal? (set-field p (person-address address-street) "Bar")
(make-person 30 "address@hidden"
(make-address "Bar" "Paris" "France")))
- (equal? (set-field (person-email) p "address@hidden")
+ (equal? (set-field p (person-email) "address@hidden")
(make-person 30 "address@hidden"
(make-address "Foo" "Paris" "France")))
(equal? p (make-person 30 "address@hidden"
@@ -448,10 +448,10 @@
(let ((p (make-person 30 "address@hidden"
(make-address "Foo" "Paris" "France"))))
- (and (equal? (set-field (person-address address-street) p "Bar")
+ (and (equal? (set-field p (person-address address-street) "Bar")
(make-person 30 "address@hidden"
(make-address "Bar" "Paris" "France")))
- (equal? (set-field (person-email) p "address@hidden")
+ (equal? (set-field p (person-email) "address@hidden")
(make-person 30 "address@hidden"
(make-address "Foo" "Paris" "France")))
(equal? p (make-person 30 "address@hidden"
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-78-g3d01c19,
Mark H Weaver <=