~mdw
/
sod
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/**/*.lisp: Use convenience functions to invoke restarts.
[sod]
/
src
/
parser
/
floc-proto.lisp
diff --git
a/src/parser/floc-proto.lisp
b/src/parser/floc-proto.lisp
index
f65ed73
..
3a11123
100644
(file)
--- a/
src/parser/floc-proto.lisp
+++ b/
src/parser/floc-proto.lisp
@@
-134,7
+134,7
@@
(define-condition simple-information (simple-condition information)
())
(define-condition simple-information (simple-condition information)
())
-(export '
(info noted)
)
+(export '
info
)
(defun info (datum &rest arguments)
"Report some useful diagnostic information.
(defun info (datum &rest arguments)
"Report some useful diagnostic information.
@@
-145,6
+145,11
@@
(signal (designated-condition 'simple-information datum arguments))
(noted () :report "Noted." t)))
(signal (designated-condition 'simple-information datum arguments))
(noted () :report "Noted." t)))
+(export 'noted)
+(defun noted (&optional condition)
+ "Invoke the `noted' restart, possibly associated with the given CONDITION."
+ (invoke-associated-restart 'noted condition))
+
(export 'simple-information-with-location)
(define-condition simple-information-with-location
(information-with-location simple-information)
(export 'simple-information-with-location)
(define-condition simple-information-with-location
(information-with-location simple-information)
@@
-342,18
+347,18
@@
(if fatal
(return-from count-and-report-errors*
(values nil errors warnings))
(if fatal
(return-from count-and-report-errors*
(values nil errors warnings))
- (
invoke-restart 'continue
)))))
+ (
continue error
)))))
(warning (lambda (warning)
(format *error-output* "~&~A: Warning: ~A~%"
(file-location warning)
warning)
(incf warnings)
(warning (lambda (warning)
(format *error-output* "~&~A: Warning: ~A~%"
(file-location warning)
warning)
(incf warnings)
- (
invoke-restart 'muffle-
warning)))
+ (
muffle-warning
warning)))
(information (lambda (info)
(format *error-output* "~&~A: Info: ~A~%"
(file-location info)
info)
(information (lambda (info)
(format *error-output* "~&~A: Info: ~A~%"
(file-location info)
info)
-
(invoke-restart 'noted
))))
+
(noted info
))))
(values (funcall thunk)
errors
warnings)))
(values (funcall thunk)
errors
warnings)))