Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	module/ice-9/psyntax-pp.scm
	module/ice-9/psyntax.scm
	module/language/bytecode/spec.scm
	module/language/tree-il/spec.scm

diff --cc .gitignore
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/ref/compiler.texi
Simple merge

diff --cc libguile/memoize.c
Simple merge

diff --cc module/ice-9/psyntax-pp.scm
index 5c39340,a0d338c..e330423
--- 1/module/ice-9/psyntax-pp.scm
--- 2/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@@ -1004,20 -990,18 +1004,31 @@@
                                         (cons var vars)
                                         (cons (cons er (wrap e w mod)) vals)
                                         (cons (cons 'lexical var) bindings)))))
--                           ((memv key '(define-syntax-form define-syntax-parameter-form))
-                             (let ((id (wrap value w mod)) (label (gen-label)))
++                           ((memv key '(define-syntax-form))
+                             (let ((id (wrap value w mod))
+                                   (label (gen-label))
+                                   (trans-r (macros-only-env er)))
                                (extend-ribcage! ribcage id label)
-                               (parse (cdr body)
-                                      (cons id ids)
-                                      (cons label labels)
-                                      var-ids
-                                      vars
-                                      vals
-                                      (cons (cons (if (eq? type 'define-syntax-parameter-form)
-                                                    'syntax-parameter
-                                                    'macro)
-                                                  (cons er (wrap e w mod)))
-                                            bindings))))
+                               (set-cdr!
+                                 r
+                                 (extend-env
+                                   (list label)
+                                   (list (cons 'macro (eval-local-transformer (expand e trans-r w mod) mod)))
+                                   (cdr r)))
+                               (parse (cdr body) (cons id ids) labels var-ids vars vals bindings)))
++                           ((memv key '(define-syntax-parameter-form))
++                            (let ((id (wrap value w mod))
++                                  (label (gen-label))
++                                  (trans-r (macros-only-env er)))
++                              (extend-ribcage! ribcage id label)
++                              (set-cdr!
++                                r
++                                (extend-env
++                                  (list label)
++                                  (list (cons 'syntax-parameter
++                                              (list (eval-local-transformer (expand e trans-r w mod) mod))))
++                                  (cdr r)))
++                              (parse (cdr body) (cons id ids) labels var-ids vars vals bindings)))
                             ((memv key '(begin-form))
                              (let* ((tmp-1 e) (tmp ($sc-dispatch tmp-1 '(_ . each-any))))
                                (if tmp

diff --cc module/ice-9/psyntax.scm
index 1698a02,565c911..79f2fd4
--- 1/module/ice-9/psyntax.scm
--- 2/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@@ -1543,18 -1469,23 +1543,40 @@@
                                      (cons id var-ids)
                                      (cons var vars) (cons (cons er (wrap e w mod)) vals)
                                      (cons (make-binding 'lexical var) bindings)))))
--                        ((define-syntax-form define-syntax-parameter-form)
-                          (let ((id (wrap value w mod)) (label (gen-label)))
++                        ((define-syntax-form)
+                          (let ((id (wrap value w mod))
+                                (label (gen-label))
+                                (trans-r (macros-only-env er)))
+                            (extend-ribcage! ribcage id label)
+                            ;; As required by R6RS, evaluate the right-hand-sides of internal
+                            ;; syntax definition forms and add their transformers to the
+                            ;; compile-time environment immediately, so that the newly-defined
+                            ;; keywords may be used in definition context within the same
+                            ;; lexical contour.
 -                           (set-cdr! r (extend-env (list label)
 -                                                   (list (make-binding 'macro
 -                                                                       (eval-local-transformer
 -                                                                        (expand e trans-r w mod)
 -                                                                        mod)))
 -                                                   (cdr r)))
++                           (set-cdr! r (extend-env
++                                        (list label)
++                                        (list (make-binding
++                                               'macro
++                                               (eval-local-transformer
++                                                (expand e trans-r w mod)
++                                                mod)))
++                                        (cdr r)))
++                           (parse (cdr body) (cons id ids) labels var-ids vars vals bindings)))
++                        ((define-syntax-parameter-form)
++                         ;; Same as define-syntax-form, but different format of the binding.
++                         (let ((id (wrap value w mod))
++                               (label (gen-label))
++                               (trans-r (macros-only-env er)))
 +                           (extend-ribcage! ribcage id label)
-                            (parse (cdr body)
-                                   (cons id ids) (cons label labels)
-                                   var-ids vars vals
-                                   (cons (make-binding
-                                          (if (eq? type 'define-syntax-parameter-form)
-                                              'syntax-parameter
-                                              'macro)
-                                          (cons er (wrap e w mod)))
-                                         bindings))))
++                           (set-cdr! r (extend-env
++                                        (list label)
++                                        (list (make-binding
++                                               'syntax-parameter
++                                               (list (eval-local-transformer
++                                                      (expand e trans-r w mod)
++                                                      mod))))
++                                        (cdr r)))
+                            (parse (cdr body) (cons id ids) labels var-ids vars vals bindings)))
                          ((begin-form)
                           (syntax-case e ()
                             ((_ e1 ...)

diff --cc module/language/bytecode/spec.scm
index c2a6d46,1d7e79b..ca703c3
--- 1/module/language/bytecode/spec.scm
--- 2/module/language/bytecode/spec.scm
+++ b/module/language/bytecode/spec.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; Guile Lowlevel Intermediate Language
  
- ;; Copyright (C) 2001, 2009, 2010, 2012 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2009, 2010, 2013 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2009, 2010, 2012, 2013 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

diff --cc module/language/objcode/spec.scm
Simple merge

diff --cc module/language/tree-il/analyze.scm
Simple merge

diff --cc module/language/tree-il/spec.scm
index 3ad3727,bb7a200..80c32fe
--- 1/module/language/tree-il/spec.scm
--- 2/module/language/tree-il/spec.scm
+++ b/module/language/tree-il/spec.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; Tree Intermediate Language
  
- ;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 -;; Copyright (C) 2009, 2010, 2013 Free Software Foundation, Inc.
++;; Copyright (C) 2009, 2010, 2011, 2013 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

diff --cc module/oop/goops.scm
Simple merge

diff --cc test-suite/tests/ecmascript.test
Simple merge

diff --cc test-suite/tests/tree-il.test
Simple merge