Changeset 15560

Timestamp:

02/27/22 10:40:12 (2 years ago)

Author:

Mark Evenson

Message:

Support for catch tags in slime

Location:

trunk/abcl

Files:

• contrib/abcl-introspect/abcl-introspect.lisp (modified) (1 diff)
• src/org/armedbear/lisp/Keyword.java (modified) (1 diff)
• src/org/armedbear/lisp/Primitives.java (modified) (2 diffs)

trunk/abcl/contrib/abcl-introspect/abcl-introspect.lisp

@@ -379 +379 @@
          for value = (jss:get-java-field binding "value" t)
          for special = (jss:get-java-field binding "specialp" t)
+         if (member symbol '(:catch))
+           collect `(,symbol ,value) into them
+         else
          unless (find symbol them :key 'second)
            collect (list (if special

trunk/abcl/src/org/armedbear/lisp/Keyword.java

@@ -52 +52 @@
         CAPITALIZE_FIRST    = internKeyword("CAPITALIZE-FIRST"),
         CASE                = internKeyword("CASE"),
+        CATCH               = internKeyword("CATCH"),
         CAUSE               = internKeyword("CAUSE"),
         CHAR                = internKeyword("CHAR"),

trunk/abcl/src/org/armedbear/lisp/Primitives.java

@@ -3806 +3806 @@
             LispObject body = args.cdr();
             LispObject result = NIL;
+            Environment ext = new Environment(env,Keyword.CATCH,tag);
             try {
+                thread.envStack.push(ext);
                 return progn(body, env, thread);
             } catch (Throw t) {
@@ -3817 +3819 @@
             }
             finally {
+                while (thread.envStack.pop() != ext) {};
                 thread.popCatchTag();
             }