From: David Vázquez <davazp@gmail.com>
Date: Sat, 6 Jul 2013 02:18:27 +0000 (+0200)
Subject: Unescape some symbols
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=a36e740ddc9ac3c56fe9fb990a624d1d611c3814;hp=8b3a69a45d61417a4b7b3a348438c157c0f0a3d4;p=jscl.git

Unescape some symbols
---

diff --git a/src/compiler.lisp b/src/compiler.lisp
index be83e08..78ab64c 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -759,12 +759,12 @@
 
 (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")
-               (== (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")))))
@@ -774,10 +774,10 @@
   `(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)))
@@ -848,12 +848,12 @@
 
 (define-compilation unwind-protect (form &rest clean-up)
   `(selfcall
-    (var (|ret| ,(convert nil)))
+    (var (ret ,(convert nil)))
     (try
-     (= |ret| ,(convert form)))
+     (= ret ,(convert form)))
     (finally
      ,(convert-block clean-up))
-    (return |ret|)))
+    (return ret)))
 
 (define-compilation multiple-value-call (func-form &rest forms)
   `(selfcall