[armedbear-devel] [PATCH] incorporating java stack frames into backtrace

Tobias C. Rittweiler tcr at freebits.de
Tue Jul 14 17:00:21 UTC 2009


"Tobias C. Rittweiler" writes:

The diff contained the following

  Index: src/org/armedbear/lisp/Lisp.java
  ===================================================================
  --- src/org/armedbear/lisp/Lisp.java	(revision 12040)
  +++ src/org/armedbear/lisp/Lisp.java	(working copy)
  @@ -94,6 +94,11 @@
           PACKAGE_CL_USER.usePackage(PACKAGE_CL);
           PACKAGE_CL_USER.usePackage(PACKAGE_EXT);
           PACKAGE_CL_USER.usePackage(PACKAGE_JAVA);
  +        PACKAGE_CL_USER.usePackage(PACKAGE_THREADS);
  +
  +        // FIXME: The following packages all have to use EXT because
  +        // of EXT:AUTOLOAD and autoload.lisp.
  +
           PACKAGE_SYS.addNickname("SYS");
           PACKAGE_SYS.usePackage(PACKAGE_CL);
           PACKAGE_SYS.usePackage(PACKAGE_EXT);
  @@ -105,6 +110,7 @@
           PACKAGE_TPL.usePackage(PACKAGE_EXT);
           PACKAGE_EXT.addNickname("EXT");
           PACKAGE_EXT.usePackage(PACKAGE_CL);
  +        // FIXME: To be removed.
           PACKAGE_EXT.usePackage(PACKAGE_THREADS);
           PACKAGE_JVM.usePackage(PACKAGE_CL);
           PACKAGE_JVM.usePackage(PACKAGE_EXT);
  @@ -118,6 +124,8 @@
           PACKAGE_LISP.usePackage(PACKAGE_CL);
           PACKAGE_LISP.usePackage(PACKAGE_EXT);
           PACKAGE_LISP.usePackage(PACKAGE_SYS);
  +        PACKAGE_THREADS.usePackage(PACKAGE_CL);
  +        PACKAGE_THREADS.usePackage(PACKAGE_EXT);
         }
       catch (Throwable t)
         {
  
Please remove these three hunks before applying the patch. They were
from my previous patch about moving MAKE-THREAD-LOCK etc. from EXT to
THREADS.

You can easily remove these hunks by opening the patch file with Emacs,
and then using M-k within a hunk.

I won't resend the patch because it's so huge.

  -T.

-- 
Diese Nachricht wurde auf Viren und andere gefaerliche Inhalte untersucht
und ist - aktuelle Virenscanner vorausgesetzt - sauber.
Freebits E-Mail Virus Scanner





More information about the armedbear-devel mailing list