mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 21:10:27 +02:00
Code Activity

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

Browse source 
Moved scm_i_struct_hash from struct.c to hash.c and made it static.

The port's alist is now a field of 'scm_t_port'.

Conflicts:
	libguile/arrays.c
	libguile/hash.c
	libguile/ports.c
	libguile/print.h
	libguile/read.c
This commit is contained in:
Mark H Weaver 2012-10-30 23:46:31 -04:00
commit fa980bcc0f
53 changed files with 1677 additions and 531 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/srfi/srfi-19.scm
View file

@ -1113,13 +1113,13 @@
(cons #\1 (lambda (date pad-with port)
(display (date->string date "~Y-~m-~d") port)))
(cons #\2 (lambda (date pad-with port)
(display (date->string date "~k:~M:~S~z") port)))
(display (date->string date "~H:~M:~S~z") port)))
(cons #\3 (lambda (date pad-with port)
(display (date->string date "~k:~M:~S") port)))
(display (date->string date "~H:~M:~S") port)))
(cons #\4 (lambda (date pad-with port)
(display (date->string date "~Y-~m-~dT~k:~M:~S~z") port)))
(display (date->string date "~Y-~m-~dT~H:~M:~S~z") port)))
(cons #\5 (lambda (date pad-with port)
(display (date->string date "~Y-~m-~dT~k:~M:~S") port)))))
(display (date->string date "~Y-~m-~dT~H:~M:~S") port)))))
(define (get-formatter char)

26
module/srfi/srfi-31.scm
View file

@ -1,6 +1,6 @@
;;; srfi-31.scm --- special form for recursive evaluation
;; Copyright (C) 2004, 2006 Free Software Foundation, Inc.
;; Copyright (C) 2004, 2006, 2012 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
@ -19,17 +19,15 @@
;;; Original author: Rob Browning <rlb@defaultvalue.org>
(define-module (srfi srfi-31)
:export-syntax (rec))
#:export (rec))
(define-macro (rec arg-form . body)
(cond
((and (symbol? arg-form) (= 1 (length body)))
;; (rec S (cons 1 (delay S)))
`(letrec ((,arg-form ,(car body)))
,arg-form))
;; (rec (f x) (+ x 1))
((list? arg-form)
`(letrec ((,(car arg-form) (lambda ,(cdr arg-form) ,@body)))
,(car arg-form)))
(else
(error "syntax error in rec form" `(rec ,arg-form ,@body)))))
(define-syntax rec
(syntax-rules ()
"Return the given object, defined in a lexical environment where
NAME is bound to itself."
((_ (name . formals) body ...) ; procedure
(letrec ((name (lambda formals body ...)))
name))
((_ name expr) ; arbitrary object
(letrec ((name expr))
name))))