[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Don't mix definitions and expressions in SRFI-9
From: |
Andreas Rottmann |
Subject: |
[PATCH] Don't mix definitions and expressions in SRFI-9 |
Date: |
Sun, 06 Mar 2011 17:39:58 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
As always, see the patch header for details.
From: Andreas Rottmann <address@hidden>
Subject: Don't mix definitions and expressions in SRFI-9
The expansion of `define-inlinable' contained an expression, which made
SRFI-9's `define-record-type' fail in non-toplevel contexts ("definition
used in expression context").
* module/srfi/srfi-9.scm (define-inlinable): Get rid of apparently
useless expression in the expansion, so the expansion yields only
definitions.
* test-suite/tests/srfi-9.test (non-toplevel): New test verifying that
`define-record-type' works in non-toplevel context as well.
---
module/srfi/srfi-9.scm | 3 +--
test-suite/tests/srfi-9.test | 12 +++++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/module/srfi/srfi-9.scm b/module/srfi/srfi-9.scm
index 80c3b60..7c2b073 100644
--- a/module/srfi/srfi-9.scm
+++ b/module/srfi/srfi-9.scm
@@ -1,6 +1,6 @@
;;; srfi-9.scm --- define-record-type
-;; Copyright (C) 2001, 2002, 2006, 2009, 2010 Free Software Foundation,
Inc.
+;; Copyright (C) 2001, 2002, 2006, 2009, 2010, 2011 Free Software
Foundation, Inc.
;;
;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public
@@ -81,7 +81,6 @@
#`(begin
(define (proc-name formals ...)
body ...)
- proc-name ;; unused
(define-syntax name
(lambda (x)
(syntax-case x ()
diff --git a/test-suite/tests/srfi-9.test b/test-suite/tests/srfi-9.test
index cf933a8..f8006c4 100644
--- a/test-suite/tests/srfi-9.test
+++ b/test-suite/tests/srfi-9.test
@@ -1,7 +1,7 @@
;;;; srfi-9.test --- Test suite for Guile's SRFI-9 functions. -*- scheme -*-
;;;; Martin Grabmueller, 2001-05-10
;;;;
-;;;; Copyright (C) 2001, 2006, 2007, 2010 Free Software Foundation, Inc.
+;;;; Copyright (C) 2001, 2006, 2007, 2010, 2011 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -93,3 +93,13 @@
;; prior to guile 1.6.9 and 1.8.1 this wan't enforced
(pass-if-exception "set-y! on bar" exception:wrong-type-arg
(set-y! b 99)))
+
+(with-test-prefix "non-toplevel"
+
+ (define-record-type :frotz (make-frotz a b) frotz?
+ (a frotz-a) (b frotz-b set-frotz-b!))
+
+ (pass-if "construction"
+ (let ((frotz (make-frotz 1 2)))
+ (and (= (frotz-a frotz) 1)
+ (= (frotz-b frotz) 2)))))
--
tg: (d59dd06..) t/srfi-9-fix (depends on: stable-2.0)
Regards, Rotty
--
Andreas Rottmann -- <http://rotty.yi.org/>
- [PATCH] Don't mix definitions and expressions in SRFI-9,
Andreas Rottmann <=