dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	libguile/deprecated.c
	libguile/ports.c
	libguile/ports.h
	libguile/strports.c
	test-suite/tests/cse.test
This commit is contained in:
Andy Wingo 2012-06-22 13:18:02 +02:00
commit 0dd7c54075
26 changed files with 343 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

6
module/language/ecmascript/base.scm
View file

@ -92,7 +92,7 @@
(pdel o (string->symbol p)))
(define-method (has-property? (o <js-object>) p)
(if (hashq-get-handle (js-props o) v)
(if (hashq-get-handle (js-props o) p)
#t
(let ((proto (js-prototype o)))
(if proto
@ -176,9 +176,9 @@
((boolean? x) (if x 1 0))
((null? x) 0)
((eq? x *undefined*) +nan.0)
((is-a? x <js-object>) (object->number x))
((is-a? x <js-object>) (object->number x #t))
((string? x) (string->number x))
(else (throw 'TypeError o '->number))))
(else (throw 'TypeError x '->number))))
(define (->integer x)
(let ((n (->number x)))