1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
Description: Drop dependency on trivial-with-current-source-form
This Common Lisp package is not yet in Debian. It is not strictly needed, since
it only provides more precise debugging information.
Author: Sébastien Villemot <sebastien@debian.org>
Bug-Debian: https://bugs.debian.org/1002015
Forwarded: not-needed
Last-Update: 2021-12-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- cl-esrap.orig/esrap.asd
+++ cl-esrap/esrap.asd
@@ -42,8 +42,7 @@
:bug-tracker "https://github.com/scymtym/esrap/issues"
:source-control (:git "https://github.com/scymtym/esrap.git")
:licence "MIT"
- :depends-on ("alexandria"
- "trivial-with-current-source-form")
+ :depends-on ("alexandria")
:components ((:module "early"
:pathname "src"
:serial t
--- cl-esrap.orig/src/macros.lisp
+++ cl-esrap/src/macros.lisp
@@ -169,7 +169,6 @@
(use-cache (singleton-option 'defrule form :use-cache
'cache-policy :default :unless-trivial)))
(dolist (option options)
- (with-current-source-form (option)
(destructuring-ecase option
((:when expr &rest rest)
(when rest
@@ -191,25 +190,22 @@
(when value
(push option transform)))
((:lambda lambda-list &body forms)
- (with-current-source-form (lambda-list option)
(multiple-value-bind (lambda-list* start-var end-var ignore)
(parse-lambda-list-maybe-containing-&bounds lambda-list)
(check-lambda-list lambda-list*
'(or (:required 1) (:optional 1))
:report-lambda-list lambda-list)
(push (list :lambda lambda-list* start-var end-var ignore forms)
- transform))))
+ transform)))
((:function designator)
(declare (ignore designator))
(push option transform))
((:destructure lambda-list &body forms)
- (with-current-source-form (lambda-list option)
(multiple-value-bind (lambda-list* start-var end-var ignore)
(parse-lambda-list-maybe-containing-&bounds lambda-list)
(push (list :destructure lambda-list* start-var end-var ignore forms)
- transform))))
+ transform)))
((:around lambda-list &body forms)
- (with-current-source-form (lambda-list option)
(multiple-value-bind (lambda-list* start end ignore)
(parse-lambda-list-maybe-containing-&bounds lambda-list)
(check-lambda-list
@@ -219,11 +215,11 @@
(function transform))
(flet ((call-transform ()
(funcall transform)))
- ,@forms))))))
+ ,@forms)))))
((:use-cache value)
(funcall use-cache value))
((:error-report behavior)
- (funcall error-report behavior)))))
+ (funcall error-report behavior))))
(values transform around (funcall when)
(funcall error-report) (funcall use-cache))))
--- cl-esrap.orig/src/package.lisp
+++ cl-esrap/src/package.lisp
@@ -22,9 +22,6 @@
#:cl
#:alexandria)
- (:import-from #:trivial-with-current-source-form
- #:with-current-source-form)
-
#+sbcl (:lock t)
;; Conditions
|
