author | Camm Maguire <camm@debian.org> | 2014年10月16日 11:48:38 -0400 |
---|---|---|
committer | Camm Maguire <camm@debian.org> | 2014年10月16日 11:48:38 -0400 |
commit | 0057c7c54990c6163cf7341b85844a422be213d8 (patch) | |
tree | f3bc1c47ba7aa545a69040f7b82b4197f15be117 | |
parent | 10a57756f90dc71246284840b846c1c14d852488 (diff) | |
download | gcl-0057c7c54990c6163cf7341b85844a422be213d8.tar.gz |
-rwxr-xr-x | gcl/clcs/package.lisp | 12 | ||||
-rwxr-xr-x | gcl/lsp/gcl_export.lsp | 23 | ||||
-rw-r--r-- | gcl/lsp/gcl_restart.lsp | 9 | ||||
-rwxr-xr-x | gcl/lsp/gcl_serror.lsp | 5 |
diff --git a/gcl/clcs/package.lisp b/gcl/clcs/package.lisp index fbee2490a..d0a72526e 100755 --- a/gcl/clcs/package.lisp +++ b/gcl/clcs/package.lisp @@ -15,20 +15,8 @@ (make-package :conditions :use '(:lisp)) (in-package :conditions :use '(:lisp)) - (import '(si::*handler-clusters* si::unique-id si::condition-class-p si::make-condition)) -(export '(handler-case handler-bind ignore-errors define-condition make-condition - condition warning serious-condition simple-condition-format-control simple-condition-format-arguments - storage-condition stack-overflow storage-exhausted type-error - type-error-datum type-error-expected-type simple-type-error - program-error control-error stream-error stream-error-stream - end-of-file file-error file-error-pathname cell-error - unbound-variable undefined-function arithmetic-error - arithmetic-error-operation arithmetic-error-operands - package-error package-error-package - division-by-zero floating-point-overflow floating-point-underflow)) - (defvar *this-package* (find-package :conditions)) diff --git a/gcl/lsp/gcl_export.lsp b/gcl/lsp/gcl_export.lsp index 2063de0d3..def216584 100755 --- a/gcl/lsp/gcl_export.lsp +++ b/gcl/lsp/gcl_export.lsp @@ -307,8 +307,27 @@ with-standard-io-syntax dynamic-extent -restart-case -store-value loop check-type assert typecase etypecase ctypecase case ecase ccase + +restart-bind restart-case with-condition-restarts muffle-warning continue abort + store-value use-value + restart restart-name restart-function restart-report-function + restart-interactive-function restart-test-function + compute-restarts find-restart invoke-restart invoke-restart-interactively + with-simple-restart signal + +simple-condition simple-error simple-warning invoke-debugger *debugger-hook* *break-on-signals* + +handler-case handler-bind ignore-errors define-condition make-condition + condition warning serious-condition simple-condition-format-control simple-condition-format-arguments + storage-condition stack-overflow storage-exhausted type-error + type-error-datum type-error-expected-type simple-type-error + program-error control-error stream-error stream-error-stream + end-of-file file-error file-error-pathname cell-error cell-error-name + unbound-variable undefined-function arithmetic-error + arithmetic-error-operation arithmetic-error-operands + package-error package-error-package + division-by-zero floating-point-overflow floating-point-underflow + )) diff --git a/gcl/lsp/gcl_restart.lsp b/gcl/lsp/gcl_restart.lsp index 6969fb953..139debb4b 100644 --- a/gcl/lsp/gcl_restart.lsp +++ b/gcl/lsp/gcl_restart.lsp @@ -1,14 +1,5 @@ ;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: "CONDITIONS"; Base: 10 -*- -(in-package :lisp) - -(export '(restart-bind restart-case with-condition-restarts muffle-warning continue abort - store-value use-value - restart restart-name restart-function restart-report-function - restart-interactive-function restart-test-function - compute-restarts find-restart invoke-restart invoke-restart-interactively - with-simple-restart signal)) - (in-package :si) (defvar *restarts* nil) diff --git a/gcl/lsp/gcl_serror.lsp b/gcl/lsp/gcl_serror.lsp index aa2ae48f2..8ab649060 100755 --- a/gcl/lsp/gcl_serror.lsp +++ b/gcl/lsp/gcl_serror.lsp @@ -1,8 +1,4 @@ ;; -*-Lisp-*- -(in-package :lisp) - -(export '(simple-condition simple-error simple-warning invoke-debugger *debugger-hook* *break-on-signals*)) - (in-package :si) (macrolet @@ -22,6 +18,7 @@ (make-condition-classp condition) (make-condition-classp simple-condition)) +(proclaim '(ftype (function (t *) t) make-condition)) (defun coerce-to-condition (datum arguments default-type function-name) (cond ((conditionp datum) |