mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 14:50:19 +02:00
implement ++, --, new, delete, void, typeof
* module/language/ecmascript/compile-ghil.scm (@impl): Implement with @implv. (comp): Implement ++ and -- (pre- and post-). Quite a pain. I'll be looking for ways to simplify this notation. Also implement new, delete, and void. * module/language/ecmascript/impl.scm: Implement typeof.
This commit is contained in:
Andy Wingo
parent
785fb107ef
commit
a287987818
2 changed files with 158 additions and 7 deletions
|
|
@ -38,15 +38,13 @@
|
||||||
(and (not (null? props))
|
(and (not (null? props))
|
||||||
props))))
|
props))))
|
||||||
|
|
||||||
(define-macro (@impl e l sym args)
|
|
||||||
`(make-ghil-call ,e ,l
|
|
||||||
(make-ghil-ref
|
|
||||||
,e ,l
|
|
||||||
(ghil-var-at-module! ,e '(language ecmascript impl) ',sym #t))
|
|
||||||
,args))
|
|
||||||
(define-macro (@implv e l sym)
|
(define-macro (@implv e l sym)
|
||||||
`(make-ghil-ref ,e ,l
|
`(make-ghil-ref ,e ,l
|
||||||
(ghil-var-at-module! ,e '(language ecmascript impl) ',sym #t)))
|
(ghil-var-at-module! ,e '(language ecmascript impl) ',sym #t)))
|
||||||
|
(define-macro (@impl e l sym args)
|
||||||
|
`(make-ghil-call ,e ,l
|
||||||
|
(@implv ,e ,l ,sym)
|
||||||
|
,args))
|
||||||
|
|
||||||
(define (comp x e)
|
(define (comp x e)
|
||||||
(let ((l (location x)))
|
(let ((l (location x)))
|
||||||
|
|
@ -72,6 +70,138 @@
|
||||||
(make-ghil-inline e l 'div (list (comp a e) (comp b e))))
|
(make-ghil-inline e l 'div (list (comp a e) (comp b e))))
|
||||||
((* ,a ,b)
|
((* ,a ,b)
|
||||||
(make-ghil-inline e l 'mul (list (comp a e) (comp b e))))
|
(make-ghil-inline e l 'mul (list (comp a e) (comp b e))))
|
||||||
|
((postinc (ref ,foo))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(ref ,foo) e))
|
||||||
|
(make-ghil-set e l (ghil-var-for-set! e foo)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(make-ghil-ref e l (car vars)))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((postinc (pref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(pref ,obj ,prop) e))
|
||||||
|
(@impl e l pput (list (comp obj e)
|
||||||
|
(make-ghil-quote e l prop)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(make-ghil-ref e l (car vars))))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((postinc (aref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(aref ,obj ,prop) e))
|
||||||
|
(@impl e l pput (list (comp obj e)
|
||||||
|
(comp prop e)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(make-ghil-ref e l (car vars))))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((postdec (ref ,foo))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(ref ,foo) e))
|
||||||
|
(make-ghil-set e l (ghil-var-for-set! e foo)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l 1))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((postdec (pref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(pref ,obj ,prop) e))
|
||||||
|
(@impl e l pput (list (comp obj e)
|
||||||
|
(make-ghil-quote e l prop)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l 1)))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((postdec (aref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp `(aref ,obj ,prop) e))
|
||||||
|
(@impl e l pput (list (comp obj e)
|
||||||
|
(comp prop e)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l 1)))))
|
||||||
|
(make-ghil-ref e l (car vars)))))))
|
||||||
|
((preinc (ref ,foo))
|
||||||
|
(let ((v (ghil-var-for-set! e foo)))
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l v
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(make-ghil-ref e l v))))
|
||||||
|
(make-ghil-ref e l v)))))
|
||||||
|
((preinc (pref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp obj e))
|
||||||
|
(@impl e l pput (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop)))))))
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop))))))))
|
||||||
|
((preinc (aref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp obj e))
|
||||||
|
(@impl e l pput (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'add (list (make-ghil-quote e l 1)
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e)))))))
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e))))))))
|
||||||
|
((predec (ref ,foo))
|
||||||
|
(let ((v (ghil-var-for-set! e foo)))
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l v
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (make-ghil-ref e l v)
|
||||||
|
(make-ghil-quote e l 1))))
|
||||||
|
(make-ghil-ref e l v)))))
|
||||||
|
((predec (pref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp obj e))
|
||||||
|
(@impl e l pput (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop)))
|
||||||
|
(make-ghil-quote e l 1)))))
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(make-ghil-quote e l prop))))))))
|
||||||
|
((predec (aref ,obj ,prop))
|
||||||
|
(call-with-ghil-bindings e '(%tmp)
|
||||||
|
(lambda (vars)
|
||||||
|
(make-ghil-begin
|
||||||
|
e l (list (make-ghil-set e l (car vars) (comp obj e))
|
||||||
|
(@impl e l pput (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e)
|
||||||
|
(make-ghil-inline
|
||||||
|
e l 'sub (list (@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e)))
|
||||||
|
(make-ghil-quote e l 1)))))
|
||||||
|
(@impl e l pget (list (make-ghil-ref e l (car vars))
|
||||||
|
(comp prop e))))))))
|
||||||
((ref ,id)
|
((ref ,id)
|
||||||
(make-ghil-ref e l (ghil-var-for-ref! e id)))
|
(make-ghil-ref e l (ghil-var-for-ref! e id)))
|
||||||
((var . ,forms)
|
((var . ,forms)
|
||||||
|
|
@ -98,6 +228,7 @@
|
||||||
(make-ghil-lambda env l vars #t '()
|
(make-ghil-lambda env l vars #t '()
|
||||||
(comp-body env l body formals '%args)))))
|
(comp-body env l body formals '%args)))))
|
||||||
((call/this ,obj ,prop ,args)
|
((call/this ,obj ,prop ,args)
|
||||||
|
;; FIXME: only evaluate "obj" once
|
||||||
(@impl e l call/this*
|
(@impl e l call/this*
|
||||||
(list obj (make-ghil-lambda
|
(list obj (make-ghil-lambda
|
||||||
e l '() #f '()
|
e l '() #f '()
|
||||||
|
|
@ -138,6 +269,16 @@
|
||||||
(@impl e l pput (list (comp obj e) (make-ghil-quote e l prop) (comp val e))))
|
(@impl e l pput (list (comp obj e) (make-ghil-quote e l prop) (comp val e))))
|
||||||
((= (aref ,obj ,prop) ,val)
|
((= (aref ,obj ,prop) ,val)
|
||||||
(@impl e l pput (list (comp obj e) (comp prop e) (comp val e))))
|
(@impl e l pput (list (comp obj e) (comp prop e) (comp val e))))
|
||||||
|
((new ,what ,args)
|
||||||
|
(@impl e l new (map (lambda (x) (comp x e)) (cons what args))))
|
||||||
|
((delete (pref ,obj ,prop))
|
||||||
|
(@impl e l pdel (list (comp obj e) (make-ghil-quote e l prop))))
|
||||||
|
((delete (aref ,obj ,prop))
|
||||||
|
(@impl e l pdel (list (comp obj e) (comp prop e))))
|
||||||
|
((void ,expr)
|
||||||
|
(make-ghil-begin e l (list (comp expr e) (@implv e l *undefined*))))
|
||||||
|
((typeof ,expr)
|
||||||
|
(@impl e l typeof (list (comp expr e))))
|
||||||
(else
|
(else
|
||||||
(error "compilation not yet implemented:" x)))))
|
(error "compilation not yet implemented:" x)))))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
#:use-module (language ecmascript base)
|
#:use-module (language ecmascript base)
|
||||||
#:use-module (language ecmascript function)
|
#:use-module (language ecmascript function)
|
||||||
#:use-module (language ecmascript array)
|
#:use-module (language ecmascript array)
|
||||||
#:export (get-this)
|
#:export (get-this typeof)
|
||||||
#:re-export (*undefined* *this* call/this*
|
#:re-export (*undefined* *this* call/this*
|
||||||
pget pput pdel
|
pget pput pdel
|
||||||
new-object
|
new-object
|
||||||
|
|
@ -33,3 +33,13 @@
|
||||||
|
|
||||||
(define (get-this)
|
(define (get-this)
|
||||||
(fluid-ref *this*))
|
(fluid-ref *this*))
|
||||||
|
|
||||||
|
(define (typeof x)
|
||||||
|
(cond ((eq? x *undefined*) "undefined")
|
||||||
|
((null? x) "object")
|
||||||
|
((boolean? x) "boolean")
|
||||||
|
((number? x) "number")
|
||||||
|
((string? x) "string")
|
||||||
|
((procedure? x) "function")
|
||||||
|
((is-a? x <js-object>) "object")
|
||||||
|
(else "scm")))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue