Mercurial > emacs
changeset 32304:e8fca08bb4cc
(regexp-opt): Add \< and \> if PAREN=`words'.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 08 Oct 2000 18:50:43 +0000 |
| parents | 58dd951541e0 |
| children | ca771411a7fd |
| files | lisp/emacs-lisp/regexp-opt.el |
| diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/regexp-opt.el Sun Oct 08 18:30:12 2000 +0000 +++ b/lisp/emacs-lisp/regexp-opt.el Sun Oct 08 18:50:43 2000 +0000 @@ -93,14 +93,20 @@ is enclosed by at least one regexp grouping construct. The returned regexp is typically more efficient than the equivalent regexp: - (let ((open-paren (if PAREN \"\\\\(\" \"\")) (close-paren (if PAREN \"\\\\)\" \"\"))) - (concat open-paren (mapconcat 'regexp-quote STRINGS \"\\\\|\") close-paren))" + (let ((open (if PAREN \"\\\\(\" \"\")) (close (if PAREN \"\\\\)\" \"\"))) + (concat open (mapconcat 'regexp-quote STRINGS \"\\\\|\") close)) + +If PAREN is `words', then the resulting regexp is additionally surrounded +by \\=\\< and \\>." (save-match-data ;; Recurse on the sorted list. - (let ((max-lisp-eval-depth (* 1024 1024)) - (completion-ignore-case nil)) - (setq paren (cond ((stringp paren) paren) (paren "\\("))) - (regexp-opt-group (sort (copy-sequence strings) 'string-lessp) paren)))) + (let* ((max-lisp-eval-depth (* 1024 1024)) + (completion-ignore-case nil) + (words (eq paren 'words)) + (open (cond ((stringp paren) paren) (paren "\\("))) + (sorted-strings (sort (copy-sequence strings) 'string-lessp)) + (re (regexp-opt-group sorted-strings open))) + (if words (concat "\\<" re "\\>") re)))) ;;;###autoload (defun regexp-opt-depth (regexp)