projects
/
jscl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8b3a69a
)
Unescape some symbols
author
David Vázquez
<davazp@gmail.com>
Sat, 6 Jul 2013 02:18:27 +0000
(
04:18
+0200)
committer
David Vázquez
<davazp@gmail.com>
Sat, 6 Jul 2013 02:18:27 +0000
(
04:18
+0200)
src/compiler.lisp
patch
|
blob
|
history
diff --git
a/src/compiler.lisp
b/src/compiler.lisp
index
be83e08
..
78ab64c
100644
(file)
--- a/
src/compiler.lisp
+++ b/
src/compiler.lisp
@@
-759,12
+759,12
@@
(define-compilation catch (id &rest body)
`(selfcall
(define-compilation catch (id &rest body)
`(selfcall
- (var (|id| ,(convert id)))
+ (var (id ,(convert id)))
(try
,(convert-block body t))
(catch (|cf|)
(if (and (== (get |cf| "type") "catch")
(try
,(convert-block body t))
(catch (|cf|)
(if (and (== (get |cf| "type") "catch")
- (== (get |cf| "id") |id|))
+ (== (get |cf| "id") id))
,(if *multiple-value-p*
`(return (method-call |values| "apply" this (call |forcemv| (get |cf| "values"))))
`(return (method-call |pv| "apply" this (call |forcemv| (get |cf| "values")))))
,(if *multiple-value-p*
`(return (method-call |values| "apply" this (call |forcemv| (get |cf| "values"))))
`(return (method-call |pv| "apply" this (call |forcemv| (get |cf| "values")))))
@@
-774,10
+774,10
@@
`(selfcall
(var (|values| |mv|))
(throw (object
`(selfcall
(var (|values| |mv|))
(throw (object
- |type| "catch"
- |id| ,(convert id)
- |values| ,(convert value t)
- |message| "Throw uncatched."))))
+ "type" "catch"
+ "id" ,(convert id)
+ "values" ,(convert value t)
+ "message" "Throw uncatched."))))
(defun go-tag-p (x)
(or (integerp x) (symbolp x)))
(defun go-tag-p (x)
(or (integerp x) (symbolp x)))
@@
-848,12
+848,12
@@
(define-compilation unwind-protect (form &rest clean-up)
`(selfcall
(define-compilation unwind-protect (form &rest clean-up)
`(selfcall
- (var (|ret| ,(convert nil)))
+ (var (ret ,(convert nil)))
(try
(try
- (= |ret| ,(convert form)))
+ (= ret ,(convert form)))
(finally
,(convert-block clean-up))
(finally
,(convert-block clean-up))
- (return |ret|)))
+ (return ret)))
(define-compilation multiple-value-call (func-form &rest forms)
`(selfcall
(define-compilation multiple-value-call (func-form &rest forms)
`(selfcall