[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.5-74-g3fafc5
|
From: |
Mark H Weaver |
|
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-74-g3fafc52 |
|
Date: |
Sun, 04 Mar 2012 17:44:01 +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=3fafc52afbfc9ef398946a7ec4d96d01adc02aa1
The branch, stable-2.0 has been updated
via 3fafc52afbfc9ef398946a7ec4d96d01adc02aa1 (commit)
via 1948b38d8818d2154f4f9292adfc53537a843126 (commit)
from 1af6d2a717f499564fbbc297c79e00ac14b0dcf9 (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 3fafc52afbfc9ef398946a7ec4d96d01adc02aa1
Author: Mark H Weaver <address@hidden>
Date: Sun Mar 4 12:01:10 2012 -0500
Comment out unused definitions of 'do' and 'case' in psyntax.scm
* module/ice-9/psyntax.scm (do, case): Comment out these definitions,
which are never used and immediately replaced by definitions in
boot-9.scm.
* module/ice-9/psyntax-pp.scm: Regenerate.
commit 1948b38d8818d2154f4f9292adfc53537a843126
Author: Mark H Weaver <address@hidden>
Date: Sun Mar 4 11:53:23 2012 -0500
Fix syntax wrap comments; remove old unused cruft
* module/ice-9/psyntax.scm (subst-rename?, rename-old, rename-new,
rename-marks, make-rename): Remove these unused syntax rules.
Fix description of syntax wraps to match current reality.
-----------------------------------------------------------------------
Summary of changes:
module/ice-9/psyntax-pp.scm | 137 -------------------------------------------
module/ice-9/psyntax.scm | 22 ++++----
2 files changed, 11 insertions(+), 148 deletions(-)
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index 5635a6a..7475983 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -2641,83 +2641,6 @@
"source expression failed to match any pattern"
tmp-1)))))))
-(define do
- (make-syntax-transformer
- 'do
- 'macro
- (lambda (orig-x)
- (let ((tmp-1 orig-x))
- (let ((tmp ($sc-dispatch
- tmp-1
- '(_ #(each (any any . any)) (any . each-any) .
each-any))))
- (if tmp
- (apply (lambda (var init step e0 e1 c)
- (let ((tmp-1 (map (lambda (v s)
- (let ((tmp-1 s))
- (let ((tmp ($sc-dispatch tmp-1
'())))
- (if tmp
- (apply (lambda () v) tmp)
- (let ((tmp ($sc-dispatch tmp-1
'(any))))
- (if tmp
- (apply (lambda (e) e) tmp)
- (syntax-violation 'do "bad
step expression" orig-x s)))))))
- var
- step)))
- (let ((tmp ($sc-dispatch tmp-1 'each-any)))
- (if tmp
- (apply (lambda (step)
- (let ((tmp e1))
- (let ((tmp-1 ($sc-dispatch tmp '())))
- (if tmp-1
- (apply (lambda ()
- (list '#(syntax-object let
((top)) (hygiene guile))
- '#(syntax-object
doloop ((top)) (hygiene guile))
- (map list var init)
- (list
'#(syntax-object if ((top)) (hygiene guile))
- (list
'#(syntax-object not ((top)) (hygiene guile)) e0)
- (cons
'#(syntax-object begin ((top)) (hygiene guile))
- (append
- c
- (list
(cons '#(syntax-object
-
doloop
-
((top))
-
(hygiene guile))
-
step)))))))
- tmp-1)
- (let ((tmp-1 ($sc-dispatch tmp '(any
. each-any))))
- (if tmp-1
- (apply (lambda (e1 e2)
- (list '#(syntax-object
let ((top)) (hygiene guile))
- '#(syntax-object
doloop ((top)) (hygiene guile))
- (map list var
init)
- (list
'#(syntax-object if ((top)) (hygiene guile))
- e0
- (cons
'#(syntax-object begin ((top)) (hygiene guile))
- (cons
e1 e2))
- (cons
'#(syntax-object begin ((top)) (hygiene guile))
-
(append
- c
-
(list (cons '#(syntax-object
-
doloop
-
((top))
-
(hygiene guile))
-
step)))))))
- tmp-1)
- (syntax-violation
- #f
- "source expression failed to
match any pattern"
- tmp)))))))
- tmp)
- (syntax-violation
- #f
- "source expression failed to match any pattern"
- tmp-1)))))
- tmp)
- (syntax-violation
- #f
- "source expression failed to match any pattern"
- tmp-1)))))))
-
(define quasiquote
(make-syntax-transformer
'quasiquote
@@ -3101,66 +3024,6 @@
"expression not valid outside of quasiquote"
x))))
-(define case
- (make-syntax-transformer
- 'case
- 'macro
- (lambda (x)
- (let ((tmp-1 x))
- (let ((tmp ($sc-dispatch tmp-1 '(_ any any . each-any))))
- (if tmp
- (apply (lambda (e m1 m2)
- (let ((tmp (let f ((clause m1) (clauses m2))
- (if (null? clauses)
- (let ((tmp-1 clause))
- (let ((tmp ($sc-dispatch
- tmp-1
- '(#(free-id #(syntax-object
else ((top)) (hygiene guile)))
- any
- .
- each-any))))
- (if tmp
- (apply (lambda (e1 e2)
- (cons '#(syntax-object
begin ((top)) (hygiene guile)) (cons e1 e2)))
- tmp)
- (let ((tmp ($sc-dispatch tmp-1
'(each-any any . each-any))))
- (if tmp
- (apply (lambda (k e1 e2)
- (list '#(syntax-object
if ((top)) (hygiene guile))
- (list
'#(syntax-object memv ((top)) (hygiene guile))
-
'#(syntax-object t ((top)) (hygiene guile))
- (list
'#(syntax-object quote ((top)) (hygiene guile))
- k))
- (cons
'#(syntax-object begin ((top)) (hygiene guile))
- (cons e1
e2))))
- tmp)
- (syntax-violation 'case "bad
clause" x clause))))))
- (let ((tmp (f (car clauses) (cdr
clauses))))
- (let ((rest tmp))
- (let ((tmp clause))
- (let ((tmp ($sc-dispatch tmp
'(each-any any . each-any))))
- (if tmp
- (apply (lambda (k e1 e2)
- (list '#(syntax-object
if ((top)) (hygiene guile))
- (list
'#(syntax-object memv ((top)) (hygiene guile))
-
'#(syntax-object t ((top)) (hygiene guile))
- (list
'#(syntax-object quote ((top)) (hygiene guile))
- k))
- (cons
'#(syntax-object begin ((top)) (hygiene guile))
- (cons e1
e2))
- rest))
- tmp)
- (syntax-violation 'case "bad
clause" x clause))))))))))
- (let ((body tmp))
- (list '#(syntax-object let ((top)) (hygiene guile))
- (list (list '#(syntax-object t ((top)) (hygiene
guile)) e))
- body))))
- tmp)
- (syntax-violation
- #f
- "source expression failed to match any pattern"
- tmp-1)))))))
-
(define make-variable-transformer
(lambda (proc)
(if (procedure? proc)
diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index a25bbba..6015eff 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -617,22 +617,15 @@
;; syntax object wraps
- ;; <wrap> ::= ((<mark> ...) . (<subst> ...))
- ;; <subst> ::= <shift> | <subs>
- ;; <subs> ::= #(<old name> <label> (<mark> ...))
- ;; <shift> ::= positive fixnum
+ ;; <wrap> ::= ((<mark> ...) . (<subst> ...))
+ ;; <subst> ::= shift | <subs>
+ ;; <subs> ::= #(ribcage #(<sym> ...) #(<mark> ...) #(<label> ...))
+ ;; | #(ribcage (<sym> ...) (<mark> ...) (<label> ...))
(define-syntax make-wrap (identifier-syntax cons))
(define-syntax wrap-marks (identifier-syntax car))
(define-syntax wrap-subst (identifier-syntax cdr))
- (define-syntax subst-rename? (identifier-syntax vector?))
- (define-syntax-rule (rename-old x) (vector-ref x 0))
- (define-syntax-rule (rename-new x) (vector-ref x 1))
- (define-syntax-rule (rename-marks x) (vector-ref x 2))
- (define-syntax-rule (make-rename old new marks)
- (vector old new marks))
-
;; labels must be comparable with "eq?", have read-write invariance,
;; and distinct from symbols.
(define (gen-label)
@@ -2822,6 +2815,9 @@
(binding (car bindings)))
#'(let (binding) body))))))))
+;; This definition of 'do' is never used, as it is immediately
+;; replaced by the definition in boot-9.scm.
+#;
(define-syntax do
(lambda (orig-x)
(syntax-case orig-x ()
@@ -2995,6 +2991,10 @@
"expression not valid outside of quasiquote"
x)))
+;; This definition of 'case' is never used, as it is immediately
+;; replaced by the definition in boot-9.scm. This version lacks
+;; R7RS-mandated support for '=>'.
+#;
(define-syntax case
(lambda (x)
(syntax-case x ()
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-74-g3fafc52,
Mark H Weaver <=