X-Git-Url: http://repo.macrolet.net/gitweb/?p=jscl.git;a=blobdiff_plain;f=src%2Fcompiler%2Fcompiler.lisp;fp=src%2Fcompiler%2Fcompiler.lisp;h=6773974c5b61fbf5092b4344da1e1d2224dc9477;hp=c5c69bd5e63beb353d86867550c69fb292aa4b00;hb=2f45bdc83670254c9905b0f7a6b49bce7b0f60db;hpb=e1301bcded5eed2d9259d7688edf03892468fe2b diff --git a/src/compiler/compiler.lisp b/src/compiler/compiler.lisp index c5c69bd..6773974 100644 --- a/src/compiler/compiler.lisp +++ b/src/compiler/compiler.lisp @@ -773,8 +773,7 @@ (var (,idvar #())) ,cbody) (catch (cf) - (if (and (== (get cf "type") "block") - (== (get cf "id") ,idvar)) + (if (and (instanceof cf |BlockNLX|) (== (get cf "id") ,idvar)) ,(if *multiple-value-p* `(return (method-call |values| "apply" this (call |forcemv| (get cf "values")))) `(return (get cf "values"))) @@ -793,12 +792,10 @@ ;; capture it in a closure. `(selfcall ,(when multiple-value-p `(var (|values| |mv|))) - (throw - (object - "type" "block" - "id" ,(binding-value b) - "values" ,(convert value multiple-value-p) - "message" ,(concat "Return from unknown block '" (symbol-name name) "'.")))))) + (throw (new (call |BlockNLX| + ,(binding-value b) + ,(convert value multiple-value-p) + ,(symbol-name name))))))) (define-compilation catch (id &rest body) (let ((values (if *multiple-value-p* '|values| '|pv|)))