[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-122-g35d70ec

[Andy Wingo]

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=35d70eccaca513c49cac29ca8b46262be725644a

The branch, master has been updated
       via  35d70eccaca513c49cac29ca8b46262be725644a (commit)
       via  a5f93842116d71026911382e48158a2385d1ccd6 (commit)
       via  23b4c817b1090dfbf6165fde71d0c34e2d973ada (commit)
       via  0f8e69a44ecf322231a5e1e8f94c234db2f72b41 (commit)
       via  0feb833d22d4998773fe045f04cfbe1afebf82b9 (commit)
       via  c4a8200fa0f28ac9bab80ee6c2ab93fbd818c33f (commit)
       via  b1e5445f778abb61832c70b884b1afe52bab75b6 (commit)
       via  e5b218826a42554510643c6752d914417bbc382a (commit)
      from  a2e0b12608ccc578f66473f67ffaafa4309b2c14 (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 35d70eccaca513c49cac29ca8b46262be725644a
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 19 20:07:29 2010 +0200

    repl compiles with warnings by default
    
    * module/system/repl/command.scm (compile): Remove the bitrotten
      options.
    
    * module/system/repl/common.scm (repl-default-options): Add
      'compile-options option.
      (repl-compile-options): Accessor for compile-options.
      (repl-compile): Use repl-compile-options.
      (repl-eval): Adapt to repl-compile interface change.

commit a5f93842116d71026911382e48158a2385d1ccd6
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 19 15:40:47 2010 +0200

    scheme-mode in syntactic records test
    
    * test-suite/tests/r6rs-records-syntactic.test: Add -*- scheme -*-.

commit 23b4c817b1090dfbf6165fde71d0c34e2d973ada
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 19 15:40:25 2010 +0200

    typo in mutable-strings
    
    * module/rnrs/mutable-strings.scm: Fix typo.

commit 0f8e69a44ecf322231a5e1e8f94c234db2f72b41
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 19 15:40:11 2010 +0200

    *unspecified* in rnrs exceptions
    
    * module/rnrs/exceptions.scm (rnrs): Import *unspecified*.

commit 0feb833d22d4998773fe045f04cfbe1afebf82b9
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 19 15:20:02 2010 +0200

    don't unconditionally restore signals in ensure-batch-mode!
    
    * module/ice-9/boot-9.scm (ensure-batch-mode!): Remove comment about
      restoring signals, and that behavior, as it was making popen.test
      hang. I should investigate further, but instead I'm just going to hope
      that this fixes it.

commit c4a8200fa0f28ac9bab80ee6c2ab93fbd818c33f
Author: Andreas Rottmann <address@hidden>
Date:   Sat Jun 19 14:52:56 2010 +0200

    Fix SRFI-9 for records without fields
    
    * module/srfi/srfi-9.scm (define-record-type): Deal with fieldless records.
    * test-suite/tests/srfi-9.test: Add a fieldless record definition.

commit b1e5445f778abb61832c70b884b1afe52bab75b6
Author: Andreas Rottmann <address@hidden>
Date:   Sat Jun 19 14:52:21 2010 +0200

    Ignore the SRFI name component(s) in R6RS imports
    
    * module/ice-9/r6rs-libraries.scm (resolve-r6rs-interface): To avoid having 
to
      create alias libraries for all the SRFIs, we simply ignore the name
      components, so (srfi :n foo bar) will resolve to (srfi :n).

commit e5b218826a42554510643c6752d914417bbc382a
Author: Andreas Rottmann <address@hidden>
Date:   Sat Jun 19 14:51:48 2010 +0200

    ice-9 receive without define-macro
    
    * module/ice-9/receive.scm: Replace define-macro usage with syntax-rules.

-----------------------------------------------------------------------

Summary of changes:
 module/ice-9/boot-9.scm                      |    8 +++-----
 module/ice-9/r6rs-libraries.scm              |    4 ++--
 module/ice-9/receive.scm                     |   10 ++++++----
 module/rnrs/exceptions.scm                   |    2 +-
 module/rnrs/mutable-strings.scm              |    3 ++-
 module/srfi/srfi-9.scm                       |    4 ++++
 module/system/repl/command.scm               |   13 +++----------
 module/system/repl/common.scm                |   20 +++++++++++---------
 test-suite/tests/r6rs-records-syntactic.test |    1 +
 test-suite/tests/srfi-9.test                 |    2 ++
 10 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 3928d1e..89abc36 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2677,15 +2677,13 @@ module '(ice-9 q) '(make-q q-length))}."
 ;; `batch-mode?' returns #f during their extent.
 ;;
 ;; Programs can re-enter batch mode, for example after a fork, by calling
-;; `ensure-batch-mode!'. This will also restore signal handlers. It's not a
-;; great interface, though; it would be better to abort to the outermost 
prompt,
-;; and call a thunk there.
+;; `ensure-batch-mode!'. It's not a great interface, though; it would be better
+;; to abort to the outermost prompt, and call a thunk there.
 (define *repl-level* (make-fluid))
 (define (batch-mode?)
   (negative? (or (fluid-ref *repl-level*) -1)))
 (define (ensure-batch-mode!)
-  (fluid-set! *repl-level* #f)
-  (restore-signals))
+  (fluid-set! *repl-level* #f))
 
 (define (quit . args)
   (apply throw 'quit args))
diff --git a/module/ice-9/r6rs-libraries.scm b/module/ice-9/r6rs-libraries.scm
index 482f826..6fcde27 100644
--- a/module/ice-9/r6rs-libraries.scm
+++ b/module/ice-9/r6rs-libraries.scm
@@ -29,7 +29,7 @@
   (define (sym? x) (symbol? (syntax->datum x)))
 
   (syntax-case import-spec (library only except prefix rename srfi)
-    ;; (srfi :n ...) -> (srfi srfi-n ...)
+    ;; (srfi :n ...) -> (srfi srfi-n)
     ((library (srfi colon-n rest ... (version ...)))
      (and (and-map sym? #'(srfi rest ...))
           (symbol? (syntax->datum #'colon-n))
@@ -40,7 +40,7 @@
                      (substring (symbol->string (syntax->datum #'colon-n))
                                 1)))))
        (resolve-r6rs-interface
-        #`(library (srfi #,srfi-n rest ... (version ...))))))
+        #`(library (srfi #,srfi-n (version ...))))))
     
     ((library (name name* ... (version ...)))
      (and-map sym? #'(name name* ...))
diff --git a/module/ice-9/receive.scm b/module/ice-9/receive.scm
index d550c6f..f4f4d81 100644
--- a/module/ice-9/receive.scm
+++ b/module/ice-9/receive.scm
@@ -1,6 +1,6 @@
 ;;;; SRFI-8
 
-;;; Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+;;; Copyright (C) 2000, 2001, 2004, 2006, 2010 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
@@ -21,8 +21,10 @@
   :no-backtrace
   )
 
-(define-macro (receive vars vals . body)
-  `(call-with-values (lambda () ,vals)
-     (lambda ,vars ,@body)))
+(define-syntax receive
+  (syntax-rules ()
+    ((receive vars vals . body)
+     (call-with-values (lambda () vals)
+       (lambda vars . body)))))
 
 (cond-expand-provide (current-module) '(srfi-8))
diff --git a/module/rnrs/exceptions.scm b/module/rnrs/exceptions.scm
index d810f2b..cd5bacf 100644
--- a/module/rnrs/exceptions.scm
+++ b/module/rnrs/exceptions.scm
@@ -22,7 +22,7 @@
   (import (rnrs base (6))
           (rnrs conditions (6))
          (rnrs records procedural (6))
-         (only (guile) with-throw-handler @@))
+         (only (guile) with-throw-handler *unspecified* @@))
 
   (define raise (@@ (rnrs records procedural) r6rs-raise))
   (define raise-continuable 
diff --git a/module/rnrs/mutable-strings.scm b/module/rnrs/mutable-strings.scm
index 1eeb8f3..b2b3102 100644
--- a/module/rnrs/mutable-strings.scm
+++ b/module/rnrs/mutable-strings.scm
@@ -15,7 +15,8 @@
 ;; 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
-^L
+
+
 
 (library (rnrs mutable-strings (6))
   (export string-set! string-fill!)
diff --git a/module/srfi/srfi-9.scm b/module/srfi/srfi-9.scm
index 39f4e34..80c3b60 100644
--- a/module/srfi/srfi-9.scm
+++ b/module/srfi/srfi-9.scm
@@ -95,6 +95,8 @@
   (lambda (x)
     (define (field-identifiers field-specs)
       (syntax-case field-specs ()
+        (()
+         '())
         ((field-spec)
          (syntax-case #'field-spec ()
            ((name accessor) #'(name))
@@ -138,6 +140,8 @@
 
     (define (accessors type-name field-specs indices)
       (syntax-case field-specs ()
+        (()
+         #'())
         ((field-spec)
          (syntax-case #'field-spec ()
            ((name accessor)
diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm
index f3b0d1b..9e79eb7 100644
--- a/module/system/repl/command.scm
+++ b/module/system/repl/command.scm
@@ -333,17 +333,10 @@ Change languages."
 ;;; Compile commands
 ;;;
 
-(define-meta-command (compile repl (form) . opts)
+(define-meta-command (compile repl (form))
   "compile FORM
-Generate compiled code.
-
-  -e    Stop after expanding syntax/macro
-  -t    Stop after translating into GHIL
-  -c    Stop after generating GLIL
-
-  -O    Enable optimization
-  -D    Add debug information"
-  (let ((x (apply repl-compile repl (repl-parse repl form) opts)))
+Generate compiled code."
+  (let ((x (repl-compile repl (repl-parse repl form))))
     (cond ((objcode? x) (guile:disassemble x))
           (else (repl-print repl x)))))
 
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 1b4e2ac..bc3fcaf 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -102,7 +102,8 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more 
details.")
 (define-record/keywords <repl> language options tm-stats gc-stats)
 
 (define repl-default-options
-  '((trace . #f)
+  '((compile-options . (#:warnings (unbound-variable arity-mismatch)))
+    (trace . #f)
     (interp . #f)))
 
 (define %make-repl make-repl)
@@ -132,13 +133,14 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more 
details.")
   ((language-reader (repl-language repl)) (current-input-port)
                                           (current-module)))
 
-(define (repl-compile repl form . opts)
-  (let ((to (lookup-language (cond ((memq #:e opts) 'scheme)
-                                   ((memq #:t opts) 'ghil)
-                                   ((memq #:c opts) 'glil)
-                                   (else 'objcode))))
-        (from (repl-language repl)))
-    (compile form #:from from #:to to #:opts opts #:env (current-module))))
+(define (repl-compile-options repl)
+  (repl-option-ref repl 'compile-options))
+
+(define (repl-compile repl form)
+  (let ((from (repl-language repl))
+        (opts (repl-compile-options repl)))
+    (compile form #:from from #:to 'objcode #:opts opts
+             #:env (current-module))))
 
 (define (repl-parse repl form)
   (let ((parser (language-parser (repl-language repl))))
@@ -150,7 +152,7 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more 
details.")
                          (or (null? (language-compilers (repl-language repl)))
                              (assq-ref (repl-options repl) 'interp)))
                     (lambda () (eval form (current-module)))
-                    (make-program (repl-compile repl form '())))))
+                    (make-program (repl-compile repl form)))))
     (% (thunk))))
 
 (define (repl-print repl val)
diff --git a/test-suite/tests/r6rs-records-syntactic.test 
b/test-suite/tests/r6rs-records-syntactic.test
index 64b2fbb..152e31c 100644
--- a/test-suite/tests/r6rs-records-syntactic.test
+++ b/test-suite/tests/r6rs-records-syntactic.test
@@ -1,3 +1,4 @@
+;;; -*- scheme -*-
 ;;; r6rs-records-syntactic.test --- Test suite for R6RS (rnrs records 
syntactic)
 
 ;;      Copyright (C) 2010 Free Software Foundation, Inc.
diff --git a/test-suite/tests/srfi-9.test b/test-suite/tests/srfi-9.test
index a645ddc..cf933a8 100644
--- a/test-suite/tests/srfi-9.test
+++ b/test-suite/tests/srfi-9.test
@@ -23,6 +23,8 @@
   #:use-module (srfi srfi-9))
 
 
+(define-record-type :qux (make-qux) qux?)
+
 (define-record-type :foo (make-foo x) foo? 
   (x get-x) (y get-y set-y!))
 


hooks/post-receive
-- 
GNU Guile