[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0f79c16 06/12: drop el-search-expression-contains-match-p
From: |
Michael Heerdegen |
Subject: |
[elpa] master 0f79c16 06/12: drop el-search-expression-contains-match-p |
Date: |
Sun, 11 Oct 2015 10:33:28 +0000 |
branch: master
commit 0f79c168ee6434d720f350f3ffb2d1ba88519559
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
drop el-search-expression-contains-match-p
A correct implementation would have to be more complicated. We didn't
recurse on arrays for example, or we didn't find (2 3) in (1 . (2 3)).
And it wasn't that effective either, so I remove it.
---
packages/el-search/el-search.el | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index dd0f2ce..5b78aa0 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -285,21 +285,8 @@ Don't move if already at beginning of a sexp."
(,pattern t)
(_ nil)))))
-(defun el-search-expression-contains-match-p (pattern expression)
- "Whether some subexp of EXPRESSION is matched by PATTERN."
- (or (el-search--match-p pattern expression)
- (and (consp expression)
- (if (cdr (last expression))
- ;; a dotted list
- (or (el-search-expression-contains-match-p pattern (car
expression))
- (el-search-expression-contains-match-p pattern (cdr
expression)))
- (cl-some (lambda (subexpr) (el-search-expression-contains-match-p
pattern subexpr))
- expression)))))
-
(defun el-search--maybe-wrap-pattern (pattern)
- (if (el-search-expression-contains-match-p
`',el-search-this-expression-identifier pattern)
- `(and ,el-search-this-expression-identifier ,pattern)
- pattern))
+ `(and ,el-search-this-expression-identifier ,pattern))
(defun el-search--search-pattern (pattern &optional noerror)
"Search elisp buffer with `pcase' PATTERN.
@@ -317,18 +304,10 @@ return nil (no error)."
(end-of-buffer
(goto-char opoint)
(throw 'no-match t)))
- (if (and (zerop (car (syntax-ppss)))
- (not (el-search-expression-contains-match-p pattern
current-expr)))
- ;; nothing here; skip to next top level form
- (let ((end-of-next-sexp (scan-sexps (point) 2)))
- (if (not end-of-next-sexp)
- (throw 'no-match t)
- (goto-char end-of-next-sexp)
- (backward-sexp)))
- (if (el-search--match-p pattern current-expr)
+ (if (el-search--match-p pattern current-expr)
(setq match-beg (point)
opoint (point))
- (forward-char)))))
+ (forward-char))))
(if noerror nil (signal 'end-of-buffer nil)))
match-beg))
- [elpa] master 5640cd0 04/12: el-search: some comment changes, (continued)
- [elpa] master 5640cd0 04/12: el-search: some comment changes, Michael Heerdegen, 2015/10/11
- [elpa] master 84282f0 08/12: avoid repeated expansion of pcase forms, Michael Heerdegen, 2015/10/11
- [elpa] master e1903f4 01/12: avoid looking-back in el-search--goto-next-sexp, Michael Heerdegen, 2015/10/11
- [elpa] master 855461b 03/12: rename a function, Michael Heerdegen, 2015/10/11
- [elpa] master ca3fe58 07/12: rename a function, Michael Heerdegen, 2015/10/11
- [elpa] master fa900da 09/12: new function el-search--end-of-sexp; use it, Michael Heerdegen, 2015/10/11
- [elpa] master ae052ce 11/12: rename a local variable, Michael Heerdegen, 2015/10/11
- [elpa] master 06c2076 02/12: change default of el-search-this-expression-identifier, Michael Heerdegen, 2015/10/11
- [elpa] master 5dd08f2 05/12: fix a condition in el-search--do-subsexps, Michael Heerdegen, 2015/10/15
- [elpa] master 0f79c16 06/12: drop el-search-expression-contains-match-p,
Michael Heerdegen <=
- [elpa] master 2d5b3ba 12/12: whitespace clean up, Michael Heerdegen, 2015/10/15
- [elpa] master 24f8de1 10/12: rename a function, Michael Heerdegen, 2015/10/15