~ chicken-core (chicken-5) 98c13757c9bfc8746e655d990f20b1c6e94d65b0

commit 98c13757c9bfc8746e655d990f20b1c6e94d65b0
Merge: 8be78e19 c765281f
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Aug 9 14:04:24 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Aug 9 14:04:24 2011 +0200

    resolved conflicts

diff --cc types.db
index f0b6bb64,86acb838..64cc039b
--- a/types.db
+++ b/types.db
@@@ -378,30 -778,38 +778,39 @@@
  (maximum-flonum float)
  (memory-statistics (procedure memory-statistics () vector))
  (minimum-flonum float)
 +(module-environment (procedure module-environment (symbol #!optional symbol) (struct environment)))
  (most-negative-fixnum fixnum)
  (most-positive-fixnum fixnum)
- (on-exit (procedure on-exit ((procedure () . *)) undefined))
- (open-input-string (procedure open-input-string (string #!rest) port))
+ (on-exit (procedure! on-exit ((procedure () . *)) undefined))
+ (open-input-string (procedure! open-input-string (string #!rest) port))
  (open-output-string (procedure open-output-string (#!rest) port))
  (parentheses-synonyms (procedure parentheses-synonyms (#!optional *) *))
- (port-name (procedure port-name (#!optional port) *))
- (port-position (procedure port-position (#!optional port) fixnum))
- (port? (procedure port? (*) boolean))
+ 
+ (port-name (procedure! port-name (#!optional port) *)
+ 	   ((port) (##sys#slot #(1) '3)))
+ 
+ (port-position (procedure! port-position (#!optional port) fixnum))
+ 
+ (port? (procedure? port port? (*) boolean))
+ 
  (print (procedure print (#!rest *) undefined))
- (print-call-chain (procedure print-call-chain (#!optional port fixnum * string) undefined))
- (print-error-message (procedure print-error-message (* #!optional port string) undefined))
+ (print-call-chain (procedure! print-call-chain (#!optional port fixnum * string) undefined))
+ (print-error-message (procedure! print-error-message (* #!optional port string) undefined))
  (print* (procedure print* (#!rest) undefined))
- (procedure-information (procedure procedure-information (procedure) *))
- (program-name (procedure program-name (#!optional string) string))
- (promise? (procedure promise? (*) boolean))
- (put! (procedure put! (symbol symbol *) undefined))
+ (procedure-information (procedure! procedure-information (procedure) *))
+ (program-name (procedure! program-name (#!optional string) string))
+ (promise? (procedure? (struct promise) promise? (*) boolean))
+ 
+ (put! (procedure! put! (symbol symbol *) undefined)
+       ((symbol symbol *)
+        (##core#inline_allocate ("C_a_i_putprop" 8) #(1) #(2) #(3))))
+ 
  (quit (procedure quit (#!optional *) noreturn))
- (register-feature! (procedure register-feature! (#!rest symbol) undefined))
- (remprop! (procedure remprop! (symbol symbol) undefined))
- (rename-file (procedure rename-file (string string) string))
- (repl (procedure repl (#!optional (procedure (*) *)) undefined))
- (repl-prompt (procedure repl-prompt (#!optional procedure) procedure))
+ (register-feature! (procedure! register-feature! (#!rest symbol) undefined))
+ (remprop! (procedure! remprop! (symbol symbol) undefined))
+ (rename-file (procedure! rename-file (string string) string))
+ (repl (procedure! repl (#!optional (procedure (*) *)) undefined))
+ (repl-prompt (procedure! repl-prompt (#!optional procedure) procedure))
  (repository-path (procedure repository-path (#!optional *) *))
  (require (procedure require (#!rest *) undefined))
  (reset (procedure reset () undefined))