1 new commit in cc-mode: https://bitbucket.org/xemacs/cc-mode/changeset/fc002d1e32de/ changeset: fc002d1e32de user: acm date: 2012-03-16 14:48:47 summary: Further optimise the handling of large macros. affected #: 2 files diff -r e8d870ec5a3a004aa9e98907d2bf3c95e1b7ffb5 -r fc002d1e32deb719d258e1c7a9f817c1c2db6583 cc-engine.el --- a/cc-engine.el +++ b/cc-engine.el ＠＠ -1248,7 +1248,7 ＠＠ (c-at-vsemi-p)))) (throw 'done vsemi-pos)) ;; In a string/comment? - ((setq lit-range (c-literal-limits)) + ((setq lit-range (c-literal-limits from)) (goto-char (cdr lit-range))) ((eq (char-after) ?:) (forward-char) ＠＠ -3255,8 +3255,7 ＠＠ (if scan-forward-p (progn (narrow-to-region (point-min) here) (c-append-to-state-cache good-pos)) - - (c-get-cache-scan-pos good-pos)))) + good-pos))) (t ; (eq strategy 'IN-LIT) (setq c-state-cache nil ＠＠ -4577,6 +4576,38 ＠＠ (point-min)) (t (c-determine-limit (- how-far-back count) base try-size)))))) + +(defun c-determine-+ve-limit (how-far &optional start-pos) + ;; Return a buffer position about HOW-FAR non-literal characters forward + ;; from START-POS (default point), which must not be inside a literal. + (save-excursion + (let ((pos (or start-pos (point))) + (count how-far) + (s (parse-partial-sexp (point) (point)))) ; null state + (while (and (not (eobp)) + (> count 0)) + ;; Scan over counted characters. + (setq s (parse-partial-sexp + pos + (min (+ pos count) (point-max)) + nil ; target-depth + nil ; stop-before + s ; state + 'syntax-table)) ; stop-comment + (setq count (- count (- (point) pos) 1) + pos (point)) + ;; Scan over literal characters. + (if (nth 8 s) + (setq s (parse-partial-sexp + pos + (point-max) + nil ; target-depth + nil ; stop-before + s ; state + 'syntax-table) ; stop-comment + pos (point)))) + (point)))) +  ;; `c-find-decl-spots' and accompanying stuff. ＠＠ -7700,8 +7731,8 ＠＠ (and (eq (c-beginning-of-statement-1 lim) 'same) - (not (or (c-major-mode-is 'objc-mode) - (c-forward-objc-directive))) + (not (and (c-major-mode-is 'objc-mode) + (c-forward-objc-directive))) (setq id-start (car-safe (c-forward-decl-or-cast-1 (c-point 'bosws) nil nil))) ＠＠ -8664,7 +8695,6 ＠＠ (setq pos (point))) (and c-macro-with-semi-re - (not (c-in-literal)) (eq (skip-chars-backward " \t") 0) ;; Check we've got nothing after this except comments and empty lines ＠＠ -8684,7 +8714,7 ＠＠ nil) (t nil)))) (eolp)) - + (goto-char pos) (progn (c-backward-syntactic-ws) (eq (point) pos)) ＠＠ -8695,7 +8725,9 ＠＠ (c-backward-syntactic-ws) t)) (c-simple-skip-symbol-backward) - (looking-at c-macro-with-semi-re))))) + (looking-at c-macro-with-semi-re) + (goto-char pos) + (not (c-in-literal)))))) ; The most expensive check last. (defun c-macro-vsemi-status-unknown-p () t) ; See cc-defs.el. ＠＠ -9236,6 +9268,10 ＠＠ containing-sexp nil))) (setq lim (1+ containing-sexp)))) (setq lim (point-min))) + (when (c-beginning-of-macro) + (goto-char indent-point) + (let ((lim1 (c-determine-limit 2000))) + (setq lim (max lim lim1)))) ;; If we're in a parenthesis list then ',' delimits the ;; "statements" rather than being an operator (with the ＠＠ -9600,7 +9636,8 ＠＠ ;; CASE 5B: After a function header but before the body (or ;; the ending semicolon if there's no body). ((save-excursion - (when (setq placeholder (c-just-after-func-arglist-p lim)) + (when (setq placeholder (c-just-after-func-arglist-p + (max lim (c-determine-limit 500)))) (setq tmp-pos (point)))) (cond ＠＠ -9808,7 +9845,7 ＠＠ ;; top level construct. Or, perhaps, an unrecognised construct. (t (while (and (setq placeholder (point)) - (eq (car (c-beginning-of-decl-1 containing-sexp)) + (eq (car (c-beginning-of-decl-1 containing-sexp)) ; Can't use `lim' here. 'same) (save-excursion (c-backward-syntactic-ws) ＠＠ -9911,7 +9948,7 ＠＠ (eq (cdar c-state-cache) (point))) ;; Speed up the backward search a bit. (goto-char (caar c-state-cache))) - (c-beginning-of-decl-1 containing-sexp) + (c-beginning-of-decl-1 containing-sexp) ; Can't use `lim' here. (setq placeholder (point)) (if (= start (point)) ;; The '}' is unbalanced. diff -r e8d870ec5a3a004aa9e98907d2bf3c95e1b7ffb5 -r fc002d1e32deb719d258e1c7a9f817c1c2db6583 cc-mode.el --- a/cc-mode.el +++ b/cc-mode.el ＠＠ -942,8 +942,8 ＠＠ ;; inside a string, comment, or macro. (setq new-bounds (c-extend-font-lock-region-for-macros c-new-BEG c-new-END old-len)) - (setq c-new-BEG (car new-bounds) - c-new-END (cdr new-bounds)) + (setq c-new-BEG (max (car new-bounds) (c-determine-limit 500 begg)) + c-new-END (min (cdr new-bounds) (c-determine-+ve-limit 500 endd))) ;; Clear 'syntax-table properties "punctuation": (c-clear-char-property-with-value c-new-BEG c-new-END 'syntax-table '(1)) Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches