[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 585fb95: CC Mode: allow bogusly "adjacent" double q
|
From: |
Alan Mackenzie |
|
Subject: |
[Emacs-diffs] master 585fb95: CC Mode: allow bogusly "adjacent" double quote marks to pair up syntactically |
|
Date: |
Tue, 16 Jul 2019 16:04:21 -0400 (EDT) |
branch: master
commit 585fb957399f21a93cbfabd182b76262466797e3
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
CC Mode: allow bogusly "adjacent" double quote marks to pair up
syntactically
For this introduce the text property c-fl-syn-tab to "mirror" syntax-table.
* lisp/progmodes/cc-defs.el (c-is-escaped, c-will-be-escaped, c-put-syn-tab)
(c-clear-syn-tab, c-clear-syn-tab-properties,
c-with-extended-string-fences):
new macros.
(c-point): Use c-is-escaped
(c-search-forward-char-property, c-search-backward-char-property)
(c-search-forward-char-property-with-value-on-char)
(c-search-forward-char-property-without-value-on-char): Fix regexp error
involving \n.
* lisp/progmodes/cc-engine.el (c-semi-pp-to-literal): User
c-with-extended-string-fences around a parse-partial-sexp.
(c-full-get-near-cache-entry): Fix an off-by-one error.
(c-full-pp-to-literal): Avoid writing duplicate entries into a cache.
(c-after-change-unmark-raw-strings): Use c-clear-syn-tab-properties.
* lisp/progmodes/cc-mode.el (c-leave-cc-mode-mode): Clear the c-fl-syn-tab
properties, too.
(c-basic-common-init): Mark c-fl-syn-tab as a non-sticky text property.
(c-depropertize-new-text): Also handle c-fl-syn-tab.
(c-multiline-string-check-final-quote, c-parse-quotes-after-change): Use
c-is-escaped.
(c-fl-syn-tab-region): New variable.
(c-clear-string-fences, c-restore-string-fences, c-remove-string-fences):
New
functions.
(c-before-change-check-unbalanced-strings)
(c-after-change-mark-abnormal-strings, c-after-change-escape-NL-in-string):
Use the new functions and macros.
(c-before-change, c-after-change, c-font-lock-fontify-region): Restore the
syntax-table text properties from c-fl-syn-tab text properties for these
functions.
(c-electric-pair-inhibit-predicate): Test the c-fl-syn-tab property rather
than syntax-table.
---
lisp/progmodes/cc-defs.el | 86 ++++++++-
lisp/progmodes/cc-engine.el | 24 ++-
lisp/progmodes/cc-mode.el | 428 +++++++++++++++++++++++++++-----------------
3 files changed, 359 insertions(+), 179 deletions(-)
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index a43f1ac..ab3e25b 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -269,7 +269,9 @@ to it is returned. This function does not modify the point
or the mark."
(not (eobp))
(progn
(end-of-line)
- (prog1 (eq (logand 1 (skip-chars-backward "\\\\")) 1))))
+ (c-is-escaped (point))
+ ;; (prog1 (eq (logand 1 (skip-chars-backward "\\\\")) 1))
+ ))
(forward-line))
(end-of-line)
(point)))
@@ -406,6 +408,25 @@ to it is returned. This function does not modify the
point or the mark."
(forward-sexp)
(= (point) (+ 4 (point-min)))))))
+(defmacro c-is-escaped (pos)
+ ;; Are there an odd number of backslashes before POS?
+ `(save-excursion
+ (goto-char ,pos)
+ (not (zerop (logand (skip-chars-backward "\\\\") 1)))))
+
+(defmacro c-will-be-escaped (pos beg end)
+ ;; Will the character after POS be escaped after the removal of (BEG END)?
+ ;; It is assumed that (>= POS END).
+ `(save-excursion
+ (let ((-end- ,end)
+ count)
+ (goto-char ,pos)
+ (setq count (skip-chars-backward "\\\\" -end-))
+ (when (eq (point) -end-)
+ (goto-char ,beg)
+ (setq count (+ count (skip-chars-backward "\\\\"))))
+ (not (zerop (logand count 1))))))
+
(defvar c-use-extents)
(defmacro c-next-single-property-change (position prop &optional object limit)
@@ -1019,6 +1040,15 @@ MODE is either a mode symbol or a list of mode symbols."
;; properties set on a single character and that never spread to any
;; other characters.
+(defmacro c-put-syn-tab (pos value)
+ ;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to
+ ;; VALUE (which should not be nil).
+ `(let ((-pos- ,pos)
+ (-value- ,value))
+ (c-put-char-property -pos- 'syntax-table -value-)
+ (c-put-char-property -pos- 'c-fl-syn-tab -value-)
+ (c-truncate-lit-pos-cache -pos-)))
+
(eval-and-compile
;; Constant used at compile time to decide whether or not to use
;; XEmacs extents. Check all the extent functions we'll use since
@@ -1146,6 +1176,13 @@ MODE is either a mode symbol or a list of mode symbols."
;; Emacs < 21.
`(c-clear-char-property-fun ,pos ',property))))
+(defmacro c-clear-syn-tab (pos)
+ ;; Remove both the 'syntax-table and `c-fl-syn-tab properties at POS.
+ `(let ((-pos- ,pos))
+ (c-clear-char-property -pos- 'syntax-table)
+ (c-clear-char-property -pos- 'c-fl-syn-tab)
+ (c-truncate-lit-pos-cache -pos-)))
+
(defmacro c-min-property-position (from to property)
;; Return the first position in the range [FROM to) where the text property
;; PROPERTY is set, or `most-positive-fixnum' if there is no such position.
@@ -1187,6 +1224,13 @@ MODE is either a mode symbol or a list of mode symbols."
(remove-text-properties -from- -to- '(,property nil)))
`(remove-text-properties ,from ,to '(,property nil)))))
+(defmacro c-clear-syn-tab-properties (from to)
+ ;; Remove all occurrences of the `syntax-table' and `c-fl-syn-tab' text
+ ;; properties between FROM and TO.
+ `(let ((-from- ,from) (-to- ,to))
+ (c-clear-char-properties -from- -to- 'syntax-table)
+ (c-clear-char-properties -from- -to- 'c-fl-syn-tab)))
+
(defmacro c-search-forward-char-property (property value &optional limit)
"Search forward for a text-property PROPERTY having value VALUE.
LIMIT bounds the search. The comparison is done with `equal'.
@@ -1203,7 +1247,7 @@ nil; point is then left undefined."
place ,property nil ,(or limit '(point-max)))))
(when (< place ,(or limit '(point-max)))
(goto-char place)
- (search-forward-regexp ".") ; to set the match-data.
+ (search-forward-regexp "\\(\n\\|.\\)") ; to set the match-data.
(point))))
(defmacro c-search-backward-char-property (property value &optional limit)
@@ -1227,7 +1271,7 @@ point is then left undefined."
place ,property nil ,(or limit '(point-min)))))
(when (> place ,(or limit '(point-min)))
(goto-char place)
- (search-backward-regexp ".") ; to set the match-data.
+ (search-backward-regexp "\\(n\\|.\\)") ; to set the match-data.
(point))))
(defun c-clear-char-property-with-value-function (from to property value)
@@ -1286,7 +1330,7 @@ nil; point is then left undefined."
(not (equal (c-get-char-property (point) ,property) -value-)))
(forward-char))
(when (< (point) -limit-)
- (search-forward-regexp ".") ; to set the match-data.
+ (search-forward-regexp "\\(\n\\|.\\)") ; to set the match-data.
(point))))
(defmacro c-search-forward-char-property-without-value-on-char
@@ -1309,7 +1353,7 @@ nil; point is then left undefined."
(equal (c-get-char-property (point) ,property) -value-))
(forward-char))
(when (< (point) -limit-)
- (search-forward-regexp ".") ; to set the match-data.
+ (search-forward-regexp "\\(\n\\|.\\)") ; to set the match-data.
(point))))
(defun c-clear-char-property-with-value-on-char-function (from to property
@@ -1381,6 +1425,29 @@ with value CHAR in the region [FROM to)."
`((setq c-syntax-table-hwm (min c-syntax-table-hwm (point)))))
(c-put-char-property (point) ,property ,value)
(forward-char)))))
+
+(defmacro c-with-extended-string-fences (beg end &rest body)
+ ;; If needed, extend the region with "mirrored" c-fl-syn-tab properties to
+ ;; contain the region (BEG END), then evaluate BODY. If this mirrored
+ ;; region was initially empty, restore it afterwards.
+ `(let ((-beg- ,beg)
+ (-end- ,end)
+ )
+ (cond
+ ((null c-fl-syn-tab-region)
+ (unwind-protect
+ (progn
+ (c-restore-string-fences -beg- -end-)
+ ,@body)
+ (c-clear-string-fences)))
+ ((and (>= -beg- (car c-fl-syn-tab-region))
+ (<= -end- (cdr c-fl-syn-tab-region)))
+ ,@body)
+ (t ; Crudely extend the mirrored region.
+ (setq -beg- (min -beg- (car c-fl-syn-tab-region))
+ -end- (max -end- (cdr c-fl-syn-tab-region)))
+ (c-restore-string-fences -beg- -end-)
+ ,@body))))
;; Macros to put overlays (Emacs) or extents (XEmacs) on buffer text.
;; For our purposes, these are characterized by being possible to
@@ -1421,6 +1488,8 @@ with value CHAR in the region [FROM to)."
(def-edebug-spec c--intersection (form form &rest [symbolp form]))
(def-edebug-spec c--delete-duplicates (form &rest [symbolp form]))
(def-edebug-spec c-point t)
+(def-edebug-spec c-is-escaped t)
+(def-edebug-spec c-will-be-escaped t)
(def-edebug-spec c-next-single-property-change t)
(def-edebug-spec c-delete-and-extract-region t)
(def-edebug-spec c-set-region-active t)
@@ -1456,13 +1525,18 @@ with value CHAR in the region [FROM to)."
(def-edebug-spec c-search-forward-char-property t)
(def-edebug-spec c-search-backward-char-property t)
(def-edebug-spec c-put-char-property t)
+(def-edebug-spec c-put-syn-tab t)
(def-edebug-spec c-get-char-property t)
(def-edebug-spec c-clear-char-property t)
-(def-edebug-spec c-min-property-position nil) ; invoked only by macros
+(def-edebug-spec c-clear-syn-tab t)
+;;(def-edebug-spec c-min-property-position nil) ; invoked only by macros
+(def-edebug-spec c-min-property-position t) ; Now invoked from functions
(2019-07)
(def-edebug-spec c-clear-char-property-with-value t)
(def-edebug-spec c-clear-char-property-with-value-on-char t)
(def-edebug-spec c-put-char-properties-on-char t)
(def-edebug-spec c-clear-char-properties t)
+(def-edebug-spec c-clear-syn-tab-properties t)
+(def-edebug-spec c-with-extended-string-fences (form form body))
(def-edebug-spec c-put-overlay t)
(def-edebug-spec c-delete-overlay t)
(def-edebug-spec c-mark-<-as-paren t)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 40a3b72..cb88fc3 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -93,6 +93,14 @@
;; `text-property-default-nonsticky' if that variable exists (Emacs
;; >= 21).
;;
+;; 'c-fl-syn-tab
+;; Saves the value of syntax-table properties which have been
+;; temporarily removed from certain buffer positions. The syntax-table
+;; properties are restored during c-before-change, c-after-change, and
+;; font locking. The purpose of the temporary removal is to enable
+;; C-M-* key sequences to operate over bogus pairs of string delimiters
+;; which are "adjacent", yet do not delimit a string.
+;;
;; 'c-is-sws and 'c-in-sws
;; Used by `c-forward-syntactic-ws' and `c-backward-syntactic-ws' to
;; speed them up. See the comment blurb before `c-put-is-sws'
@@ -155,6 +163,9 @@
(defvar c-doc-line-join-re)
(defvar c-doc-bright-comment-start-re)
(defvar c-doc-line-join-end-ch)
+(defvar c-fl-syn-tab-region)
+(cc-bytecomp-defun c-clear-string-fences)
+(cc-bytecomp-defun c-restore-string-fences)
;; Make declarations for all the `c-lang-defvar' variables in cc-langs.
@@ -2816,7 +2827,9 @@ comment at the start of cc-engine.el for more info."
c-block-comment-awkward-chars)))
(and (nth 4 s) (nth 7 s) ; Line comment
(not (memq (char-before here) '(?\\ ?\n)))))))
- (setq s (parse-partial-sexp pos here nil nil s)))
+ (c-with-extended-string-fences
+ pos here
+ (setq s (parse-partial-sexp pos here nil nil s))))
(when (not (eq near-pos here))
(c-semi-put-near-cache-entry here s))
(cond
@@ -2883,7 +2896,7 @@ comment at the start of cc-engine.el for more info."
(setq elt (car nc-list))
(when
(and (car (cddr elt))
- (>= here (nth 8 (cadr elt)))
+ (> here (nth 8 (cadr elt)))
(< here (car (cddr elt))))
(throw 'found elt))
(when
@@ -2902,7 +2915,7 @@ comment at the start of cc-engine.el for more info."
(copy-tree nc-pos-state)))
(defun c-full-put-near-cache-entry (here state end)
- ;; Put a new near chace entry into the near cache.
+ ;; Put a new near cache entry into the near cache.
(while (>= (length c-full-lit-near-cache) 6)
(setq c-full-lit-near-cache
(delq (car (last c-full-lit-near-cache))
@@ -3001,7 +3014,8 @@ comment at the start of cc-engine.el for more info."
(list s ty (cons start (point))))
(t
- (c-full-put-near-cache-entry here s nil)
+ (unless (eq near-base here)
+ (c-full-put-near-cache-entry here s nil))
(list s))))))))
(defsubst c-truncate-lit-pos-cache (pos)
@@ -7379,7 +7393,7 @@ comment at the start of cc-engine.el for more info."
(when found
(setq c-new-BEG (min (point) c-new-BEG)
c-new-END (point-max))
- (c-clear-char-properties (point) c-new-END 'syntax-table)
+ (c-clear-syn-tab-properties (point) c-new-END)
(c-truncate-lit-pos-cache (point)))))
;; Are there any raw strings in a newly created macro?
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 98b8385..5ae7e0f 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -181,6 +181,7 @@
(c-save-buffer-state ()
(c-clear-char-properties (point-min) (point-max) 'category)
(c-clear-char-properties (point-min) (point-max) 'syntax-table)
+ (c-clear-char-properties (point-min) (point-max) 'c-fl-syn-tab)
(c-clear-char-properties (point-min) (point-max) 'c-is-sws)
(c-clear-char-properties (point-min) (point-max) 'c-in-sws)
(c-clear-char-properties (point-min) (point-max) 'c-type)
@@ -632,7 +633,7 @@ that requires a literal mode spec at compile time."
(unless (assq tprop text-property-default-nonsticky)
(setq text-property-default-nonsticky
(cons `(,tprop . t) text-property-default-nonsticky))))
- '(syntax-table category c-type)))
+ '(syntax-table c-fl-syn-tab category c-type)))
;; In Emacs 21 and later it's possible to turn off the ad-hoc
;; heuristic that open parens in column 0 are defun starters. Since
@@ -1016,6 +1017,7 @@ Note that the style variables are always made local to
the buffer."
(c-save-buffer-state ()
(when (> end beg)
(c-clear-char-properties beg end 'syntax-table)
+ (c-clear-char-properties beg end 'c-fl-syn-tab)
(c-clear-char-properties beg end 'category)
(c-clear-char-properties beg end 'c-is-sws)
(c-clear-char-properties beg end 'c-in-sws)
@@ -1188,7 +1190,7 @@ Note that the style variables are always made local to
the buffer."
(goto-char (car pos-ll)))
((save-excursion
(backward-char) ; over "
- (eq (logand (skip-chars-backward "\\\\") 1) 1))
+ (c-is-escaped (point)))
;; At an escaped string.
(backward-char)
t)
@@ -1205,11 +1207,103 @@ Note that the style variables are always made local to
the buffer."
(c-put-char-property (1- (point)) 'syntax-table '(15)))
(t nil)))))
+(defvar c-fl-syn-tab-region nil)
+ ;; Non-nil when a `c-restore-string-fences' is "in force". It's value is a
+ ;; cons of the BEG and END of the region currently "mirroring" the
+ ;; c-fl-syn-tab properties as syntax-table properties.
+
+(defun c-clear-string-fences ()
+ ;; Clear syntax-table text properties in the region defined by
+ ;; `c-cl-syn-tab-region' which are "mirrored" by c-fl-syn-tab text
+ ;; properties. However, any such " character which ends up not being
+ ;; balanced by another " is left with a '(1) syntax-table property.
+ (when c-fl-syn-tab-region
+ (let ((beg (car c-fl-syn-tab-region))
+ (end (cdr c-fl-syn-tab-region))
+ s pos)
+ (setq pos beg)
+ (while
+ (and
+ (< pos end)
+ (setq pos
+ (c-min-property-position pos end 'c-fl-syn-tab))
+ (< pos end))
+ (c-clear-char-property pos 'syntax-table)
+ (setq pos (1+ pos)))
+ ;; Check we haven't left any unbalanced "s.
+ (save-excursion
+ (setq pos beg)
+ (while (< pos end)
+ (setq pos
+ (c-min-property-position pos end 'c-fl-syn-tab))
+ (when (< pos end)
+ (if (memq (char-after pos) c-string-delims)
+ (progn
+ ;; Step over the ".
+ (setq s (parse-partial-sexp pos end nil nil nil
+ 'syntax-table))
+ ;; Seek a (bogus) matching ".
+ (setq s (parse-partial-sexp (point) end nil nil s
+ 'syntax-table))
+ ;; When a bogus matching " is found, do nothing.
+ ;; Otherwise mark the " with 'syntax-table '(1).
+ (unless
+ (and ;(< (point) end)
+ (not (nth 3 s))
+ (c-get-char-property (1- (point)) 'c-fl-syn-tab))
+ (c-put-char-property pos 'syntax-table '(1)))
+ (setq pos (point)))
+ (setq pos (1+ pos))))))
+ (setq c-fl-syn-tab-region nil))))
+
+(defun c-restore-string-fences (beg end)
+ ;; Restore any syntax-table text properties in the region (BEG END) which
+ ;; are "mirrored" by c-fl-syn-tab text properties.
+ (let ((pos beg))
+ (while
+ (and
+ (< pos end)
+ (setq pos
+ (c-min-property-position pos end 'c-fl-syn-tab))
+ (< pos end))
+ (c-put-char-property pos 'syntax-table
+ (c-get-char-property pos 'c-fl-syn-tab))
+ (setq pos (1+ pos)))
+ (setq c-fl-syn-tab-region (cons beg end))))
+
(defvar c-bc-changed-stringiness nil)
;; Non-nil when, in a before-change function, the deletion of a range of text
;; will change the "stringiness" of the subsequent text. Only used when
;; `c-multiline-sting-start-char' is a non-nil value which isn't a character.
+(defun c-remove-string-fences (&optional here)
+ ;; The character after HERE (default point) is either a string delimiter or
+ ;; a newline, which is marked with a string fence text property for both
+ ;; syntax-table and c-fl-syn-tab. Remove these properties from that
+ ;; character and its matching newline or string delimiter, if any (there may
+ ;; not be one if there is a missing newline at EOB).
+ (save-excursion
+ (if here
+ (goto-char here)
+ (setq here (point)))
+ (cond
+ ((memq (char-after) c-string-delims)
+ (save-excursion
+ (save-match-data
+ (forward-char)
+ (if (and (c-search-forward-char-property 'syntax-table '(15))
+ (memq (char-before) '(?\n ?\r)))
+ (c-clear-syn-tab (1- (point))))))
+ (c-clear-syn-tab (point)))
+ ((memq (char-after) '(?\n ?\r))
+ (save-excursion
+ (save-match-data
+ (when (and (c-search-backward-char-property 'syntax-table '(15))
+ (memq (char-after) c-string-delims))
+ (c-clear-syn-tab (point)))))
+ (c-clear-syn-tab (point)))
+ (t (c-benign-error "c-remove-string-fences: wrong position")))))
+
(defun c-before-change-check-unbalanced-strings (beg end)
;; If BEG or END is inside an unbalanced string, remove the syntax-table
;; text property from respectively the start or end of the string. Also
@@ -1261,8 +1355,7 @@ Note that the style variables are always made local to
the buffer."
"\"\\|\\s|")
(point-max) t t)
(progn
- (c-clear-char-property (1- (point)) 'syntax-table)
- (c-truncate-lit-pos-cache (1- (point)))
+ (c-clear-syn-tab (1- (point)))
(not (memq (char-before) c-string-delims)))))
(memq (char-before) c-string-delims))
(progn
@@ -1279,7 +1372,7 @@ Note that the style variables are always made local to
the buffer."
(if (and (looking-at (if c-single-quotes-quote-strings
"\\\\*[\"']"
"\\\\*\""))
- (eq (logand (skip-chars-backward "\\\\" beg) 1) 1))
+ (c-is-escaped (point)))
(setq c-bc-changed-stringiness (not c-bc-changed-stringiness)))
(if (eq beg-literal-type 'string)
(setq c-new-BEG (min (car beg-limits) c-new-BEG))))
@@ -1291,17 +1384,12 @@ Note that the style variables are always made local to
the buffer."
(cond
;; Are we escaping a newline by deleting stuff between \ and \n?
((and (> end beg)
- (progn
- (goto-char end)
- (eq (logand (skip-chars-backward "\\\\" beg) 1) 1)))
- (c-clear-char-property end 'syntax-table)
- (c-truncate-lit-pos-cache end)
+ (c-will-be-escaped end beg end))
+ (c-remove-string-fences end)
(goto-char (1+ end)))
;; Are we unescaping a newline by inserting stuff between \ and \n?
((and (eq end beg)
- (progn
- (goto-char end)
- (eq (logand (skip-chars-backward "\\\\") 1) 1)))
+ (c-is-escaped end))
(goto-char (1+ end))) ; To after the NL which is being unescaped.
(t
(goto-char end)))
@@ -1314,19 +1402,13 @@ Note that the style variables are always made local to
the buffer."
(if (equal (c-get-char-property (point) 'syntax-table) '(15))
(if (memq (char-after) '(?\n ?\r))
;; Normally terminated invalid string.
- (let ((eoll-1 (point)))
- (forward-char)
- (backward-sexp)
- (c-clear-char-property eoll-1 'syntax-table)
- (c-clear-char-property (point) 'syntax-table)
- (c-truncate-lit-pos-cache (point)))
+ (c-remove-string-fences)
;; Opening " at EOB.
- (c-clear-char-property (1- (point)) 'syntax-table))
+ (c-clear-syn-tab (1- (point))))
(when (and (c-search-backward-char-property 'syntax-table '(15)
c-new-BEG)
(memq (char-after) c-string-delims)) ; Ignore an
unterminated raw string's (.
;; Opening " on last line of text (without EOL).
- (c-clear-char-property (point) 'syntax-table)
- (c-truncate-lit-pos-cache (point))
+ (c-remove-string-fences)
(setq c-new-BEG (min c-new-BEG (point))))))
(t (goto-char end) ; point-max
@@ -1334,10 +1416,9 @@ Note that the style variables are always made local to
the buffer."
(and
(c-search-backward-char-property 'syntax-table '(15) c-new-BEG)
(memq (char-after) c-string-delims))
- (c-clear-char-property (point) 'syntax-table)
- (c-truncate-lit-pos-cache (point)))))
+ (c-remove-string-fences))))
- (unless
+ (unless
(or (and
;; Don't set c-new-BEG/END if we're in a raw string.
(eq beg-literal-type 'string)
@@ -1346,14 +1427,12 @@ Note that the style variables are always made local to
the buffer."
(not (c-characterp c-multiline-string-start-char))))
(when (and (eq end-literal-type 'string)
(not (eq (char-before (cdr end-limits)) ?\()))
- (c-clear-char-property (1- (cdr end-limits)) 'syntax-table)
- (c-truncate-lit-pos-cache (1- (cdr end-limits)))
+ (c-remove-string-fences (1- (cdr end-limits)))
(setq c-new-END (max c-new-END (cdr end-limits))))
(when (and (eq beg-literal-type 'string)
(memq (char-after (car beg-limits)) c-string-delims))
- (c-clear-char-property (car beg-limits) 'syntax-table)
- (c-truncate-lit-pos-cache (car beg-limits))
+ (c-remove-string-fences (car beg-limits))
(setq c-new-BEG (min c-new-BEG (car beg-limits)))))))
(defun c-after-change-mark-abnormal-strings (beg end _old-len)
@@ -1375,7 +1454,7 @@ Note that the style variables are always made local to
the buffer."
end-literal-limits end-literal-type)
(when (and (eq beg-literal-type 'string)
(c-get-char-property (car beg-literal-limits) 'syntax-table))
- (c-clear-char-property (car beg-literal-limits) 'syntax-table)
+ (c-clear-syn-tab (car beg-literal-limits))
(setq c-bc-changed-stringiness (not c-bc-changed-stringiness)))
(setq end-literal-limits (progn (goto-char end) (c-literal-limits))
end-literal-type (c-literal-type end-literal-limits))
@@ -1456,13 +1535,13 @@ Note that the style variables are always made local to
the buffer."
(looking-at (cdr (assq (char-before) c-string-innards-re-alist))))
(cond
((memq (char-after (match-end 0)) '(?\n ?\r))
- (c-put-char-property (1- (point)) 'syntax-table '(15))
- (c-put-char-property (match-end 0) 'syntax-table '(15))
+ (c-put-syn-tab (1- (point)) '(15))
+ (c-put-syn-tab (match-end 0) '(15))
(setq c-new-BEG (min c-new-BEG (point))
c-new-END (max c-new-END (match-end 0))))
((or (eq (match-end 0) (point-max))
(eq (char-after (match-end 0)) ?\\)) ; \ at EOB
- (c-put-char-property (1- (point)) 'syntax-table '(15))
+ (c-put-syn-tab (1- (point)) '(15))
(setq c-new-BEG (min c-new-BEG (point))
c-new-END (max c-new-END (match-end 0))) ; Do we need
c-new-END?
))
@@ -1480,12 +1559,12 @@ Note that the style variables are always made local to
the buffer."
;; This function is called exclusively as an after-change function via
;; `c-before-font-lock-functions'. In C++ Mode, it should come before
;; `c-after-change-unmark-raw-strings' in that lang variable.
- (let (lit-start) ; Don't calculate this till we have to.
+ (let (lit-start ; Don't calculate this till we have to.
+ lim)
(when
(and (> end beg)
(memq (char-after end) '(?\n ?\r))
- (progn (goto-char end)
- (eq (logand (skip-chars-backward "\\\\") 1) 1))
+ (c-is-escaped end)
(progn (goto-char end)
(setq lit-start (c-literal-start)))
(memq (char-after lit-start) c-string-delims)
@@ -1501,21 +1580,14 @@ Note that the style variables are always made local to
the buffer."
(save-excursion
(c-beginning-of-macro))))
(goto-char (1+ end)) ; After the \
- ;; Search forward for a closing ".
- (when (and (re-search-forward "\\(\\\\\\(.\\|\n\\)\\|[^\"\\\n\r]\\)*"
- nil t)
- (eq (char-after) ?\")
- (equal (c-get-char-property (point) 'syntax-table) '(15)))
- (c-clear-char-property end 'syntax-table)
- (c-truncate-lit-pos-cache end)
- (c-clear-char-property (point) 'syntax-table)
- (forward-char) ; to after the "
- (when
- (and
- ;; Search forward for an end of logical line.
- (re-search-forward "\\(\\\\\\(.\\|\n\\)\\|[^\\\n\r]\\)*" nil t)
- (memq (char-after) '(?\n ?\r)))
- (c-clear-char-property (point) 'syntax-table))))))
+ ;; Search forward for EOLL
+ (setq lim (re-search-forward "\\(\\\\\\(.\\|\n\\)\\|[^\\\n\r]\\)*"
+ nil t))
+ (goto-char (1+ end))
+ (when (c-search-forward-char-property-with-value-on-char
+ 'syntax-table '(15) ?\" lim)
+ (c-remove-string-fences end)
+ (c-remove-string-fences (1- (point)))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Parsing of quotes.
@@ -1734,11 +1806,7 @@ Note that this is a strict tail, so won't match, e.g.
\"0x....\".")
(goto-char c-new-BEG)
(while (and (< (point) c-new-END)
(search-forward "'" c-new-END 'limit))
- (cond ((and (eq (char-before (1- (point))) ?\\)
- ;; Check we've got an odd number of \s, here.
- (save-excursion
- (backward-char)
- (eq (logand (skip-chars-backward "\\\\") 1) 1)))) ; not a
real '.
+ (cond ((c-is-escaped (1- (point)))) ; not a real '.
((c-quoted-number-straddling-point)
(setq num-beg (match-beginning 0)
num-end (match-end 0))
@@ -1794,78 +1862,90 @@ Note that this is a strict tail, so won't match, e.g.
\"0x....\".")
;; property changes.
(when (fboundp 'syntax-ppss)
(setq c-syntax-table-hwm most-positive-fixnum))
- (save-restriction
- (save-match-data
- (widen)
- (save-excursion
- ;; Are we inserting/deleting stuff in the middle of an identifier?
- (c-unfind-enclosing-token beg)
- (c-unfind-enclosing-token end)
- ;; Are we coalescing two tokens together, e.g. "fo o" -> "foo"?
- (when (< beg end)
- (c-unfind-coalesced-tokens beg end))
- (c-invalidate-sws-region-before beg end)
- ;; Are we (potentially) disrupting the syntactic context which
- ;; makes a type a type? E.g. by inserting stuff after "foo" in
- ;; "foo bar;", or before "foo" in "typedef foo *bar;"?
- ;;
- ;; We search for appropriate c-type properties "near" the change.
- ;; First, find an appropriate boundary for this property search.
- (let (lim
- type type-pos
- marked-id term-pos
- (end1
- (or (and (eq (get-text-property end 'face)
- 'font-lock-comment-face)
- (previous-single-property-change end 'face))
- end)))
- (when (>= end1 beg) ; Don't hassle about changes entirely in
comments.
- ;; Find a limit for the search for a `c-type' property
- (while
- (and (/= (skip-chars-backward "^;{}") 0)
- (> (point) (point-min))
- (memq (c-get-char-property (1- (point)) 'face)
- '(font-lock-comment-face font-lock-string-face))))
- (setq lim (max (point-min) (1- (point))))
-
- ;; Look for the latest `c-type' property before end1
- (when (and (> end1 (point-min))
- (setq type-pos
- (if (get-text-property (1- end1) 'c-type)
- end1
- (previous-single-property-change end1 'c-type
- nil lim))))
- (setq type (get-text-property (max (1- type-pos) lim) 'c-type))
-
- (when (memq type '(c-decl-id-start c-decl-type-start))
- ;; Get the identifier, if any, that the property is on.
- (goto-char (1- type-pos))
- (setq marked-id
- (when (looking-at "\\(\\sw\\|\\s_\\)")
- (c-beginning-of-current-token)
- (buffer-substring-no-properties (point) type-pos)))
-
- (goto-char end1)
- (skip-chars-forward "^;{}") ;FIXME!!! loop for comment, maybe
- (setq lim (point))
- (setq term-pos
- (or (c-next-single-property-change end 'c-type nil lim)
- lim))
- (setq c-maybe-stale-found-type
- (list type marked-id
- type-pos term-pos
- (buffer-substring-no-properties type-pos
- term-pos)
- (buffer-substring-no-properties beg end)))))))
-
- (if c-get-state-before-change-functions
- (mapc (lambda (fn)
- (funcall fn beg end))
- c-get-state-before-change-functions))
- )))
- ;; The following must be done here rather than in `c-after-change' because
- ;; newly inserted parens would foul up the invalidation algorithm.
- (c-invalidate-state-cache beg)))
+ (unwind-protect
+ (progn
+ (c-restore-string-fences (point-min) (point-max))
+ (save-restriction
+ (save-match-data
+ (widen)
+ (save-excursion
+ ;; Are we inserting/deleting stuff in the middle of an
+ ;; identifier?
+ (c-unfind-enclosing-token beg)
+ (c-unfind-enclosing-token end)
+ ;; Are we coalescing two tokens together, e.g. "fo o"
+ ;; -> "foo"?
+ (when (< beg end)
+ (c-unfind-coalesced-tokens beg end))
+ (c-invalidate-sws-region-before beg end)
+ ;; Are we (potentially) disrupting the syntactic
+ ;; context which makes a type a type? E.g. by
+ ;; inserting stuff after "foo" in "foo bar;", or
+ ;; before "foo" in "typedef foo *bar;"?
+ ;;
+ ;; We search for appropriate c-type properties "near"
+ ;; the change. First, find an appropriate boundary
+ ;; for this property search.
+ (let (lim
+ type type-pos
+ marked-id term-pos
+ (end1
+ (or (and (eq (get-text-property end 'face)
+ 'font-lock-comment-face)
+ (previous-single-property-change end 'face))
+ end)))
+ (when (>= end1 beg) ; Don't hassle about changes
+ ; entirely in comments.
+ ;; Find a limit for the search for a `c-type' property
+ (while
+ (and (/= (skip-chars-backward "^;{}") 0)
+ (> (point) (point-min))
+ (memq (c-get-char-property (1- (point)) 'face)
+ '(font-lock-comment-face
font-lock-string-face))))
+ (setq lim (max (point-min) (1- (point))))
+
+ ;; Look for the latest `c-type' property before end1
+ (when (and (> end1 (point-min))
+ (setq type-pos
+ (if (get-text-property (1- end1) 'c-type)
+ end1
+ (previous-single-property-change end1
'c-type
+ nil
lim))))
+ (setq type (get-text-property (max (1- type-pos) lim)
'c-type))
+
+ (when (memq type '(c-decl-id-start c-decl-type-start))
+ ;; Get the identifier, if any, that the property is on.
+ (goto-char (1- type-pos))
+ (setq marked-id
+ (when (looking-at "\\(\\sw\\|\\s_\\)")
+ (c-beginning-of-current-token)
+ (buffer-substring-no-properties (point)
type-pos)))
+
+ (goto-char end1)
+ (skip-chars-forward "^;{}") ;FIXME!!! loop for
+ ;comment, maybe
+ (setq lim (point))
+ (setq term-pos
+ (or (c-next-single-property-change end 'c-type
nil lim)
+ lim))
+ (setq c-maybe-stale-found-type
+ (list type marked-id
+ type-pos term-pos
+ (buffer-substring-no-properties type-pos
+ term-pos)
+ (buffer-substring-no-properties beg
end)))))))
+
+ (if c-get-state-before-change-functions
+ (mapc (lambda (fn)
+ (funcall fn beg end))
+ c-get-state-before-change-functions))
+ )))
+ ;; The following must be done here rather than in
+ ;; `c-after-change' because newly inserted parens would foul
+ ;; up the invalidation algorithm.
+ (c-invalidate-state-cache beg)
+ (c-truncate-lit-pos-cache beg))
+ (c-clear-string-fences))))
(defvar c-in-after-change-fontification nil)
(make-variable-buffer-local 'c-in-after-change-fontification)
@@ -1909,43 +1989,51 @@ Note that this is a strict tail, so won't match, e.g.
\"0x....\".")
;; When `combine-after-change-calls' is used we might get calls
;; with regions outside the current narrowing. This has been
;; observed in Emacs 20.7.
- (save-restriction
- (save-match-data ; c-recognize-<>-arglists changes match-data
- (widen)
-
- (when (> end (point-max))
- ;; Some emacsen might return positions past the end. This has been
- ;; observed in Emacs 20.7 when rereading a buffer changed on disk
- ;; (haven't been able to minimize it, but Emacs 21.3 appears to
- ;; work).
- (setq end (point-max))
- (when (> beg end)
- (setq beg end)))
-
- ;; C-y is capable of spuriously converting category properties
- ;; c-</>-as-paren-syntax and c-cpp-delimiter into hard syntax-table
- ;; properties. Remove these when it happens.
- (when (eval-when-compile (memq 'category-properties c-emacs-features))
- (c-save-buffer-state ()
- (c-clear-char-property-with-value beg end 'syntax-table
- c-<-as-paren-syntax)
- (c-clear-char-property-with-value beg end 'syntax-table
- c->-as-paren-syntax)
- (c-clear-char-property-with-value beg end 'syntax-table nil)))
-
- (c-trim-found-types beg end old-len) ; maybe we don't need all of
these.
- (c-invalidate-sws-region-after beg end old-len)
- ;; (c-invalidate-state-cache beg) ; moved to `c-before-change'.
- (c-invalidate-find-decl-cache beg)
-
- (when c-recognize-<>-arglists
- (c-after-change-check-<>-operators beg end))
-
- (setq c-in-after-change-fontification t)
- (save-excursion
- (mapc (lambda (fn)
- (funcall fn beg end old-len))
- c-before-font-lock-functions))))))
+ (unwind-protect
+ (progn
+ (c-restore-string-fences (point-min) (point-max))
+ (save-restriction
+ (save-match-data ; c-recognize-<>-arglists changes match-data
+ (widen)
+
+ (when (> end (point-max))
+ ;; Some emacsen might return positions past the
+ ;; end. This has been observed in Emacs 20.7 when
+ ;; rereading a buffer changed on disk (haven't been
+ ;; able to minimize it, but Emacs 21.3 appears to
+ ;; work).
+ (setq end (point-max))
+ (when (> beg end)
+ (setq beg end)))
+
+ ;; C-y is capable of spuriously converting category
+ ;; properties c-</>-as-paren-syntax and
+ ;; c-cpp-delimiter into hard syntax-table properties.
+ ;; Remove these when it happens.
+ (when (eval-when-compile (memq 'category-properties
c-emacs-features))
+ (c-save-buffer-state ()
+ (c-clear-char-property-with-value beg end 'syntax-table
+ c-<-as-paren-syntax)
+ (c-clear-char-property-with-value beg end 'syntax-table
+ c->-as-paren-syntax)
+ (c-clear-char-property-with-value beg end 'syntax-table
nil)))
+
+ (c-trim-found-types beg end old-len) ; maybe we don't
+ ; need all of these.
+ (c-invalidate-sws-region-after beg end old-len)
+ ;; (c-invalidate-state-cache beg) ; moved to
+ ;; `c-before-change'.
+ (c-invalidate-find-decl-cache beg)
+
+ (when c-recognize-<>-arglists
+ (c-after-change-check-<>-operators beg end))
+
+ (setq c-in-after-change-fontification t)
+ (save-excursion
+ (mapc (lambda (fn)
+ (funcall fn beg end old-len))
+ c-before-font-lock-functions)))))
+ (c-clear-string-fences))))
;; A workaround for syntax-ppss's failure to notice syntax-table text
;; property changes.
(when (fboundp 'syntax-ppss)
@@ -2173,8 +2261,12 @@ Note that this is a strict tail, so won't match, e.g.
\"0x....\".")
;; Context (etc.) fontification.
(setq new-region (c-before-context-fl-expand-region beg end)
new-beg (car new-region) new-end (cdr new-region)))
- (funcall (default-value 'font-lock-fontify-region-function)
- new-beg new-end verbose)))
+ (c-save-buffer-state nil
+ (unwind-protect
+ (progn (c-restore-string-fences new-beg new-end)
+ (funcall (default-value 'font-lock-fontify-region-function)
+ new-beg new-end verbose))
+ (c-clear-string-fences)))))
(defun c-after-font-lock-init ()
;; Put on `font-lock-mode-hook'. This function ensures our after-change
@@ -2291,7 +2383,7 @@ This function is the appropriate value of
invalid strings with such a syntax table text property on the
opening \" and the next unescaped end of line."
(if (eq char ?\")
- (not (equal (get-text-property (1- (point)) 'syntax-table) '(15)))
+ (not (equal (get-text-property (1- (point)) 'c-fl-syn-tab) '(15)))
(funcall (default-value 'electric-pair-inhibit-predicate) char)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 585fb95: CC Mode: allow bogusly "adjacent" double quote marks to pair up syntactically,
Alan Mackenzie <=