mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-28 10:56:36 +00:00
Code Issues Releases Activity

* lisp/progmodes/perl-mode.el: Refine handling of /re/ and y/abc/def/

Browse Source 
(perl--syntax-exp-intro-keywords): New var.
(perl--syntax-exp-intro-regexp, perl-syntax-propertize-function): Use it.
(bug#20800).
This commit is contained in:
Stefan Monnier 2015-06-15 17:10:06 -04:00
parent e58a815339
commit f784272f73
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lisp/progmodes/perl-mode.el
View File

@ -204,10 +204,13 @@
'((?\( . ?\)) (?\[ . ?\]) (?\{ . ?\}) (?\< . ?\>)))
(eval-and-compile
(defconst perl--syntax-exp-intro-keywords
'("split" "if" "unless" "until" "while" "print"
"grep" "map" "not" "or" "and" "for" "foreach"))
(defconst perl--syntax-exp-intro-regexp
(concat "\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
(regexp-opt '("split" "if" "unless" "until" "while" "print"
"grep" "map" "not" "or" "and" "for" "foreach"))
(regexp-opt perl--syntax-exp-intro-keywords)
"\\|[-?:.,;|&+*=!~({[]\\|\\(^\\)\\)[ \t\n]*")))
;; FIXME: handle here-docs and regexps.
@ -278,8 +281,13 @@
(forward-comment (- (point-max)))
(put-text-property (point) (match-end 2)
'syntax-multiline t)
(not (memq (char-before)
'(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[)))))
(not (or (and (eq ?w (char-syntax (preceding-char)))
(let ((end (point)))
(backward-sexp 1)
(member (buffer-substring (point) end)
perl--syntax-exp-intro-keywords)))
(memq (char-before)
'(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[))))))
nil ;; A division sign instead of a regexp-match.
(put-text-property (match-beginning 2) (match-end 2)
'syntax-table (string-to-syntax "\""))
@ -297,13 +305,19 @@
(looking-at-p "sub[ \t\n]"))
;; This is defining a function.
nil
(put-text-property (match-beginning 3) (match-end 3)
'syntax-table
(if (assoc (char-after (match-beginning 3))
perl-quote-like-pairs)
(string-to-syntax "|")
(string-to-syntax "\"")))
(perl-syntax-propertize-special-constructs end)))))
(unless (nth 8 (save-excursion (syntax-ppss (match-beginning 1))))
;; Don't add this syntax-table property if
;; within a string, which would misbehave in cases such as
;; $a = "foo y \"toto\" bar" where we'd end up changing the
;; syntax of the backslash and hence de-escaping the embedded
;; double quote.
(put-text-property (match-beginning 3) (match-end 3)
'syntax-table
(if (assoc (char-after (match-beginning 3))
perl-quote-like-pairs)
(string-to-syntax "|")
(string-to-syntax "\"")))
(perl-syntax-propertize-special-constructs end))))))
;; Here documents.
((concat
"\\(?:"

8
test/indent/perl.perl
View File

@ -59,3 +59,11 @@ END
$fileType_filesButNot # bug#12373?
= join( '|', map { quotemeta($_).'$' } @{$fileType->{filesButNot}} );
# There can be a comment between an if/when/while and a /<re>/ matcher!
return 'W' if #/^Not Available on Mobile/m; #W=Web only
/This video is not available on mobile devices./m; #bug#20800
# A "y|abc|def|" shouldn't interfere when inside a string!
$toto = " x \" string\"";
$toto = " y \" string\""; # This is not the `y' operator!