pestctrl/emacs
1
0
Fork 0
forked from Github/emacs
Code Issues Pull requests Projects Releases Packages Wiki Activity

Repair hideif regexp problems

Browse source 
* lisp/progmodes/hideif.el (hif-white-regexp, hif-tokenize):
Avoid superlinear backtracking behaviour by rewriting regexps
to avoid nested repetitions and make positive progress each time.
Use lazy matching of the innards of /*...*/ comments to avoid
matching too much.
This commit is contained in:
Mattias Engdegård 2023-01-27 17:21:28 +01:00
parent 627ac228b2
commit 4287d56bad
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/progmodes/hideif.el
View file

@ -555,8 +555,8 @@ that form should be displayed.")
(defconst hif-line-concat "\\\\[ \t]*[\n\r]")
;; If `hif-white-regexp' is modified, `hif-tokenize' might need to be modified
;; accordingly.
(defconst hif-white-regexp (concat "\\(?:\\(?:[ \t]\\|/\\*.*\\*/\\)*"
"\\(?:" hif-line-concat "\\)?\\)*"))
(defconst hif-white-regexp (concat "\\(?:[ \t]\\|/\\*.*?\\*/"
"\\|\\(?:" hif-line-concat "\\)\\)*"))
(defconst hif-define-regexp (concat hif-cpp-prefix "\\(define\\|undef\\)"))
(defconst hif-id-regexp (concat "[[:alpha:]_][[:alnum:]_]*"))
(defconst hif-etc-regexp "\\.\\.\\.")
@ -946,8 +946,8 @@ Assuming we've just performed a `hif-token-regexp' lookup."
(let ((token-list nil)
;; Similar to `hif-white-regexp' but keep the spaces if there are
(white-regexp (concat "\\(?:"
"\\(?:\\([ \t]+\\)\\|\\(?:/\\*.*\\*/\\)?\\)*"
"\\(?:" hif-line-concat "\\)?"
"\\([ \t]+\\)\\|/\\*.*?\\*/"
"\\|\\(?:" hif-line-concat "\\)"
"\\)*"))
token)
(setq hif-simple-token-only t)