From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mark H Weaver Newsgroups: gmane.lisp.guile.devel Subject: [PATCH] Implement SRFI-111 Boxes Date: Fri, 24 Jan 2014 00:56:47 -0500 Message-ID: <87a9elkjmo.fsf@netris.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1390543200 23986 80.91.229.3 (24 Jan 2014 06:00:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 24 Jan 2014 06:00:00 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri Jan 24 07:00:08 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W6ZoF-0000sz-TX for guile-devel@m.gmane.org; Fri, 24 Jan 2014 07:00:08 +0100 Original-Received: from localhost ([::1]:44562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6ZoF-00080I-KU for guile-devel@m.gmane.org; Fri, 24 Jan 2014 01:00:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6Zo7-0007yf-9s for guile-devel@gnu.org; Fri, 24 Jan 2014 01:00:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6Zo2-0005Y6-3v for guile-devel@gnu.org; Fri, 24 Jan 2014 00:59:59 -0500 Original-Received: from world.peace.net ([96.39.62.75]:59552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6Zo1-0005Wp-UQ for guile-devel@gnu.org; Fri, 24 Jan 2014 00:59:54 -0500 Original-Received: from 209-6-91-212.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com ([209.6.91.212] helo=yeeloong) by world.peace.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1W6ZnZ-0001ax-6p; Fri, 24 Jan 2014 00:59:26 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 96.39.62.75 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:16839 Archived-At: --=-=-= Content-Type: text/plain Here's an implementation of SRFI-111 Boxes for stable-2.0. What do you think? Mark --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Implement-SRFI-111-Boxes.patch Content-Description: [PATCH] Implement SRFI-111 Boxes >From 625b1a68a7fcbe41abfd499937ecdf627a31530c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 24 Jan 2014 00:21:17 -0500 Subject: [PATCH] Implement SRFI-111 Boxes. * module/srfi/srfi-111.scm: New file. * module/Makefile.am (SRFI_SOURCES): Add srfi/srfi-111.scm. * test-suite/tests/srfi-111.test: New file. * test-suite/Makefile.am (SCM_TESTS): Add tests/srfi-111.test. * doc/ref/srfi-modules.texi (SRFI-111): New node. --- doc/ref/srfi-modules.texi | 25 +++++++++++++++ module/Makefile.am | 3 +- module/srfi/srfi-111.scm | 37 ++++++++++++++++++++++ test-suite/Makefile.am | 1 + test-suite/tests/srfi-111.test | 65 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 1 deletions(-) create mode 100644 module/srfi/srfi-111.scm create mode 100644 test-suite/tests/srfi-111.test diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi index 66d5bd1..8845c85 100644 --- a/doc/ref/srfi-modules.texi +++ b/doc/ref/srfi-modules.texi @@ -59,6 +59,7 @@ get the relevant SRFI documents from the SRFI home page * SRFI-88:: Keyword objects. * SRFI-98:: Accessing environment variables. * SRFI-105:: Curly-infix expressions. +* SRFI-111:: Boxes. @end menu @@ -5181,6 +5182,30 @@ directive @code{#!curly-infix-and-bracket-lists}. For example: For more information on reader options, @xref{Scheme Read}. +@node SRFI-111 +@subsection SRFI-111 Boxes. +@cindex SRFI-111 + +@uref{http://srfi.schemers.org/srfi-111/srfi-111.html, SRFI-111} +provides boxes: objects with a single mutable cell. + +@deffn {Scheme Procedure} box value +Return a newly allocated box whose contents is initialized to +@var{value}. +@end deffn + +@deffn {Scheme Procedure} box? obj +Return true if @var{obj} is a box, otherwise return false. +@end deffn + +@deffn {Scheme Procedure} unbox box +Return the current contents of @var{box}. +@end deffn + +@deffn {Scheme Procedure} set-box! box value +Set the contents of @var{box} to @var{value}. +@end deffn + @c srfi-modules.texi ends here @c Local Variables: diff --git a/module/Makefile.am b/module/Makefile.am index 8a7befd..47b9c2c 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -295,7 +295,8 @@ SRFI_SOURCES = \ srfi/srfi-67.scm \ srfi/srfi-69.scm \ srfi/srfi-88.scm \ - srfi/srfi-98.scm + srfi/srfi-98.scm \ + srfi/srfi-111.scm RNRS_SOURCES = \ rnrs/base.scm \ diff --git a/module/srfi/srfi-111.scm b/module/srfi/srfi-111.scm new file mode 100644 index 0000000..3d3cd89 --- /dev/null +++ b/module/srfi/srfi-111.scm @@ -0,0 +1,37 @@ +;;; srfi-111.scm -- SRFI 111 Boxes + +;; Copyright (C) 2014 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 +;; License as published by the Free Software Foundation; either +;; version 3 of the License, or (at your option) any later version. +;; +;; This library is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; Lesser General Public License for more details. +;; +;; You should have received a copy of the GNU Lesser General Public +;; License along with this library; if not, write to the Free Software +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +(define-module (srfi srfi-111) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-9 gnu) + #:export (box box? unbox set-box!)) + +(cond-expand-provide (current-module) '(srfi-111)) + +(define-record-type + (box value) + box? + (value unbox set-box!)) + +(set-record-type-printer! + (lambda (box port) + (display "#string (object-address box) 16) port) + (display " value: ") + (write (unbox box) port) + (display ">" port))) diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am index 01ffd1c..00f62fe 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -139,6 +139,7 @@ SCM_TESTS = tests/00-initial-env.test \ tests/srfi-69.test \ tests/srfi-88.test \ tests/srfi-105.test \ + tests/srfi-111.test \ tests/srfi-4.test \ tests/srfi-9.test \ tests/statprof.test \ diff --git a/test-suite/tests/srfi-111.test b/test-suite/tests/srfi-111.test new file mode 100644 index 0000000..e2d76c6 --- /dev/null +++ b/test-suite/tests/srfi-111.test @@ -0,0 +1,65 @@ +;;;; srfi-111.test --- Test suite for SRFI-111 (Boxes). -*- scheme -*- +;;;; +;;;; Copyright (C) 2014 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 +;;;; License as published by the Free Software Foundation; either +;;;; version 3 of the License, or (at your option) any later version. +;;;; +;;;; This library is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;;; Lesser General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU Lesser General Public +;;;; License along with this library; if not, write to the Free Software +;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +(define-module (test-srfi-111) + #:use-module (test-suite lib) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-111)) + +(with-test-prefix "srfi-111" + + (let ((test-vals '(#f #t #\space "string" -5 #e1e100 1e-30 #(a vector)))) + (pass-if-equal "box and unbox" + test-vals + (map (lambda (x) + (unbox (box x))) + test-vals)) + + (pass-if "box?" + (and (box? (box 5)) + (not (any box? test-vals)))) + + (pass-if-equal "set-box!" + "string" + (let ((b (box #f))) + (set-box! b "string") + (unbox b))) + + (pass-if "eq? on boxes" + (let ((box1 (box #f)) + (box2 (box #f))) + (and (eq? box1 box1) + (eq? box2 box2) + (not (eq? box1 box2))))) + + (pass-if "eqv? on boxes" + (let ((box1 (box #f)) + (box2 (box #f))) + (and (eqv? box1 box1) + (eqv? box2 box2) + (not (eqv? box1 box2))))) + + (pass-if "equal? on boxes" + (let ((box1 (box "foo")) + (box2 (box "bar"))) + (and (equal? box1 box1) + (equal? box2 box2) + (not (equal? box1 box2)) + ;; Guile extension, not guaranteed by SRFI-111. + (begin (set-box! box2 (string #\f #\o #\o)) + (equal? box1 box2))))))) -- 1.7.5.4 --=-=-=--