Skip to content

Refactor RegExp for beginning of defun #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2021
Merged

Refactor RegExp for beginning of defun #681

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e9985
Refactor regexp
zonuexe Aug 1, 2021
bd3bd23
Fix syntax testing method
zonuexe Aug 1, 2021
b3a0445
Revert "Fix syntax testing method"
zonuexe Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lisp/php.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,17 @@ it is the character that will terminate the string, or t if the string should be
(bound-and-true-p poly-php-html-mode))

(defconst php-beginning-of-defun-regexp
"^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+&?\\(\\(\\sw\\|\\s_\\)+\\)\\s-*("
(eval-when-compile
(rx bol
(* (syntax whitespace))
(* (or "abstract" "final" "private" "protected" "public" "static")
(+ (syntax whitespace)))
"function"
(+ (syntax whitespace))
(? "&" (* (syntax whitespace)))
(group (+ (or (syntax word) (syntax symbol))))
(* (syntax whitespace))
"("))
"Regular expression for a PHP function.")

(eval-when-compile
Expand Down