[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el
|
From: |
Martin Stjernholm |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el |
|
Date: |
Thu, 03 Jul 2003 08:31:03 -0400 |
Index: emacs/lisp/progmodes/cc-engine.el
diff -c emacs/lisp/progmodes/cc-engine.el:1.28
emacs/lisp/progmodes/cc-engine.el:1.29
*** emacs/lisp/progmodes/cc-engine.el:1.28 Sat Mar 22 20:58:30 2003
--- emacs/lisp/progmodes/cc-engine.el Thu Jul 3 08:30:59 2003
***************
*** 1,10 ****
;;; cc-engine.el --- core syntax guessing engine for CC mode
! ;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.
! ;; Authors: 2000- Martin Stjernholm
! ;; 1998-1999 Barry A. Warsaw and Martin Stjernholm
! ;; 1992-1997 Barry A. Warsaw
;; 1987 Dave Detlefs and Stewart Clamen
;; 1985 Richard M. Stallman
;; Maintainer: address@hidden
--- 1,9 ----
;;; cc-engine.el --- core syntax guessing engine for CC mode
! ;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
! ;; Authors: 1998- Martin Stjernholm
! ;; 1992-1999 Barry A. Warsaw
;; 1987 Dave Detlefs and Stewart Clamen
;; 1985 Richard M. Stallman
;; Maintainer: address@hidden
***************
*** 41,46 ****
--- 40,122 ----
;; probably also applies to many other Emacs packages, but here it's
;; clearly spelled out.)
+ ;; Hidden buffer changes
+ ;;
+ ;; Various functions in CC Mode use text properties for caching and
+ ;; syntactic markup purposes, and those of them that might modify such
+ ;; properties are said to do "hidden buffer changes". They should be
+ ;; used within `c-save-buffer-state' or a similar function that saves
+ ;; and restores buffer modifiedness etc.
+ ;;
+ ;; Interactive functions are assumed to not do hidden buffer changes
+ ;; (this isn't applicable in the specific parts of them that do real
+ ;; changes, though).
+ ;;
+ ;; All other functions are assumed to do hidden buffer changes and
+ ;; must thus be wrapped inside `c-save-buffer-state' if they're used
+ ;; from any function that does not do hidden buffer changes.
+ ;;
+ ;; Every function, except the interactive ones, that doesn't do hidden
+ ;; buffer changes have that explicitly stated in their docstring or
+ ;; comment.
+
+ ;; Use of text properties
+ ;;
+ ;; CC Mode uses several text properties internally to mark up various
+ ;; positions, e.g. to improve speed and to eliminate glitches in
+ ;; interactive refontification.
+ ;;
+ ;; 'syntax-table
+ ;; Used to modify the syntax of some characters. Currently used to
+ ;; mark the "<" and ">" of angle bracket parens with paren syntax.
+ ;;
+ ;; This property is used on single characters and is therefore
+ ;; always treated as front and rear nonsticky (or start and end open
+ ;; in XEmacs vocabulary). It's therefore installed on
+ ;; `text-property-default-nonsticky' if that variable exists (Emacs
+ ;; >= 21).
+ ;;
+ ;; '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'
+ ;; below for further details.
+ ;;
+ ;; 'c-type
+ ;; This property is used on single characters to mark positions with
+ ;; special syntactic relevance of various sorts. It's primary use
+ ;; is to avoid glitches when multiline constructs are refontified
+ ;; interactively (on font lock decoration level 3). It's cleared in
+ ;; a region before it's fontified and is then put on relevant chars
+ ;; in that region as they are encountered during the fontification.
+ ;; The value specifies the kind of position:
+ ;;
+ ;; 'c-decl-arg-start
+ ;; Put on the last char of the token preceding each declaration
+ ;; inside a declaration style arglist (typically in a function
+ ;; prototype).
+ ;;
+ ;; 'c-decl-end
+ ;; Put on the last char of the token preceding a declaration.
+ ;; This is used in cases where declaration boundaries can't be
+ ;; recognized simply by looking for a token like ";" or "}".
+ ;; `c-type-decl-end-used' must be set if this is used (see also
+ ;; `c-find-decl-spots').
+ ;;
+ ;; 'c-<>-arg-sep
+ ;; Put on the commas that separate arguments in angle bracket
+ ;; arglists like C++ template arglists.
+ ;;
+ ;; 'c-decl-id-start and 'c-decl-type-start
+ ;; Put on the last char of the token preceding each declarator
+ ;; in the declarator list of a declaration. They are also used
+ ;; between the identifiers cases like enum declarations.
+ ;; 'c-decl-type-start is used when the declarators are types,
+ ;; 'c-decl-id-start otherwise.
+ ;;
+ ;; 'c-awk-NL-prop
+ ;; Used in AWK mode to mark the various kinds of newlines. See
+ ;; cc-awk.el.
+
;;; Code:
(eval-when-compile
***************
*** 49,64 ****
(stringp byte-compile-dest-file))
(cons (file-name-directory byte-compile-dest-file) load-path)
load-path)))
! (require 'cc-bytecomp)))
(cc-require 'cc-defs)
(cc-require 'cc-vars)
! (cc-require 'cc-langs)
;; Silence the compiler.
(cc-bytecomp-defun buffer-syntactic-context) ; XEmacs
(defun c-calculate-state (arg prevstate)
;; Calculate the new state of PREVSTATE, t or nil, based on arg. If
;; arg is nil or zero, toggle the state. If arg is negative, turn
--- 125,180 ----
(stringp byte-compile-dest-file))
(cons (file-name-directory byte-compile-dest-file) load-path)
load-path)))
! (load "cc-bytecomp" nil t)))
(cc-require 'cc-defs)
+ (cc-require-when-compile 'cc-langs)
(cc-require 'cc-vars)
!
! ;; Some functions/constants in cc-awk.el that are called/referenced here.
! ;; (Can't use cc-require due to cyclicity.)
! (cc-bytecomp-defun c-awk-unstick-NL-prop)
! (cc-bytecomp-defun c-awk-clear-NL-props)
! (cc-bytecomp-defvar awk-mode-syntax-table)
! (cc-bytecomp-defun c-awk-backward-syntactic-ws)
! (cc-bytecomp-defun c-awk-after-logical-semicolon)
! (cc-bytecomp-defun c-awk-NL-prop-not-set)
! (cc-bytecomp-defun c-awk-completed-stmt-ws-ends-line-p)
! (cc-bytecomp-defun c-awk-completed-stmt-ws-ends-prev-line-p)
! (cc-bytecomp-defun c-awk-prev-line-incomplete-p)
! (cc-bytecomp-defun c-awk-after-change)
;; Silence the compiler.
(cc-bytecomp-defun buffer-syntactic-context) ; XEmacs
+ ;; Make declarations for all the `c-lang-defvar' variables in cc-langs.
+
+ (defmacro c-declare-lang-variables ()
+ `(progn
+ ,@(mapcan (lambda (init)
+ `(,(if (elt init 2)
+ `(defvar ,(car init) nil ,(elt init 2))
+ `(defvar ,(car init) nil))
+ (make-variable-buffer-local ',(car init))))
+ (cdr c-lang-variable-inits))))
+ (c-declare-lang-variables)
+
+
+ ;;; Internal state variables.
+
+ ;; Internal state of hungry delete key feature
+ (defvar c-hungry-delete-key nil)
+ (make-variable-buffer-local 'c-hungry-delete-key)
+
+ ;; Internal state of auto newline feature.
+ (defvar c-auto-newline nil)
+ (make-variable-buffer-local 'c-auto-newline)
+
+ ;; Internal auto-newline/hungry-delete designation string for mode line.
+ (defvar c-auto-hungry-string nil)
+ (make-variable-buffer-local 'c-auto-hungry-string)
+
(defun c-calculate-state (arg prevstate)
;; Calculate the new state of PREVSTATE, t or nil, based on arg. If
;; arg is nil or zero, toggle the state. If arg is negative, turn
***************
*** 68,76 ****
(not prevstate)
(> arg 0)))
!
(defvar c-in-literal-cache t)
(defvar c-parsing-error nil)
;; KLUDGE ALERT: c-maybe-labelp is used to pass information between
;; c-crosses-statement-barrier-p and c-beginning-of-statement-1. A
--- 184,309 ----
(not prevstate)
(> arg 0)))
! ;; Dynamically bound cache for `c-in-literal'.
(defvar c-in-literal-cache t)
+
+ ;; Must be set in buffers where the `c-type' text property might be used
+ ;; with the value `c-decl-end'.
+ (defvar c-type-decl-end-used nil)
+ (make-variable-buffer-local 'c-type-decl-end-used)
+
+
+ ;;; Basic utility functions.
+
+ (defun c-syntactic-content (from to)
+ ;; Return the given region as a string where all syntactic
+ ;; whitespace is removed or, where necessary, replaced with a single
+ ;; space.
+ (save-excursion
+ (goto-char from)
+ (let* ((parts (list nil)) (tail parts) pos)
+ (while (re-search-forward c-syntactic-ws-start to t)
+ (goto-char (setq pos (match-beginning 0)))
+ (c-forward-syntactic-ws to)
+ (if (= (point) pos)
+ (forward-char)
+ (if (and (> pos from)
+ (< (point) to)
+ (looking-at "\\w\\|\\s_")
+ (save-excursion
+ (goto-char (1- pos))
+ (looking-at "\\w\\|\\s_")))
+ (progn
+ (setcdr tail (list (buffer-substring-no-properties from pos)
+ " "))
+ (setq tail (cddr tail)))
+ (setcdr tail (list (buffer-substring-no-properties from pos)))
+ (setq tail (cdr tail)))
+ (setq from (point))))
+ (setcdr tail (list (buffer-substring-no-properties from to)))
+ (apply 'concat (cdr parts)))))
+
+ (defsubst c-keyword-sym (keyword)
+ ;; Return non-nil if the string KEYWORD is a known keyword. More
+ ;; precisely, the value is the symbol for the keyword in
+ ;; `c-keywords-obarray'.
+ (intern-soft keyword c-keywords-obarray))
+
+ (defsubst c-keyword-member (keyword-sym lang-constant)
+ ;; Return non-nil if the symbol KEYWORD-SYM, as returned by
+ ;; `c-keyword-sym', is a member of LANG-CONSTANT, which is the name
+ ;; of a language constant that ends with "-kwds". If KEYWORD-SYM is
+ ;; nil then the result is nil.
+ (get keyword-sym lang-constant))
+
+ ;; String syntax chars, suitable for skip-syntax-(forward|backward).
+ (defconst c-string-syntax (if (memq 'gen-string-delim c-emacs-features)
+ "\"|"
+ "\""))
+
+ ;; Regexp matching string start syntax.
+ (defconst c-string-limit-regexp (if (memq 'gen-string-delim c-emacs-features)
+ "\\s\"\\|\\s|"
+ "\\s\""))
+
+ ;; Holds formatted error strings for the few cases where parse errors
+ ;; are reported.
(defvar c-parsing-error nil)
+ (make-variable-buffer-local 'c-parsing-error)
+
+ (defun c-echo-parsing-error (&optional quiet)
+ ;; This function does not do any hidden buffer changes.
+ (when (and c-report-syntactic-errors c-parsing-error (not quiet))
+ (c-benign-error "%s" c-parsing-error))
+ c-parsing-error)
+
+ ;; Faces given to comments and string literals. This is used in some
+ ;; situations to speed up recognition; it isn't mandatory that font
+ ;; locking is in use. This variable is extended with the face in
+ ;; `c-doc-face-name' when fontification is activated in cc-fonts.el.
+ (defconst c-literal-faces
+ '(font-lock-comment-face font-lock-string-face))
+
+
+ ;; Some debug tools to visualize various special positions. This
+ ;; debug code isn't as portable as the rest of CC Mode.
+
+ (cc-bytecomp-defun overlays-in)
+ (cc-bytecomp-defun overlay-get)
+ (cc-bytecomp-defun overlay-start)
+ (cc-bytecomp-defun overlay-end)
+ (cc-bytecomp-defun delete-overlay)
+ (cc-bytecomp-defun overlay-put)
+ (cc-bytecomp-defun make-overlay)
+
+ (defun c-debug-add-face (beg end face)
+ (c-save-buffer-state ((overlays (overlays-in beg end)) overlay)
+ (while overlays
+ (setq overlay (car overlays)
+ overlays (cdr overlays))
+ (when (eq (overlay-get overlay 'face) face)
+ (setq beg (min beg (overlay-start overlay))
+ end (max end (overlay-end overlay)))
+ (delete-overlay overlay)))
+ (overlay-put (make-overlay beg end) 'face face)))
+
+ (defun c-debug-remove-face (beg end face)
+ (c-save-buffer-state ((overlays (overlays-in beg end)) overlay
+ (ol-beg beg) (ol-end end))
+ (while overlays
+ (setq overlay (car overlays)
+ overlays (cdr overlays))
+ (when (eq (overlay-get overlay 'face) face)
+ (setq ol-beg (min ol-beg (overlay-start overlay))
+ ol-end (max ol-end (overlay-end overlay)))
+ (delete-overlay overlay)))
+ (when (< ol-beg beg)
+ (overlay-put (make-overlay ol-beg beg) 'face face))
+ (when (> ol-end end)
+ (overlay-put (make-overlay end ol-end) 'face face))))
+
+
+ ;; `c-beginning-of-statement-1' and accompanying stuff.
;; KLUDGE ALERT: c-maybe-labelp is used to pass information between
;; c-crosses-statement-barrier-p and c-beginning-of-statement-1. A
***************
*** 78,83 ****
--- 311,318 ----
;; the byte compiler.
(defvar c-maybe-labelp nil)
+ ;; New awk-compatible version of c-beginning-of-statement-1, ACM 2002/6/22
+
;; Macros used internally in c-beginning-of-statement-1 for the
;; automaton actions.
(defmacro c-bos-push-state ()
***************
*** 123,134 ****
statements/declarations on the same level are considered, i.e. don't
move into or out of sexps (not even normal expression parentheses).
! Stop at statement continuations like \"else\", \"catch\", \"finally\"
! and the \"while\" in \"do ... while\" if the start point is within
! them. If starting at such a continuation, move to the corresponding
! statement start. If at the beginning of a statement, move to the
! closest containing statement if there is any. This might also stop at
! a continuation clause.
Labels are treated as separate statements if IGNORE-LABELS is non-nil.
The function is not overly intelligent in telling labels from other
--- 358,369 ----
statements/declarations on the same level are considered, i.e. don't
move into or out of sexps (not even normal expression parentheses).
! Stop at statement continuation tokens like \"else\", \"catch\",
! \"finally\" and the \"while\" in \"do ... while\" if the start point
! is within the continuation. If starting at such a token, move to the
! corresponding statement start. If at the beginning of a statement,
! move to the closest containing statement if there is any. This might
! also stop at a continuation clause.
Labels are treated as separate statements if IGNORE-LABELS is non-nil.
The function is not overly intelligent in telling labels from other
***************
*** 159,194 ****
Normally only ';' is considered to delimit statements, but if
COMMA-DELIM is non-nil then ',' is treated likewise."
! ;; The bulk of this function is a pushdown automaton that looks at
! ;; statement boundaries and the tokens in c-opt-block-stmt-key.
;;
;; Note: The position of a boundary is the following token.
;;
! ;; Begin with current token, stop when stack is empty and the
! ;; position has been moved.
;;
;; Common state:
! ;; "else": Push state, goto state `else':
! ;; boundary: Goto state `else-boundary':
! ;; "if": Pop state.
! ;; boundary: Error, pop state.
! ;; other: See common state.
! ;; other: Error, pop state, retry token.
! ;; "while": Push state, goto state `while':
! ;; boundary: Save position, goto state `while-boundary':
! ;; "do": Pop state.
! ;; boundary: Restore position if it's not at start, pop state.
! ;; other: See common state.
! ;; other: Pop state, retry token.
! ;; "catch" or "finally": Push state, goto state `catch':
! ;; boundary: Goto state `catch-boundary':
! ;; "try": Pop state.
! ;; "catch": Goto state `catch'.
! ;; boundary: Error, pop state.
! ;; other: See common state.
! ;; other: Error, pop state, retry token.
;; other: Do nothing special.
;;
;; In addition to the above there is some special handling of labels
;; and macros.
--- 394,477 ----
Normally only ';' is considered to delimit statements, but if
COMMA-DELIM is non-nil then ',' is treated likewise."
! ;; The bulk of this function is a pushdown automaton that looks at statement
! ;; boundaries and the tokens (such as "while") in c-opt-block-stmt-key. Its
! ;; purpose is to keep track of nested statements, ensuring that such
! ;; statments are skipped over in their entirety (somewhat akin to what C-M-p
! ;; does with nested braces/brackets/parentheses).
;;
;; Note: The position of a boundary is the following token.
;;
! ;; Beginning with the current token (the one following point), move back one
! ;; sexp at a time (where a sexp is, more or less, either a token or the
! ;; entire contents of a brace/bracket/paren pair). Each time a statement
! ;; boundary is crossed or a "while"-like token is found, update the state of
! ;; the PDA. Stop at the beginning of a statement when the stack (holding
! ;; nested statement info) is empty and the position has been moved.
! ;;
! ;; The following variables constitute the PDA:
! ;;
! ;; sym: This is either the "while"-like token (e.g. 'for) we've just
! ;; scanned back over, 'boundary if we've just gone back over a
! ;; statement boundary, or nil otherwise.
! ;; state: takes one of the values (nil else else-boundary while
! ;; while-boundary catch catch-boundary).
! ;; nil means "no "while"-like token yet scanned".
! ;; 'else, for example, means "just gone back over an else".
! ;; 'else-boundary means "just gone back over a statement boundary
! ;; immediately after having gone back over an else".
! ;; saved-pos: A vector of either saved positions (tok ptok pptok, etc.) or
! ;; of error reporting information.
! ;; stack: The stack onto which the PDA pushes its state. Each entry
! ;; consists of a saved value of state and saved-pos. An entry is
! ;; pushed when we move back over a "continuation" token (e.g. else)
! ;; and popped when we encounter the corresponding opening token
! ;; (e.g. if).
! ;;
! ;;
! ;; The following diagram briefly outlines the PDA.
;;
;; Common state:
! ;; "else": Push state, goto state `else'.
! ;; "while": Push state, goto state `while'.
! ;; "catch" or "finally": Push state, goto state `catch'.
! ;; boundary: Pop state.
;; other: Do nothing special.
;;
+ ;; State `else':
+ ;; boundary: Goto state `else-boundary'.
+ ;; other: Error, pop state, retry token.
+ ;;
+ ;; State `else-boundary':
+ ;; "if": Pop state.
+ ;; boundary: Error, pop state.
+ ;; other: See common state.
+ ;;
+ ;; State `while':
+ ;; boundary: Save position, goto state `while-boundary'.
+ ;; other: Pop state, retry token.
+ ;;
+ ;; State `while-boundary':
+ ;; "do": Pop state.
+ ;; boundary: Restore position if it's not at start, pop state. [*see
below]
+ ;; other: See common state.
+ ;;
+ ;; State `catch':
+ ;; boundary: Goto state `catch-boundary'.
+ ;; other: Error, pop state, retry token.
+ ;;
+ ;; State `catch-boundary':
+ ;; "try": Pop state.
+ ;; "catch": Goto state `catch'.
+ ;; boundary: Error, pop state.
+ ;; other: See common state.
+ ;;
+ ;; [*] In the `while-boundary' state, we had pushed a 'while state, and were
+ ;; searching for a "do" which would have opened a do-while. If we didn't
+ ;; find it, we discard the analysis done since the "while", go back to this
+ ;; token in the buffer and restart the scanning there, this time WITHOUT
+ ;; pushing the 'while state onto the stack.
+ ;;
;; In addition to the above there is some special handling of labels
;; and macros.
***************
*** 200,215 ****
c-stmt-delim-chars-with-comma
c-stmt-delim-chars))
pos ; Current position.
! boundary-pos ; Position of last boundary.
after-labels-pos ; Value of tok after first found colon.
last-label-pos ; Value of tok after last found colon.
! sym ; Current symbol in the alphabet.
! state ; Current state in the automaton.
! saved-pos ; Current saved positions.
stack ; Stack of conses (state . saved-pos).
! (cond-key (or c-opt-block-stmt-key
"\\<\\>")) ; Matches nothing.
! (ret 'same)
tok ptok pptok ; Pos of last three sexps or bounds.
c-in-literal-cache c-maybe-labelp saved)
--- 483,499 ----
c-stmt-delim-chars-with-comma
c-stmt-delim-chars))
pos ; Current position.
! boundary-pos ; Position of last stmt boundary character (e.g. ;).
after-labels-pos ; Value of tok after first found colon.
last-label-pos ; Value of tok after last found colon.
! sym ; Symbol just scanned back over (e.g. 'while or
! ; 'boundary). See above
! state ; Current state in the automaton. See above.
! saved-pos ; Current saved positions. See above
stack ; Stack of conses (state . saved-pos).
! (cond-key (or c-opt-block-stmt-key ; regexp which matches "for", "if",
etc.
"\\<\\>")) ; Matches nothing.
! (ret 'same) ; Return value.
tok ptok pptok ; Pos of last three sexps or bounds.
c-in-literal-cache c-maybe-labelp saved)
***************
*** 221,244 ****
(/= (point) start)))
(setq macro-start (point)))
! ;; Try to skip over unary operator characters, to register
;; that we've moved.
(while (progn
(setq pos (point))
! (c-backward-syntactic-ws)
! (/= (skip-chars-backward "-+!*&address@hidden") 0)))
!
! ;; First check for bare semicolon. Later on we ignore the
! ;; boundaries for statements that doesn't contain any sexp.
! ;; The only thing that is affected is that the error checking
! ;; is a little less strict, and we really don't bother.
(if (and (memq (char-before) delims)
(progn (forward-char -1)
(setq saved (point))
! (c-backward-syntactic-ws)
(or (memq (char-before) delims)
(memq (char-before) '(?: nil))
! (eq (char-syntax (char-before)) ?\())))
(setq ret 'previous
pos saved)
--- 505,541 ----
(/= (point) start)))
(setq macro-start (point)))
! ;; Try to skip back over unary operator characters, to register
;; that we've moved.
(while (progn
(setq pos (point))
! (c-backward-syntactic-ws) ; might go back an awk-mode virtual
semicolon, here.
! ; How about using c-awk-NL-prop for
AWK Mode, here.
! ; Something like
c-awk-backward-syntactic-ws.
! ; 2002/6/22. Doesn't matter! Leave
it as it is.
! (/= (skip-chars-backward "-+!*&address@hidden") 0))) ; ACM,
2002/5/31;
! ; Make a variable in
! ; cc-langs.el, maybe
!
! ;; Skip back over any semicolon here. If it was a bare semicolon, we're
! ;; done. Later on we ignore the boundaries for statements that doesn't
! ;; contain any sexp. The only thing that is affected is that the error
! ;; checking is a little less strict, and we really don't bother.
(if (and (memq (char-before) delims)
(progn (forward-char -1)
(setq saved (point))
! (if (c-mode-is-new-awk-p)
! (c-awk-backward-syntactic-ws)
! (c-backward-syntactic-ws))
(or (memq (char-before) delims)
(memq (char-before) '(?: nil))
! (eq (char-syntax (char-before)) ?\()
! (and (c-mode-is-new-awk-p)
! (c-awk-after-logical-semicolon))))) ; ACM
2002/6/22
! ;; ACM, 2002/7/20: What about giving a limit to the above function?
! ;; ACM, 2003/6/16: The above two lines (checking for
! ;; awk-logical-semicolon) are probably redundant after rewriting
! ;; c-awk-backward-syntactic-ws.
(setq ret 'previous
pos saved)
***************
*** 249,266 ****
;; Record this as the first token if not starting inside it.
(setq tok start))
(while
(catch 'loop ;; Throw nil to break, non-nil to continue.
(cond
! ;; Check for macro start.
((save-excursion
(and macro-start
- (looking-at "[ \t]*[a-zA-Z0-9!]")
(progn (skip-chars-backward " \t")
(eq (char-before) ?#))
(progn (setq saved (1- (point)))
(beginning-of-line)
(not (eq (char-before (1- (point))) ?\\)))
(progn (skip-chars-forward " \t")
(eq (point) saved))))
(goto-char saved)
--- 546,569 ----
;; Record this as the first token if not starting inside it.
(setq tok start))
+ ;; The following while loop goes back one sexp (balanced parens,
+ ;; etc. with contents, or symbol or suchlike) each iteration. This
+ ;; movement is accomplished with a call to scan-sexps approx 130 lines
+ ;; below.
(while
(catch 'loop ;; Throw nil to break, non-nil to continue.
(cond
! ;; Check for macro start. Take this out for AWK Mode (ACM,
2002/5/31)
! ;; NO!! just make sure macro-start is nil in AWK Mode (ACM,
2002/6/22)
! ;; It always is (ACM, 2002/6/23)
((save-excursion
(and macro-start
(progn (skip-chars-backward " \t")
(eq (char-before) ?#))
(progn (setq saved (1- (point)))
(beginning-of-line)
(not (eq (char-before (1- (point))) ?\\)))
+ (looking-at c-opt-cpp-start)
(progn (skip-chars-forward " \t")
(eq (point) saved))))
(goto-char saved)
***************
*** 275,282 ****
ignore-labels t))
(throw 'loop nil))
! ;; Do a round through the automaton if we found a
! ;; boundary or if looking at a statement keyword.
((or sym
(and (looking-at cond-key)
(setq sym (intern (match-string 1)))))
--- 578,585 ----
ignore-labels t))
(throw 'loop nil))
! ;; Do a round through the automaton if we've just passed a
! ;; statement boundary or passed a "while"-like token.
((or sym
(and (looking-at cond-key)
(setq sym (intern (match-string 1)))))
***************
*** 284,291 ****
(when (and (< pos start) (null stack))
(throw 'loop nil))
! ;; The state handling. Continue in the common state for
! ;; unhandled cases.
(or (cond
((eq state 'else)
(if (eq sym 'boundary)
--- 587,606 ----
(when (and (< pos start) (null stack))
(throw 'loop nil))
! ;; The PDA state handling.
! ;;
! ;; Refer to the description of the PDA in the openining
! ;; comments. In the following OR form, the first leaf
! ;; attempts to handles one of the specific actions detailed
! ;; (e.g., finding token "if" whilst in state `else-boundary').
! ;; We drop through to the second leaf (which handles common
! ;; state) if no specific handler is found in the first cond.
! ;; If a parsing error is detected (e.g. an "else" with no
! ;; preceding "if"), we throw to the enclosing catch.
! ;;
! ;; Note that the (eq state 'else) means
! ;; "we've just passed an else", NOT "we're looking for an
! ;; else".
(or (cond
((eq state 'else)
(if (eq sym 'boundary)
***************
*** 309,322 ****
(not after-labels-pos))
(progn (c-bos-save-pos)
(setq state 'while-boundary))
! (c-bos-pop-state-and-retry)))
((eq state 'while-boundary)
(cond ((eq sym 'do)
(c-bos-pop-state (setq ret 'beginning)))
! ((eq sym 'boundary)
! (c-bos-restore-pos)
! (c-bos-pop-state))))
((eq state 'catch)
(if (eq sym 'boundary)
--- 624,637 ----
(not after-labels-pos))
(progn (c-bos-save-pos)
(setq state 'while-boundary))
! (c-bos-pop-state-and-retry))) ; Can't be a do-while
((eq state 'while-boundary)
(cond ((eq sym 'do)
(c-bos-pop-state (setq ret 'beginning)))
! ((eq sym 'boundary) ; isn't a do-while
! (c-bos-restore-pos) ; the position of the while
! (c-bos-pop-state)))) ; no longer searching for do.
((eq state 'catch)
(if (eq sym 'boundary)
***************
*** 334,355 ****
(c-bos-report-error)
(c-bos-pop-state)))))
! ;; This is state common.
(cond ((eq sym 'boundary)
! (if (< pos start)
! (c-bos-pop-state)
! (c-bos-push-state)))
((eq sym 'else)
(c-bos-push-state)
(c-bos-save-error-info 'if 'else)
(setq state 'else))
((eq sym 'while)
(when (or (not pptok)
! (memq (char-after pptok) delims))
;; Since this can cause backtracking we do a
;; little more careful analysis to avoid it: If
;; the while isn't followed by a semicolon it
;; can't be a do-while.
(c-bos-push-state)
(setq state 'while)))
((memq sym '(catch finally))
--- 649,685 ----
(c-bos-report-error)
(c-bos-pop-state)))))
! ;; This is state common. We get here when the previous
! ;; cond statement found no particular state handler.
(cond ((eq sym 'boundary)
! ;; If we have a boundary at the start
! ;; position we push a frame to go to the
! ;; previous statement.
! (if (>= pos start)
! (c-bos-push-state)
! (c-bos-pop-state)))
((eq sym 'else)
(c-bos-push-state)
(c-bos-save-error-info 'if 'else)
(setq state 'else))
((eq sym 'while)
(when (or (not pptok)
! (memq (char-after pptok) delims)
! (and (c-mode-is-new-awk-p)
! (or
! ;; might we be calling this from
! ;;
c-awk-after-if-do-for-while-condition-p?
! ;; If so, avoid infinite recursion.
! (and (eq (point) start)
! (c-awk-NL-prop-not-set))
! ;; The following may recursively
! ;; call this function.
!
(c-awk-completed-stmt-ws-ends-line-p pptok))))
;; Since this can cause backtracking we do a
;; little more careful analysis to avoid it: If
;; the while isn't followed by a semicolon it
;; can't be a do-while.
+ ;; ACM, 2002/5/31; IT CAN IN AWK Mode. ;-(
(c-bos-push-state)
(setq state 'while)))
((memq sym '(catch finally))
***************
*** 365,377 ****
last-label-pos nil
c-maybe-labelp nil))))
! ;; Step to next sexp, but not if we crossed a boundary, since
! ;; that doesn't consume a sexp.
(if (eq sym 'boundary)
(setq ret 'previous)
(while
(progn
(or (c-safe (goto-char (scan-sexps (point) -1)) t)
(throw 'loop nil))
(cond ((looking-at "\\\\$")
;; Step again if we hit a line continuation.
--- 695,715 ----
last-label-pos nil
c-maybe-labelp nil))))
! ;; Step to the previous sexp, but not if we crossed a
! ;; boundary, since that doesn't consume an sexp.
(if (eq sym 'boundary)
(setq ret 'previous)
+
+ ;; HERE IS THE SINGLE PLACE INSIDE THE PDA LOOP WHERE WE MOVE
+ ;; BACKWARDS THROUGH THE SOURCE. The following loop goes back
+ ;; one sexp and then only loops in special circumstances (line
+ ;; continuations and skipping past entire macros).
(while
(progn
(or (c-safe (goto-char (scan-sexps (point) -1)) t)
+ ;; Give up if we hit an unbalanced block.
+ ;; Since the stack won't be empty the code
+ ;; below will report a suitable error.
(throw 'loop nil))
(cond ((looking-at "\\\\$")
;; Step again if we hit a line continuation.
***************
*** 380,386 ****
;; If we started inside a macro then this
;; sexp is always interesting.
nil)
! (t
;; Otherwise check that we didn't step
;; into a macro from the end.
(let ((macro-start
--- 718,724 ----
;; If we started inside a macro then this
;; sexp is always interesting.
nil)
! ((not (c-mode-is-new-awk-p)) ; Changed from t, ACM
2002/6/25
;; Otherwise check that we didn't step
;; into a macro from the end.
(let ((macro-start
***************
*** 391,412 ****
(goto-char macro-start)
t))))))
! ;; Check for statement boundary.
(when (save-excursion
(if (if (eq (char-after) ?{)
(c-looking-at-inexpr-block lim nil)
! (eq (char-syntax (char-after)) ?\())
! ;; Need to move over parens and
! ;; in-expression blocks to get a good start
! ;; position for the boundary check.
! (c-forward-sexp 1))
(setq boundary-pos (c-crosses-statement-barrier-p
(point) pos)))
(setq pptok ptok
ptok tok
tok boundary-pos
sym 'boundary)
! (throw 'loop t)))
(when (and (numberp c-maybe-labelp) (not ignore-labels))
;; c-crosses-statement-barrier-p has found a colon, so
--- 729,770 ----
(goto-char macro-start)
t))))))
! ;; Did the last movement by a sexp cross a statement boundary?
(when (save-excursion
(if (if (eq (char-after) ?{)
(c-looking-at-inexpr-block lim nil)
! (looking-at "\\s\("))
!
! ;; Should not include the paren sexp we've
! ;; passed over in the boundary check.
! (if (> (point) (- pos 100))
! (c-forward-sexp 1)
!
! ;; Find its end position this way instead of
! ;; moving forward if the sexp is large.
! (goto-char pos)
! (while
! (progn
! (goto-char (1+ (c-down-list-backward)))
! (unless macro-start
! ;; Check that we didn't step into
! ;; a macro from the end.
! (let ((macro-start
! (save-excursion
! (and (c-beginning-of-macro)
! (point)))))
! (when macro-start
! (goto-char macro-start)
! t)))))))
!
(setq boundary-pos (c-crosses-statement-barrier-p
(point) pos)))
+
(setq pptok ptok
ptok tok
tok boundary-pos
sym 'boundary)
! (throw 'loop t))) ; like a C "continue". Analyze the next
sexp.
(when (and (numberp c-maybe-labelp) (not ignore-labels))
;; c-crosses-statement-barrier-p has found a colon, so
***************
*** 423,433 ****
ignore-labels t) ; Avoid the label check on exit.
(throw 'loop nil))
(setq sym nil
pptok ptok
ptok tok
tok (point)
! pos tok))) ; Not nil.
;; If the stack isn't empty there might be errors to report.
(while stack
--- 781,792 ----
ignore-labels t) ; Avoid the label check on exit.
(throw 'loop nil))
+ ;; We've moved back by a sexp, so update the token positions.
(setq sym nil
pptok ptok
ptok tok
tok (point)
! pos tok))) ; Not nil (for the while loop).
;; If the stack isn't empty there might be errors to report.
(while stack
***************
*** 446,452 ****
(cond ((> start saved) (setq pos saved))
((= start saved) (setq ret 'up)))))
! (when (and c-maybe-labelp (not ignore-labels) after-labels-pos)
;; We're in a label. Maybe we should step to the statement
;; after it.
(if (< after-labels-pos start)
--- 805,814 ----
(cond ((> start saved) (setq pos saved))
((= start saved) (setq ret 'up)))))
! (when (and c-maybe-labelp
! (not ignore-labels)
! (not (eq ret 'beginning))
! after-labels-pos)
;; We're in a label. Maybe we should step to the statement
;; after it.
(if (< after-labels-pos start)
***************
*** 459,465 ****
(goto-char pos)
(while (progn
(c-backward-syntactic-ws)
! (/= (skip-chars-backward "-+!*&address@hidden") 0))
(setq pos (point)))
(goto-char pos)
ret)))
--- 821,827 ----
(goto-char pos)
(while (progn
(c-backward-syntactic-ws)
! (/= (skip-chars-backward "-+!*&address@hidden") 0)) ; Hopefully
the # won't hurt awk.
(setq pos (point)))
(goto-char pos)
ret)))
***************
*** 467,473 ****
(defun c-crosses-statement-barrier-p (from to)
"Return non-nil if buffer positions FROM to TO cross one or more
statement or declaration boundaries. The returned value is actually
! the position of the earliest boundary char.
The variable `c-maybe-labelp' is set to the position of the first `:' that
might start a label (i.e. not part of `::' and not preceded by `?'). If a
--- 829,836 ----
(defun c-crosses-statement-barrier-p (from to)
"Return non-nil if buffer positions FROM to TO cross one or more
statement or declaration boundaries. The returned value is actually
! the position of the earliest boundary char. FROM must not be within
! a string or comment.
The variable `c-maybe-labelp' is set to the position of the first `:' that
might start a label (i.e. not part of `::' and not preceded by `?'). If a
***************
*** 479,486 ****
(goto-char from)
(while (progn (skip-chars-forward skip-chars to)
(< (point) to))
! (if (setq lit-range (c-literal-limits from))
! (goto-char (setq from (cdr lit-range)))
(cond ((eq (char-after) ?:)
(forward-char)
(if (and (eq (char-after) ?:)
--- 842,851 ----
(goto-char from)
(while (progn (skip-chars-forward skip-chars to)
(< (point) to))
! (if (setq lit-range (c-literal-limits from)) ; Have we landed in a
string/comment?
! (progn (goto-char (setq from (cdr lit-range)))
! (if (and (c-mode-is-new-awk-p) (bolp)) ; ACM 2002/7/17.
Make sure we
! (backward-char))) ; don't skip over a virtual
semi-colon after an awk comment. :-(
(cond ((eq (char-after) ?:)
(forward-char)
(if (and (eq (char-after) ?:)
***************
*** 493,508 ****
;; looking for more : and ?.
(setq c-maybe-labelp nil
skip-chars (substring c-stmt-delim-chars 0 -2)))
(t (throw 'done (point))))))
nil))))
;; This is a dynamically bound cache used together with
! ;; c-query-macro-start and c-query-and-set-macro-start. It only works
! ;; as long as point doesn't cross a macro boundary.
(defvar c-macro-start 'unknown)
(defsubst c-query-and-set-macro-start ()
(if (symbolp c-macro-start)
(setq c-macro-start (save-excursion
(and (c-beginning-of-macro)
--- 858,1021 ----
;; looking for more : and ?.
(setq c-maybe-labelp nil
skip-chars (substring c-stmt-delim-chars 0 -2)))
+ ((and (eolp) ; Can only happen in AWK Mode
+ (not (c-awk-completed-stmt-ws-ends-line-p)))
+ (forward-char))
+ ((and (c-mode-is-new-awk-p)
+ (bolp) lit-range ; awk: comment/string ended prev
line.
+ (not (c-awk-completed-stmt-ws-ends-prev-line-p))))
(t (throw 'done (point))))))
nil))))
+ ;; A set of functions that covers various idiosyncrasies in
+ ;; implementations of `forward-comment'.
+
+ ;; Note: Some emacsen considers incorrectly that any line comment
+ ;; ending with a backslash continues to the next line. I can't think
+ ;; of any way to work around that in a reliable way without changing
+ ;; the buffer, though. Suggestions welcome. ;) (No, temporarily
+ ;; changing the syntax for backslash doesn't work since we must treat
+ ;; escapes in string literals correctly.)
+
+ (defun c-forward-single-comment ()
+ "Move forward past whitespace and the closest following comment, if any.
+ Return t if a comment was found, nil otherwise. In either case, the
+ point is moved past the following whitespace. Line continuations,
+ i.e. a backslashes followed by line breaks, are treated as whitespace.
+ The line breaks that end line comments are considered to be the
+ comment enders, so the point will be put on the beginning of the next
+ line if it moved past a line comment.
+
+ This function does not do any hidden buffer changes."
+
+ (let ((start (point)))
+ (when (looking-at "\\([ \t\n\r\f\v]\\|\\\\[\n\r]\\)+")
+ (goto-char (match-end 0)))
+
+ (when (forward-comment 1)
+ (if (eobp)
+ ;; Some emacsen (e.g. XEmacs 21) return t when moving
+ ;; forwards at eob.
+ nil
+
+ ;; Emacs includes the ending newline in a b-style (c++)
+ ;; comment, but XEmacs doesn't. We depend on the Emacs
+ ;; behavior (which also is symmetric).
+ (if (and (eolp) (elt (parse-partial-sexp start (point)) 7))
+ (condition-case nil (forward-char 1)))
+
+ t))))
+
+ (defsubst c-forward-comments ()
+ "Move forward past all following whitespace and comments.
+ Line continuations, i.e. a backslashes followed by line breaks, are
+ treated as whitespace.
+
+ This function does not do any hidden buffer changes."
+
+ (while (or
+ ;; If forward-comment in at least XEmacs 21 is given a large
+ ;; positive value, it'll loop all the way through if it hits
+ ;; eob.
+ (and (forward-comment 5)
+ ;; Some emacsen (e.g. XEmacs 21) return t when moving
+ ;; forwards at eob.
+ (not (eobp)))
+
+ (when (looking-at "\\\\[\n\r]")
+ (forward-char 2)
+ t))))
+
+ (defun c-backward-single-comment ()
+ "Move backward past whitespace and the closest preceding comment, if any.
+ Return t if a comment was found, nil otherwise. In either case, the
+ point is moved past the preceding whitespace. Line continuations,
+ i.e. a backslashes followed by line breaks, are treated as whitespace.
+ The line breaks that end line comments are considered to be the
+ comment enders, so the point cannot be at the end of the same line to
+ move over a line comment.
+
+ This function does not do any hidden buffer changes."
+
+ (let ((start (point)))
+ ;; When we got newline terminated comments, forward-comment in all
+ ;; supported emacsen so far will stop at eol of each line not
+ ;; ending with a comment when moving backwards. This corrects for
+ ;; that, and at the same time handles line continuations.
+ (while (progn
+ (skip-chars-backward " \t\n\r\f\v")
+ (and (looking-at "[\n\r]")
+ (eq (char-before) ?\\)
+ (< (point) start)))
+ (backward-char))
+
+ (if (bobp)
+ ;; Some emacsen (e.g. Emacs 19.34) return t when moving
+ ;; backwards at bob.
+ nil
+
+ ;; Leave point after the closest following newline if we've
+ ;; backed up over any above, since forward-comment won't move
+ ;; backward over a line comment if point is at the end of the
+ ;; same line.
+ (re-search-forward "\\=\\s *[\n\r]" start t)
+
+ (if (if (forward-comment -1)
+ (if (eolp)
+ ;; If forward-comment above succeeded and we're at eol
+ ;; then the newline we moved over above didn't end a
+ ;; line comment, so we give it another go.
+ (forward-comment -1)
+ t))
+
+ ;; Emacs <= 20 and XEmacs move back over the closer of a
+ ;; block comment that lacks an opener.
+ (if (looking-at "\\*/")
+ (progn (forward-char 2) nil)
+ t)))))
+
+ (defsubst c-backward-comments ()
+ "Move backward past all preceding whitespace and comments.
+ Line continuations, i.e. a backslashes followed by line breaks, are
+ treated as whitespace. The line breaks that end line comments are
+ considered to be the comment enders, so the point cannot be at the end
+ of the same line to move over a line comment.
+
+ This function does not do any hidden buffer changes."
+
+ (let ((start (point)))
+ (while (and
+ ;; `forward-comment' in some emacsen (e.g. Emacs 19.34)
+ ;; return t when moving backwards at bob.
+ (not (bobp))
+
+ (if (forward-comment -1)
+ (if (looking-at "\\*/")
+ ;; Emacs <= 20 and XEmacs move back over the
+ ;; closer of a block comment that lacks an opener.
+ (progn (forward-char 2) nil)
+ t)
+
+ ;; XEmacs treats line continuations as whitespace but
+ ;; only in the backward direction, which seems a bit
+ ;; odd. Anyway, this is necessary for Emacs.
+ (when (and (looking-at "[\n\r]")
+ (eq (char-before) ?\\)
+ (< (point) start))
+ (backward-char)
+ t))))))
+
+
+ ;; Basic handling of preprocessor directives.
+
;; This is a dynamically bound cache used together with
! ;; `c-query-macro-start' and `c-query-and-set-macro-start'. It only
! ;; works as long as point doesn't cross a macro boundary.
(defvar c-macro-start 'unknown)
(defsubst c-query-and-set-macro-start ()
+ ;; This function does not do any hidden buffer changes.
(if (symbolp c-macro-start)
(setq c-macro-start (save-excursion
(and (c-beginning-of-macro)
***************
*** 510,515 ****
--- 1023,1029 ----
c-macro-start))
(defsubst c-query-macro-start ()
+ ;; This function does not do any hidden buffer changes.
(if (symbolp c-macro-start)
(save-excursion
(and (c-beginning-of-macro)
***************
*** 517,542 ****
c-macro-start))
(defun c-beginning-of-macro (&optional lim)
! "Go to the beginning of a cpp macro definition.
! Leave point at the beginning of the macro and return t if in a cpp
! macro definition, otherwise return nil and leave point unchanged."
! (let ((here (point)))
! (save-restriction
! (if lim (narrow-to-region lim (point-max)))
! (beginning-of-line)
! (while (eq (char-before (1- (point))) ?\\)
! (forward-line -1))
! (back-to-indentation)
! (if (and (<= (point) here)
! (looking-at "#[ \t]*[a-zA-Z0-9!]"))
! t
! (goto-char here)
! nil))))
(defun c-end-of-macro ()
! "Go to the end of a cpp macro definition.
More accurately, move point to the end of the closest following line
! that doesn't end with a line continuation backslash."
(while (progn
(end-of-line)
(when (and (eq (char-before) ?\\)
--- 1031,1061 ----
c-macro-start))
(defun c-beginning-of-macro (&optional lim)
! "Go to the beginning of a preprocessor directive.
! Leave point at the beginning of the directive and return t if in one,
! otherwise return nil and leave point unchanged.
!
! This function does not do any hidden buffer changes."
! (when c-opt-cpp-prefix
! (let ((here (point)))
! (save-restriction
! (if lim (narrow-to-region lim (point-max)))
! (beginning-of-line)
! (while (eq (char-before (1- (point))) ?\\)
! (forward-line -1))
! (back-to-indentation)
! (if (and (<= (point) here)
! (looking-at c-opt-cpp-start))
! t
! (goto-char here)
! nil)))))
(defun c-end-of-macro ()
! "Go to the end of a preprocessor directive.
More accurately, move point to the end of the closest following line
! that doesn't end with a line continuation backslash.
!
! This function does not do any hidden buffer changes."
(while (progn
(end-of-line)
(when (and (eq (char-before) ?\\)
***************
*** 544,1114 ****
(forward-char)
t))))
! (defun c-forward-comment (count)
! ;; Insulation from various idiosyncrasies in implementations of
! ;; `forward-comment'.
! ;;
! ;; Note: Some emacsen considers incorrectly that any line comment
! ;; ending with a backslash continues to the next line. I can't
! ;; think of any way to work around that in a reliable way without
! ;; changing the buffer, though. Suggestions welcome. ;) (No,
! ;; temporarily changing the syntax for backslash doesn't work since
! ;; we must treat escapes in string literals correctly.)
! ;;
! ;; Another note: When moving backwards over a block comment, there's
! ;; a bug in forward-comment that can make it stop at "/*" inside a
! ;; line comment. Haven't yet found a reasonably cheap way to kludge
! ;; around that one either. :\
! (let ((here (point)))
! (if (>= count 0)
! (when (forward-comment count)
! (if (eobp)
! ;; Some emacsen (e.g. XEmacs 21) return t when moving
! ;; forwards at eob.
! nil
! ;; Emacs includes the ending newline in a b-style (c++)
! ;; comment, but XEmacs doesn't. We depend on the Emacs
! ;; behavior (which also is symmetric).
! (if (and (eolp) (nth 7 (parse-partial-sexp here (point))))
! (condition-case nil (forward-char 1)))
! t))
! ;; When we got newline terminated comments,
! ;; forward-comment in all supported emacsen so far will
! ;; stop at eol of each line not ending with a comment when
! ;; moving backwards. The following corrects for it when
! ;; count is -1. The other common case, when count is
! ;; large and negative, works regardless. It's too much
! ;; work to correct for the rest of the cases.
! (skip-chars-backward " \t\n\r\f")
! (if (bobp)
! ;; Some emacsen return t when moving backwards at bob.
! nil
! (re-search-forward "[\n\r]" here t)
! (let* ((res (if (forward-comment count)
! (if (eolp) (forward-comment -1) t)))
! (savepos (point)))
! ;; XEmacs treats line continuations as whitespace (but only
! ;; in the backward direction).
! (while (and (progn (end-of-line) (< (point) here))
! (eq (char-before) ?\\))
! (setq res nil
! savepos (point))
! (forward-line))
! (goto-char savepos)
! res)))))
!
! (defun c-forward-comment-lc (count)
! ;; Like `c-forward-comment', but treat line continuations as
! ;; whitespace.
! (catch 'done
! (if (> count 0)
! (while (if (c-forward-comment 1)
! (progn
! (setq count (1- count))
! (> count 0))
! (if (looking-at "\\\\$")
! (progn
! (forward-char)
! t)
! (throw 'done nil))))
! (while (if (c-forward-comment -1)
! (progn
! (setq count (1+ count))
! (< count 0))
! (if (and (eolp) (eq (char-before) ?\\))
! (progn
! (backward-char)
! t)
! (throw 'done nil)))))
! t))
! (defun c-forward-syntactic-ws (&optional lim)
! "Forward skip of syntactic whitespace.
! Syntactic whitespace is defined as whitespace characters, comments,
! and preprocessor directives. However if point starts inside a comment
! or preprocessor directive, the content of it is not treated as
! whitespace. LIM sets an upper limit of the forward movement, if
! specified."
! (let ((here (point-max)))
! (or lim (setq lim here))
! (while (/= here (point))
! ;; If forward-comment in at least XEmacs 21 is given a large
! ;; positive value, it'll loop all the way through if it hits eob.
! (while (c-forward-comment 5))
! (setq here (point))
! (cond
! ;; Skip line continuations.
! ((looking-at "\\\\$")
! (forward-char))
! ;; Skip preprocessor directives.
! ((and (looking-at "#[ \t]*[a-zA-Z0-9!]")
! (save-excursion
! (skip-chars-backward " \t")
! (bolp)))
! (end-of-line)
! (while (and (<= (point) lim)
! (eq (char-before) ?\\)
! (= (forward-line 1) 0))
! (end-of-line))
! (when (> (point) lim)
! ;; Don't move past the macro if that'd take us past the limit.
! (goto-char here)))
! ;; Skip in-comment line continuations (used for Pike refdoc).
! ((and c-opt-in-comment-lc (looking-at c-opt-in-comment-lc))
! (goto-char (match-end 0)))))
! (goto-char (min (point) lim))))
!
! (defun c-backward-syntactic-ws (&optional lim)
! "Backward skip of syntactic whitespace.
! Syntactic whitespace is defined as whitespace characters, comments,
! and preprocessor directives. However if point starts inside a comment
! or preprocessor directive, the content of it is not treated as
! whitespace. LIM sets a lower limit of the backward movement, if
! specified."
! (let ((start-line (c-point 'bol))
! (here (point-min))
! (line-cont 'maybe)
! prev-pos)
! (or lim (setq lim here))
! (while (/= here (point))
! (setq prev-pos (point))
! ;; If forward-comment in Emacs 19.34 is given a large negative
! ;; value, it'll loop all the way through if it hits bob.
! (while (c-forward-comment -5))
! (setq here (point))
! (cond
! ((and (eolp)
! (eq (char-before) ?\\)
! (if (<= prev-pos (c-point 'eonl))
! t
! ;; Passed a line continuation, but not from the line we
! ;; started on.
! (forward-char)
! (setq line-cont nil)))
! (backward-char)
! (setq line-cont t))
! ((progn
! (when (eq line-cont 'maybe)
! (save-excursion
! (end-of-line)
! (setq line-cont (eq (char-before) ?\\))))
! (or line-cont
! (and (< (point) start-line)
! (c-beginning-of-macro))))
! (if (< (point) lim)
! ;; Don't move past the macro if we began inside it or at
! ;; the end of the same line, or if the move would take us
! ;; past the limit.
! (goto-char here))
! (setq line-cont nil))
! ;; Skip in-comment line continuations (used for Pike refdoc).
! ((and c-opt-in-comment-lc
! (save-excursion
! (and (c-safe (beginning-of-line)
! (backward-char 2)
! t)
! (looking-at c-opt-in-comment-lc)
! (eq (match-end 0) here))))
! (goto-char (match-beginning 0)))))
! (goto-char (max (point) lim))))
! (defun c-forward-token-1 (&optional count balanced lim)
! "Move forward by tokens.
! A token is defined as all symbols and identifiers which aren't
! syntactic whitespace \(note that e.g. \"->\" is considered to be two
! tokens). Point is always either left at the beginning of a token or
! not moved at all. COUNT specifies the number of tokens to move; a
! negative COUNT moves in the opposite direction. A COUNT of 0 moves to
! the next token beginning only if not already at one. If BALANCED is
! true, move over balanced parens, otherwise move into them. Also, if
! BALANCED is true, never move out of an enclosing paren. LIM sets the
! limit for the movement and defaults to the point limit.
! Return the number of tokens left to move \(positive or negative). If
! BALANCED is true, a move over a balanced paren counts as one. Note
! that if COUNT is 0 and no appropriate token beginning is found, 1 will
! be returned. Thus, a return value of 0 guarantees that point is at
! the requested position and a return value less \(without signs) than
! COUNT guarantees that point is at the beginning of some token."
! (or count (setq count 1))
! (if (< count 0)
! (- (c-backward-token-1 (- count) balanced lim))
! (let ((jump-syntax (if balanced
! '(?w ?_ ?\( ?\) ?\" ?\\ ?/ ?$ ?')
! '(?w ?_ ?\" ?\\ ?/ ?')))
! (last (point))
! (prev (point)))
! (save-restriction
! (if lim (narrow-to-region (point-min) lim))
! (if (/= (point)
! (progn (c-forward-syntactic-ws) (point)))
! ;; Skip whitespace. Count this as a move if we did in fact
! ;; move and aren't out of bounds.
! (or (eobp)
! (setq count (max (1- count) 0))))
! (if (and (= count 0)
! (or (and (memq (char-syntax (or (char-after) ? )) '(?w ?_))
! (memq (char-syntax (or (char-before) ? )) '(?w ?_)))
! (eobp)))
! ;; If count is zero we should jump if in the middle of a
! ;; token or if there is whitespace between point and the
! ;; following token beginning.
! (setq count 1))
! (if (eobp)
! (goto-char last)
! ;; Avoid having the limit tests inside the loop.
! (condition-case nil
! (while (> count 0)
! (setq prev last
! last (point))
! (if (memq (char-syntax (char-after)) jump-syntax)
! (goto-char (scan-sexps (point) 1))
! (forward-char))
! (c-forward-syntactic-ws)
! (setq count (1- count)))
! (error (goto-char last)))
! (when (eobp)
! (goto-char prev)
! (setq count (1+ count)))))
! count)))
- (defun c-backward-token-1 (&optional count balanced lim)
- "Move backward by tokens.
- See `c-forward-token-1' for details."
- (or count (setq count 1))
- (if (< count 0)
- (- (c-forward-token-1 (- count) balanced lim))
- (let ((jump-syntax (if balanced
- '(?w ?_ ?\( ?\) ?\" ?\\ ?/ ?$ ?')
- '(?w ?_ ?\" ?\\ ?/ ?')))
- last)
- (if (and (= count 0)
- (or (and (memq (char-syntax (or (char-after) ? )) '(?w ?_))
- (memq (char-syntax (or (char-before) ? )) '(?w ?_)))
- (/= (point)
- (save-excursion
- (c-forward-syntactic-ws (1+ lim))
- (point)))
- (eobp)))
- ;; If count is zero we should jump if in the middle of a
- ;; token or if there is whitespace between point and the
- ;; following token beginning.
- (setq count 1))
- (save-restriction
- (if lim (narrow-to-region lim (point-max)))
- (or (bobp)
(progn
! ;; Avoid having the limit tests inside the loop.
! (condition-case nil
! (while (progn
! (setq last (point))
! (> count 0))
! (c-backward-syntactic-ws)
! (if (memq (char-syntax (char-before)) jump-syntax)
! (goto-char (scan-sexps (point) -1))
! (backward-char))
! (setq count (1- count)))
! (error (goto-char last)))
! (if (bobp) (goto-char last)))))
! count)))
! (defun c-syntactic-re-search-forward (regexp &optional bound noerror count
! paren-level)
! ;; Like `re-search-forward', but only report matches that are found
! ;; in syntactically significant text. I.e. matches that begins in
! ;; comments, macros or string literals are ignored. The start point
! ;; is assumed to be outside any comment, macro or string literal, or
! ;; else the content of that region is taken as syntactically
! ;; significant text. If PAREN-LEVEL is non-nil, an additional
! ;; restriction is added to ignore matches in nested paren sexps, and
! ;; the search will also not go outside the current paren sexp.
! (or bound (setq bound (point-max)))
! (or count (setq count 1))
! (if paren-level (setq paren-level -1))
! (let ((start (point))
! (pos (point))
! match-pos state)
! (condition-case err
! (while (and (> count 0)
! (re-search-forward regexp bound noerror))
! (setq match-pos (point)
! state (parse-partial-sexp pos (match-beginning 0)
! paren-level nil state)
! pos (point))
! (cond ((nth 3 state)
! ;; Match inside a string. Skip to the end of it
! ;; before continuing.
! (let ((ender (make-string 1 (nth 3 state))))
! (while (progn
! (search-forward ender bound noerror)
! (setq state (parse-partial-sexp pos (point)
! nil nil state)
! pos (point))
! (nth 3 state)))))
! ((nth 7 state)
! ;; Match inside a line comment. Skip to eol. Use
! ;; re-search-forward for it to get the right bound
! ;; behavior.
! (re-search-forward "[\n\r]" bound noerror))
! ((nth 4 state)
! ;; Match inside a block comment. Skip to the '*/'.
! (re-search-forward "\\*/" bound noerror))
! ((save-excursion (c-beginning-of-macro start))
! ;; Match inside a macro. Skip to the end of it.
! (c-end-of-macro))
! ((and paren-level (/= (car state) 0))
! (if (> (car state) 0)
! ;; Match inside a nested paren sexp. Skip out of it.
! (setq state (parse-partial-sexp pos bound 0 nil state)
! pos (point))
! ;; Have exited the current paren sexp. The
! ;; parse-partial-sexp above has left us just after
! ;; the closing paren in this case. Just make
! ;; re-search-forward above fail in the appropriate
! ;; way; we'll adjust the leave off point below if
! ;; necessary.
! (setq bound (point))))
! (t
! ;; A real match.
! (setq count (1- count)))))
! (error
! (goto-char start)
! (signal (car err) (cdr err))))
! (if (= count 0)
! (progn
! (goto-char match-pos)
! match-pos)
! ;; Search failed. Set point as appropriate.
! (cond ((eq noerror t)
! (goto-char start))
! (paren-level
! (if (eq (car (parse-partial-sexp pos bound -1 nil state)) -1)
! (backward-char)))
! (t
! (goto-char bound)))
! nil)))
!
! (defun c-in-literal (&optional lim detect-cpp)
! "Return the type of literal point is in, if any.
! The return value is `c' if in a C-style comment, `c++' if in a C++
! style comment, `string' if in a string literal, `pound' if DETECT-CPP
! is non-nil and on a preprocessor line, or nil if somewhere else.
! Optional LIM is used as the backward limit of the search. If omitted,
! or nil, `c-beginning-of-defun' is used.
! The last point calculated is cached if the cache is enabled, i.e. if
! `c-in-literal-cache' is bound to a two element vector."
! (if (and (vectorp c-in-literal-cache)
! (= (point) (aref c-in-literal-cache 0)))
! (aref c-in-literal-cache 1)
! (let ((rtn (save-excursion
! (let* ((lim (or lim (c-point 'bod)))
! (state (parse-partial-sexp lim (point))))
! (cond
! ((nth 3 state) 'string)
! ((nth 4 state) (if (nth 7 state) 'c++ 'c))
! ((and detect-cpp (c-beginning-of-macro lim)) 'pound)
! (t nil))))))
! ;; cache this result if the cache is enabled
! (if (not c-in-literal-cache)
! (setq c-in-literal-cache (vector (point) rtn)))
! rtn)))
! ;; XEmacs has a built-in function that should make this much quicker.
! ;; I don't think we even need the cache, which makes our lives more
! ;; complicated anyway. In this case, lim is only used to detect
! ;; cpp directives.
! (defun c-fast-in-literal (&optional lim detect-cpp)
! (let ((context (buffer-syntactic-context)))
! (cond
! ((eq context 'string) 'string)
! ((eq context 'comment) 'c++)
! ((eq context 'block-comment) 'c)
! ((and detect-cpp (save-excursion (c-beginning-of-macro lim))) 'pound))))
! (if (fboundp 'buffer-syntactic-context)
! (defalias 'c-in-literal 'c-fast-in-literal))
! (defun c-literal-limits (&optional lim near not-in-delimiter)
! "Return a cons of the beginning and end positions of the comment or
! string surrounding point (including both delimiters), or nil if point
! isn't in one. If LIM is non-nil, it's used as the \"safe\" position
! to start parsing from. If NEAR is non-nil, then the limits of any
! literal next to point is returned. \"Next to\" means there's only [
! \t] between point and the literal. The search for such a literal is
! done first in forward direction. If NOT-IN-DELIMITER is non-nil, the
! case when point is inside a starting delimiter won't be recognized.
! This only has effect for comments, which have starting delimiters with
! more than one character."
! (save-excursion
! (let* ((pos (point))
! (lim (or lim (c-point 'bod)))
! (state (parse-partial-sexp lim (point))))
! (cond ((nth 3 state)
! ;; String. Search backward for the start.
! (while (nth 3 state)
! (search-backward (make-string 1 (nth 3 state)))
! (setq state (parse-partial-sexp lim (point))))
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
! ((nth 7 state)
! ;; Line comment. Search from bol for the comment starter.
! (beginning-of-line)
! (setq state (parse-partial-sexp lim (point))
! lim (point))
! (while (not (nth 7 state))
! (search-forward "//") ; Should never fail.
! (setq state (parse-partial-sexp
! lim (point) nil nil state)
! lim (point)))
! (backward-char 2)
! (cons (point) (progn (c-forward-comment 1) (point))))
! ((nth 4 state)
! ;; Block comment. Search backward for the comment starter.
! (while (nth 4 state)
! (search-backward "/*") ; Should never fail.
! (setq state (parse-partial-sexp lim (point))))
! (cons (point) (progn (c-forward-comment 1) (point))))
! ((and (not not-in-delimiter)
! (not (nth 5 state))
! (eq (char-before) ?/)
! (looking-at "[/*]"))
! ;; We're standing in a comment starter.
! (backward-char 1)
! (cons (point) (progn (c-forward-comment 1) (point))))
! (near
! (goto-char pos)
! ;; Search forward for a literal.
! (skip-chars-forward " \t")
! (cond
! ((eq (char-syntax (or (char-after) ?\ )) ?\") ; String.
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
! ((looking-at "/[/*]") ; Line or block comment.
! (cons (point) (progn (c-forward-comment 1) (point))))
! (t
! ;; Search backward.
! (skip-chars-backward " \t")
! (let ((end (point)) beg)
! (cond
! ((eq (char-syntax (or (char-before) ?\ )) ?\") ; String.
! (setq beg (c-safe (c-backward-sexp 1) (point))))
! ((and (c-safe (forward-char -2) t)
! (looking-at "*/"))
! ;; Block comment. Due to the nature of line
! ;; comments, they will always be covered by the
! ;; normal case above.
! (goto-char end)
! (c-forward-comment -1)
! ;; If LIM is bogus, beg will be bogus.
! (setq beg (point))))
! (if beg (cons beg end))))))
! ))))
!
! (defun c-literal-limits-fast (&optional lim near not-in-delimiter)
! ;; Like c-literal-limits, but for emacsen whose `parse-partial-sexp'
! ;; returns the pos of the comment start.
! (save-excursion
! (let* ((pos (point))
! (lim (or lim (c-point 'bod)))
! (state (parse-partial-sexp lim (point))))
! (cond ((nth 3 state) ; String.
! (goto-char (nth 8 state))
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
! ((nth 4 state) ; Comment.
! (goto-char (nth 8 state))
! (cons (point) (progn (c-forward-comment 1) (point))))
! ((and (not not-in-delimiter)
! (not (nth 5 state))
! (eq (char-before) ?/)
! (looking-at "[/*]"))
! ;; We're standing in a comment starter.
! (backward-char 1)
! (cons (point) (progn (c-forward-comment 1) (point))))
! (near
! (goto-char pos)
! ;; Search forward for a literal.
! (skip-chars-forward " \t")
! (cond
! ((eq (char-syntax (or (char-after) ?\ )) ?\") ; String.
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
! ((looking-at "/[/*]") ; Line or block comment.
! (cons (point) (progn (c-forward-comment 1) (point))))
! (t
! ;; Search backward.
! (skip-chars-backward " \t")
! (let ((end (point)) beg)
! (cond
! ((eq (char-syntax (or (char-before) ?\ )) ?\") ; String.
! (setq beg (c-safe (c-backward-sexp 1) (point))))
! ((and (c-safe (forward-char -2) t)
! (looking-at "*/"))
! ;; Block comment. Due to the nature of line
! ;; comments, they will always be covered by the
! ;; normal case above.
! (goto-char end)
! (c-forward-comment -1)
! ;; If LIM is bogus, beg will be bogus.
! (setq beg (point))))
! (if beg (cons beg end))))))
! ))))
! (if (c-safe (> (length (save-excursion (parse-partial-sexp 1 1))) 8))
! (defalias 'c-literal-limits 'c-literal-limits-fast))
!
! (defun c-collect-line-comments (range)
! "If the argument is a cons of two buffer positions (such as returned by
! `c-literal-limits'), and that range contains a C++ style line comment,
! then an extended range is returned that contains all adjacent line
! comments (i.e. all comments that starts in the same column with no
! empty lines or non-whitespace characters between them). Otherwise the
! argument is returned."
! (save-excursion
! (condition-case nil
! (if (and (consp range) (progn
! (goto-char (car range))
! (looking-at "//")))
! (let ((col (current-column))
! (beg (point))
! (bopl (c-point 'bopl))
! (end (cdr range)))
! ;; Got to take care in the backward direction to handle
! ;; comments which are preceded by code.
! (while (and (c-forward-comment -1)
! (>= (point) bopl)
! (looking-at "//")
! (= col (current-column)))
! (setq beg (point)
! bopl (c-point 'bopl)))
! (goto-char end)
! (while (and (progn (skip-chars-forward " \t")
! (looking-at "//"))
! (= col (current-column))
! (prog1 (zerop (forward-line 1))
! (setq end (point)))))
! (cons beg end))
! range)
! (error range))))
! (defun c-literal-type (range)
! "Convenience function that given the result of `c-literal-limits',
! returns nil or the type of literal that the range surrounds. It's
! much faster than using `c-in-literal' and is intended to be used when
! you need both the type of a literal and its limits."
! (if (consp range)
! (save-excursion
! (goto-char (car range))
! (cond ((eq (char-syntax (or (char-after) ?\ )) ?\") 'string)
! ((looking-at "//") 'c++)
! (t 'c))) ; Assuming the range is valid.
! range))
! ;; utilities for moving and querying around syntactic elements
(defvar c-state-cache nil)
(make-variable-buffer-local 'c-state-cache)
--- 1063,1670 ----
(forward-char)
t))))
! (defun c-forward-to-cpp-define-body ()
! ;; Assuming point is at the "#" that introduces a preprocessor
! ;; directive, it's moved forward to the start of the definition body
! ;; if it's a "#define". Non-nil is returned in this case, in all
! ;; other cases nil is returned and point isn't moved.
! (when (and (looking-at
! (concat "#[ \t]*"
! "define[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?"
! "\\([ \t]\\|\\\\\n\\)*"))
! (not (= (match-end 0) (c-point 'eol))))
! (goto-char (match-end 0))))
!
! ;; Tools for skipping over syntactic whitespace.
! ;; The following functions use text properties to cache searches over
! ;; large regions of syntactic whitespace. It works as follows:
! ;;
! ;; o If a syntactic whitespace region contains anything but simple
! ;; whitespace (i.e. space, tab and line breaks), the text property
! ;; `c-in-sws' is put over it. At places where we have stopped
! ;; within that region there's also a `c-is-sws' text property.
! ;; That since there typically are nested whitespace inside that
! ;; must be handled separately, e.g. whitespace inside a comment or
! ;; cpp directive. Thus, from one point with `c-is-sws' it's safe
! ;; to jump to another point with that property within the same
! ;; `c-in-sws' region. It can be likened to a ladder where
! ;; `c-in-sws' marks the bars and `c-is-sws' the rungs.
! ;;
! ;; o The `c-is-sws' property is put on the simple whitespace chars at
! ;; a "rung position" and also maybe on the first following char.
! ;; As many characters as can be conveniently found in this range
! ;; are marked, but no assumption can be made that the whole range
! ;; is marked (it could be clobbered by later changes, for
! ;; instance).
! ;;
! ;; Note that some part of the beginning of a sequence of simple
! ;; whitespace might be part of the end of a preceding line comment
! ;; or cpp directive and must not be considered part of the "rung".
! ;; Such whitespace is some amount of horizontal whitespace followed
! ;; by a newline. In the case of cpp directives it could also be
! ;; two newlines with horizontal whitespace between them.
! ;;
! ;; The reason to include the first following char is to cope with
! ;; "rung positions" that doesn't have any ordinary whitespace. If
! ;; `c-is-sws' is put on a token character it does not have
! ;; `c-in-sws' set simultaneously. That's the only case when that
! ;; can occur, and the reason for not extending the `c-in-sws'
! ;; region to cover it is that the `c-in-sws' region could then be
! ;; accidentally merged with a following one if the token is only
! ;; one character long.
! ;;
! ;; o On buffer changes the `c-in-sws' and `c-is-sws' properties are
! ;; removed in the changed region. If the change was inside
! ;; syntactic whitespace that means that the "ladder" is broken, but
! ;; a later call to `c-forward-sws' or `c-backward-sws' will use the
! ;; parts on either side and use an ordinary search only to "repair"
! ;; the gap.
! ;;
! ;; Special care needs to be taken if a region is removed: If there
! ;; are `c-in-sws' on both sides of it which do not connect inside
! ;; the region then they can't be joined. If e.g. a marked macro is
! ;; broken, syntactic whitespace inside the new text might be
! ;; marked. If those marks would become connected with the old
! ;; `c-in-sws' range around the macro then we could get a ladder
! ;; with one end outside the macro and the other at some whitespace
! ;; within it.
! ;;
! ;; The main motivation for this system is to increase the speed in
! ;; skipping over the large whitespace regions that can occur at the
! ;; top level in e.g. header files that contain a lot of comments and
! ;; cpp directives. For small comments inside code it's probably
! ;; slower than using `forward-comment' straightforwardly, but speed is
! ;; not a significant factor there anyway.
!
! ; (defface c-debug-is-sws-face
! ; '((t (:background "GreenYellow")))
! ; "Debug face to mark the `c-is-sws' property.")
! ; (defface c-debug-in-sws-face
! ; '((t (:underline t)))
! ; "Debug face to mark the `c-in-sws' property.")
!
! ; (defun c-debug-put-sws-faces ()
! ; ;; Put the sws debug faces on all the `c-is-sws' and `c-in-sws'
! ; ;; properties in the buffer.
! ; (interactive)
! ; (save-excursion
! ; (let (in-face)
! ; (goto-char (point-min))
! ; (setq in-face (if (get-text-property (point) 'c-is-sws)
! ; (point)))
! ; (while (progn
! ; (goto-char (next-single-property-change
! ; (point) 'c-is-sws nil (point-max)))
! ; (if in-face
! ; (progn
! ; (c-debug-add-face in-face (point) 'c-debug-is-sws-face)
! ; (setq in-face nil))
! ; (setq in-face (point)))
! ; (not (eobp))))
! ; (goto-char (point-min))
! ; (setq in-face (if (get-text-property (point) 'c-in-sws)
! ; (point)))
! ; (while (progn
! ; (goto-char (next-single-property-change
! ; (point) 'c-in-sws nil (point-max)))
! ; (if in-face
! ; (progn
! ; (c-debug-add-face in-face (point) 'c-debug-in-sws-face)
! ; (setq in-face nil))
! ; (setq in-face (point)))
! ; (not (eobp)))))))
!
! (defmacro c-debug-sws-msg (&rest args)
! ;;`(message ,@args)
! )
!
! (defmacro c-put-is-sws (beg end)
! `(let ((beg ,beg) (end ,end))
! (put-text-property beg end 'c-is-sws t)
! ,@(when (facep 'c-debug-is-sws-face)
! `((c-debug-add-face beg end 'c-debug-is-sws-face)))))
!
! (defmacro c-put-in-sws (beg end)
! `(let ((beg ,beg) (end ,end))
! (put-text-property beg end 'c-in-sws t)
! ,@(when (facep 'c-debug-is-sws-face)
! `((c-debug-add-face beg end 'c-debug-in-sws-face)))))
!
! (defmacro c-remove-is-sws (beg end)
! `(let ((beg ,beg) (end ,end))
! (remove-text-properties beg end '(c-is-sws nil))
! ,@(when (facep 'c-debug-is-sws-face)
! `((c-debug-remove-face beg end 'c-debug-is-sws-face)))))
!
! (defmacro c-remove-in-sws (beg end)
! `(let ((beg ,beg) (end ,end))
! (remove-text-properties beg end '(c-in-sws nil))
! ,@(when (facep 'c-debug-is-sws-face)
! `((c-debug-remove-face beg end 'c-debug-in-sws-face)))))
!
! (defmacro c-remove-is-and-in-sws (beg end)
! `(let ((beg ,beg) (end ,end))
! (remove-text-properties beg end '(c-is-sws nil c-in-sws nil))
! ,@(when (facep 'c-debug-is-sws-face)
! `((c-debug-remove-face beg end 'c-debug-is-sws-face)
! (c-debug-remove-face beg end 'c-debug-in-sws-face)))))
!
! (defsubst c-invalidate-sws-region-after (beg end)
! ;; Called from `after-change-functions'. Note that if
! ;; `c-forward-sws' or `c-backward-sws' are used outside
! ;; `c-save-buffer-state' or similar then this will remove the cache
! ;; properties right after they're added.
! (save-excursion
! ;; Adjust the end to remove the properties in any following simple
! ;; ws up to and including the next line break, if there is any
! ;; after the changed region. This is necessary e.g. when a rung
! ;; marked empty line is converted to a line comment by inserting
! ;; "//" before the line break. In that case the line break would
! ;; keep the rung mark which could make a later `c-backward-sws'
! ;; move into the line comment instead of over it.
! (goto-char end)
! (skip-chars-forward " \t\f\v")
! (when (and (eolp) (not (eobp)))
! (setq end (1+ (point)))))
!
! (when (and (= beg end)
! (get-text-property beg 'c-in-sws)
! (not (bobp))
! (get-text-property (1- beg) 'c-in-sws))
! ;; Ensure that an `c-in-sws' range gets broken. Note that it isn't
! ;; safe to keep a range that was continuous before the change. E.g:
! ;;
! ;; #define foo
! ;; \
! ;; bar
! ;;
! ;; There can be a "ladder" between "#" and "b". Now, if the newline
! ;; after "foo" is removed then "bar" will become part of the cpp
! ;; directive instead of a syntactically relevant token. In that
! ;; case there's no longer syntactic ws from "#" to "b".
! (setq beg (1- beg)))
!
! (c-debug-sws-msg "c-invalidate-sws-region-after [%s..%s]" beg end)
! (c-remove-is-and-in-sws beg end))
!
! (defun c-forward-sws ()
! ;; Used by `c-forward-syntactic-ws' to implement the unbounded search.
!
! (let (;; `rung-pos' is set to a position as early as possible in the
! ;; unmarked part of the simple ws region.
! (rung-pos (point)) next-rung-pos rung-end-pos last-put-in-sws-pos
! rung-is-marked next-rung-is-marked simple-ws-end
! ;; `safe-start' is set when it's safe to cache the start position.
! ;; It's not set if we've initially skipped over comments and line
! ;; continuations since we might have gone out through the end of a
! ;; macro then. This provision makes `c-forward-sws' not populate the
! ;; cache in the majority of cases, but otoh is `c-backward-sws' by far
! ;; more common.
! safe-start)
!
! ;; Skip simple ws and do a quick check on the following character to see
! ;; if it's anything that can't start syntactic ws, so we can bail out
! ;; early in the majority of cases when there just are a few ws chars.
! (skip-chars-forward " \t\n\r\f\v")
! (when (looking-at c-syntactic-ws-start)
!
! (setq rung-end-pos (min (1+ (point)) (point-max)))
! (if (setq rung-is-marked (text-property-any rung-pos rung-end-pos
! 'c-is-sws t))
! ;; Find the last rung position to avoid setting properties in all
! ;; the cases when the marked rung is complete.
! ;; (`next-single-property-change' is certain to move at least one
! ;; step forward.)
! (setq rung-pos (1- (next-single-property-change
! rung-is-marked 'c-is-sws nil rung-end-pos)))
! ;; Got no marked rung here. Since the simple ws might have started
! ;; inside a line comment or cpp directive we must set `rung-pos' as
! ;; high as possible.
! (setq rung-pos (point)))
!
! (while
! (progn
! (while
! (when (and rung-is-marked
! (get-text-property (point) 'c-in-sws))
!
! ;; The following search is the main reason that `c-in-sws'
! ;; and `c-is-sws' aren't combined to one property.
! (goto-char (next-single-property-change
! (point) 'c-in-sws nil (point-max)))
! (unless (get-text-property (point) 'c-is-sws)
! ;; If the `c-in-sws' region extended past the last
! ;; `c-is-sws' char we have to go back a bit.
! (or (get-text-property (1- (point)) 'c-is-sws)
! (goto-char (previous-single-property-change
! (point) 'c-is-sws)))
! (backward-char))
!
! (c-debug-sws-msg
! "c-forward-sws cached move %s -> %s (max %s)"
! rung-pos (point) (point-max))
!
! (setq rung-pos (point))
! (and (> (skip-chars-forward " \t\n\r\f\v") 0)
! (not (eobp))))
!
! ;; We'll loop here if there is simple ws after the last rung.
! ;; That means that there's been some change in it and it's
! ;; possible that we've stepped into another ladder, so extend
! ;; the previous one to join with it if there is one, and try to
! ;; use the cache again.
! (c-debug-sws-msg
! "c-forward-sws extending rung with [%s..%s] (max %s)"
! (1+ rung-pos) (1+ (point)) (point-max))
! (unless (get-text-property (point) 'c-is-sws)
! ;; Remove any `c-in-sws' property from the last char of
! ;; the rung before we mark it with `c-is-sws', so that we
! ;; won't connect with the remains of a broken "ladder".
! (c-remove-in-sws (point) (1+ (point))))
! (c-put-is-sws (1+ rung-pos)
! (1+ (point)))
! (c-put-in-sws rung-pos
! (setq rung-pos (point)
! last-put-in-sws-pos rung-pos)))
!
! (setq simple-ws-end (point))
! (c-forward-comments)
!
! (cond
! ((/= (point) simple-ws-end)
! ;; Skipped over comments. Don't cache at eob in case the buffer
! ;; is narrowed.
! (not (eobp)))
!
! ((save-excursion
! (and c-opt-cpp-prefix
! (looking-at c-opt-cpp-start)
! (progn (skip-chars-backward " \t")
! (bolp))
! (or (bobp)
! (progn (backward-char)
! (not (eq (char-before) ?\\))))))
! ;; Skip a preprocessor directive.
! (end-of-line)
! (while (and (eq (char-before) ?\\)
! (= (forward-line 1) 0))
! (end-of-line))
! (forward-line 1)
! (setq safe-start t)
! ;; Don't cache at eob in case the buffer is narrowed.
! (not (eobp)))))
!
! ;; We've searched over a piece of non-white syntactic ws. See if this
! ;; can be cached.
! (setq next-rung-pos (point))
! (skip-chars-forward " \t\n\r\f\v")
! (setq rung-end-pos (min (1+ (point)) (point-max)))
!
! (if (or
! ;; Cache if we haven't skipped comments only, and if we started
! ;; either from a marked rung or from a completely uncached
! ;; position.
! (and safe-start
! (or rung-is-marked
! (not (get-text-property simple-ws-end 'c-in-sws))))
!
! ;; See if there's a marked rung in the encountered simple ws. If
! ;; so then we can cache, unless `safe-start' is nil. Even then
! ;; we need to do this to check if the cache can be used for the
! ;; next step.
! (and (setq next-rung-is-marked
! (text-property-any next-rung-pos rung-end-pos
! 'c-is-sws t))
! safe-start))
(progn
! (c-debug-sws-msg
! "c-forward-sws caching [%s..%s] - [%s..%s] (max %s)"
! rung-pos (1+ simple-ws-end) next-rung-pos rung-end-pos
! (point-max))
!
! ;; Remove the properties for any nested ws that might be cached.
! ;; Only necessary for `c-is-sws' since `c-in-sws' will be set
! ;; anyway.
! (c-remove-is-sws (1+ simple-ws-end) next-rung-pos)
! (unless (and rung-is-marked (= rung-pos simple-ws-end))
! (c-put-is-sws rung-pos
! (1+ simple-ws-end))
! (setq rung-is-marked t))
! (c-put-in-sws rung-pos
! (setq rung-pos (point)
! last-put-in-sws-pos rung-pos))
! (unless (get-text-property (1- rung-end-pos) 'c-is-sws)
! ;; Remove any `c-in-sws' property from the last char of
! ;; the rung before we mark it with `c-is-sws', so that we
! ;; won't connect with the remains of a broken "ladder".
! (c-remove-in-sws (1- rung-end-pos) rung-end-pos))
! (c-put-is-sws next-rung-pos
! rung-end-pos))
!
! (c-debug-sws-msg
! "c-forward-sws not caching [%s..%s] - [%s..%s] (max %s)"
! rung-pos (1+ simple-ws-end) next-rung-pos rung-end-pos
! (point-max))
!
! ;; Set `rung-pos' for the next rung. It's the same thing here as
! ;; initially, except that the rung position is set as early as
! ;; possible since we can't be in the ending ws of a line comment or
! ;; cpp directive now.
! (if (setq rung-is-marked next-rung-is-marked)
! (setq rung-pos (1- (next-single-property-change
! rung-is-marked 'c-is-sws nil rung-end-pos)))
! (setq rung-pos next-rung-pos))
! (setq safe-start t)))
!
! ;; Make sure that the newly marked `c-in-sws' region doesn't connect to
! ;; another one after the point (which might occur when editing inside a
! ;; comment or macro).
! (when (eq last-put-in-sws-pos (point))
! (cond ((< last-put-in-sws-pos (point-max))
! (c-debug-sws-msg
! "c-forward-sws clearing at %s for cache separation"
! last-put-in-sws-pos)
! (c-remove-in-sws last-put-in-sws-pos
! (1+ last-put-in-sws-pos)))
! (t
! ;; If at eob we have to clear the last character before the end
! ;; instead since the buffer might be narrowed and there might
! ;; be a `c-in-sws' after (point-max). In this case it's
! ;; necessary to clear both properties.
! (c-debug-sws-msg
! "c-forward-sws clearing thoroughly at %s for cache separation"
! (1- last-put-in-sws-pos))
! (c-remove-is-and-in-sws (1- last-put-in-sws-pos)
! last-put-in-sws-pos))))
! )))
! (defun c-backward-sws ()
! ;; Used by `c-backward-syntactic-ws' to implement the unbounded search.
! (let (;; `rung-pos' is set to a position as late as possible in the unmarked
! ;; part of the simple ws region.
! (rung-pos (point)) next-rung-pos last-put-in-sws-pos
! rung-is-marked simple-ws-beg cmt-skip-pos)
!
! ;; Skip simple horizontal ws and do a quick check on the preceding
! ;; character to see if it's anying that can't end syntactic ws, so we can
! ;; bail out early in the majority of cases when there just are a few ws
! ;; chars. Newlines are complicated in the backward direction, so we can't
! ;; skip over them.
! (skip-chars-backward " \t\f")
! (when (and (not (bobp))
! (save-excursion
! (backward-char)
! (looking-at c-syntactic-ws-end)))
! ;; Try to find a rung position in the simple ws preceding point, so that
! ;; we can get a cache hit even if the last bit of the simple ws has
! ;; changed recently.
! (setq simple-ws-beg (point))
! (skip-chars-backward " \t\n\r\f\v")
! (if (setq rung-is-marked (text-property-any
! (point) (min (1+ rung-pos) (point-max))
! 'c-is-sws t))
! ;; `rung-pos' will be the earliest marked position, which means that
! ;; there might be later unmarked parts in the simple ws region.
! ;; It's not worth the effort to fix that; the last part of the
! ;; simple ws is also typically edited often, so it could be wasted.
! (goto-char (setq rung-pos rung-is-marked))
! (goto-char simple-ws-beg))
! (while
! (progn
! (while
! (when (and rung-is-marked
! (not (bobp))
! (get-text-property (1- (point)) 'c-in-sws))
!
! ;; The following search is the main reason that `c-in-sws'
! ;; and `c-is-sws' aren't combined to one property.
! (goto-char (previous-single-property-change
! (point) 'c-in-sws nil (point-min)))
! (unless (get-text-property (point) 'c-is-sws)
! ;; If the `c-in-sws' region extended past the first
! ;; `c-is-sws' char we have to go forward a bit.
! (goto-char (next-single-property-change
! (point) 'c-is-sws)))
!
! (c-debug-sws-msg
! "c-backward-sws cached move %s <- %s (min %s)"
! (point) rung-pos (point-min))
!
! (setq rung-pos (point))
! (if (and (< (min (skip-chars-backward " \t\f\v")
! (progn
! (setq simple-ws-beg (point))
! (skip-chars-backward " \t\n\r\f\v")))
! 0)
! (setq rung-is-marked
! (text-property-any (point) rung-pos
! 'c-is-sws t)))
! t
! (goto-char simple-ws-beg)
! nil))
! ;; We'll loop here if there is simple ws before the first rung.
! ;; That means that there's been some change in it and it's
! ;; possible that we've stepped into another ladder, so extend
! ;; the previous one to join with it if there is one, and try to
! ;; use the cache again.
! (c-debug-sws-msg
! "c-backward-sws extending rung with [%s..%s] (min %s)"
! rung-is-marked rung-pos (point-min))
! (unless (get-text-property (1- rung-pos) 'c-is-sws)
! ;; Remove any `c-in-sws' property from the last char of
! ;; the rung before we mark it with `c-is-sws', so that we
! ;; won't connect with the remains of a broken "ladder".
! (c-remove-in-sws (1- rung-pos) rung-pos))
! (c-put-is-sws rung-is-marked
! rung-pos)
! (c-put-in-sws rung-is-marked
! (1- rung-pos))
! (setq rung-pos rung-is-marked
! last-put-in-sws-pos rung-pos))
! (c-backward-comments)
! (setq cmt-skip-pos (point))
! (cond
! ((and c-opt-cpp-prefix
! (/= cmt-skip-pos simple-ws-beg)
! (c-beginning-of-macro))
! ;; Inside a cpp directive. See if it should be skipped over.
! (let ((cpp-beg (point)))
!
! ;; Move back over all line continuations in the region skipped
! ;; over by `c-backward-comments'. If we go past it then we
! ;; started inside the cpp directive.
! (goto-char simple-ws-beg)
! (beginning-of-line)
! (while (and (> (point) cmt-skip-pos)
! (progn (backward-char)
! (eq (char-before) ?\\)))
! (beginning-of-line))
!
! (if (< (point) cmt-skip-pos)
! ;; Don't move past the cpp directive if we began inside
! ;; it. Note that the position at the end of the last line
! ;; of the macro is also considered to be within it.
! (progn (goto-char cmt-skip-pos)
! nil)
!
! ;; It's worthwhile to spend a little bit of effort on finding
! ;; the end of the macro, to get a good `simple-ws-beg'
! ;; position for the cache. Note that `c-backward-comments'
! ;; could have stepped over some comments before going into
! ;; the macro, and then `simple-ws-beg' must be kept on the
! ;; same side of those comments.
! (goto-char simple-ws-beg)
! (skip-chars-backward " \t\n\r\f\v")
! (if (eq (char-before) ?\\)
! (forward-char))
! (forward-line 1)
! (if (< (point) simple-ws-beg)
! ;; Might happen if comments after the macro were skipped
! ;; over.
! (setq simple-ws-beg (point)))
!
! (goto-char cpp-beg)
! t)))
!
! ((/= (save-excursion
! (skip-chars-forward " \t\n\r\f\v" simple-ws-beg)
! (setq next-rung-pos (point)))
! simple-ws-beg)
! ;; Skipped over comments. Must put point at the end of
! ;; the simple ws at point since we might be after a line
! ;; comment or cpp directive that's been partially
! ;; narrowed out, and we can't risk marking the simple ws
! ;; at the end of it.
! (goto-char next-rung-pos)
! t)))
!
! ;; We've searched over a piece of non-white syntactic ws. See if this
! ;; can be cached.
! (setq next-rung-pos (point))
! (skip-chars-backward " \t\f\v")
!
! (if (or
! ;; Cache if we started either from a marked rung or from a
! ;; completely uncached position.
! rung-is-marked
! (not (get-text-property (1- simple-ws-beg) 'c-in-sws))
! ;; Cache if there's a marked rung in the encountered simple ws.
! (save-excursion
! (skip-chars-backward " \t\n\r\f\v")
! (text-property-any (point) (min (1+ next-rung-pos) (point-max))
! 'c-is-sws t)))
+ (progn
+ (c-debug-sws-msg
+ "c-backward-sws caching [%s..%s] - [%s..%s] (min %s)"
+ (point) (1+ next-rung-pos)
+ simple-ws-beg (min (1+ rung-pos) (point-max))
+ (point-min))
+
+ ;; Remove the properties for any nested ws that might be cached.
+ ;; Only necessary for `c-is-sws' since `c-in-sws' will be set
+ ;; anyway.
+ (c-remove-is-sws (1+ next-rung-pos) simple-ws-beg)
+ (unless (and rung-is-marked (= simple-ws-beg rung-pos))
+ (let ((rung-end-pos (min (1+ rung-pos) (point-max))))
+ (unless (get-text-property (1- rung-end-pos) 'c-is-sws)
+ ;; Remove any `c-in-sws' property from the last char of
+ ;; the rung before we mark it with `c-is-sws', so that we
+ ;; won't connect with the remains of a broken "ladder".
+ (c-remove-in-sws (1- rung-end-pos) rung-end-pos))
+ (c-put-is-sws simple-ws-beg
+ rung-end-pos)
+ (setq rung-is-marked t)))
+ (c-put-in-sws (setq simple-ws-beg (point)
+ last-put-in-sws-pos simple-ws-beg)
+ rung-pos)
+ (c-put-is-sws (setq rung-pos simple-ws-beg)
+ (1+ next-rung-pos)))
+
+ (c-debug-sws-msg
+ "c-backward-sws not caching [%s..%s] - [%s..%s] (min %s)"
+ (point) (1+ next-rung-pos)
+ simple-ws-beg (min (1+ rung-pos) (point-max))
+ (point-min))
+ (setq rung-pos next-rung-pos
+ simple-ws-beg (point))
+ ))
+
+ ;; Make sure that the newly marked `c-in-sws' region doesn't connect to
+ ;; another one before the point (which might occur when editing inside a
+ ;; comment or macro).
+ (when (eq last-put-in-sws-pos (point))
+ (cond ((< (point-min) last-put-in-sws-pos)
+ (c-debug-sws-msg
+ "c-backward-sws clearing at %s for cache separation"
+ (1- last-put-in-sws-pos))
+ (c-remove-in-sws (1- last-put-in-sws-pos)
+ last-put-in-sws-pos))
+ ((> (point-min) 1)
+ ;; If at bob and the buffer is narrowed, we have to clear the
+ ;; character we're standing on instead since there might be a
+ ;; `c-in-sws' before (point-min). In this case it's necessary
+ ;; to clear both properties.
+ (c-debug-sws-msg
+ "c-backward-sws clearing thoroughly at %s for cache separation"
+ last-put-in-sws-pos)
+ (c-remove-is-and-in-sws last-put-in-sws-pos
+ (1+ last-put-in-sws-pos)))))
+ )))
! ;; A system for handling noteworthy parens before the point.
(defvar c-state-cache nil)
(make-variable-buffer-local 'c-state-cache)
***************
*** 1121,1129 ****
;; most effective if `c-parse-state' is used on each line while moving
;; forward.
! (defvar c-state-cache-start nil)
! ;; This (point-min) when `c-state-cache' was calculated, to detect
! ;; that the start point hasn't changed due to narrowing.
(defun c-parse-state ()
;; Finds and records all noteworthy parens between some good point
--- 1677,1703 ----
;; most effective if `c-parse-state' is used on each line while moving
;; forward.
! (defvar c-state-cache-start 1)
! (make-variable-buffer-local 'c-state-cache-start)
! ;; This is (point-min) when `c-state-cache' was calculated, since a
! ;; change of narrowing is likely to affect the parens that are visible
! ;; before the point.
!
! (defsubst c-invalidate-state-cache (pos)
! ;; Invalidate all info on `c-state-cache' that applies to the buffer
! ;; at POS or higher. This is much like `c-whack-state-after', but
! ;; it never changes a paren pair element into an open paren element.
! ;; Doing that would mean that the new open paren wouldn't have the
! ;; required preceding paren pair element.
! ;;
! ;; This function does not do any hidden buffer changes.
! (while (and c-state-cache
! (let ((elem (car c-state-cache)))
! (if (consp elem)
! (or (<= pos (car elem))
! (< pos (cdr elem)))
! (<= pos elem))))
! (setq c-state-cache (cdr c-state-cache))))
(defun c-parse-state ()
;; Finds and records all noteworthy parens between some good point
***************
*** 1134,1160 ****
;; The returned value is a list of the noteworthy parens with the
;; last one first. If an element in the list is an integer, it's
;; the position of an open paren which has not been closed before
! ;; point. If an element is a cons, it gives the position of a
;; closed brace paren pair; the car is the start paren position and
;; the cdr is the position following the closing paren. Only the
;; last closed brace paren pair before each open paren is recorded,
;; and thus the state never contains two cons elements in
;; succession.
(save-restriction
(let* ((here (point))
(c-macro-start (c-query-macro-start))
(in-macro-start (or c-macro-start (point)))
old-state last-pos pairs pos save-pos)
! ;; Somewhat ugly use of c-check-state-cache to get rid of the
! ;; part of the state cache that is after point. Can't use
! ;; c-whack-state-after for the same reasons as in that function.
! (c-check-state-cache (point) nil nil)
;; Get the latest position we know are directly inside the
;; closest containing paren of the cached state.
(setq last-pos (and c-state-cache
(if (consp (car c-state-cache))
(cdr (car c-state-cache))
(1+ (car c-state-cache)))))
;; Check if the found last-pos is in a macro. If it is, and
;; we're not in the same macro, we must discard everything on
;; c-state-cache that is inside the macro before using it.
--- 1708,1761 ----
;; The returned value is a list of the noteworthy parens with the
;; last one first. If an element in the list is an integer, it's
;; the position of an open paren which has not been closed before
! ;; the point. If an element is a cons, it gives the position of a
;; closed brace paren pair; the car is the start paren position and
;; the cdr is the position following the closing paren. Only the
;; last closed brace paren pair before each open paren is recorded,
;; and thus the state never contains two cons elements in
;; succession.
+ ;;
+ ;; Currently no characters which are given paren syntax with the
+ ;; syntax-table property are recorded, i.e. angle bracket arglist
+ ;; parens are never present here. Note that this might change.
+ ;;
+ ;; This function does not do any hidden buffer changes.
+
(save-restriction
(let* ((here (point))
(c-macro-start (c-query-macro-start))
(in-macro-start (or c-macro-start (point)))
old-state last-pos pairs pos save-pos)
! (c-invalidate-state-cache (point))
!
! ;; If the minimum position has changed due to narrowing then we
! ;; have to fix the tail of `c-state-cache' accordingly.
! (unless (= c-state-cache-start (point-min))
! (if (> (point-min) c-state-cache-start)
! ;; If point-min has moved forward then we just need to cut
! ;; off a bit of the tail.
! (let ((ptr (cons nil c-state-cache)) elem)
! (while (and (setq elem (cdr ptr))
! (>= (if (consp elem) (car elem) elem)
! (point-min)))
! (setq ptr elem))
! (when (consp ptr)
! (if (eq (cdr ptr) c-state-cache)
! (setq c-state-cache nil)
! (setcdr ptr nil))))
! ;; If point-min has moved backward then we drop the state
! ;; completely. It's possible to do a better job here and
! ;; recalculate the top only.
! (setq c-state-cache nil))
! (setq c-state-cache-start (point-min)))
!
;; Get the latest position we know are directly inside the
;; closest containing paren of the cached state.
(setq last-pos (and c-state-cache
(if (consp (car c-state-cache))
(cdr (car c-state-cache))
(1+ (car c-state-cache)))))
+
;; Check if the found last-pos is in a macro. If it is, and
;; we're not in the same macro, we must discard everything on
;; c-state-cache that is inside the macro before using it.
***************
*** 1163,1179 ****
(goto-char last-pos)
(when (and (c-beginning-of-macro)
(/= (point) in-macro-start))
! (c-check-state-cache (point) nil nil)
;; Set last-pos again, just like above.
(setq last-pos (and c-state-cache
(if (consp (car c-state-cache))
(cdr (car c-state-cache))
(1+ (car c-state-cache))))))))
(setq pos
;; Find the start position for the forward search. (Can't
;; search in the backward direction since point might be
;; in some kind of literal.)
(or (when last-pos
;; There's a cached state with a containing paren. Pop
;; off the stale containing sexps from it by going
;; forward out of parens as far as possible.
--- 1764,1782 ----
(goto-char last-pos)
(when (and (c-beginning-of-macro)
(/= (point) in-macro-start))
! (c-invalidate-state-cache (point))
;; Set last-pos again, just like above.
(setq last-pos (and c-state-cache
(if (consp (car c-state-cache))
(cdr (car c-state-cache))
(1+ (car c-state-cache))))))))
+
(setq pos
;; Find the start position for the forward search. (Can't
;; search in the backward direction since point might be
;; in some kind of literal.)
(or (when last-pos
+
;; There's a cached state with a containing paren. Pop
;; off the stale containing sexps from it by going
;; forward out of parens as far as possible.
***************
*** 1188,1193 ****
--- 1791,1797 ----
c-state-cache (cdr-safe (cdr c-state-cache)))
(setq pair-beg (car c-state-cache)
c-state-cache (cdr c-state-cache))))
+
(when (and pair-beg (eq (char-after pair-beg) ?{))
;; The last paren pair we moved out from was a brace
;; pair. Modify the state to record this as a closed
***************
*** 1196,1201 ****
--- 1800,1806 ----
(setq c-state-cache (cdr c-state-cache)))
(setq c-state-cache (cons (cons pair-beg last-pos)
c-state-cache))))
+
;; Check if the preceding balanced paren is within a
;; macro; it should be ignored if we're outside the
;; macro. There's no need to check any further upwards;
***************
*** 1208,1216 ****
--- 1813,1823 ----
(when (c-beginning-of-macro)
(setq here (point)
c-state-cache (cdr c-state-cache)))))
+
(when c-state-cache
(setq old-state c-state-cache)
last-pos))
+
(save-excursion
;; go back 2 bods, but ignore any bogus positions
;; returned by beginning-of-defun (i.e. open paren in
***************
*** 1222,1228 ****
--- 1829,1837 ----
(if (eq (char-after) ?\{)
(setq cnt (1- cnt)))))
(point))))
+
(narrow-to-region (point-min) here)
+
(while pos
;; Find the balanced brace pairs.
(setq save-pos pos
***************
*** 1231,1236 ****
--- 1840,1846 ----
(setq pos (c-up-list-forward last-pos)))
(if (eq (char-before last-pos) ?{)
(setq pairs (cons (cons last-pos pos) pairs))))
+
;; Should ignore any pairs that are in a macro, providing
;; we're not in the same one.
(when (and pairs (< (car (car pairs)) in-macro-start))
***************
*** 1238,1243 ****
--- 1848,1854 ----
(goto-char (car (car pairs)))
(c-beginning-of-macro))
(setq pairs (cdr pairs)))))
+
;; Record the last brace pair.
(when pairs
(if (and (eq c-state-cache old-state)
***************
*** 1249,1268 ****
(setcar pairs (1- (car pairs)))
(when (consp (car-safe c-state-cache))
;; There could already be a cons first in `c-state-cache'
! ;; if we've jumped over an unbalanced open paren in a
;; macro below.
(setq c-state-cache (cdr c-state-cache)))
(setq c-state-cache (cons pairs c-state-cache)))
(if last-pos
;; Prepare to loop, but record the open paren only if it's
! ;; outside a macro or within the same macro as point.
(progn
(setq pos last-pos)
! (if (or (>= last-pos in-macro-start)
! (save-excursion
! (goto-char last-pos)
! (not (c-beginning-of-macro))))
! (setq c-state-cache (cons (1- pos) c-state-cache))))
(if (setq last-pos (c-up-list-forward pos))
;; Found a close paren without a corresponding opening
;; one. Maybe we didn't go back far enough, so try to
--- 1860,1884 ----
(setcar pairs (1- (car pairs)))
(when (consp (car-safe c-state-cache))
;; There could already be a cons first in `c-state-cache'
! ;; if we've e.g. jumped over an unbalanced open paren in a
;; macro below.
(setq c-state-cache (cdr c-state-cache)))
(setq c-state-cache (cons pairs c-state-cache)))
+
(if last-pos
;; Prepare to loop, but record the open paren only if it's
! ;; outside a macro or within the same macro as point, and
! ;; if it is a "real" open paren and not some character
! ;; that got an open paren syntax-table property.
(progn
(setq pos last-pos)
! (if (and (or (>= last-pos in-macro-start)
! (save-excursion
! (goto-char last-pos)
! (not (c-beginning-of-macro))))
! (= (char-syntax (char-before last-pos)) ?\())
! (setq c-state-cache (cons (1- last-pos) c-state-cache))))
!
(if (setq last-pos (c-up-list-forward pos))
;; Found a close paren without a corresponding opening
;; one. Maybe we didn't go back far enough, so try to
***************
*** 1283,1288 ****
--- 1899,1905 ----
(1+ (count-lines (point-min)
(c-point 'bol last-pos)))))))
(setq pos nil))))
+
c-state-cache)))
;; Debug tool to catch cache inconsistencies.
***************
*** 1306,1387 ****
'c-real-parse-state)))
(c-keep-region-active))
! (defun c-check-state-cache (beg end old-length)
! ;; Used on `after-change-functions' to adjust `c-state-cache'.
! ;; Prefer speed to finesse here, since there will be many more calls
! ;; to this function than times `c-state-cache' is used.
! ;;
! ;; This is much like `c-whack-state-after', but it never changes a
! ;; paren pair element into an open paren element. Doing that would
! ;; mean that the new open paren wouldn't have the required preceding
! ;; paren pair element.
! (if (not (eq c-state-cache-start (point-min)))
! (setq c-state-cache-start (point-min)
! c-state-cache nil)
! (while (and c-state-cache
! (let ((elem (car c-state-cache)))
! (if (consp elem)
! (or (<= beg (car elem))
! (< beg (cdr elem)))
! (<= beg elem))))
! (setq c-state-cache (cdr c-state-cache)))))
! (defun c-whack-state-before (bufpos paren-state)
! ;; Whack off any state information from PAREN-STATE which lies
! ;; before BUFPOS. Not destructive on PAREN-STATE.
! (let* ((newstate (list nil))
! (ptr newstate)
! car)
! (while paren-state
! (setq car (car paren-state)
! paren-state (cdr paren-state))
! (if (< (if (consp car) (car car) car) bufpos)
! (setq paren-state nil)
! (setcdr ptr (list car))
! (setq ptr (cdr ptr))))
! (cdr newstate)))
! (defun c-whack-state-after (bufpos paren-state)
! ;; Whack off any state information from PAREN-STATE which lies at or
! ;; after BUFPOS. Not destructive on PAREN-STATE.
! (catch 'done
! (while paren-state
! (let ((car (car paren-state)))
! (if (consp car)
! ;; just check the car, because in a balanced brace
! ;; expression, it must be impossible for the corresponding
! ;; close brace to be before point, but the open brace to
! ;; be after.
! (if (<= bufpos (car car))
! nil ; whack it off
! (if (< bufpos (cdr car))
! ;; its possible that the open brace is before
! ;; bufpos, but the close brace is after. In that
! ;; case, convert this to a non-cons element. The
! ;; rest of the state is before bufpos, so we're
! ;; done.
! (throw 'done (cons (car car) (cdr paren-state)))
! ;; we know that both the open and close braces are
! ;; before bufpos, so we also know that everything else
! ;; on state is before bufpos.
! (throw 'done paren-state)))
! (if (<= bufpos car)
! nil ; whack it off
! ;; it's before bufpos, so everything else should too.
! (throw 'done paren-state)))
! (setq paren-state (cdr paren-state)))
nil)))
(defun c-beginning-of-inheritance-list (&optional lim)
;; Go to the first non-whitespace after the colon that starts a
;; multiple inheritance introduction. Optional LIM is the farthest
;; back we should search.
! (let* ((lim (or lim (c-point 'bod))))
(c-with-syntax-table c++-template-syntax-table
! (c-backward-token-1 0 t lim)
! (while (and (looking-at "[_a-zA-Z<,]")
! (= (c-backward-token-1 1 t lim) 0)))
(skip-chars-forward "^:"))))
(defun c-in-method-def-p ()
--- 1923,4203 ----
'c-real-parse-state)))
(c-keep-region-active))
! (defun c-whack-state-before (bufpos paren-state)
! ;; Whack off any state information from PAREN-STATE which lies
! ;; before BUFPOS. Not destructive on PAREN-STATE.
! ;;
! ;; This function does not do any hidden buffer changes.
! (let* ((newstate (list nil))
! (ptr newstate)
! car)
! (while paren-state
! (setq car (car paren-state)
! paren-state (cdr paren-state))
! (if (< (if (consp car) (car car) car) bufpos)
! (setq paren-state nil)
! (setcdr ptr (list car))
! (setq ptr (cdr ptr))))
! (cdr newstate)))
!
! (defun c-whack-state-after (bufpos paren-state)
! ;; Whack off any state information from PAREN-STATE which lies at or
! ;; after BUFPOS. Not destructive on PAREN-STATE.
! ;;
! ;; This function does not do any hidden buffer changes.
! (catch 'done
! (while paren-state
! (let ((car (car paren-state)))
! (if (consp car)
! ;; just check the car, because in a balanced brace
! ;; expression, it must be impossible for the corresponding
! ;; close brace to be before point, but the open brace to
! ;; be after.
! (if (<= bufpos (car car))
! nil ; whack it off
! (if (< bufpos (cdr car))
! ;; its possible that the open brace is before
! ;; bufpos, but the close brace is after. In that
! ;; case, convert this to a non-cons element. The
! ;; rest of the state is before bufpos, so we're
! ;; done.
! (throw 'done (cons (car car) (cdr paren-state)))
! ;; we know that both the open and close braces are
! ;; before bufpos, so we also know that everything else
! ;; on state is before bufpos.
! (throw 'done paren-state)))
! (if (<= bufpos car)
! nil ; whack it off
! ;; it's before bufpos, so everything else should too.
! (throw 'done paren-state)))
! (setq paren-state (cdr paren-state)))
! nil)))
!
! (defun c-most-enclosing-brace (paren-state &optional bufpos)
! ;; Return the bufpos of the innermost enclosing open paren before
! ;; bufpos that hasn't been narrowed out, or nil if none was found.
! ;;
! ;; This function does not do any hidden buffer changes.
! (let (enclosingp)
! (or bufpos (setq bufpos 134217727))
! (while paren-state
! (setq enclosingp (car paren-state)
! paren-state (cdr paren-state))
! (if (or (consp enclosingp)
! (>= enclosingp bufpos))
! (setq enclosingp nil)
! (if (< enclosingp (point-min))
! (setq enclosingp nil))
! (setq paren-state nil)))
! enclosingp))
!
! (defun c-least-enclosing-brace (paren-state &optional bufpos)
! ;; Return the bufpos of the outermost enclosing open paren before
! ;; bufpos that hasn't been narrowed out, or nil if none was found.
! ;;
! ;; This function does not do any hidden buffer changes.
! (let (pos elem)
! (or bufpos (setq bufpos 134217727))
! (while paren-state
! (setq elem (car paren-state)
! paren-state (cdr paren-state))
! (unless (or (consp elem)
! (>= elem bufpos))
! (if (>= elem (point-min))
! (setq pos elem))))
! pos))
!
! (defun c-safe-position (bufpos paren-state)
! ;; Return the closest known safe position higher up than BUFPOS, or
! ;; nil if PAREN-STATE doesn't contain one. Return nil if BUFPOS is
! ;; nil, which is useful to find the closest limit before a given
! ;; limit that might be nil.
! ;;
! ;; This function does not do any hidden buffer changes.
! (when bufpos
! (let (elem)
! (catch 'done
! (while paren-state
! (setq elem (car paren-state))
! (if (consp elem)
! (cond ((< (cdr elem) bufpos)
! (throw 'done (cdr elem)))
! ((< (car elem) bufpos)
! ;; See below.
! (throw 'done (min (1+ (car elem)) bufpos))))
! (if (< elem bufpos)
! ;; elem is the position at and not after the opening paren, so
! ;; we can go forward one more step unless it's equal to
! ;; bufpos. This is useful in some cases avoid an extra paren
! ;; level between the safe position and bufpos.
! (throw 'done (min (1+ elem) bufpos))))
! (setq paren-state (cdr paren-state)))))))
!
! (defun c-beginning-of-syntax ()
! ;; This is used for `font-lock-beginning-of-syntax-function'. It
! ;; goes to the closest previous point that is known to be outside
! ;; any string literal or comment. `c-state-cache' is used if it has
! ;; a position in the vicinity.
! (let* ((paren-state c-state-cache)
! elem
!
! (pos (catch 'done
! ;; Note: Similar code in `c-safe-position'. The
! ;; difference is that we accept a safe position at
! ;; the point and don't bother to go forward past open
! ;; parens.
! (while paren-state
! (setq elem (car paren-state))
! (if (consp elem)
! (cond ((<= (cdr elem) (point))
! (throw 'done (cdr elem)))
! ((<= (car elem) (point))
! (throw 'done (car elem))))
! (if (<= elem (point))
! (throw 'done elem)))
! (setq paren-state (cdr paren-state)))
! (point-min))))
!
! (if (> pos (- (point) 4000))
! (goto-char pos)
! ;; The position is far back. Try `c-beginning-of-defun-1'
! ;; (although we can't be entirely sure it will go to a position
! ;; outside a comment or string in current emacsen). FIXME:
! ;; Consult `syntax-ppss' here.
! (c-beginning-of-defun-1)
! (if (< (point) pos)
! (goto-char pos)))))
!
!
! ;; Tools for scanning identifiers and other tokens.
!
! (defun c-on-identifier ()
! "Return non-nil if the point is on or directly after an identifier.
! Keywords are recognized and not considered identifiers. If an
! identifier is detected, the returned value is its starting position.
! If an identifier both starts and stops at the point \(can only happen
! in Pike) then the point for the preceding one is returned.
!
! This function does not do any hidden buffer changes."
!
! (save-excursion
! (if (zerop (skip-syntax-backward "w_"))
!
! (when (c-major-mode-is 'pike-mode)
! ;; Handle the `<operator> syntax in Pike.
! (let ((pos (point)))
! (skip-chars-backward "!%&*+\\-/<=>^|~[]()")
! (and (if (< (skip-chars-backward "`") 0)
! t
! (goto-char pos)
! (eq (char-after) ?\`))
! (looking-at c-symbol-key)
! (>= (match-end 0) pos)
! (point))))
!
! (and (not (looking-at c-keywords-regexp))
! (point)))))
!
! (defsubst c-simple-skip-symbol-backward ()
! ;; If the point is at the end of a symbol then skip backward to the
! ;; beginning of it. Don't move otherwise. Return non-nil if point
! ;; moved.
! (or (< (skip-syntax-backward "w_") 0)
! (and (c-major-mode-is 'pike-mode)
! ;; Handle the `<operator> syntax in Pike.
! (let ((pos (point)))
! (if (and (< (skip-chars-backward "!%&*+\\-/<=>^|~[]()") 0)
! (< (skip-chars-backward "`") 0)
! (looking-at c-symbol-key)
! (>= (match-end 0) pos))
! t
! (goto-char pos)
! nil)))))
!
! (defsubst c-beginning-of-current-token (&optional back-limit)
! ;; Move to the beginning of the current token. Do not move if not
! ;; in the middle of one. BACK-LIMIT may be used to bound the
! ;; backward search; if given it's assumed to be at the boundary
! ;; between two tokens.
! (if (looking-at "\\w\\|\\s_")
! (skip-syntax-backward "w_" back-limit)
! (let ((start (point)))
! (when (< (skip-syntax-backward ".()" back-limit) 0)
! (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp)
! (match-end 0))
! ;; `c-nonsymbol-token-regexp' should always match
! ;; since we've skipped backward over punctuator
! ;; or paren syntax, but consume one char in case
! ;; it doesn't so that we don't leave point before
! ;; some earlier incorrect token.
! (1+ (point)))))
! (if (<= pos start)
! (goto-char pos))
! (< pos start)))))))
!
! (defsubst c-end-of-current-token (&optional back-limit)
! ;; Move to the end of the current token. Do not move if not in the
! ;; middle of one. BACK-LIMIT may be used to bound the backward
! ;; search; if given it's assumed to be at the boundary between two
! ;; tokens.
! (let ((start (point)))
! (cond ((< (skip-syntax-backward "w_" (1- start)) 0)
! (skip-syntax-forward "w_"))
! ((< (skip-syntax-backward ".()" back-limit) 0)
! (while (progn
! (if (looking-at c-nonsymbol-token-regexp)
! (goto-char (match-end 0))
! ;; `c-nonsymbol-token-regexp' should always match since
! ;; we've skipped backward over punctuator or paren
! ;; syntax, but move forward in case it doesn't so that
! ;; we don't leave point earlier than we started with.
! (forward-char))
! (< (point) start)))))))
!
! (defconst c-jump-syntax-balanced
! (if (memq 'gen-string-delim c-emacs-features)
! "\\w\\|\\s_\\|\\s\(\\|\\s\)\\|\\s\"\\|\\s|"
! "\\w\\|\\s_\\|\\s\(\\|\\s\)\\|\\s\""))
!
! (defconst c-jump-syntax-unbalanced
! (if (memq 'gen-string-delim c-emacs-features)
! "\\w\\|\\s_\\|\\s\"\\|\\s|"
! "\\w\\|\\s_\\|\\s\""))
!
! (defun c-forward-token-2 (&optional count balanced limit)
! "Move forward by tokens.
! A token is defined as all symbols and identifiers which aren't
! syntactic whitespace \(note that multicharacter tokens like \"==\" are
! treated properly). Point is always either left at the beginning of a
! token or not moved at all. COUNT specifies the number of tokens to
! move; a negative COUNT moves in the opposite direction. A COUNT of 0
! moves to the next token beginning only if not already at one. If
! BALANCED is true, move over balanced parens, otherwise move into them.
! Also, if BALANCED is true, never move out of an enclosing paren.
!
! LIMIT sets the limit for the movement and defaults to the point limit.
! The case when LIMIT is set in the middle of a token, comment or macro
! is handled correctly, i.e. the point won't be left there.
!
! Return the number of tokens left to move \(positive or negative). If
! BALANCED is true, a move over a balanced paren counts as one. Note
! that if COUNT is 0 and no appropriate token beginning is found, 1 will
! be returned. Thus, a return value of 0 guarantees that point is at
! the requested position and a return value less \(without signs) than
! COUNT guarantees that point is at the beginning of some token."
!
! (or count (setq count 1))
! (if (< count 0)
! (- (c-backward-token-2 (- count) balanced limit))
!
! (let ((jump-syntax (if balanced
! c-jump-syntax-balanced
! c-jump-syntax-unbalanced))
! (last (point))
! (prev (point)))
!
! (if (zerop count)
! ;; If count is zero we should jump if in the middle of a token.
! (c-end-of-current-token))
!
! (save-restriction
! (if limit (narrow-to-region (point-min) limit))
! (if (/= (point)
! (progn (c-forward-syntactic-ws) (point)))
! ;; Skip whitespace. Count this as a move if we did in
! ;; fact move.
! (setq count (max (1- count) 0)))
!
! (if (eobp)
! ;; Moved out of bounds. Make sure the returned count isn't zero.
! (progn
! (if (zerop count) (setq count 1))
! (goto-char last))
!
! ;; Use `condition-case' to avoid having the limit tests
! ;; inside the loop.
! (condition-case nil
! (while (and
! (> count 0)
! (progn
! (setq last (point))
! (cond ((looking-at jump-syntax)
! (goto-char (scan-sexps (point) 1))
! t)
! ((looking-at c-nonsymbol-token-regexp)
! (goto-char (match-end 0))
! t)
! ;; `c-nonsymbol-token-regexp' above should always
! ;; match if there are correct tokens. Try to
! ;; widen to see if the limit was set in the
! ;; middle of one, else fall back to treating
! ;; the offending thing as a one character token.
! ((and limit
! (save-restriction
! (widen)
! (looking-at c-nonsymbol-token-regexp)))
! nil)
! (t
! (forward-char)
! t))))
! (c-forward-syntactic-ws)
! (setq prev last
! count (1- count)))
! (error (goto-char last)))
!
! (when (eobp)
! (goto-char prev)
! (setq count (1+ count)))))
!
! count)))
!
! (defun c-backward-token-2 (&optional count balanced limit)
! "Move backward by tokens.
! See `c-forward-token-2' for details."
!
! (or count (setq count 1))
! (if (< count 0)
! (- (c-forward-token-2 (- count) balanced limit))
!
! (or limit (setq limit (point-min)))
! (let ((jump-syntax (if balanced
! c-jump-syntax-balanced
! c-jump-syntax-unbalanced))
! (last (point)))
!
! (if (zerop count)
! ;; The count is zero so try to skip to the beginning of the
! ;; current token.
! (if (> (point)
! (progn (c-beginning-of-current-token) (point)))
! (if (< (point) limit)
! ;; The limit is inside the same token, so return 1.
! (setq count 1))
!
! ;; We're not in the middle of a token. If there's
! ;; whitespace after the point then we must move backward,
! ;; so set count to 1 in that case.
! (and (looking-at c-syntactic-ws-start)
! ;; If we're looking at a '#' that might start a cpp
! ;; directive then we have to do a more elaborate check.
! (or (/= (char-after) ?#)
! (not c-opt-cpp-prefix)
! (save-excursion
! (and (= (point)
! (progn (beginning-of-line)
! (looking-at "[ \t]*")
! (match-end 0)))
! (or (bobp)
! (progn (backward-char)
! (not (eq (char-before) ?\\)))))))
! (setq count 1))))
!
! ;; Use `condition-case' to avoid having to check for buffer
! ;; limits in `backward-char', `scan-sexps' and `goto-char' below.
! (condition-case nil
! (while (and
! (> count 0)
! (progn
! (c-backward-syntactic-ws)
! (backward-char)
! (if (looking-at jump-syntax)
! (goto-char (scan-sexps (1+ (point)) -1))
! ;; This can be very inefficient if there's a long
! ;; sequence of operator tokens without any separation.
! ;; That doesn't happen in practice, anyway.
! (c-beginning-of-current-token))
! (>= (point) limit)))
! (setq last (point)
! count (1- count)))
! (error (goto-char last)))
!
! (if (< (point) limit)
! (goto-char last))
!
! count)))
!
! (defun c-forward-token-1 (&optional count balanced limit)
! "Like `c-forward-token-2' but doesn't treat multicharacter operator
! tokens like \"==\" as single tokens, i.e. all sequences of symbol
! characters are jumped over character by character. This function is
! for compatibility only; it's only a wrapper over `c-forward-token-2'."
! (let ((c-nonsymbol-token-regexp "\\s.\\|\\s\(\\|\\s\)"))
! (c-forward-token-2 count balanced limit)))
!
! (defun c-backward-token-1 (&optional count balanced limit)
! "Like `c-backward-token-2' but doesn't treat multicharacter operator
! tokens like \"==\" as single tokens, i.e. all sequences of symbol
! characters are jumped over character by character. This function is
! for compatibility only; it's only a wrapper over `c-backward-token-2'."
! (let ((c-nonsymbol-token-regexp "\\s.\\|\\s\(\\|\\s\)"))
! (c-backward-token-2 count balanced limit)))
!
!
! ;; Tools for doing searches restricted to syntactically relevant text.
!
! (defun c-syntactic-re-search-forward (regexp &optional bound noerror
! paren-level not-inside-token
! lookbehind-submatch)
! "Like `re-search-forward', but only report matches that are found
! in syntactically significant text. I.e. matches in comments, macros
! or string literals are ignored. The start point is assumed to be
! outside any comment, macro or string literal, or else the content of
! that region is taken as syntactically significant text.
!
! If PAREN-LEVEL is non-nil, an additional restriction is added to
! ignore matches in nested paren sexps, and the search will also not go
! outside the current paren sexp.
!
! If NOT-INSIDE-TOKEN is non-nil, matches in the middle of tokens are
! ignored. Things like multicharacter operators and special symbols
! \(e.g. \"`()\" in Pike) are handled but currently not floating point
! constants.
!
! If LOOKBEHIND-SUBMATCH is non-nil, it's taken as a number of a
! subexpression in REGEXP. The end of that submatch is used as the
! position to check for syntactic significance. If LOOKBEHIND-SUBMATCH
! isn't used or if that subexpression didn't match then the start
! position of the whole match is used instead. The \"look behind\"
! subexpression is never tested before the starting position, so it
! might be a good idea to include \\=\\= as a match alternative in it.
!
! Optimization note: Matches might be missed if the \"look behind\"
! subexpression should match the end of nonwhite syntactic whitespace,
! i.e. the end of comments or cpp directives. This since the function
! skips over such things before resuming the search. It's also not safe
! to assume that the \"look behind\" subexpression never can match
! syntactic whitespace."
!
! (or bound (setq bound (point-max)))
! (if paren-level (setq paren-level -1))
!
! ;;(message "c-syntactic-re-search-forward %s %s %S" (point) bound regexp)
!
! (let ((start (point))
! (pos (point))
! (last-token-end-pos (point-min))
! match-pos found state check-pos check-state tmp)
!
! (condition-case err
! (while
! (and
! (re-search-forward regexp bound noerror)
!
! (progn
! (setq match-pos (point)
! state (parse-partial-sexp
! pos (match-beginning 0) paren-level nil state)
! pos (point))
! (if (setq check-pos (and lookbehind-submatch
! (match-end lookbehind-submatch)))
! (setq check-state (parse-partial-sexp
! pos check-pos paren-level nil state))
! (setq check-pos pos
! check-state state))
!
! ;; If we got a look behind subexpression and get an
! ;; insignificant match in something that isn't
! ;; syntactic whitespace (i.e. strings or in nested
! ;; parentheses), then we can never skip more than a
! ;; single character from the match position before
! ;; continuing the search. That since the look behind
! ;; subexpression might match the end of the
! ;; insignificant region.
!
! (cond
! ((setq tmp (elt check-state 3))
! ;; Match inside a string.
! (if (or lookbehind-submatch
! (not (integerp tmp)))
! (goto-char (min (1+ pos) bound))
! ;; Skip to the end of the string before continuing.
! (let ((ender (make-string 1 tmp)) (continue t))
! (while (if (search-forward ender bound noerror)
! (progn
! (setq state (parse-partial-sexp
! pos (point) nil nil state)
! pos (point))
! (elt state 3))
! (setq continue nil)))
! continue)))
!
! ((elt check-state 7)
! ;; Match inside a line comment. Skip to eol. Use
! ;; `re-search-forward' instead of `skip-chars-forward' to get
! ;; the right bound behavior.
! (re-search-forward "[\n\r]" bound noerror))
!
! ((elt check-state 4)
! ;; Match inside a block comment. Skip to the '*/'.
! (search-forward "*/" bound noerror))
!
! ((and (not (elt check-state 5))
! (eq (char-before check-pos) ?/)
! (memq (char-after check-pos) '(?/ ?*)))
! ;; Match in the middle of the opener of a block or line
! ;; comment.
! (if (= (char-after check-pos) ?/)
! (re-search-forward "[\n\r]" bound noerror)
! (search-forward "*/" bound noerror)))
!
! ((and not-inside-token
! (or (< check-pos last-token-end-pos)
! (< check-pos
! (save-excursion
! (goto-char check-pos)
! (c-end-of-current-token last-token-end-pos)
! (setq last-token-end-pos (point))))))
! ;; Match inside a token.
! (cond ((<= (point) bound)
! (goto-char (min (1+ pos) bound))
! t)
! (noerror nil)
! (t (signal 'search-failed "end of token"))))
!
! ((save-excursion
! (save-match-data
! (c-beginning-of-macro start)))
! ;; Match inside a macro. Skip to the end of it.
! (c-end-of-macro)
! (cond ((<= (point) bound) t)
! (noerror nil)
! (t (signal 'search-failed "end of macro"))))
!
! ((and paren-level
! (/= (setq tmp (car check-state)) 0))
! (if (> tmp 0)
! ;; Match inside a nested paren sexp.
! (if lookbehind-submatch
! (goto-char (min (1+ pos) bound))
! ;; Skip out of the paren quickly.
! (setq state (parse-partial-sexp pos bound 0 nil state)
! pos (point)))
! ;; Have exited the current paren sexp. The
! ;; `parse-partial-sexp' above has left us just after the
! ;; closing paren in this case. Just make
! ;; `re-search-forward' above fail in the appropriate way;
! ;; we'll adjust the leave off point below if necessary.
! (setq bound (point))))
!
! (t
! ;; A real match.
! (setq found t)
! nil)))))
!
! (error
! (goto-char start)
! (signal (car err) (cdr err))))
!
! ;;(message "c-syntactic-re-search-forward done %s" (or match-pos (point)))
!
! (if found
! (progn
! (goto-char match-pos)
! match-pos)
!
! ;; Search failed. Set point as appropriate.
! (cond ((eq noerror t)
! (goto-char start))
! (paren-level
! (if (eq (car (parse-partial-sexp pos bound -1 nil state)) -1)
! (backward-char)))
! (t
! (goto-char bound)))
! nil)))
!
! (defun c-syntactic-skip-backward (skip-chars &optional limit)
! "Like `skip-chars-backward' but only look at syntactically relevant chars,
! i.e. don't stop at positions inside syntactic whitespace or string
! literals. Preprocessor directives are also ignored, with the exception
! of the one that the point starts within, if any. If LIMIT is given,
! it's assumed to be at a syntactically relevant position.
!
! This function does not do any hidden buffer changes."
!
! (let ((start (point))
! ;; A list of syntactically relevant positions in descending
! ;; order. It's used to avoid scanning repeatedly over
! ;; potentially large regions with `parse-partial-sexp' to verify
! ;; each position.
! safe-pos-list
! ;; The result from `c-beginning-of-macro' at the start position or the
! ;; start position itself if it isn't within a macro. Evaluated on
! ;; demand.
! start-macro-beg)
!
! (while (progn
! (while (and
! (< (skip-chars-backward skip-chars limit) 0)
!
! ;; Use `parse-partial-sexp' from a safe position down to
! ;; the point to check if it's outside comments and
! ;; strings.
! (let ((pos (point)) safe-pos state)
! ;; Pick a safe position as close to the point as
! ;; possible.
! ;;
! ;; FIXME: Consult `syntax-ppss' here if our
! ;; cache doesn't give a good position.
! (while (and safe-pos-list
! (> (car safe-pos-list) (point)))
! (setq safe-pos-list (cdr safe-pos-list)))
! (unless (setq safe-pos (car-safe safe-pos-list))
! (setq safe-pos (max (or (c-safe-position
! (point) (or c-state-cache
! (c-parse-state)))
! 0)
! (point-min))
! safe-pos-list (list safe-pos)))
!
! (while (progn
! (setq state (parse-partial-sexp
! safe-pos pos 0))
! (< (point) pos))
! ;; Cache positions along the way to use if we have to
! ;; back up more. Every closing paren on the same
! ;; level seems like fairly well spaced positions.
! (setq safe-pos (point)
! safe-pos-list (cons safe-pos safe-pos-list)))
!
! (cond
! ((or (elt state 3) (elt state 4))
! ;; Inside string or comment. Continue search at the
! ;; beginning of it.
! (if (setq pos (nth 8 state))
! ;; It's an emacs where `parse-partial-sexp'
! ;; supplies the starting position.
! (goto-char pos)
! (goto-char (car (c-literal-limits safe-pos))))
! t)
!
! ((c-beginning-of-macro limit)
! ;; Inside a macro.
! (if (< (point)
! (or start-macro-beg
! (setq start-macro-beg
! (save-excursion
! (goto-char start)
! (c-beginning-of-macro limit)
! (point)))))
! t
! ;; It's inside the same macro we started in so it's
! ;; a relevant match.
! (goto-char pos)
! nil))))))
!
! (> (point)
! (progn
! ;; Skip syntactic ws afterwards so that we don't stop at the
! ;; end of a comment if `skip-chars' is something like "^/".
! (c-backward-syntactic-ws)
! (point)))))
!
! (- (point) start)))
!
!
! ;; Tools for handling comments and string literals.
!
! (defun c-slow-in-literal (&optional lim detect-cpp)
! "Return the type of literal point is in, if any.
! The return value is `c' if in a C-style comment, `c++' if in a C++
! style comment, `string' if in a string literal, `pound' if DETECT-CPP
! is non-nil and in a preprocessor line, or nil if somewhere else.
! Optional LIM is used as the backward limit of the search. If omitted,
! or nil, `c-beginning-of-defun' is used.
!
! The last point calculated is cached if the cache is enabled, i.e. if
! `c-in-literal-cache' is bound to a two element vector.
!
! This function does not do any hidden buffer changes."
! (if (and (vectorp c-in-literal-cache)
! (= (point) (aref c-in-literal-cache 0)))
! (aref c-in-literal-cache 1)
! (let ((rtn (save-excursion
! (let* ((pos (point))
! (lim (or lim (progn
! (c-beginning-of-syntax)
! (point))))
! (state (parse-partial-sexp lim pos)))
! (cond
! ((elt state 3) 'string)
! ((elt state 4) (if (elt state 7) 'c++ 'c))
! ((and detect-cpp (c-beginning-of-macro lim)) 'pound)
! (t nil))))))
! ;; cache this result if the cache is enabled
! (if (not c-in-literal-cache)
! (setq c-in-literal-cache (vector (point) rtn)))
! rtn)))
!
! ;; XEmacs has a built-in function that should make this much quicker.
! ;; I don't think we even need the cache, which makes our lives more
! ;; complicated anyway. In this case, lim is only used to detect
! ;; cpp directives.
! ;;
! ;; Note that there is a bug in Xemacs's buffer-syntactic-context when used in
! ;; conjunction with syntax-table-properties. The bug is present in, e.g.,
! ;; Xemacs 21.4.4. It manifested itself thus:
! ;;
! ;; Starting with an empty AWK Mode buffer, type
! ;; /regexp/ {<C-j>
! ;; Point gets wrongly left at column 0, rather than being indented to
tab-width.
! ;;
! ;; AWK Mode is designed such that when the first / is typed, it gets the
! ;; syntax-table property "string fence". When the second / is typed, BOTH /s
! ;; are given the s-t property "string". However, buffer-syntactic-context
! ;; fails to take account of the change of the s-t property on the opening / to
! ;; "string", and reports that the { is within a string started by the second
/.
! ;;
! ;; The workaround for this is for the AWK Mode initialisation to switch the
! ;; defalias for c-in-literal to c-slow-in-literal. This will slow down other
! ;; cc-modes in Xemacs whenever an awk-buffer has been initialised.
! ;;
! ;; (Alan Mackenzie, 2003/4/30).
!
! (defun c-fast-in-literal (&optional lim detect-cpp)
! (let ((context (buffer-syntactic-context)))
! (cond
! ((eq context 'string) 'string)
! ((eq context 'comment) 'c++)
! ((eq context 'block-comment) 'c)
! ((and detect-cpp (save-excursion (c-beginning-of-macro lim))) 'pound))))
!
! (defalias 'c-in-literal
! (if (fboundp 'buffer-syntactic-context)
! 'c-fast-in-literal ; Xemacs
! 'c-slow-in-literal)) ; GNU Emacs
!
! ;; The defalias above isn't enough to shut up the byte compiler.
! (cc-bytecomp-defun c-in-literal)
!
! (defun c-literal-limits (&optional lim near not-in-delimiter)
! "Return a cons of the beginning and end positions of the comment or
! string surrounding point (including both delimiters), or nil if point
! isn't in one. If LIM is non-nil, it's used as the \"safe\" position
! to start parsing from. If NEAR is non-nil, then the limits of any
! literal next to point is returned. \"Next to\" means there's only
! spaces and tabs between point and the literal. The search for such a
! literal is done first in forward direction. If NOT-IN-DELIMITER is
! non-nil, the case when point is inside a starting delimiter won't be
! recognized. This only has effect for comments, which have starting
! delimiters with more than one character.
!
! This function does not do any hidden buffer changes."
!
! (save-excursion
! (let* ((pos (point))
! (lim (or lim (progn
! (c-beginning-of-syntax)
! (point))))
! (state (parse-partial-sexp lim pos)))
!
! (cond ((elt state 3)
! ;; String. Search backward for the start.
! (while (elt state 3)
! (search-backward (make-string 1 (elt state 3)))
! (setq state (parse-partial-sexp lim (point))))
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
!
! ((elt state 7)
! ;; Line comment. Search from bol for the comment starter.
! (beginning-of-line)
! (setq state (parse-partial-sexp lim (point))
! lim (point))
! (while (not (elt state 7))
! (search-forward "//") ; Should never fail.
! (setq state (parse-partial-sexp
! lim (point) nil nil state)
! lim (point)))
! (backward-char 2)
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! ((elt state 4)
! ;; Block comment. Search backward for the comment starter.
! (while (elt state 4)
! (search-backward "/*") ; Should never fail.
! (setq state (parse-partial-sexp lim (point))))
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! ((and (not not-in-delimiter)
! (not (elt state 5))
! (eq (char-before) ?/)
! (looking-at "[/*]"))
! ;; We're standing in a comment starter.
! (backward-char 1)
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! (near
! (goto-char pos)
!
! ;; Search forward for a literal.
! (skip-chars-forward " \t")
!
! (cond
! ((looking-at c-string-limit-regexp) ; String.
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
!
! ((looking-at c-comment-start-regexp) ; Line or block comment.
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! (t
! ;; Search backward.
! (skip-chars-backward " \t")
!
! (let ((end (point)) beg)
! (cond
! ((save-excursion
! (< (skip-syntax-backward c-string-syntax) 0)) ; String.
! (setq beg (c-safe (c-backward-sexp 1) (point))))
!
! ((and (c-safe (forward-char -2) t)
! (looking-at "*/"))
! ;; Block comment. Due to the nature of line
! ;; comments, they will always be covered by the
! ;; normal case above.
! (goto-char end)
! (c-backward-single-comment)
! ;; If LIM is bogus, beg will be bogus.
! (setq beg (point))))
!
! (if beg (cons beg end))))))
! ))))
!
! (defun c-literal-limits-fast (&optional lim near not-in-delimiter)
! ;; Like c-literal-limits, but for emacsen whose `parse-partial-sexp'
! ;; returns the pos of the comment start.
!
! "Return a cons of the beginning and end positions of the comment or
! string surrounding point (including both delimiters), or nil if point
! isn't in one. If LIM is non-nil, it's used as the \"safe\" position
! to start parsing from. If NEAR is non-nil, then the limits of any
! literal next to point is returned. \"Next to\" means there's only
! spaces and tabs between point and the literal. The search for such a
! literal is done first in forward direction. If NOT-IN-DELIMITER is
! non-nil, the case when point is inside a starting delimiter won't be
! recognized. This only has effect for comments, which have starting
! delimiters with more than one character.
!
! This function does not do any hidden buffer changes."
!
! (save-excursion
! (let* ((pos (point))
! (lim (or lim (progn
! (c-beginning-of-syntax)
! (point))))
! (state (parse-partial-sexp lim pos)))
!
! (cond ((elt state 3) ; String.
! (goto-char (elt state 8))
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
!
! ((elt state 4) ; Comment.
! (goto-char (elt state 8))
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! ((and (not not-in-delimiter)
! (not (elt state 5))
! (eq (char-before) ?/)
! (looking-at "[/*]"))
! ;; We're standing in a comment starter.
! (backward-char 1)
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! (near
! (goto-char pos)
!
! ;; Search forward for a literal.
! (skip-chars-forward " \t")
!
! (cond
! ((looking-at c-string-limit-regexp) ; String.
! (cons (point) (or (c-safe (c-forward-sexp 1) (point))
! (point-max))))
!
! ((looking-at c-comment-start-regexp) ; Line or block comment.
! (cons (point) (progn (c-forward-single-comment) (point))))
!
! (t
! ;; Search backward.
! (skip-chars-backward " \t")
!
! (let ((end (point)) beg)
! (cond
! ((save-excursion
! (< (skip-syntax-backward c-string-syntax) 0)) ; String.
! (setq beg (c-safe (c-backward-sexp 1) (point))))
!
! ((and (c-safe (forward-char -2) t)
! (looking-at "*/"))
! ;; Block comment. Due to the nature of line
! ;; comments, they will always be covered by the
! ;; normal case above.
! (goto-char end)
! (c-backward-single-comment)
! ;; If LIM is bogus, beg will be bogus.
! (setq beg (point))))
!
! (if beg (cons beg end))))))
! ))))
!
! (if (memq 'pps-extended-state c-emacs-features)
! (defalias 'c-literal-limits 'c-literal-limits-fast))
!
! (defun c-collect-line-comments (range)
! "If the argument is a cons of two buffer positions (such as returned by
! `c-literal-limits'), and that range contains a C++ style line comment,
! then an extended range is returned that contains all adjacent line
! comments (i.e. all comments that starts in the same column with no
! empty lines or non-whitespace characters between them). Otherwise the
! argument is returned.
!
! This function does not do any hidden buffer changes."
! (save-excursion
! (condition-case nil
! (if (and (consp range) (progn
! (goto-char (car range))
! (looking-at "//")))
! (let ((col (current-column))
! (beg (point))
! (bopl (c-point 'bopl))
! (end (cdr range)))
! ;; Got to take care in the backward direction to handle
! ;; comments which are preceded by code.
! (while (and (c-backward-single-comment)
! (>= (point) bopl)
! (looking-at "//")
! (= col (current-column)))
! (setq beg (point)
! bopl (c-point 'bopl)))
! (goto-char end)
! (while (and (progn (skip-chars-forward " \t")
! (looking-at "//"))
! (= col (current-column))
! (prog1 (zerop (forward-line 1))
! (setq end (point)))))
! (cons beg end))
! range)
! (error range))))
!
! (defun c-literal-type (range)
! "Convenience function that given the result of `c-literal-limits',
! returns nil or the type of literal that the range surrounds. It's
! much faster than using `c-in-literal' and is intended to be used when
! you need both the type of a literal and its limits.
!
! This function does not do any hidden buffer changes."
! (if (consp range)
! (save-excursion
! (goto-char (car range))
! (cond ((looking-at c-string-limit-regexp) 'string)
! ((or (looking-at "//") ; c++ line comment
! (and (looking-at "\\s<") ; comment starter
! (looking-at "#"))) ; awk comment.
! 'c++)
! (t 'c))) ; Assuming the range is valid.
! range))
!
!
! ;; `c-find-decl-spots' and accompanying stuff.
!
! ;; Variables used in `c-find-decl-spots' to cache the search done for
! ;; the first declaration in the last call. When that function starts,
! ;; it needs to back up over syntactic whitespace to look at the last
! ;; token before the region being searched. That can sometimes cause
! ;; moves back and forth over a quite large region of comments and
! ;; macros, which would be repeated for each changed character when
! ;; we're called during fontification, since font-lock refontifies the
! ;; current line for each change. Thus it's worthwhile to cache the
! ;; first match.
! ;;
! ;; `c-find-decl-syntactic-pos' is a syntactically relevant position in
! ;; the syntactic whitespace less or equal to some start position.
! ;; There's no cached value if it's nil.
! ;;
! ;; `c-find-decl-match-pos' is the match position if
! ;; `c-find-decl-prefix-search' matched before the syntactic whitespace
! ;; at `c-find-decl-syntactic-pos', or nil if there's no such match.
! (defvar c-find-decl-syntactic-pos nil)
! (make-variable-buffer-local 'c-find-decl-syntactic-pos)
! (defvar c-find-decl-match-pos nil)
! (make-variable-buffer-local 'c-find-decl-match-pos)
!
! (defsubst c-invalidate-find-decl-cache (change-min-pos)
! (and c-find-decl-syntactic-pos
! (< change-min-pos c-find-decl-syntactic-pos)
! (setq c-find-decl-syntactic-pos nil)))
!
! ; (defface c-debug-decl-spot-face
! ; '((t (:background "Turquoise")))
! ; "Debug face to mark the spots where `c-find-decl-spots' stopped.")
! ; (defface c-debug-decl-sws-face
! ; '((t (:background "Khaki")))
! ; "Debug face to mark the syntactic whitespace between the declaration
! ; spots and the preceding token end.")
!
! (defmacro c-debug-put-decl-spot-faces (match-pos decl-pos)
! (when (facep 'c-debug-decl-spot-face)
! `(let ((match-pos ,match-pos) (decl-pos ,decl-pos))
! (c-debug-add-face (max match-pos (point-min)) decl-pos
! 'c-debug-decl-sws-face)
! (c-debug-add-face decl-pos (min (1+ decl-pos) (point-max))
! 'c-debug-decl-spot-face))))
! (defmacro c-debug-remove-decl-spot-faces (beg end)
! (when (facep 'c-debug-decl-spot-face)
! `(progn
! (c-debug-remove-face ,beg ,end 'c-debug-decl-spot-face)
! (c-debug-remove-face ,beg ,end 'c-debug-decl-sws-face))))
!
! (defmacro c-find-decl-prefix-search ()
! ;; Macro used inside `c-find-decl-spots'. It ought to be a defun,
! ;; but it contains lots of free variables that refer to things
! ;; inside `c-find-decl-spots'. The point is left at `cfd-match-pos'
! ;; if there is a match, otherwise at `cfd-limit'.
!
! '(progn
! ;; Find the next property match position if we haven't got one already.
! (unless cfd-prop-match
! (save-excursion
! (while (progn
! (goto-char (next-single-property-change
! (point) 'c-type nil cfd-limit))
! (and (< (point) cfd-limit)
! (not (eq (c-get-char-property (1- (point)) 'c-type)
! 'c-decl-end)))))
! (setq cfd-prop-match (point))))
!
! ;; Find the next `c-decl-prefix-re' match if we haven't got one already.
! (unless cfd-re-match
! (while (and (setq cfd-re-match
! (re-search-forward c-decl-prefix-re cfd-limit 'move))
! (c-got-face-at (1- (setq cfd-re-match (match-end 1)))
! c-literal-faces))
! ;; Search again if the match is within a comment or a string literal.
! (while (progn
! (goto-char (next-single-property-change
! cfd-re-match 'face nil cfd-limit))
! (and (< (point) cfd-limit)
! (c-got-face-at (point) c-literal-faces)))
! (setq cfd-re-match (point))))
! (unless cfd-re-match
! (setq cfd-re-match cfd-limit)))
!
! ;; Choose whichever match is closer to the start.
! (if (< cfd-re-match cfd-prop-match)
! (setq cfd-match-pos cfd-re-match
! cfd-re-match nil)
! (setq cfd-match-pos cfd-prop-match
! cfd-prop-match nil))
!
! (goto-char cfd-match-pos)
!
! (when (< cfd-match-pos cfd-limit)
! ;; Skip forward past comments only so we don't skip macros.
! (c-forward-comments)
! ;; Set the position to continue at. We can avoid going over
! ;; the comments skipped above a second time, but it's possible
! ;; that the comment skipping has taken us past `cfd-prop-match'
! ;; since the property might be used inside comments.
! (setq cfd-continue-pos (if cfd-prop-match
! (min cfd-prop-match (point))
! (point))))))
!
! (defun c-find-decl-spots (cfd-limit cfd-decl-re cfd-face-checklist cfd-fun)
! ;; Call CFD-FUN for each possible spot for a declaration from the
! ;; point to CFD-LIMIT. A spot for a declaration is the first token
! ;; in the buffer and each token after the ones matched by
! ;; `c-decl-prefix-re' and after the occurrences of the `c-type'
! ;; property with the value `c-decl-end' (if `c-type-decl-end-used'
! ;; is set). Only a spot that match CFD-DECL-RE and whose face is in
! ;; the CFD-FACE-CHECKLIST list causes CFD-FUN to be called. The
! ;; face check is disabled if CFD-FACE-CHECKLIST is nil.
! ;;
! ;; If the match is inside a macro then the buffer is narrowed to the
! ;; end of it, so that CFD-FUN can investigate the following tokens
! ;; without matching something that begins inside a macro and ends
! ;; outside it. It's to avoid this work that the CFD-DECL-RE and
! ;; CFD-FACE-CHECKLIST checks exist.
! ;;
! ;; CFD-FUN is called with point at the start of the spot. It's
! ;; passed two arguments: The first is the end position of the token
! ;; that `c-decl-prefix-re' matched, or 0 for the implicit match at
! ;; bob. The second is a flag that is t when the match is inside a
! ;; macro.
! ;;
! ;; It's assumed that comment and strings are fontified in the
! ;; searched range.
! ;;
! ;; This is mainly used in fontification, and so has an elaborate
! ;; cache to handle repeated calls from the same start position; see
! ;; the variables above.
! ;;
! ;; All variables in this function begin with `cfd-' to avoid name
! ;; collision with the (dynamically bound) variables used in CFD-FUN.
!
! (let ((cfd-buffer-end (point-max))
! ;; The last regexp match found by `c-find-decl-prefix-search'.
! cfd-re-match
! ;; The last `c-decl-end' found by `c-find-decl-prefix-search'.
! ;; If searching for the property isn't needed then we disable
! ;; it by faking a first match at the limit.
! (cfd-prop-match (unless c-type-decl-end-used cfd-limit))
! ;; The position of the last match found by
! ;; `c-find-decl-prefix-search'. For regexp matches it's the
! ;; end of the matched token, for property matches it's the end
! ;; of the property. 0 for the implicit match at bob.
! ;; `cfd-limit' if there's no match.
! (cfd-match-pos cfd-limit)
! ;; The position to continue searching at.
! cfd-continue-pos
! ;; The position of the last "real" token we've stopped at.
! ;; This can be greater than `cfd-continue-pos' when we get
! ;; hits inside macros or at `c-decl-end' positions inside
! ;; comments.
! (cfd-token-pos 0)
! ;; The end position of the last entered macro.
! (cfd-macro-end 0))
!
! ;; Initialize by finding a syntactically relevant start position
! ;; before the point, and do the first `c-decl-prefix-re' search
! ;; unless we're at bob.
!
! (let ((start-pos (point)) syntactic-pos)
! ;; Must back up a bit since we look for the end of the previous
! ;; statement or declaration, which is earlier than the first
! ;; returned match.
!
! (when (c-got-face-at (point) c-literal-faces)
! ;; But first we need to move to a syntactically relevant
! ;; position. Use the faces to back up to the start of the
! ;; comment or string literal.
! (when (and (not (bobp))
! (c-got-face-at (1- (point)) c-literal-faces))
! (while (progn
! (goto-char (previous-single-property-change
! (point) 'face nil (point-min)))
! (and (> (point) (point-min))
! (c-got-face-at (point) c-literal-faces)))))
!
! ;; XEmacs doesn't fontify the quotes surrounding string
! ;; literals.
! (and (featurep 'xemacs)
! (eq (get-text-property (point) 'face)
! 'font-lock-string-face)
! (not (bobp))
! (progn (backward-char)
! (not (looking-at c-string-limit-regexp)))
! (forward-char))
!
! ;; The font lock package might not have fontified the start of
! ;; the literal at all so check that we have arrived at
! ;; something that looks like a start or else resort to
! ;; `c-literal-limits'.
! (unless (looking-at c-literal-start-regexp)
! (let ((range (c-literal-limits)))
! (if range (goto-char (car range))))))
!
! ;; Must back out of any macro so that we don't miss any
! ;; declaration that could follow after it, unless the limit is
! ;; inside the macro. We only check that for the current line to
! ;; save some time; it's enough for the by far most common case
! ;; when font-lock refontifies the current line only.
! (when (save-excursion
! (and (= (forward-line 1) 0)
! (or (< (c-point 'eol) cfd-limit)
! (progn (backward-char)
! (not (eq (char-before) ?\\))))))
! (c-beginning-of-macro))
!
! ;; Clear the cache if it applied further down.
! (c-invalidate-find-decl-cache start-pos)
!
! (setq syntactic-pos (point))
! (c-backward-syntactic-ws c-find-decl-syntactic-pos)
!
! ;; If we hit `c-find-decl-syntactic-pos' and
! ;; `c-find-decl-match-pos' is set then we install the cached
! ;; values. If we hit `c-find-decl-syntactic-pos' and
! ;; `c-find-decl-match-pos' is nil then we know there's no decl
! ;; prefix in the whitespace before `c-find-decl-syntactic-pos'
! ;; and so we can continue the search from this point. If we
! ;; didn't hit `c-find-decl-syntactic-pos' then we're now in the
! ;; right spot to begin searching anyway.
! (if (and (eq (point) c-find-decl-syntactic-pos)
! c-find-decl-match-pos)
!
! (progn
! ;; The match is always outside macros and comments so we
! ;; start at the next token. The loop below will later go
! ;; back using `cfd-continue-pos' to fix declarations inside
! ;; the syntactic ws.
! (goto-char syntactic-pos)
! (c-forward-syntactic-ws)
! (setq cfd-match-pos c-find-decl-match-pos
! cfd-continue-pos syntactic-pos)
! (if (< cfd-continue-pos (point))
! (setq cfd-token-pos (point))))
!
! (setq c-find-decl-syntactic-pos syntactic-pos)
!
! (when (if (bobp)
! ;; Always consider bob a match to get the first declaration
! ;; in the file. Do this separately instead of letting
! ;; `c-decl-prefix-re' match bob, so that it always can
! ;; consume at least one character to ensure that we won't
! ;; get stuck in an infinite loop.
! (setq cfd-re-match 0)
! (backward-char)
! (c-beginning-of-current-token)
! (< (point) cfd-limit))
! ;; Do an initial search now. In the bob case above it's only done
! ;; to search for the `c-type' property.
! (c-find-decl-prefix-search))
!
! ;; Advance `cfd-continue-pos' if we got a hit before the start
! ;; position. The earliest position that could affect after
! ;; the start position is the char before the preceding
! ;; comments.
! (when (and cfd-continue-pos (< cfd-continue-pos start-pos))
! (goto-char syntactic-pos)
! (c-backward-comments)
! (unless (bobp)
! (backward-char)
! (c-beginning-of-current-token))
! (setq cfd-continue-pos (max cfd-continue-pos (point))))
!
! ;; If we got a match it's always outside macros and comments so
! ;; advance to the next token and set `cfd-token-pos'. The loop
! ;; below will later go back using `cfd-continue-pos' to fix
! ;; declarations inside the syntactic ws.
! (when (and (< cfd-match-pos cfd-limit) (< (point) syntactic-pos))
! (goto-char syntactic-pos)
! (c-forward-syntactic-ws)
! (and cfd-continue-pos
! (< cfd-continue-pos (point))
! (setq cfd-token-pos (point))))
!
! (setq c-find-decl-match-pos (and (< cfd-match-pos start-pos)
! cfd-match-pos))))
!
! ;; Now loop. We already got the first match.
!
! (while (progn
! (while (and
! (< cfd-match-pos cfd-limit)
!
! (or
! ;; Kludge to filter out matches on the "<" that
! ;; aren't open parens, for the sake of languages
! ;; that got `c-recognize-<>-arglists' set.
! (and (eq (char-before cfd-match-pos) ?<)
! (not (c-get-char-property (1- cfd-match-pos)
! 'syntax-table)))
!
! ;; If `cfd-continue-pos' is less or equal to
! ;; `cfd-token-pos', we've got a hit inside a macro
! ;; that's in the syntactic whitespace before the last
! ;; "real" declaration we've checked. If they're equal
! ;; we've arrived at the declaration a second time, so
! ;; there's nothing to do.
! (= cfd-continue-pos cfd-token-pos)
!
! (progn
! ;; If `cfd-continue-pos' is less than `cfd-token-pos'
! ;; we're still searching for declarations embedded in
! ;; the syntactic whitespace. In that case we need
! ;; only to skip comments and not macros, since they
! ;; can't be nested, and that's already been done in
! ;; `c-find-decl-prefix-search'.
! (when (> cfd-continue-pos cfd-token-pos)
! (c-forward-syntactic-ws)
! (setq cfd-token-pos (point)))
!
! ;; Continue if the following token fails the
! ;; CFD-DECL-RE and CFD-FACE-CHECKLIST checks.
! (when (or (>= (point) cfd-limit)
! (not (looking-at cfd-decl-re))
! (and cfd-face-checklist
! (not (c-got-face-at
! (point) cfd-face-checklist))))
! (goto-char cfd-continue-pos)
! t)))
!
! (< (point) cfd-limit))
! (c-find-decl-prefix-search))
!
! (< (point) cfd-limit))
!
! (when (progn
! ;; Narrow to the end of the macro if we got a hit inside
! ;; one, to avoid recognizing things that start inside
! ;; the macro and end outside it.
! (when (> cfd-match-pos cfd-macro-end)
! ;; Not in the same macro as in the previous round.
! (save-excursion
! (goto-char cfd-match-pos)
! (setq cfd-macro-end
! (if (save-excursion (and (c-beginning-of-macro)
! (< (point) cfd-match-pos)))
! (progn (c-end-of-macro)
! (point))
! 0))))
!
! (if (zerop cfd-macro-end)
! t
! (if (> cfd-macro-end (point))
! (progn (narrow-to-region (point-min) cfd-macro-end)
! t)
! ;; The matched token was the last thing in the
! ;; macro, so the whole match is bogus.
! (setq cfd-macro-end 0)
! nil)))
!
! (c-debug-put-decl-spot-faces cfd-match-pos (point))
! (funcall cfd-fun cfd-match-pos (/= cfd-macro-end 0))
!
! (when (/= cfd-macro-end 0)
! ;; Restore limits if we did macro narrowment above.
! (narrow-to-region (point-min) cfd-buffer-end)))
!
! (goto-char cfd-continue-pos)
! (if (= cfd-continue-pos cfd-limit)
! (setq cfd-match-pos cfd-limit)
! (c-find-decl-prefix-search)))))
!
!
! ;; A cache for found types.
! ;; Buffer local variable that contains an obarray with the types we've
! ;; found. If a declaration is recognized somewhere we record the
! ;; fully qualified identifier in it to recognize it as a type
! ;; elsewhere in the file too. This is not accurate since we do not
! ;; bother with the scoping rules of the languages, but in practice the
! ;; same name is seldom used as both a type and something else in a
! ;; file, and we only use this as a last resort in ambiguous cases (see
! ;; `c-font-lock-declarations').
! (defvar c-found-types nil)
! (make-variable-buffer-local 'c-found-types)
! (defsubst c-clear-found-types ()
! ;; Clears `c-found-types'.
! ;;
! ;; This function does not do any hidden buffer changes.
! (setq c-found-types (make-vector 53 0)))
!
! (defun c-add-type (from to)
! ;; Add the given region as a type in `c-found-types'. If the region
! ;; doesn't match an existing type but there is a type which is equal
! ;; to the given one except that the last character is missing, then
! ;; the shorter type is removed. That's done to avoid adding all
! ;; prefixes of a type as it's being entered and font locked. This
! ;; doesn't cover cases like when characters are removed from a type
! ;; or added in the middle. We'd need the position of point when the
! ;; font locking is invoked to solve this well.
! (unless (and c-recognize-<>-arglists
! (save-excursion
! (goto-char from)
! (c-syntactic-re-search-forward "<" to t)))
! ;; To avoid storing very long strings, do not add a type that
! ;; contains '<' in languages with angle bracket arglists, since
! ;; the type then probably contains a C++ template spec and those
! ;; can be fairly sized programs in themselves.
! (let ((type (c-syntactic-content from to)))
! (unless (intern-soft type c-found-types)
! (unintern (substring type 0 -1) c-found-types)
! (intern type c-found-types)))))
!
! (defsubst c-check-type (from to)
! ;; Return non-nil if the given region contains a type in
! ;; `c-found-types'.
! (intern-soft (c-syntactic-content from to) c-found-types))
!
! (defun c-list-found-types ()
! ;; Return all the types in `c-found-types' as a sorted list of
! ;; strings.
! (let (type-list)
! (mapatoms (lambda (type)
! (setq type-list (cons (symbol-name type)
! type-list)))
! c-found-types)
! (sort type-list 'string-lessp)))
!
!
! ;; Handling of small scale constructs like types and names.
!
! (defun c-remove-<>-arglist-properties (from to)
! ;; Remove all the properties put by `c-forward-<>-arglist' in the
! ;; specified region. Point is clobbered.
! (goto-char from)
! (while (progn (skip-chars-forward "^<>," to)
! (< (point) to))
! (if (eq (char-after) ?,)
! (when (eq (c-get-char-property (point) 'c-type) 'c-<>-arg-sep)
! (c-clear-char-property (point) 'c-type))
! (c-clear-char-property (point) 'syntax-table))
! (forward-char)))
!
! ;; Dynamically bound variable that instructs `c-forward-type' to also
! ;; treat possible types (i.e. those that it normally returns 'maybe or
! ;; 'found for) as actual types (and always return 'found for them).
! ;; This means that it records them in `c-record-type-identifiers' if
! ;; that is set, and that it adds them to `c-found-types'.
! (defvar c-promote-possible-types nil)
!
! ;; Dynamically bound variable that instructs `c-forward-<>-arglist' to
! ;; not accept arglists that contain more than one argument. It's used
! ;; to handle ambiguous cases like "foo (a < b, c > d)" better.
! (defvar c-disallow-comma-in-<>-arglists nil)
!
! ;; Dynamically bound variables that instructs `c-forward-name',
! ;; `c-forward-type' and `c-forward-<>-arglist' to record the ranges of
! ;; all the type and reference identifiers they encounter. They will
! ;; build lists on these variables where each element is a cons of the
! ;; buffer positions surrounding each identifier. This recording is
! ;; only activated when `c-record-type-identifiers' is non-nil.
! ;;
! ;; All known types that can't be identifiers are recorded, and also
! ;; other possible types if `c-promote-possible-types' is set.
! ;; Recording is however disabled inside angle bracket arglists that
! ;; are encountered inside names and other angle bracket arglists.
! ;; Such occurences are taken care of by `c-font-lock-<>-arglists'
! ;; instead.
! ;;
! ;; Only the names in C++ template style references (e.g. "tmpl" in
! ;; "tmpl<a,b>::foo") are recorded as references, other references
! ;; aren't handled here.
! (defvar c-record-type-identifiers nil)
! (defvar c-record-ref-identifiers nil)
!
! ;; If `c-record-type-identifiers' is set, this will receive a cons
! ;; cell of the range of the last single identifier symbol stepped over
! ;; by `c-forward-name' if it's successful. This is the range that
! ;; should be put on one of the record lists by the caller. It's
! ;; assigned nil if there's no such symbol in the name.
! (defvar c-last-identifier-range nil)
!
! (defmacro c-record-type-id (range)
! (if (eq (car-safe range) 'cons)
! ;; Always true.
! `(setq c-record-type-identifiers
! (cons ,range c-record-type-identifiers))
! `(let ((range ,range))
! (if range
! (setq c-record-type-identifiers
! (cons range c-record-type-identifiers))))))
!
! (defmacro c-record-ref-id (range)
! (if (eq (car-safe range) 'cons)
! ;; Always true.
! `(setq c-record-ref-identifiers
! (cons ,range c-record-ref-identifiers))
! `(let ((range ,range))
! (if range
! (setq c-record-ref-identifiers
! (cons range c-record-ref-identifiers))))))
!
! ;; Dynamically bound variable that instructs `c-forward-type' to
! ;; record the ranges of types that only are found. Behaves otherwise
! ;; like `c-record-type-identifiers'.
! (defvar c-record-found-types nil)
!
! (defmacro c-forward-keyword-prefixed-id (type)
! ;; Used internally in `c-forward-keyword-clause' to move forward
! ;; over a type (if TYPE is 'type) or a name (otherwise) which
! ;; possibly is prefixed by keywords and their associated clauses.
! ;; Try with a type/name first to not trip up on those that begin
! ;; with a keyword. Return t if a known or found type is moved
! ;; over. The point is clobbered if nil is returned. If range
! ;; recording is enabled, the identifier is recorded on as a type
! ;; if TYPE is 'type or as a reference if TYPE is 'ref.
! `(let (res)
! (while (if (setq res ,(if (eq type 'type)
! `(c-forward-type)
! `(c-forward-name)))
! nil
! (and (looking-at c-keywords-regexp)
! (c-forward-keyword-clause))))
! (when (memq res '(t known found prefix))
! ,(when (eq type 'ref)
! `(when c-record-type-identifiers
! (c-record-ref-id c-last-identifier-range)))
! t)))
!
! (defmacro c-forward-id-comma-list (type)
! ;; Used internally in `c-forward-keyword-clause' to move forward
! ;; over a comma separated list of types or names using
! ;; `c-forward-keyword-prefixed-id'.
! `(while (and (progn
! (setq safe-pos (point))
! (eq (char-after) ?,))
! (progn
! (forward-char)
! (c-forward-syntactic-ws)
! (c-forward-keyword-prefixed-id ,type)))))
!
! (defun c-forward-keyword-clause ()
! ;; The first submatch in the current match data is assumed to
! ;; surround a token. If it's a keyword, move over it and any
! ;; following clauses associated with it, stopping at the next
! ;; following token. t is returned in that case, otherwise the point
! ;; stays and nil is returned. The kind of clauses that are
! ;; recognized are those specified by `c-type-list-kwds',
! ;; `c-ref-list-kwds', `c-colon-type-list-kwds',
! ;; `c-paren-nontype-kwds', `c-paren-type-kwds', `c-<>-type-kwds',
! ;; and `c-<>-arglist-kwds'.
!
! (let ((kwd-sym (c-keyword-sym (match-string 1))) safe-pos pos)
! (when kwd-sym
! (goto-char (match-end 1))
! (c-forward-syntactic-ws)
! (setq safe-pos (point))
!
! (cond
! ((and (c-keyword-member kwd-sym 'c-type-list-kwds)
! (c-forward-keyword-prefixed-id type))
! ;; There's a type directly after a keyword in `c-type-list-kwds'.
! (c-forward-id-comma-list type))
!
! ((and (c-keyword-member kwd-sym 'c-ref-list-kwds)
! (c-forward-keyword-prefixed-id ref))
! ;; There's a name directly after a keyword in `c-ref-list-kwds'.
! (c-forward-id-comma-list ref))
!
! ((and (c-keyword-member kwd-sym 'c-paren-any-kwds)
! (eq (char-after) ?\())
! ;; There's an open paren after a keyword in `c-paren-any-kwds'.
!
! (forward-char)
! (when (and (setq pos (c-up-list-forward))
! (eq (char-before pos) ?\)))
! (when (and c-record-type-identifiers
! (c-keyword-member kwd-sym 'c-paren-type-kwds))
! ;; Use `c-forward-type' on every identifier we can find
! ;; inside the paren, to record the types.
! (while (c-syntactic-re-search-forward c-symbol-start pos t)
! (goto-char (match-beginning 0))
! (unless (c-forward-type)
! (looking-at c-symbol-key) ; Always matches.
! (goto-char (match-end 0)))))
!
! (goto-char pos)
! (c-forward-syntactic-ws)
! (setq safe-pos (point))))
!
! ((and (c-keyword-member kwd-sym 'c-<>-sexp-kwds)
! (eq (char-after) ?<)
! (c-forward-<>-arglist (c-keyword-member kwd-sym 'c-<>-type-kwds)
! (or c-record-type-identifiers
! c-disallow-comma-in-<>-arglists)))
! (c-forward-syntactic-ws)
! (setq safe-pos (point)))
!
! ((and (c-keyword-member kwd-sym 'c-nonsymbol-sexp-kwds)
! (not (looking-at c-symbol-start)))
! (c-forward-sexp)
! (c-forward-syntactic-ws)
! (setq safe-pos (point))))
!
! (when (and (c-keyword-member kwd-sym 'c-colon-type-list-kwds)
! (progn
! ;; If a keyword matched both one of the types above and
! ;; this one, we match `c-colon-type-list-re' after the
! ;; clause matched above.
! (goto-char safe-pos)
! (looking-at c-colon-type-list-re))
! (progn
! (goto-char (match-end 0))
! (c-forward-syntactic-ws)
! (c-forward-keyword-prefixed-id type)))
! ;; There's a type after the `c-colon-type-list-re'
! ;; match after a keyword in `c-colon-type-list-kwds'.
! (c-forward-id-comma-list type))
!
! (goto-char safe-pos)
! t)))
!
! (defun c-forward-<>-arglist (all-types reparse)
! ;; The point is assumed to be at a '<'. Try to treat it as the open
! ;; paren of an angle bracket arglist and move forward to the the
! ;; corresponding '>'. If successful, the point is left after the
! ;; '>' and t is returned, otherwise the point isn't moved and nil is
! ;; returned. If ALL-TYPES is t then all encountered arguments in
! ;; the arglist that might be types are treated as found types.
! ;;
! ;; The surrounding '<' and '>' are given syntax-table properties to
! ;; make them behave like parentheses. Each argument separating ','
! ;; is also set to `c-<>-arg-sep' in the `c-type' property. These
! ;; properties are also cleared in a relevant region forward from the
! ;; point if they seems to be set and it turns out to not be an
! ;; arglist.
! ;;
! ;; If the arglist has been successfully parsed before then paren
! ;; syntax properties will be exploited to quickly jump to the end,
! ;; but that can be disabled by setting REPARSE to t. That is
! ;; necessary if the various side effects, e.g. recording of type
! ;; ranges, are important. Setting REPARSE to t only applies
! ;; recursively to nested angle bracket arglists if
! ;; `c-disallow-comma-in-<>-arglists' is set.
! ;;
! ;; This is primarily used in C++ to mark up template arglists. C++
! ;; disambiguates them by checking whether the preceding name is a
! ;; template or not. We can't do that, so we assume it is a template
! ;; if it can be parsed as one. This usually works well since
! ;; comparison expressions on the forms "a < b > c" or "a < b, c > d"
! ;; in almost all cases would be pointless. Cases like function
! ;; calls on the form "foo (a < b, c > d)" needs to be handled
! ;; specially through the `c-disallow-comma-in-<>-arglists' variable.
!
! (let ((start (point))
! ;; If `c-record-type-identifiers' is set then activate
! ;; recording of any found types that constitute an argument in
! ;; the arglist.
! (c-record-found-types (if c-record-type-identifiers t)))
! (if (catch 'angle-bracket-arglist-escape
! (setq c-record-found-types
! (c-forward-<>-arglist-recur all-types reparse)))
! (progn
! (when (consp c-record-found-types)
! (setq c-record-type-identifiers
! ;; `nconc' doesn't mind that the tail of
! ;; `c-record-found-types' is t.
! (nconc c-record-found-types c-record-type-identifiers)))
! t)
!
! (goto-char start)
nil)))
+ (defun c-forward-<>-arglist-recur (all-types reparse)
+ ;; Recursive part of `c-forward-<>-arglist'.
+
+ (let ((start (point)) res pos tmp
+ ;; Cover this so that any recorded found type ranges are
+ ;; automatically lost if it turns out to not be an angle
+ ;; bracket arglist. It's propagated through the return value
+ ;; on successful completion.
+ (c-record-found-types c-record-found-types)
+ ;; List that collects the positions after the argument
+ ;; separating ',' in the arglist.
+ arg-start-pos)
+
+ ;; If the '<' has paren open syntax then we've marked it as an
+ ;; angle bracket arglist before, so try to skip to the end and see
+ ;; that the close paren matches.
+ (if (and (c-get-char-property (point) 'syntax-table)
+ (progn
+ (forward-char)
+ (if (and (not (looking-at c-<-op-cont-regexp))
+ (if (c-parse-sexp-lookup-properties)
+ (c-go-up-list-forward)
+ (catch 'at-end
+ (let ((depth 1))
+ (while (c-syntactic-re-search-forward
+ "[<>]" nil t t)
+ (when (c-get-char-property (1- (point))
+ 'syntax-table)
+ (if (eq (char-before) ?<)
+ (setq depth (1+ depth))
+ (setq depth (1- depth))
+ (when (= depth 0) (throw 'at-end t)))))
+ nil)))
+ (not (looking-at c->-op-cont-regexp))
+ (save-excursion
+ (backward-char)
+ (= (point)
+ (progn (c-beginning-of-current-token)
+ (point)))))
+
+ ;; Got an arglist that appears to be valid.
+ (if reparse
+ ;; Reparsing is requested, so zap the properties in the
+ ;; region and go on to redo it. It's done here to
+ ;; avoid leaving it behind if we exit through
+ ;; `angle-bracket-arglist-escape' below.
+ (progn
+ (c-remove-<>-arglist-properties start (point))
+ (goto-char start)
+ nil)
+ t)
+
+ ;; Got unmatched paren brackets or either paren was
+ ;; actually some other token. Recover by clearing the
+ ;; syntax properties on all the '<' and '>' in the
+ ;; range where we'll search for the arglist below.
+ (goto-char start)
+ (while (progn (skip-chars-forward "^<>,;{}")
+ (looking-at "[<>,]"))
+ (if (eq (char-after) ?,)
+ (when (eq (c-get-char-property (point) 'c-type)
+ 'c-<>-arg-sep)
+ (c-clear-char-property (point) 'c-type))
+ (c-clear-char-property (point) 'syntax-table))
+ (forward-char))
+ (goto-char start)
+ nil)))
+ t
+
+ (forward-char)
+ (unless (looking-at c-<-op-cont-regexp)
+ (while (and
+ (progn
+
+ (when c-record-type-identifiers
+ (if all-types
+
+ ;; All encountered identifiers are types, so set the
+ ;; promote flag and parse the type.
+ (progn
+ (c-forward-syntactic-ws)
+ (when (looking-at c-identifier-start)
+ (let ((c-promote-possible-types t))
+ (c-forward-type))))
+
+ ;; Check if this arglist argument is a sole type. If
+ ;; it's known then it's recorded in
+ ;; `c-record-type-identifiers'. If it only is found
+ ;; then it's recorded in `c-record-found-types' which we
+ ;; might roll back if it turns out that this isn't an
+ ;; angle bracket arglist afterall.
+ (when (memq (char-before) '(?, ?<))
+ (let ((orig-record-found-types c-record-found-types))
+ (c-forward-syntactic-ws)
+ (and (memq (c-forward-type) '(known found))
+ (not (looking-at "[,>]"))
+ ;; A found type was recorded but it's not the
+ ;; only thing in the arglist argument, so reset
+ ;; `c-record-found-types'.
+ (setq c-record-found-types
+ orig-record-found-types))))))
+
+ (setq pos (point))
+ (or (when (eq (char-after) ?>)
+ ;; Must check for '>' at the very start separately,
+ ;; since the regexp below has to avoid ">>" without
+ ;; using \\=.
+ (forward-char)
+ t)
+
+ ;; Note: This regexp exploits the match order in
+ ;; \| so that "<>" is matched by "<" rather than
+ ;; "[^>:-]>".
+ (c-syntactic-re-search-forward
+ "[<;{},]\\|\\([^>:-]>\\)" nil 'move t t 1)
+
+ ;; If the arglist starter has lost its open paren
+ ;; syntax but not the closer, we won't find the
+ ;; closer above since we only search in the
+ ;; balanced sexp. In that case we stop just short
+ ;; of it so check if the following char is the closer.
+ (when (eq (char-after) ?>)
+ ;; Remove its syntax so that we don't enter the
+ ;; recovery code below. That's not necessary
+ ;; since there's no real reason to suspect that
+ ;; things inside the arglist are unbalanced.
+ (c-clear-char-property (point) 'syntax-table)
+ (forward-char)
+ t)))
+
+ (cond
+ ((eq (char-before) ?>)
+ ;; Either an operator starting with '>' or the end of
+ ;; the angle bracket arglist.
+
+ (if (and (/= (1- (point)) pos)
+ (c-get-char-property (1- (point)) 'syntax-table)
+ (progn
+ (c-clear-char-property (1- (point)) 'syntax-table)
+ (c-parse-sexp-lookup-properties)))
+
+ ;; We've skipped past a list that ended with '>'. It
+ ;; must be unbalanced since nested arglists are handled
+ ;; in the case below. Recover by removing all paren
+ ;; properties on '<' and '>' in the searched region and
+ ;; redo the search.
+ (progn
+ (c-remove-<>-arglist-properties pos (point))
+ (goto-char pos)
+ t)
+
+ (if (looking-at c->-op-cont-regexp)
+ (progn
+ (when (text-property-not-all
+ (1- (point)) (match-end 0) 'syntax-table nil)
+ (c-remove-<>-arglist-properties (1- (point))
+ (match-end 0)))
+ (goto-char (match-end 0))
+ t)
+
+ ;; The angle bracket arglist is finished.
+ (while arg-start-pos
+ (c-put-char-property (1- (car arg-start-pos))
+ 'c-type 'c-<>-arg-sep)
+ (setq arg-start-pos (cdr arg-start-pos)))
+ (c-mark-<-as-paren start)
+ (c-mark->-as-paren (1- (point)))
+ (setq res t)
+ nil)))
+
+ ((eq (char-before) ?<)
+ ;; Either an operator starting with '<' or a nested arglist.
+
+ (setq pos (point))
+ (let (id-start id-end subres keyword-match)
+ (if (if (looking-at c-<-op-cont-regexp)
+ (setq tmp (match-end 0))
+ (setq tmp pos)
+ (backward-char)
+ (not
+ (and
+
+ (save-excursion
+ ;; There's always an identifier before a angle
+ ;; bracket arglist, or a keyword in
+ ;; `c-<>-type-kwds' or `c-<>-arglist-kwds'.
+ (c-backward-syntactic-ws)
+ (setq id-end (point))
+ (c-simple-skip-symbol-backward)
+ (when (or (setq keyword-match
+ (looking-at c-opt-<>-sexp-key))
+ (not (looking-at c-keywords-regexp)))
+ (setq id-start (point))))
+
+ (setq subres
+ (let ((c-record-type-identifiers nil)
+ (c-record-found-types nil))
+ (c-forward-<>-arglist-recur
+ (and keyword-match
+ (c-keyword-member
+ (c-keyword-sym (match-string 1))
+ 'c-<>-type-kwds))
+ (and reparse
+ c-disallow-comma-in-<>-arglists))))
+ )))
+
+ ;; It was not an angle bracket arglist.
+ (progn
+ (when (text-property-not-all
+ (1- pos) tmp 'syntax-table nil)
+ (if (c-parse-sexp-lookup-properties)
+ ;; Got an invalid open paren syntax on this
+ ;; '<'. We'll probably get an unbalanced '>'
+ ;; further ahead if we just remove the syntax
+ ;; here, so recover by removing all paren
+ ;; properties up to and including the
+ ;; balancing close paren.
+ (parse-partial-sexp pos (point-max) -1)
+ (goto-char tmp))
+ (c-remove-<>-arglist-properties pos (point)))
+ (goto-char tmp))
+
+ ;; It was an angle bracket arglist.
+ (setq c-record-found-types subres)
+
+ ;; Record the identifier before the template as a type
+ ;; or reference depending on whether the arglist is last
+ ;; in a qualified identifier.
+ (when (and c-record-type-identifiers
+ (not keyword-match))
+ (if (and c-opt-identifier-concat-key
+ (progn
+ (c-forward-syntactic-ws)
+ (looking-at c-opt-identifier-concat-key)))
+ (c-record-ref-id (cons id-start id-end))
+ (c-record-type-id (cons id-start id-end))))))
+ t)
+
+ ((and (eq (char-before) ?,)
+ (not c-disallow-comma-in-<>-arglists))
+ ;; Just another argument. Record the position. The
+ ;; type check stuff that made us stop at it is at
+ ;; the top of the loop.
+ (setq arg-start-pos (cons (point) arg-start-pos)))
+
+ (t
+ ;; Got a character that can't be in an angle bracket
+ ;; arglist argument. Abort using `throw', since
+ ;; it's useless to try to find a surrounding arglist
+ ;; if we're nested.
+ (throw 'angle-bracket-arglist-escape nil))))))
+
+ (if res
+ (or c-record-found-types t)))))
+
+ (defun c-forward-name ()
+ ;; Move forward over a complete name if at the beginning of one,
+ ;; stopping at the next following token. If the point is not at
+ ;; something that are recognized as name then it stays put. A name
+ ;; could be something as simple as "foo" in C or something as
+ ;; complex as "X<Y<class A<int>::B, BIT_MAX >> b>, ::operator<> ::
+ ;; Z<(a>b)> :: operator const X<&foo>::T Q::G<unsigned short
+ ;; int>::*volatile const" in C++ (this function is actually little
+ ;; more than a `looking-at' call in all modes except those that,
+ ;; like C++, have `c-recognize-<>-arglists' set). Return nil if no
+ ;; name is found, 'template if it's an identifier ending with an
+ ;; angle bracket arglist, 'operator of it's an operator identifier,
+ ;; or t if it's some other kind of name.
+
+ (let ((pos (point)) res id-start id-end
+ ;; Turn off `c-promote-possible-types' here since we might
+ ;; call `c-forward-<>-arglist' and we don't want it to promote
+ ;; every suspect thing in the arglist to a type. We're
+ ;; typically called from `c-forward-type' in this case, and
+ ;; the caller only wants the top level type that it finds to
+ ;; be promoted.
+ c-promote-possible-types)
+ (while
+ (and
+ (looking-at c-identifier-key)
+
+ (progn
+ ;; Check for keyword. We go to the last symbol in
+ ;; `c-identifier-key' first.
+ (if (eq c-identifier-key c-symbol-key)
+ (setq id-start (point)
+ id-end (match-end 0))
+ (goto-char (setq id-end (match-end 0)))
+ (c-simple-skip-symbol-backward)
+ (setq id-start (point)))
+
+ (if (looking-at c-keywords-regexp)
+ (when (and (c-major-mode-is 'c++-mode)
+ (looking-at
+ (cc-eval-when-compile
+ (concat "\\(operator\\|\\(template\\)\\)"
+ "\\(" (c-lang-const c-nonsymbol-key c++)
+ "\\|$\\)")))
+ (if (match-beginning 2)
+ ;; "template" is only valid inside an
+ ;; identifier if preceded by "::".
+ (save-excursion
+ (c-backward-syntactic-ws)
+ (and (c-safe (backward-char 2) t)
+ (looking-at "::")))
+ t))
+
+ ;; Handle a C++ operator or template identifier.
+ (goto-char id-end)
+ (c-forward-syntactic-ws)
+ (cond ((eq (char-before id-end) ?e)
+ ;; Got "... ::template".
+ (let ((subres (c-forward-name)))
+ (when subres
+ (setq pos (point)
+ res subres))))
+
+ ((looking-at c-identifier-start)
+ ;; Got a cast operator.
+ (when (c-forward-type)
+ (setq pos (point)
+ res 'operator)
+ ;; Now we should match a sequence of either
+ ;; '*', '&' or a name followed by ":: *",
+ ;; where each can be followed by a sequence
+ ;; of `c-opt-type-modifier-key'.
+ (while (cond ((looking-at "[*&]")
+ (goto-char (match-end 0))
+ t)
+ ((looking-at c-identifier-start)
+ (and (c-forward-name)
+ (looking-at "::")
+ (progn
+ (goto-char (match-end 0))
+ (c-forward-syntactic-ws)
+ (eq (char-after) ?*))
+ (progn
+ (forward-char)
+ t))))
+ (while (progn
+ (c-forward-syntactic-ws)
+ (setq pos (point))
+ (looking-at c-opt-type-modifier-key))
+ (goto-char (match-end 1))))))
+
+ ((looking-at c-overloadable-operators-regexp)
+ ;; Got some other operator.
+ (when c-record-type-identifiers
+ (setq c-last-identifier-range
+ (cons (point) (match-end 0))))
+ (goto-char (match-end 0))
+ (c-forward-syntactic-ws)
+ (setq pos (point)
+ res 'operator)))
+
+ nil)
+
+ (when c-record-type-identifiers
+ (setq c-last-identifier-range
+ (cons id-start id-end)))
+ (goto-char id-end)
+ (c-forward-syntactic-ws)
+ (setq pos (point)
+ res t)))
+
+ (progn
+ (goto-char pos)
+ (when (or c-opt-identifier-concat-key
+ c-recognize-<>-arglists)
+
+ (cond
+ ((and c-opt-identifier-concat-key
+ (looking-at c-opt-identifier-concat-key))
+ ;; Got a concatenated identifier. This handles the
+ ;; cases with tricky syntactic whitespace that aren't
+ ;; covered in `c-identifier-key'.
+ (goto-char (match-end 0))
+ (c-forward-syntactic-ws)
+ t)
+
+ ((and c-recognize-<>-arglists
+ (eq (char-after) ?<))
+ ;; Maybe an angle bracket arglist.
+ (when (let ((c-record-type-identifiers nil)
+ (c-record-found-types nil))
+ (c-forward-<>-arglist
+ nil c-disallow-comma-in-<>-arglists))
+ (c-forward-syntactic-ws)
+ (setq pos (point))
+ (if (and c-opt-identifier-concat-key
+ (looking-at c-opt-identifier-concat-key))
+ ;; Continue if there's an identifier concatenation
+ ;; operator after the template argument.
+ (progn
+ (when c-record-type-identifiers
+ (c-record-ref-id (cons id-start id-end))
+ (setq c-last-identifier-range nil))
+ (forward-char 2)
+ (c-forward-syntactic-ws)
+ t)
+ ;; `c-add-type' isn't called here since we don't
+ ;; want to add types containing angle bracket
+ ;; arglists.
+ (when c-record-type-identifiers
+ (c-record-type-id (cons id-start id-end))
+ (setq c-last-identifier-range nil))
+ (setq res 'template)
+ nil)))
+ )))))
+
+ (goto-char pos)
+ res))
+
+ (defun c-forward-type ()
+ ;; Move forward over a type spec if at the beginning of one,
+ ;; stopping at the next following token. Return t if it's a known
+ ;; type that can't be a name, 'known if it's an otherwise known type
+ ;; (according to `*-font-lock-extra-types'), 'prefix if it's a known
+ ;; prefix of a type, 'found if it's a type that matches one in
+ ;; `c-found-types', 'maybe if it's an identfier that might be a
+ ;; type, or nil if it can't be a type (the point isn't moved then).
+ ;; The point is assumed to be at the beginning of a token.
+ ;;
+ ;; Note that this function doesn't skip past the brace definition
+ ;; that might be considered part of the type, e.g.
+ ;; "enum {a, b, c} foo".
+ (let ((start (point)) pos res res2 id-start id-end id-range)
+
+ ;; Skip leading type modifiers. If any are found we know it's a
+ ;; prefix of a type.
+ (when c-opt-type-modifier-key
+ (while (looking-at c-opt-type-modifier-key)
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)
+ (setq res 'prefix)))
+
+ (cond
+ ((looking-at c-type-prefix-key)
+ ;; Looking at a keyword that prefixes a type identifier,
+ ;; e.g. "class".
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)
+ (setq pos (point))
+ (if (memq (setq res2 (c-forward-name)) '(t template))
+ (progn
+ (when (eq res2 t)
+ ;; In many languages the name can be used without the
+ ;; prefix, so we add it to `c-found-types'.
+ (c-add-type pos (point))
+ (when c-record-type-identifiers
+ (c-record-type-id c-last-identifier-range)))
+ (setq res t))
+ ;; Invalid syntax.
+ (goto-char start)
+ (setq res nil)))
+
+ ((progn
+ (setq pos nil)
+ (if (looking-at c-identifier-start)
+ (save-excursion
+ (setq id-start (point)
+ res2 (c-forward-name))
+ (when res2
+ (setq id-end (point)
+ id-range c-last-identifier-range))))
+ (and (cond ((looking-at c-primitive-type-key)
+ (setq res t))
+ ((c-with-syntax-table c-identifier-syntax-table
+ (looking-at c-known-type-key))
+ (setq res 'known)))
+ (or (not id-end)
+ (>= (save-excursion
+ (save-match-data
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)
+ (setq pos (point))))
+ id-end)
+ (setq res nil))))
+ ;; Looking at a primitive or known type identifier. We've
+ ;; checked for a name first so that we don't go here if the
+ ;; known type match only is a prefix of another name.
+
+ (setq id-end (match-end 1))
+
+ (when (and c-record-type-identifiers
+ (or c-promote-possible-types (eq res t)))
+ (c-record-type-id (cons (match-beginning 1) (match-end 1))))
+
+ (if (and c-opt-type-component-key
+ (save-match-data
+ (looking-at c-opt-type-component-key)))
+ ;; There might be more keywords for the type.
+ (let (safe-pos)
+ (c-forward-keyword-clause)
+ (while (progn
+ (setq safe-pos (point))
+ (looking-at c-opt-type-component-key))
+ (when (and c-record-type-identifiers
+ (looking-at c-primitive-type-key))
+ (c-record-type-id (cons (match-beginning 1)
+ (match-end 1))))
+ (c-forward-keyword-clause))
+ (if (looking-at c-primitive-type-key)
+ (progn
+ (when c-record-type-identifiers
+ (c-record-type-id (cons (match-beginning 1)
+ (match-end 1))))
+ (c-forward-keyword-clause)
+ (setq res t))
+ (goto-char safe-pos)
+ (setq res 'prefix)))
+ (unless (save-match-data (c-forward-keyword-clause))
+ (if pos
+ (goto-char pos)
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)))))
+
+ (res2
+ (cond ((eq res2 t)
+ ;; A normal identifier.
+ (goto-char id-end)
+ (if (or res c-promote-possible-types)
+ (progn
+ (c-add-type id-start id-end)
+ (when c-record-type-identifiers
+ (c-record-type-id id-range))
+ (unless res
+ (setq res 'found)))
+ (setq res (if (c-check-type id-start id-end)
+ ;; It's an identifier that has been used as
+ ;; a type somewhere else.
+ 'found
+ ;; It's an identifier that might be a type.
+ 'maybe))))
+ ((eq res2 'template)
+ ;; A template is a type.
+ (goto-char id-end)
+ (setq res t))
+ (t
+ ;; Otherwise it's an operator identifier, which is not a type.
+ (goto-char start)
+ (setq res nil)))))
+
+ (when res
+ ;; Skip trailing type modifiers. If any are found we know it's
+ ;; a type.
+ (when c-opt-type-modifier-key
+ (while (looking-at c-opt-type-modifier-key)
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)
+ (setq res t)))
+
+ ;; Step over any type suffix operator. Do not let the existence
+ ;; of these alter the classification of the found type, since
+ ;; these operators typically are allowed in normal expressions
+ ;; too.
+ (when c-opt-type-suffix-key
+ (while (looking-at c-opt-type-suffix-key)
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)))
+
+ (when c-opt-type-concat-key
+ ;; Look for a trailing operator that concatenate the type with
+ ;; a following one, and if so step past that one through a
+ ;; recursive call.
+ (setq pos (point))
+ (let* ((c-promote-possible-types (or (memq res '(t known))
+ c-promote-possible-types))
+ ;; If we can't promote then set `c-record-found-types' so that
+ ;; we can merge in the types from the second part afterwards if
+ ;; it turns out to be a known type there.
+ (c-record-found-types (and c-record-type-identifiers
+ (not c-promote-possible-types))))
+ (if (and (looking-at c-opt-type-concat-key)
+
+ (progn
+ (goto-char (match-end 1))
+ (c-forward-syntactic-ws)
+ (setq res2 (c-forward-type))))
+
+ (progn
+ ;; If either operand certainly is a type then both are, but we
+ ;; don't let the existence of the operator itself promote two
+ ;; uncertain types to a certain one.
+ (cond ((eq res t))
+ ((or (eq res 'known) (memq res2 '(t known)))
+ (c-add-type id-start id-end)
+ (when c-record-type-identifiers
+ (c-record-type-id id-range))
+ (setq res t))
+ ((eq res 'found))
+ ((eq res2 'found)
+ (setq res 'found))
+ (t
+ (setq res 'maybe)))
+
+ (when (and (eq res t)
+ (consp c-record-found-types))
+ ;; Merge in the ranges of any types found by the second
+ ;; `c-forward-type'.
+ (setq c-record-type-identifiers
+ ;; `nconc' doesn't mind that the tail of
+ ;; `c-record-found-types' is t.
+ (nconc c-record-found-types
+ c-record-type-identifiers))))
+
+ (goto-char pos))))
+
+ (when (and c-record-found-types (memq res '(known found)) id-range)
+ (setq c-record-found-types
+ (cons id-range c-record-found-types))))
+
+ ;;(message "c-forward-type %s -> %s: %s" start (point) res)
+
+ res))
+
+ ;; Handling of large scale constructs like statements and declarations.
+
(defun c-beginning-of-inheritance-list (&optional lim)
;; Go to the first non-whitespace after the colon that starts a
;; multiple inheritance introduction. Optional LIM is the farthest
;; back we should search.
! (let* ((lim (or lim (save-excursion
! (c-beginning-of-syntax)
! (point)))))
(c-with-syntax-table c++-template-syntax-table
! (c-backward-token-2 0 t lim)
! (while (and (or (looking-at c-symbol-start)
! (looking-at "[<,]"))
! (zerop (c-backward-token-2 1 t lim))))
(skip-chars-forward "^:"))))
(defun c-in-method-def-p ()
***************
*** 1414,1421 ****
(defun c-at-toplevel-p ()
"Return a determination as to whether point is at the `top-level'.
Being at the top-level means that point is either outside any
! enclosing block (such function definition), or inside a class,
! namespace or extern definition, but outside any method blocks.
If point is not at the top-level (e.g. it is inside a method
definition), then nil is returned. Otherwise, if point is at a
--- 4230,4237 ----
(defun c-at-toplevel-p ()
"Return a determination as to whether point is at the `top-level'.
Being at the top-level means that point is either outside any
! enclosing block (such function definition), or only inside a class,
! namespace or other block that contains another declaration level.
If point is not at the top-level (e.g. it is inside a method
definition), then nil is returned. Otherwise, if point is at a
***************
*** 1428,1460 ****
(or (not (c-most-enclosing-brace paren-state))
(c-search-uplist-for-classkey paren-state))))
! (defun c-forward-to-cpp-define-body ()
! ;; Assuming point is at the "#" that introduces a preprocessor
! ;; directive, it's moved forward to the start of the definition body
! ;; if it's a "#define". Non-nil is returned in this case, in all
! ;; other cases nil is returned and point isn't moved.
! (when (and (looking-at
! (concat "#[ \t]*"
! "define[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?"
! "\\([ \t]\\|\\\\\n\\)*"))
! (not (= (match-end 0) (c-point 'eol))))
! (goto-char (match-end 0))))
!
! (defun c-just-after-func-arglist-p (&optional containing lim)
;; Return t if we are between a function's argument list closing
;; paren and its opening brace. Note that the list close brace
;; could be followed by a "const" specifier or a member init hanging
! ;; colon. Optional CONTAINING is position of containing s-exp open
! ;; brace. If not supplied, point is used as search start. LIM is
! ;; used as bound for some backward buffer searches; the search might
! ;; continue past it.
;;
;; Note: This test is easily fooled. It only works reasonably well
;; in the situations where `c-guess-basic-syntax' uses it.
(save-excursion
! (c-backward-syntactic-ws lim)
! (let ((checkpoint (or containing (point))))
! (goto-char checkpoint)
;; could be looking at const specifier
(if (and (eq (char-before) ?t)
(forward-word -1)
--- 4244,4263 ----
(or (not (c-most-enclosing-brace paren-state))
(c-search-uplist-for-classkey paren-state))))
! (defun c-just-after-func-arglist-p (&optional lim)
;; Return t if we are between a function's argument list closing
;; paren and its opening brace. Note that the list close brace
;; could be followed by a "const" specifier or a member init hanging
! ;; colon. LIM is used as bound for some backward buffer searches;
! ;; the search might continue past it.
;;
;; Note: This test is easily fooled. It only works reasonably well
;; in the situations where `c-guess-basic-syntax' uses it.
(save-excursion
! (if (c-mode-is-new-awk-p)
! (c-awk-backward-syntactic-ws lim)
! (c-backward-syntactic-ws lim))
! (let ((checkpoint (point)))
;; could be looking at const specifier
(if (and (eq (char-before) ?t)
(forward-word -1)
***************
*** 1510,1533 ****
;; position that bounds the backward search for the argument list.
;;
;; Note: A declaration level context is assumed; the test can return
! ;; false positives for statements and #define headers. This test is
! ;; even more easily fooled than `c-just-after-func-arglist-p'.
(save-excursion
(save-restriction
;; Go back to the closest preceding normal parenthesis sexp. We
;; take that as the argument list in the function header. Then
;; check that it's followed by some symbol before the next ';'
;; or '{'. If it does, it's the header of the K&R argdecl we're
;; in.
(if lim (narrow-to-region lim (point)))
! (let (paren-end)
! (and (c-safe (setq paren-end (c-down-list-backward (point))))
! (eq (char-after paren-end) ?\))
! (progn
! (goto-char (1+ paren-end))
(c-forward-syntactic-ws)
(looking-at "\\w\\|\\s_"))
(c-safe (c-up-list-backward paren-end))
(point))))))
(defun c-skip-conditional ()
--- 4313,4356 ----
;; position that bounds the backward search for the argument list.
;;
;; Note: A declaration level context is assumed; the test can return
! ;; false positives for statements. This test is even more easily
! ;; fooled than `c-just-after-func-arglist-p'.
!
(save-excursion
(save-restriction
+
;; Go back to the closest preceding normal parenthesis sexp. We
;; take that as the argument list in the function header. Then
;; check that it's followed by some symbol before the next ';'
;; or '{'. If it does, it's the header of the K&R argdecl we're
;; in.
(if lim (narrow-to-region lim (point)))
! (let ((outside-macro (not (c-query-macro-start)))
! paren-end)
!
! (catch 'done
! (while (if (and (c-safe (setq paren-end
! (c-down-list-backward (point))))
! (eq (char-after paren-end) ?\)))
! (progn
! (goto-char (1+ paren-end))
! (if outside-macro
! (c-beginning-of-macro)))
! (throw 'done nil))))
!
! (and (progn
(c-forward-syntactic-ws)
(looking-at "\\w\\|\\s_"))
(c-safe (c-up-list-backward paren-end))
+
+ (save-excursion
+ ;; If it's a K&R declaration then we're now at the
+ ;; beginning of the function arglist. Check that there
+ ;; isn't a '=' before it in this statement since that
+ ;; means it some kind of initialization instead.
+ (c-syntactic-skip-backward "^;=}{")
+ (not (eq (char-before) ?=)))
+
(point))))))
(defun c-skip-conditional ()
***************
*** 1551,1560 ****
;; If looking at the token after a conditional then return the
;; position of its start, otherwise return nil.
(save-excursion
! (and (= (c-backward-token-1 1 t lim) 0)
(or (looking-at c-block-stmt-1-key)
(and (eq (char-after) ?\()
! (= (c-backward-token-1 1 t lim) 0)
(looking-at c-block-stmt-2-key)))
(point))))
--- 4374,4383 ----
;; If looking at the token after a conditional then return the
;; position of its start, otherwise return nil.
(save-excursion
! (and (zerop (c-backward-token-2 1 t lim))
(or (looking-at c-block-stmt-1-key)
(and (eq (char-after) ?\()
! (zerop (c-backward-token-2 1 t lim))
(looking-at c-block-stmt-2-key)))
(point))))
***************
*** 1594,1608 ****
;; semicolon. I.e. search forward for the closest following
;; (syntactically relevant) '{', '=' or ';' token. Point is left
;; _after_ the first found token, or at point-max if none is found.
! (c-with-syntax-table (if (c-major-mode-is 'c++-mode)
! c++-template-syntax-table
! (syntax-table))
! (while (and (c-syntactic-re-search-forward "[;{=]" nil 'move 1 t)
! ;; In Pike it can be an operator identifier containing
! ;; '='.
! (c-major-mode-is 'pike-mode)
! (eq (char-before) ?=)
! (c-on-identifier)))))
(defun c-beginning-of-decl-1 (&optional lim)
;; Go to the beginning of the current declaration, or the beginning
--- 4417,4433 ----
;; semicolon. I.e. search forward for the closest following
;; (syntactically relevant) '{', '=' or ';' token. Point is left
;; _after_ the first found token, or at point-max if none is found.
! (if (c-major-mode-is 'c++-mode)
! ;; In C++ we need to take special care to handle those pesky
! ;; template brackets.
! (while (and (c-syntactic-re-search-forward "[;{=<]" nil 'move t)
! (when (eq (char-before) ?<)
! (c-with-syntax-table c++-template-syntax-table
! (if (c-safe (goto-char (c-up-list-forward (point))))
! t
! (goto-char (point-max))
! nil)))))
! (c-syntactic-re-search-forward "[;{=]" nil 'move t t)))
(defun c-beginning-of-decl-1 (&optional lim)
;; Go to the beginning of the current declaration, or the beginning
***************
*** 1620,1692 ****
;; declarations, e.g. "struct foo { ... }" and "bar;" in this case.
(catch 'return
(let* ((start (point))
! (last-stmt-start (point))
! (move (c-beginning-of-statement-1 lim t t)))
- (while (and (/= last-stmt-start (point))
- (save-excursion
- (c-backward-syntactic-ws lim)
- (not (memq (char-before) '(?\; ?} ?: nil)))))
;; `c-beginning-of-statement-1' stops at a block start, but we
;; want to continue if the block doesn't begin a top level
;; construct, i.e. if it isn't preceded by ';', '}', ':', or bob.
! (setq last-stmt-start (point)
! move (c-beginning-of-statement-1 lim t t)))
!
! (when c-recognize-knr-p
! (let ((fallback-pos (point)) knr-argdecl-start)
! ;; Handle K&R argdecls. Back up after the "statement" jumped
! ;; over by `c-beginning-of-statement-1', unless it was the
! ;; function body, in which case we're sitting on the opening
! ;; brace now. Then test if we're in a K&R argdecl region and
! ;; that we started at the other side of the first argdecl in
! ;; it.
! (unless (eq (char-after) ?{)
! (goto-char last-stmt-start))
! (if (and (setq knr-argdecl-start (c-in-knr-argdecl lim))
! (< knr-argdecl-start start)
! (progn
! (goto-char knr-argdecl-start)
! (not (eq (c-beginning-of-statement-1 lim t t) 'macro))))
! (throw 'return
! (cons (if (eq (char-after fallback-pos) ?{)
! 'previous
! 'same)
! knr-argdecl-start))
! (goto-char fallback-pos))))
!
! (when c-opt-access-key
! ;; Might have ended up before a protection label. This should
! ;; perhaps be checked before `c-recognize-knr-p' to be really
! ;; accurate, but we know that no language has both.
! (while (looking-at c-opt-access-key)
! (goto-char (match-end 0))
! (c-forward-syntactic-ws)
! (when (>= (point) start)
! (goto-char start)
! (throw 'return (cons 'same nil)))))
!
! ;; `c-beginning-of-statement-1' counts each brace block as a
! ;; separate statement, so the result will be 'previous if we've
! ;; moved over any. If they were brace list initializers we might
! ;; not have moved over a declaration boundary though, so change it
! ;; to 'same if we've moved past a '=' before '{', but not ';'.
! ;; (This ought to be integrated into `c-beginning-of-statement-1',
! ;; so we avoid this extra pass which potentially can search over a
! ;; large amount of text.)
! (if (and (eq move 'previous)
! (c-with-syntax-table (if (c-major-mode-is 'c++-mode)
! c++-template-syntax-table
! (syntax-table))
! (save-excursion
! (and (c-syntactic-re-search-forward "[;={]" start t 1 t)
! (eq (char-before) ?=)
! (c-syntactic-re-search-forward "[;{]" start t 1 t)
! (eq (char-before) ?{)
! (c-safe (goto-char (c-up-list-forward (point))) t)
! (not (c-syntactic-re-search-forward ";" start t 1 t))))))
! (cons 'same nil)
! (cons move nil)))))
(defun c-end-of-decl-1 ()
;; Assuming point is at the start of a declaration (as detected by
--- 4445,4529 ----
;; declarations, e.g. "struct foo { ... }" and "bar;" in this case.
(catch 'return
(let* ((start (point))
! (last-stmt-start (point))
! (move (c-beginning-of-statement-1 lim t t)))
;; `c-beginning-of-statement-1' stops at a block start, but we
;; want to continue if the block doesn't begin a top level
;; construct, i.e. if it isn't preceded by ';', '}', ':', or bob.
! (let ((beg (point)) tentative-move)
! (while (and
! ;; Must check with c-opt-method-key in ObjC mode.
! (not (and c-opt-method-key
! (looking-at c-opt-method-key)))
! (/= last-stmt-start (point))
! (progn
! (c-backward-syntactic-ws lim)
! (not (memq (char-before) '(?\; ?} ?: nil))))
! ;; Check that we don't move from the first thing in a
! ;; macro to its header.
! (not (eq (setq tentative-move
! (c-beginning-of-statement-1 lim t t))
! 'macro)))
! (setq last-stmt-start beg
! beg (point)
! move tentative-move))
! (goto-char beg))
!
! (when c-recognize-knr-p
! (let ((fallback-pos (point)) knr-argdecl-start)
! ;; Handle K&R argdecls. Back up after the "statement" jumped
! ;; over by `c-beginning-of-statement-1', unless it was the
! ;; function body, in which case we're sitting on the opening
! ;; brace now. Then test if we're in a K&R argdecl region and
! ;; that we started at the other side of the first argdecl in
! ;; it.
! (unless (eq (char-after) ?{)
! (goto-char last-stmt-start))
! (if (and (setq knr-argdecl-start (c-in-knr-argdecl lim))
! (< knr-argdecl-start start)
! (progn
! (goto-char knr-argdecl-start)
! (not (eq (c-beginning-of-statement-1 lim t t) 'macro))))
! (throw 'return
! (cons (if (eq (char-after fallback-pos) ?{)
! 'previous
! 'same)
! knr-argdecl-start))
! (goto-char fallback-pos))))
!
! (when c-opt-access-key
! ;; Might have ended up before a protection label. This should
! ;; perhaps be checked before `c-recognize-knr-p' to be really
! ;; accurate, but we know that no language has both.
! (while (looking-at c-opt-access-key)
! (goto-char (match-end 0))
! (c-forward-syntactic-ws)
! (when (>= (point) start)
! (goto-char start)
! (throw 'return (cons 'same nil)))))
!
! ;; `c-beginning-of-statement-1' counts each brace block as a
! ;; separate statement, so the result will be 'previous if we've
! ;; moved over any. If they were brace list initializers we might
! ;; not have moved over a declaration boundary though, so change it
! ;; to 'same if we've moved past a '=' before '{', but not ';'.
! ;; (This ought to be integrated into `c-beginning-of-statement-1',
! ;; so we avoid this extra pass which potentially can search over a
! ;; large amount of text.)
! (if (and (eq move 'previous)
! (c-with-syntax-table (if (c-major-mode-is 'c++-mode)
! c++-template-syntax-table
! (syntax-table))
! (save-excursion
! (and (c-syntactic-re-search-forward "[;={]" start t t t)
! (eq (char-before) ?=)
! (c-syntactic-re-search-forward "[;{]" start t t)
! (eq (char-before) ?{)
! (c-safe (goto-char (c-up-list-forward (point))) t)
! (not (c-syntactic-re-search-forward ";" start t t))))))
! (cons 'same nil)
! (cons move nil)))))
(defun c-end-of-decl-1 ()
;; Assuming point is at the start of a declaration (as detected by
***************
*** 1711,1724 ****
;; detected using the same criteria as in
;; `c-beginning-of-decl-1'. Move to the following block
;; start.
! (c-syntactic-re-search-forward "{" nil 'move 1 t))
(when (eq (char-before) ?{)
;; Encountered a block in the declaration. Jump over it.
(condition-case nil
(goto-char (c-up-list-forward (point)))
! (goto-char (point-max))
! (throw 'return nil))
(if (or (not c-opt-block-decls-with-vars-key)
(save-excursion
(c-with-syntax-table decl-syntax-table
--- 4548,4561 ----
;; detected using the same criteria as in
;; `c-beginning-of-decl-1'. Move to the following block
;; start.
! (c-syntactic-re-search-forward "{" nil 'move t))
(when (eq (char-before) ?{)
;; Encountered a block in the declaration. Jump over it.
(condition-case nil
(goto-char (c-up-list-forward (point)))
! (error (goto-char (point-max))
! (throw 'return nil)))
(if (or (not c-opt-block-decls-with-vars-key)
(save-excursion
(c-with-syntax-table decl-syntax-table
***************
*** 1728,1741 ****
;; Check for `c-opt-block-decls-with-vars-key'
;; before the first paren.
(c-syntactic-re-search-forward
! (concat "[;=\(\[{]\\|\\<\\("
c-opt-block-decls-with-vars-key
"\\)")
! lim t 1 t)
(match-beginning 1)
(not (eq (char-before) ?_))
! ;; Check that the first following paren is the
block.
! (c-syntactic-re-search-forward "[;=\(\[{]" lim t 1
t)
(eq (char-before) ?{)))))))
;; The declaration doesn't have any of the
;; `c-opt-block-decls-with-vars' keywords in the
--- 4565,4580 ----
;; Check for `c-opt-block-decls-with-vars-key'
;; before the first paren.
(c-syntactic-re-search-forward
! (concat "[;=\(\[{]\\|\\("
c-opt-block-decls-with-vars-key
"\\)")
! lim t t t)
(match-beginning 1)
(not (eq (char-before) ?_))
! ;; Check that the first following paren is
! ;; the block.
! (c-syntactic-re-search-forward "[;=\(\[{]"
! lim t t t)
(eq (char-before) ?{)))))))
;; The declaration doesn't have any of the
;; `c-opt-block-decls-with-vars' keywords in the
***************
*** 1746,1789 ****
(while (progn
(if (eq (char-before) ?\;)
(throw 'return t))
! (c-syntactic-re-search-forward ";" nil 'move 1 t))))
nil)))
(defun c-beginning-of-member-init-list (&optional limit)
;; Goes to the beginning of a member init list (i.e. just after the
! ;; ':') if inside one. Returns t in that case, nil otherwise.
(or limit
(setq limit (point-min)))
(skip-chars-forward " \t")
(if (eq (char-after) ?,)
(forward-char 1)
(c-backward-syntactic-ws limit))
! (while (and (< limit (point))
! (eq (char-before) ?,))
! ;; this will catch member inits with multiple
! ;; line arglists
! (forward-char -1)
! (c-backward-syntactic-ws limit)
! (if (eq (char-before) ?\))
! (c-backward-sexp 1))
! (c-backward-syntactic-ws limit)
! ;; Skip over any template arg to the class.
! (if (eq (char-before) ?>)
! (c-with-syntax-table c++-template-syntax-table
! (c-backward-sexp 1)))
! (c-backward-sexp 1)
! (c-backward-syntactic-ws limit)
! ;; Skip backwards over a fully::qualified::name.
! (while (and (eq (char-before) ?:)
! (save-excursion
! (forward-char -1)
! (eq (char-before) ?:)))
! (backward-char 2)
! (c-backward-sexp 1))
! ;; now continue checking
! (c-backward-syntactic-ws limit))
! (and (< limit (point))
! (eq (char-before) ?:)))
(defun c-search-uplist-for-classkey (paren-state)
;; search for the containing class, returning a 2 element vector if
--- 4585,4645 ----
(while (progn
(if (eq (char-before) ?\;)
(throw 'return t))
! (c-syntactic-re-search-forward ";" nil 'move t))))
nil)))
(defun c-beginning-of-member-init-list (&optional limit)
;; Goes to the beginning of a member init list (i.e. just after the
! ;; ':') if inside one. Returns t in that case, nil otherwise.
(or limit
(setq limit (point-min)))
(skip-chars-forward " \t")
+
(if (eq (char-after) ?,)
(forward-char 1)
(c-backward-syntactic-ws limit))
!
! (catch 'exit
! (while (and (< limit (point))
! (eq (char-before) ?,))
!
! ;; this will catch member inits with multiple
! ;; line arglists
! (forward-char -1)
! (c-backward-syntactic-ws limit)
! (if (eq (char-before) ?\))
! (unless (c-safe (c-backward-sexp 1))
! (throw 'exit nil)))
! (c-backward-syntactic-ws limit)
!
! ;; Skip over any template arg to the class. This way with a
! ;; syntax table is bogus but it'll have to do for now.
! (if (and (eq (char-before) ?>)
! (c-major-mode-is 'c++-mode))
! (c-with-syntax-table c++-template-syntax-table
! (unless (c-safe (c-backward-sexp 1))
! (throw 'exit nil))))
! (c-safe (c-backward-sexp 1))
! (c-backward-syntactic-ws limit)
!
! ;; Skip backwards over a fully::qualified::name.
! (while (and (eq (char-before) ?:)
! (save-excursion
! (forward-char -1)
! (eq (char-before) ?:)))
! (backward-char 2)
! (c-safe (c-backward-sexp 1)))
!
! ;; If we've stepped over a number then this is a bitfield.
! (when (and c-opt-bitfield-key
! (looking-at "[0-9]"))
! (throw 'exit nil))
!
! ;; now continue checking
! (c-backward-syntactic-ws limit))
!
! (and (< limit (point))
! (eq (char-before) ?:))))
(defun c-search-uplist-for-classkey (paren-state)
;; search for the containing class, returning a 2 element vector if
***************
*** 1807,1817 ****
search-end (nth 0 paren-state)))
;; if search-end is nil, or if the search-end character isn't an
;; open brace, we are definitely not in a class
! (when (consp search-end)
! (setq search-end (car search-end)))
! (unless (or (not search-end)
! (< search-end (point-min))
! (not (eq (char-after search-end) ?{)))
;; now, we need to look more closely at search-start. if
;; search-start is nil, then our start boundary is really
;; point-min.
--- 4663,4672 ----
search-end (nth 0 paren-state)))
;; if search-end is nil, or if the search-end character isn't an
;; open brace, we are definitely not in a class
! (if (or (not search-end)
! (< search-end (point-min))
! (not (eq (char-after search-end) ?{)))
! nil
;; now, we need to look more closely at search-start. if
;; search-start is nil, then our start boundary is really
;; point-min.
***************
*** 1821,1827 ****
;; searching from the end of the balanced sexp just ahead of
;; us
(if (consp search-start)
! (setq search-start (cdr search-start))))
;; now we can do a quick regexp search from search-start to
;; search-end and see if we can find a class key. watch for
;; class like strings in literals
--- 4676,4684 ----
;; searching from the end of the balanced sexp just ahead of
;; us
(if (consp search-start)
! (setq search-start (cdr search-start))
! ;; Otherwise we start searching within the surrounding paren sexp.
! (setq search-start (1+ search-start))))
;; now we can do a quick regexp search from search-start to
;; search-end and see if we can find a class key. watch for
;; class like strings in literals
***************
*** 1833,1839 ****
(progn
(c-forward-syntactic-ws search-end)
(> search-end (point)))
! (re-search-forward c-decl-block-key search-end t))
(setq class (match-beginning 0)
match-end (match-end 0))
(goto-char class)
--- 4690,4700 ----
(progn
(c-forward-syntactic-ws search-end)
(> search-end (point)))
! ;; Add one to the search limit, to allow
! ;; matching of the "{" in the regexp.
! (re-search-forward c-decl-block-key
! (1+ search-end)
! t))
(setq class (match-beginning 0)
match-end (match-end 0))
(goto-char class)
***************
*** 1857,1863 ****
;; Check if this is an anonymous inner class.
((and c-opt-inexpr-class-key
(looking-at c-opt-inexpr-class-key))
! (while (and (= (c-forward-token-1 1 t) 0)
(looking-at "(\\|\\w\\|\\s_\\|\\.")))
(if (eq (point) search-end)
;; We're done. Just trap this case in the cond.
--- 4718,4724 ----
;; Check if this is an anonymous inner class.
((and c-opt-inexpr-class-key
(looking-at c-opt-inexpr-class-key))
! (while (and (zerop (c-forward-token-2 1 t))
(looking-at "(\\|\\w\\|\\s_\\|\\.")))
(if (eq (point) search-end)
;; We're done. Just trap this case in the cond.
***************
*** 1900,1914 ****
;; places in inconvenient locations. Its a trade-off we make for
;; speed.
(or
! ;; this will pick up enum lists
(c-safe
(save-excursion
(goto-char containing-sexp)
(c-forward-sexp -1)
(let (bracepos)
! (if (and (or (looking-at "enum\\>[^_]")
(progn (c-forward-sexp -1)
! (looking-at "enum\\>[^_]")))
(setq bracepos (c-down-list-forward (point)))
(not (c-crosses-statement-barrier-p (point)
(- bracepos 2))))
--- 4761,4775 ----
;; places in inconvenient locations. Its a trade-off we make for
;; speed.
(or
! ;; This will pick up brace list declarations.
(c-safe
(save-excursion
(goto-char containing-sexp)
(c-forward-sexp -1)
(let (bracepos)
! (if (and (or (looking-at c-brace-list-key)
(progn (c-forward-sexp -1)
! (looking-at c-brace-list-key)))
(setq bracepos (c-down-list-forward (point)))
(not (c-crosses-statement-barrier-p (point)
(- bracepos 2))))
***************
*** 1941,1957 ****
;; see if the open brace is preceded by = or [...] in
;; this statement, but watch out for operator=
(setq braceassignp 'dontknow)
! (c-backward-token-1 1 t lim)
;; Checks to do only on the first sexp before the brace.
! (when (and (c-major-mode-is 'java-mode)
(eq (char-after) ?\[))
;; In Java, an initialization brace list may follow
;; directly after "new Foo[]", so check for a "new"
;; earlier.
(while (eq braceassignp 'dontknow)
(setq braceassignp
! (cond ((/= (c-backward-token-1 1 t lim) 0) nil)
! ((looking-at "new\\>[^_]") t)
((looking-at "\\sw\\|\\s_\\|[.[]")
;; Carry on looking if this is an
;; identifier (may contain "." in Java)
--- 4802,4818 ----
;; see if the open brace is preceded by = or [...] in
;; this statement, but watch out for operator=
(setq braceassignp 'dontknow)
! (c-backward-token-2 1 t lim)
;; Checks to do only on the first sexp before the brace.
! (when (and c-opt-inexpr-brace-list-key
(eq (char-after) ?\[))
;; In Java, an initialization brace list may follow
;; directly after "new Foo[]", so check for a "new"
;; earlier.
(while (eq braceassignp 'dontknow)
(setq braceassignp
! (cond ((/= (c-backward-token-2 1 t lim) 0) nil)
! ((looking-at c-opt-inexpr-brace-list-key) t)
((looking-at "\\sw\\|\\s_\\|[.[]")
;; Carry on looking if this is an
;; identifier (may contain "." in Java)
***************
*** 1971,1977 ****
;; that it isn't something that should be ignored.
(setq braceassignp 'maybe)
(while (and (eq braceassignp 'maybe)
! (zerop (c-backward-token-1 1 t lim)))
(setq braceassignp
(cond
;; Check for operator =
--- 4832,4838 ----
;; that it isn't something that should be ignored.
(setq braceassignp 'maybe)
(while (and (eq braceassignp 'maybe)
! (zerop (c-backward-token-2 1 t lim)))
(setq braceassignp
(cond
;; Check for operator =
***************
*** 2003,2009 ****
nil)
(t t))))))
(if (and (eq braceassignp 'dontknow)
! (/= (c-backward-token-1 1 t lim) 0))
(setq braceassignp nil)))
(if (not braceassignp)
(if (eq (char-after) ?\;)
--- 4864,4870 ----
nil)
(t t))))))
(if (and (eq braceassignp 'dontknow)
! (/= (c-backward-token-2 1 t lim) 0))
(setq braceassignp nil)))
(if (not braceassignp)
(if (eq (char-after) ?\;)
***************
*** 2121,2127 ****
;; in-expression class.
(let ((prev (point)))
(while (and
! (= (c-backward-token-1 1 nil closest-lim) 0)
(eq (char-syntax (char-after)) ?w))
(setq prev (point)))
(goto-char prev)
--- 4982,4988 ----
;; in-expression class.
(let ((prev (point)))
(while (and
! (= (c-backward-token-2 1 nil closest-lim) 0)
(eq (char-syntax (char-after)) ?w))
(setq prev (point)))
(goto-char prev)
***************
*** 2132,2138 ****
(save-excursion
(and (c-major-mode-is 'pike-mode)
(progn (goto-char block-follows)
! (= (c-forward-token-1 1 t) 0))
(eq (char-after) ?\())))
(cons 'inexpr-class (point))))
((and c-opt-inexpr-block-key
--- 4993,4999 ----
(save-excursion
(and (c-major-mode-is 'pike-mode)
(progn (goto-char block-follows)
! (zerop (c-forward-token-2 1 t)))
(eq (char-after) ?\())))
(cons 'inexpr-class (point))))
((and c-opt-inexpr-block-key
***************
*** 2183,2268 ****
paren-state)
containing-sexp)))))
- (defun c-on-identifier ()
- "Return non-nil if we're on or directly after an identifier.
- Keywords are recognized and not considered identifiers."
- (if (or (memq (char-syntax (or (char-after) ? )) '(?w ?_))
- (memq (char-syntax (or (char-before) ? )) '(?w ?_)))
- (save-excursion
- (skip-syntax-backward "w_")
- (not (looking-at c-keywords-regexp)))
- (if (c-major-mode-is 'pike-mode)
- ;; Handle the `<operator> syntax in Pike.
- (save-excursion
- (if (eq (char-after) ?\`) (forward-char))
- (skip-chars-backward "!%&*+\\-/<=>^|~")
- (let ((pos (point)))
- (cond ((memq (char-before) '(?\) ?\]))
- (c-safe (backward-char 2)))
- ((memq (char-before) '(?\( ?\[))
- (c-safe (backward-char 1))))
- (if (not (looking-at "()\\|\\[]"))
- (goto-char pos)))
- (and (eq (char-before) ?\`)
- (looking-at "[-!%&*+/<=>^|~]\\|()\\|\\[]"))))))
-
-
- (defun c-most-enclosing-brace (paren-state &optional bufpos)
- ;; Return the bufpos of the innermost enclosing brace before bufpos
- ;; that hasn't been narrowed out, or nil if none was found.
- (let (enclosingp)
- (or bufpos (setq bufpos 134217727))
- (while paren-state
- (setq enclosingp (car paren-state)
- paren-state (cdr paren-state))
- (if (or (consp enclosingp)
- (>= enclosingp bufpos))
- (setq enclosingp nil)
- (if (< enclosingp (point-min))
- (setq enclosingp nil))
- (setq paren-state nil)))
- enclosingp))
-
- (defun c-least-enclosing-brace (paren-state &optional bufpos)
- ;; Return the bufpos of the outermost enclosing brace before bufpos
- ;; that hasn't been narrowed out, or nil if none was found.
- (let (pos elem)
- (or bufpos (setq bufpos 134217727))
- (while paren-state
- (setq elem (car paren-state)
- paren-state (cdr paren-state))
- (unless (or (consp elem)
- (>= elem bufpos))
- (if (>= elem (point-min))
- (setq pos elem))))
- pos))
-
- (defun c-safe-position (bufpos paren-state)
- ;; Return the closest known safe position higher up than BUFPOS, or
- ;; nil if PAREN-STATE doesn't contain one. Return nil if BUFPOS is
- ;; nil, which is useful to find the closest limit before a given
- ;; limit that might be nil.
- (when bufpos
- (let ((c-macro-start (c-query-macro-start)) safepos)
- (if (and c-macro-start
- (< c-macro-start bufpos))
- ;; Make sure bufpos is outside the macro we might be in.
- (setq bufpos c-macro-start))
- (catch 'done
- (while paren-state
- (setq safepos
- (if (consp (car paren-state))
- (cdr (car paren-state))
- (car paren-state)))
- (if (< safepos bufpos)
- (throw 'done safepos)
- (setq paren-state (cdr paren-state))))
- (if (eq c-macro-start bufpos)
- ;; Backed up bufpos to the macro start and got outside the
- ;; state. We know the macro is at the top level in this case,
- ;; so we can use the macro start as the safe position.
- c-macro-start)))))
-
(defun c-narrow-out-enclosing-class (paren-state lim)
;; Narrow the buffer so that the enclosing class is hidden. Uses
;; and returns the value from c-search-uplist-for-classkey.
--- 5044,5049 ----
***************
*** 2289,2309 ****
inclass-p))
! ;; c-guess-basic-syntax implements the main decision tree for
! ;; determining the syntactic analysis of the current line of code.
! ;; Yes, it's huge and bloated!
!
! ;; It's useful to break out some parts of the decision tree to
! ;; separate functions, which are all collected below. Use dynamic
! ;; binding to propagate back the syntax results from them.
! (defvar syntax)
! (defvar syntactic-relpos)
(defun c-add-stmt-syntax (syntax-symbol
stop-at-boi-only
containing-sexp
! paren-state
! &optional at-block-start)
;; Do the generic processing to anchor the given syntax symbol on
;; the preceding statement: Skip over any labels and containing
;; statements on the same line, and then search backward until we
--- 5070,5103 ----
inclass-p))
! ;; `c-guess-basic-syntax' and the functions that precedes it below
! ;; implements the main decision tree for determining the syntactic
! ;; analysis of the current line of code.
!
! ;; Dynamically bound to t when `c-guess-basic-syntax' is called during
! ;; auto newline analysis.
! (defvar c-auto-newline-analysis nil)
!
! (defsubst c-add-syntax (symbol &rest args)
! ;; A simple function to prepend a new syntax element to
! ;; `c-syntactic-context'. Using `setq' on it is unsafe since it
! ;; should always be dynamically bound but since we read it first
! ;; we'll fail properly anyway if this function is misused.
! (setq c-syntactic-context (cons (cons symbol args)
! c-syntactic-context)))
!
! (defsubst c-append-syntax (symbol &rest args)
! ;; Like `c-add-syntax' but appends to the end of the syntax list.
! ;; (Normally not necessary.)
! (setq c-syntactic-context (nconc c-syntactic-context
! (list (cons symbol args)))))
(defun c-add-stmt-syntax (syntax-symbol
+ syntax-extra-args
stop-at-boi-only
+ at-block-start
containing-sexp
! paren-state)
;; Do the generic processing to anchor the given syntax symbol on
;; the preceding statement: Skip over any labels and containing
;; statements on the same line, and then search backward until we
***************
*** 2312,2320 ****
;;
;; Point is assumed to be at the prospective anchor point for the
;; given SYNTAX-SYMBOL. More syntax entries are added if we need to
! ;; skip past block opens and containing statement. All the added
;; syntax elements will get the same anchor point.
;;
;; If STOP-AT-BOI-ONLY is nil, we might stop in the middle of the
;; line if another statement precedes the current one on this line.
;;
--- 5106,5117 ----
;;
;; Point is assumed to be at the prospective anchor point for the
;; given SYNTAX-SYMBOL. More syntax entries are added if we need to
! ;; skip past open parens and containing statements. All the added
;; syntax elements will get the same anchor point.
;;
+ ;; SYNTAX-EXTRA-ARGS are a list of the extra arguments for the
+ ;; syntax symbol. They are appended after the anchor point.
+ ;;
;; If STOP-AT-BOI-ONLY is nil, we might stop in the middle of the
;; line if another statement precedes the current one on this line.
;;
***************
*** 2325,2338 ****
(if (= (point) (c-point 'boi))
;; This is by far the most common case, so let's give it special
;; treatment.
! (c-add-syntax syntax-symbol (point))
! (let* ((savepos (point))
! (syms (list syntax-symbol))
! (syms-tail syms)
! (boi (c-point 'boi))
! (prev-paren (if at-block-start ?{ (char-after)))
! step-type step-tmp at-comment add-inexpr-stmt)
;; Begin by skipping any labels and containing statements that
;; are on the same line.
--- 5122,5135 ----
(if (= (point) (c-point 'boi))
;; This is by far the most common case, so let's give it special
;; treatment.
! (apply 'c-add-syntax syntax-symbol (point) syntax-extra-args)
! (let ((savepos (point))
! (syntax-last c-syntactic-context)
! (boi (c-point 'boi))
! (prev-paren (if at-block-start ?{ (char-after)))
! step-type step-tmp at-comment special-list)
! (apply 'c-add-syntax syntax-symbol nil syntax-extra-args)
;; Begin by skipping any labels and containing statements that
;; are on the same line.
***************
*** 2351,2356 ****
--- 5148,5154 ----
;; Loop if we have to back out of the containing block.
(while
(progn
+
;; Loop if we have to back up another statement.
(while
(progn
***************
*** 2358,2364 ****
;; Always start by skipping over any comments that
;; stands between the statement and boi.
(while (and (/= (setq savepos (point)) boi)
! (c-forward-comment -1))
(setq at-comment t
boi (c-point 'boi)))
(goto-char savepos)
--- 5156,5162 ----
;; Always start by skipping over any comments that
;; stands between the statement and boi.
(while (and (/= (setq savepos (point)) boi)
! (c-backward-single-comment))
(setq at-comment t
boi (c-point 'boi)))
(goto-char savepos)
***************
*** 2397,2404 ****
;; if" clauses won't indent deeper and deeper.
(when (and (eq step-type 'up)
(< (point) boi))
! (setcdr syms-tail (list 'substatement))
! (setq syms-tail (cdr syms-tail)))
(setq boi (c-point 'boi))
(/= (point) savepos)))))
--- 5195,5201 ----
;; if" clauses won't indent deeper and deeper.
(when (and (eq step-type 'up)
(< (point) boi))
! (c-add-syntax 'substatement nil))
(setq boi (c-point 'boi))
(/= (point) savepos)))))
***************
*** 2410,2439 ****
(when (and (eq step-type 'same)
containing-sexp)
(goto-char containing-sexp)
- (setq paren-state (c-whack-state-after containing-sexp
- paren-state)
- containing-sexp (c-most-enclosing-brace paren-state))
! (when (eq (setq prev-paren (char-after)) ?\()
! (c-backward-syntactic-ws containing-sexp)
! (when (c-on-identifier)
! ;; Arrived at a function arglist start. Exit with
! ;; the position of the first argument inside it.
! (goto-char savepos)
! (throw 'done t))
! ;; We're in an in-expression statement. Remember
! ;; this. We'll iterate below, but won't add any
! ;; syntax element.
! (setq add-inexpr-stmt t))
! (setq savepos (point)
! boi (c-point 'boi)
! step-type (c-beginning-of-statement-1 containing-sexp))
(let ((at-bod (and (eq step-type 'same)
(/= savepos (point))
(eq prev-paren ?{))))
(when (= savepos boi)
;; If the open brace was at boi, we're always
;; done. The c-beginning-of-statement-1 call
--- 5207,5255 ----
(when (and (eq step-type 'same)
containing-sexp)
(goto-char containing-sexp)
+ ;; Don't stop in the middle of a special brace list opener
+ ;; like "({".
+ (when (and c-special-brace-lists
+ (setq special-list
+ (c-looking-at-special-brace-list)))
+ (setq containing-sexp (car (car special-list)))
+ (goto-char containing-sexp))
! (setq paren-state (c-whack-state-after containing-sexp
! paren-state)
! containing-sexp (c-most-enclosing-brace paren-state)
! savepos (point)
! boi (c-point 'boi))
! (if (eq (setq prev-paren (char-after)) ?\()
! (progn
! (c-backward-syntactic-ws containing-sexp)
! (when (/= savepos boi)
! (if (and (or (not (looking-at "\\>"))
! (not (c-on-identifier)))
! (not special-list)
! (save-excursion
! (c-forward-syntactic-ws)
! (forward-char)
! (c-forward-syntactic-ws)
! (eq (char-after) ?{)))
! ;; We're in an in-expression statement.
! ;; This syntactic element won't get an anchor pos.
! (c-add-syntax 'inexpr-statement)
! (c-add-syntax 'arglist-cont-nonempty nil savepos)))
! (goto-char (max boi
! (if containing-sexp
! (1+ containing-sexp)
! (point-min))))
! (setq step-type 'same))
! (setq step-type
! (c-beginning-of-statement-1 containing-sexp)))
(let ((at-bod (and (eq step-type 'same)
(/= savepos (point))
(eq prev-paren ?{))))
+
(when (= savepos boi)
;; If the open brace was at boi, we're always
;; done. The c-beginning-of-statement-1 call
***************
*** 2443,2452 ****
(setq savepos nil))
(when (eq prev-paren ?{)
! (setcdr syms-tail (list (if at-bod
! 'defun-block-intro
! 'statement-block-intro)))
! (setq syms-tail (cdr syms-tail)))
(when (and (not at-bod) savepos)
;; Loop if the brace wasn't at boi, and we didn't
--- 5259,5268 ----
(setq savepos nil))
(when (eq prev-paren ?{)
! (c-add-syntax (if at-bod
! 'defun-block-intro
! 'statement-block-intro)
! nil))
(when (and (not at-bod) savepos)
;; Loop if the brace wasn't at boi, and we didn't
***************
*** 2462,2472 ****
(setq boi (c-point 'boi)))))
)))
! (while syms
! (c-add-syntax (car syms) (point))
! (setq syms (cdr syms)))
! (if add-inexpr-stmt
! (c-add-syntax 'inexpr-statement))
)))
(defun c-add-class-syntax (symbol classkey paren-state)
--- 5278,5291 ----
(setq boi (c-point 'boi)))))
)))
! ;; Fill in the current point as the anchor for all the symbols
! ;; added above.
! (let ((p c-syntactic-context))
! (while (not (eq p syntax-last))
! (if (cdr (car p))
! (setcar (cdr (car p)) (point)))
! (setq p (cdr p))))
!
)))
(defun c-add-class-syntax (symbol classkey paren-state)
***************
*** 2499,2507 ****
--- 5318,5328 ----
;; This function contains the decision tree reached through both
;; cases 18 and 10. It's a continued statement or top level
;; construct of some kind.
+
(let (special-brace-list)
(goto-char indent-point)
(skip-chars-forward " \t")
+
(cond
;; (CASE A removed.)
;; CASE B: open braces for class or brace-lists
***************
*** 2509,2574 ****
(or (and c-special-brace-lists
(c-looking-at-special-brace-list))
(eq char-after-ip ?{)))
(cond
;; CASE B.1: class-open
((save-excursion
! (goto-char indent-point)
! (skip-chars-forward " \t{")
(let ((decl (c-search-uplist-for-classkey (c-parse-state))))
(and decl
(setq beg-of-same-or-containing-stmt (aref decl 0)))
))
(c-add-syntax 'class-open beg-of-same-or-containing-stmt))
;; CASE B.2: brace-list-open
((or (consp special-brace-list)
(save-excursion
(goto-char beg-of-same-or-containing-stmt)
! (looking-at "enum\\>[^_]"))
! (save-excursion
! (goto-char indent-point)
! (while (and (> (point) beg-of-same-or-containing-stmt)
! (= (c-backward-token-1 1 t) 0)
! (/= (char-after) ?=)))
! (eq (char-after) ?=)))
;; The most semantically accurate symbol here is
! ;; brace-list-open, but we report it simply as a statement-cont.
! ;; The reason is that one normally adjusts brace-list-open for
! ;; brace lists as top-level constructs, and brace lists inside
! ;; statements is a completely different context.
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax 'statement-cont nil containing-sexp paren-state))
;; CASE B.3: The body of a function declared inside a normal
;; block. Can occur e.g. in Pike and when using gcc
;; extensions. Might also trigger it with some macros followed
;; by blocks, and this gives sane indentation then too.
! ;; C.f. cases 16F and 17G.
! ((progn
! (goto-char indent-point)
! (and (not (c-looking-at-bos))
! (eq (c-beginning-of-statement-1 containing-sexp nil nil t)
! 'same)))
! (c-add-stmt-syntax 'defun-open t containing-sexp paren-state))
;; CASE B.4: Continued statement with block open.
(t
(goto-char beg-of-same-or-containing-stmt)
! (c-add-stmt-syntax 'statement-cont nil containing-sexp paren-state)
(c-add-syntax 'block-open))
))
;; CASE C: iostream insertion or extraction operator
! ((and (looking-at "<<\\|>>")
(save-excursion
(goto-char beg-of-same-or-containing-stmt)
! (while (and (re-search-forward "<<\\|>>" indent-point 'move)
! (c-in-literal beg-of-same-or-containing-stmt)))
! ;; if we ended up at indent-point, then the first streamop is on a
! ;; separate line. Indent the line like a statement-cont instead
! (when (/= (point) indent-point)
(c-add-syntax 'stream-op (c-point 'boi))
t))))
;; CASE D: continued statement.
(t
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax 'statement-cont nil containing-sexp paren-state))
)))
(defun c-guess-basic-syntax ()
--- 5330,5424 ----
(or (and c-special-brace-lists
(c-looking-at-special-brace-list))
(eq char-after-ip ?{)))
+
(cond
;; CASE B.1: class-open
((save-excursion
! (skip-chars-forward "{")
(let ((decl (c-search-uplist-for-classkey (c-parse-state))))
(and decl
(setq beg-of-same-or-containing-stmt (aref decl 0)))
))
(c-add-syntax 'class-open beg-of-same-or-containing-stmt))
+
;; CASE B.2: brace-list-open
((or (consp special-brace-list)
(save-excursion
(goto-char beg-of-same-or-containing-stmt)
! (c-syntactic-re-search-forward "=\\([^=]\\|$\\)"
! indent-point t t t)))
;; The most semantically accurate symbol here is
! ;; brace-list-open, but we normally report it simply as a
! ;; statement-cont. The reason is that one normally adjusts
! ;; brace-list-open for brace lists as top-level constructs,
! ;; and brace lists inside statements is a completely different
! ;; context. C.f. case 5A.3.
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax (if c-auto-newline-analysis
! ;; Turn off the dwim above when we're
! ;; analyzing the nature of the brace
! ;; for the auto newline feature.
! 'brace-list-open
! 'statement-cont)
! nil nil nil
! containing-sexp paren-state))
!
;; CASE B.3: The body of a function declared inside a normal
;; block. Can occur e.g. in Pike and when using gcc
;; extensions. Might also trigger it with some macros followed
;; by blocks, and this gives sane indentation then too.
! ;; C.f. cases E, 16F and 17G.
! ((and (not (c-looking-at-bos))
! (eq (c-beginning-of-statement-1 containing-sexp nil nil t)
! 'same))
! (c-add-stmt-syntax 'defun-open nil t nil
! containing-sexp paren-state))
!
;; CASE B.4: Continued statement with block open.
(t
(goto-char beg-of-same-or-containing-stmt)
! (c-add-stmt-syntax 'statement-cont nil nil nil
! containing-sexp paren-state)
(c-add-syntax 'block-open))
))
+
;; CASE C: iostream insertion or extraction operator
! ((and (looking-at "\\(<<\\|>>\\)\\([^=]\\|$\\)")
(save-excursion
(goto-char beg-of-same-or-containing-stmt)
! ;; If there is no preceding streamop in the statement
! ;; then indent this line as a normal statement-cont.
! (when (c-syntactic-re-search-forward
! "\\(<<\\|>>\\)\\([^=]\\|$\\)" indent-point 'move t t)
(c-add-syntax 'stream-op (c-point 'boi))
t))))
+
+ ;; CASE E: In the "K&R region" of a function declared inside a
+ ;; normal block. C.f. case B.3.
+ ((and (save-excursion
+ ;; Check that the next token is a '{'. This works as
+ ;; long as no language that allows nested function
+ ;; definitions doesn't allow stuff like member init
+ ;; lists, K&R declarations or throws clauses there.
+ ;;
+ ;; Note that we do a forward search for something ahead
+ ;; of the indentation line here. That's not good since
+ ;; the user might not have typed it yet. Unfortunately
+ ;; it's exceedingly tricky to recognize a function
+ ;; prototype in a code block without resorting to this.
+ (c-forward-syntactic-ws)
+ (eq (char-after) ?{))
+ (not (c-looking-at-bos))
+ (eq (c-beginning-of-statement-1 containing-sexp nil nil t)
+ 'same))
+ (c-add-stmt-syntax 'func-decl-cont nil t nil
+ containing-sexp paren-state))
+
;; CASE D: continued statement.
(t
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax 'statement-cont nil nil nil
! containing-sexp paren-state))
)))
(defun c-guess-basic-syntax ()
***************
*** 2580,2595 ****
(case-fold-search nil)
(paren-state (c-parse-state))
literal containing-sexp char-before-ip char-after-ip lim
! syntax placeholder c-in-literal-cache step-type
tmpsymbol keyword injava-inher special-brace-list
;; narrow out any enclosing class or extern "C" block
(inclass-p (c-narrow-out-enclosing-class paren-state
indent-point))
! ;; c-state-cache is shadowed here. That means we must
! ;; not do any changes during the execution of this
! ;; function, since c-check-state-cache then would change
! ;; this local variable and leave a bogus value in the
! ;; global one.
(c-state-cache (if inclass-p
(c-whack-state-before (point-min) paren-state)
paren-state))
--- 5430,5446 ----
(case-fold-search nil)
(paren-state (c-parse-state))
literal containing-sexp char-before-ip char-after-ip lim
! c-syntactic-context placeholder c-in-literal-cache step-type
tmpsymbol keyword injava-inher special-brace-list
;; narrow out any enclosing class or extern "C" block
(inclass-p (c-narrow-out-enclosing-class paren-state
indent-point))
! ;; `c-state-cache' is shadowed here so that we don't
! ;; throw it away due to the narrowing that might be done
! ;; by the function above. That means we must not do any
! ;; changes during the execution of this function, since
! ;; `c-invalidate-state-cache' then would change this local
! ;; variable and leave a bogus value in the global one.
(c-state-cache (if inclass-p
(c-whack-state-before (point-min) paren-state)
paren-state))
***************
*** 2599,2621 ****
;; a relpos. It's stored in syntactic-relpos.
syntactic-relpos
(c-stmt-delim-chars c-stmt-delim-chars))
! ;; check for meta top-level enclosing constructs, possible
! ;; extern language definitions, possibly (in C++) namespace
! ;; definitions.
(save-excursion
(save-restriction
(widen)
! (if (and inclass-p
! (progn
! (goto-char (aref inclass-p 0))
! (looking-at c-other-decl-block-key)))
! (let ((enclosing (match-string 1)))
! (cond
! ((string-equal enclosing "extern")
! (setq inenclosing-p 'extern))
! ((string-equal enclosing "namespace")
! (setq inenclosing-p 'namespace))
! )))))
;; Init some position variables:
;;
--- 5450,5469 ----
;; a relpos. It's stored in syntactic-relpos.
syntactic-relpos
(c-stmt-delim-chars c-stmt-delim-chars))
! ;; Check for meta top-level enclosing constructs such as
! ;; extern language definitions.
(save-excursion
(save-restriction
(widen)
! (when (and inclass-p
! (progn
! (goto-char (aref inclass-p 0))
! (looking-at c-other-decl-block-key)))
! (setq inenclosing-p (match-string 1))
! (if (string-equal inenclosing-p "extern")
! ;; Compatibility with legacy choice of name for the
! ;; extern-lang syntactic symbols.
! (setq inenclosing-p "extern-lang")))))
;; Init some position variables:
;;
***************
*** 2682,2689 ****
((eq literal 'string)
(c-add-syntax 'string (c-point 'bopl)))
;; CASE 2: in a C or C++ style comment.
! ((memq literal '(c c++))
! (c-add-syntax literal (car (c-literal-limits lim))))
;; CASE 3: in a cpp preprocessor macro continuation.
((and (save-excursion
(when (c-beginning-of-macro)
--- 5530,5546 ----
((eq literal 'string)
(c-add-syntax 'string (c-point 'bopl)))
;; CASE 2: in a C or C++ style comment.
! ((and (memq literal '(c c++))
! ;; This is a kludge for XEmacs where we use
! ;; `buffer-syntactic-context', which doesn't correctly
! ;; recognize "\*/" to end a block comment.
! ;; `parse-partial-sexp' which is used by
! ;; `c-literal-limits' will however do that in most
! ;; versions, which results in that we get nil from
! ;; `c-literal-limits' even when `c-in-literal' claims
! ;; we're inside a comment.
! (setq placeholder (c-literal-limits lim)))
! (c-add-syntax literal (car placeholder)))
;; CASE 3: in a cpp preprocessor macro continuation.
((and (save-excursion
(when (c-beginning-of-macro)
***************
*** 2712,2718 ****
;; CASE 11: an else clause?
((looking-at "else\\>[^_]")
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax 'else-clause t containing-sexp paren-state))
;; CASE 12: while closure of a do/while construct?
((and (looking-at "while\\>[^_]")
(save-excursion
--- 5569,5576 ----
;; CASE 11: an else clause?
((looking-at "else\\>[^_]")
(c-beginning-of-statement-1 containing-sexp)
! (c-add-stmt-syntax 'else-clause nil t nil
! containing-sexp paren-state))
;; CASE 12: while closure of a do/while construct?
((and (looking-at "while\\>[^_]")
(save-excursion
***************
*** 2720,2726 ****
'beginning)
(setq placeholder (point)))))
(goto-char placeholder)
! (c-add-stmt-syntax 'do-while-closure t containing-sexp paren-state))
;; CASE 13: A catch or finally clause? This case is simpler
;; than if-else and do-while, because a block is required
;; after every try, catch and finally.
--- 5578,5585 ----
'beginning)
(setq placeholder (point)))))
(goto-char placeholder)
! (c-add-stmt-syntax 'do-while-closure nil t nil
! containing-sexp paren-state))
;; CASE 13: A catch or finally clause? This case is simpler
;; than if-else and do-while, because a block is required
;; after every try, catch and finally.
***************
*** 2742,2752 ****
(looking-at "\\(try\\|catch\\)\\>[^_]")
(setq placeholder (point))))
(goto-char placeholder)
! (c-add-stmt-syntax 'catch-clause t containing-sexp paren-state))
;; CASE 18: A substatement we can recognize by keyword.
((save-excursion
(and c-opt-block-stmt-key
! (not (eq char-before-ip ?\;))
(not (memq char-after-ip '(?\) ?\] ?,)))
(or (not (eq char-before-ip ?}))
(c-looking-at-inexpr-block-backward c-state-cache))
--- 5601,5614 ----
(looking-at "\\(try\\|catch\\)\\>[^_]")
(setq placeholder (point))))
(goto-char placeholder)
! (c-add-stmt-syntax 'catch-clause nil t nil
! containing-sexp paren-state))
;; CASE 18: A substatement we can recognize by keyword.
((save-excursion
(and c-opt-block-stmt-key
! (if (c-mode-is-new-awk-p)
! (c-awk-prev-line-incomplete-p containing-sexp) ; ACM
2002/3/29
! (not (eq char-before-ip ?\;)))
(not (memq char-after-ip '(?\) ?\] ?,)))
(or (not (eq char-before-ip ?}))
(c-looking-at-inexpr-block-backward c-state-cache))
***************
*** 2780,2786 ****
;; Necessary to catch e.g. synchronized in Java,
;; which can be used both as statement and
;; modifier.
! (and (= (c-forward-token-1 1 nil) 0)
(eq (char-after) ?\())
(looking-at c-opt-block-stmt-key))))
(if (eq step-type 'up)
--- 5642,5648 ----
;; Necessary to catch e.g. synchronized in Java,
;; which can be used both as statement and
;; modifier.
! (and (zerop (c-forward-token-2 1 nil))
(eq (char-after) ?\())
(looking-at c-opt-block-stmt-key))))
(if (eq step-type 'up)
***************
*** 2789,2804 ****
(goto-char placeholder)
(cond
((eq char-after-ip ?{)
! (c-add-stmt-syntax 'substatement-open nil
containing-sexp paren-state))
((save-excursion
(goto-char indent-point)
(back-to-indentation)
(looking-at c-label-key))
! (c-add-stmt-syntax 'substatement-label nil
containing-sexp paren-state))
(t
! (c-add-stmt-syntax 'substatement nil
containing-sexp paren-state))))
;; CASE 18B: Some other substatement. This is shared
;; with case 10.
--- 5651,5666 ----
(goto-char placeholder)
(cond
((eq char-after-ip ?{)
! (c-add-stmt-syntax 'substatement-open nil nil nil
containing-sexp paren-state))
((save-excursion
(goto-char indent-point)
(back-to-indentation)
(looking-at c-label-key))
! (c-add-stmt-syntax 'substatement-label nil nil nil
containing-sexp paren-state))
(t
! (c-add-stmt-syntax 'substatement nil nil nil
containing-sexp paren-state))))
;; CASE 18B: Some other substatement. This is shared
;; with case 10.
***************
*** 2829,2835 ****
'lambda-intro-cont)))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol t
(c-most-enclosing-brace c-state-cache (point))
(c-whack-state-after (point) paren-state))
(unless (eq (point) (cdr placeholder))
--- 5691,5697 ----
'lambda-intro-cont)))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol nil t nil
(c-most-enclosing-brace c-state-cache (point))
(c-whack-state-after (point) paren-state))
(unless (eq (point) (cdr placeholder))
***************
*** 2844,2865 ****
(c-looking-at-special-brace-list))
(eq char-after-ip ?{)))
(cond
! ;; CASE 5A.1: extern language or namespace construct
((save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
! (and (c-safe (progn (c-backward-sexp 2) t))
(looking-at c-other-decl-block-key)
(setq keyword (match-string 1)
placeholder (point))
! (or (and (string-equal keyword "namespace")
! (setq tmpsymbol 'namespace-open))
! (and (string-equal keyword "extern")
! (progn
! (c-forward-sexp 1)
! (c-forward-syntactic-ws)
! (eq (char-after) ?\"))
! (setq tmpsymbol 'extern-lang-open)))
))
(goto-char placeholder)
(c-add-syntax tmpsymbol (c-point 'boi)))
--- 5706,5729 ----
(c-looking-at-special-brace-list))
(eq char-after-ip ?{)))
(cond
! ;; CASE 5A.1: Non-class declaration block open.
((save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
! (and (c-safe (c-backward-sexp 2) t)
(looking-at c-other-decl-block-key)
(setq keyword (match-string 1)
placeholder (point))
! (if (string-equal keyword "extern")
! ;; Special case for extern-lang-open. The
! ;; check for a following string is disabled
! ;; since it doesn't disambiguate anything.
! (and ;;(progn
! ;; (c-forward-sexp 1)
! ;; (c-forward-syntactic-ws)
! ;; (eq (char-after) ?\"))
! (setq tmpsymbol 'extern-lang-open))
! (setq tmpsymbol (intern (concat keyword "-open"))))
))
(goto-char placeholder)
(c-add-syntax tmpsymbol (c-point 'boi)))
***************
*** 2874,2903 ****
(c-add-syntax 'class-open placeholder))
;; CASE 5A.3: brace list open
((save-excursion
! (c-beginning-of-statement-1 lim t)
! (if (looking-at "typedef\\>[^_]")
! (progn (c-forward-sexp 1)
! (c-forward-syntactic-ws indent-point)))
(setq placeholder (c-point 'boi))
(or (consp special-brace-list)
(and (or (save-excursion
(goto-char indent-point)
(setq tmpsymbol nil)
(while (and (> (point) placeholder)
! (= (c-backward-token-1 1 t) 0)
(/= (char-after) ?=))
! (if (and (not tmpsymbol)
! (looking-at "new\\>[^_]"))
! (setq tmpsymbol 'topmost-intro-cont)))
(eq (char-after) ?=))
! (looking-at "enum\\>[^_]"))
(save-excursion
(while (and (< (point) indent-point)
! (= (c-forward-token-1 1 t) 0)
(not (memq (char-after) '(?\; ?\()))))
(not (memq (char-after) '(?\; ?\()))
))))
! (if (and (c-major-mode-is 'java-mode)
(eq tmpsymbol 'topmost-intro-cont))
;; We're in Java and have found that the open brace
;; belongs to a "new Foo[]" initialization list,
--- 5738,5769 ----
(c-add-syntax 'class-open placeholder))
;; CASE 5A.3: brace list open
((save-excursion
! (c-beginning-of-decl-1 lim)
! (while (looking-at c-specifier-key)
! (goto-char (match-end 1))
! (c-forward-syntactic-ws indent-point))
(setq placeholder (c-point 'boi))
(or (consp special-brace-list)
(and (or (save-excursion
(goto-char indent-point)
(setq tmpsymbol nil)
(while (and (> (point) placeholder)
! (zerop (c-backward-token-2 1 t))
(/= (char-after) ?=))
! (and c-opt-inexpr-brace-list-key
! (not tmpsymbol)
! (looking-at c-opt-inexpr-brace-list-key)
! (setq tmpsymbol 'topmost-intro-cont)))
(eq (char-after) ?=))
! (looking-at c-brace-list-key))
(save-excursion
(while (and (< (point) indent-point)
! (zerop (c-forward-token-2 1 t))
(not (memq (char-after) '(?\; ?\()))))
(not (memq (char-after) '(?\; ?\()))
))))
! (if (and (not c-auto-newline-analysis)
! (c-major-mode-is 'java-mode)
(eq tmpsymbol 'topmost-intro-cont))
;; We're in Java and have found that the open brace
;; belongs to a "new Foo[]" initialization list,
***************
*** 2906,2912 ****
;; therefore treat it as any topmost continuation
;; even though the semantically correct symbol still
;; is brace-list-open, on the same grounds as in
! ;; case 10B.2.
(progn
(c-beginning-of-statement-1 lim)
(c-add-syntax 'topmost-intro-cont (c-point 'boi)))
--- 5772,5778 ----
;; therefore treat it as any topmost continuation
;; even though the semantically correct symbol still
;; is brace-list-open, on the same grounds as in
! ;; case B.2.
(progn
(c-beginning-of-statement-1 lim)
(c-add-syntax 'topmost-intro-cont (c-point 'boi)))
***************
*** 2924,2930 ****
(c-add-syntax 'defun-open (c-point 'bol)))
)))
;; CASE 5B: first K&R arg decl or member init
! ((c-just-after-func-arglist-p nil lim)
(cond
;; CASE 5B.1: a member init
((or (eq char-before-ip ?:)
--- 5790,5796 ----
(c-add-syntax 'defun-open (c-point 'bol)))
)))
;; CASE 5B: first K&R arg decl or member init
! ((c-just-after-func-arglist-p lim)
(cond
;; CASE 5B.1: a member init
((or (eq char-before-ip ?:)
***************
*** 2976,2987 ****
(when (eq char-after-ip ?,)
(skip-chars-forward " \t")
(forward-char))
! (looking-at c-opt-decl-spec-key)))
(and (or (eq char-before-ip ?:)
;; watch out for scope operator
(save-excursion
(and (eq char-after-ip ?:)
! (c-safe (progn (forward-char 1) t))
(not (eq (char-after) ?:))
)))
(save-excursion
--- 5842,5853 ----
(when (eq char-after-ip ?,)
(skip-chars-forward " \t")
(forward-char))
! (looking-at c-opt-postfix-decl-spec-key)))
(and (or (eq char-before-ip ?:)
;; watch out for scope operator
(save-excursion
(and (eq char-after-ip ?:)
! (c-safe (forward-char 1) t)
(not (eq (char-after) ?:))
)))
(save-excursion
***************
*** 3000,3006 ****
cont done)
(save-excursion
(while (not done)
! (cond ((looking-at c-opt-decl-spec-key)
(setq injava-inher (cons cont (point))
done t))
((or (not (c-safe (c-forward-sexp -1) t))
--- 5866,5872 ----
cont done)
(save-excursion
(while (not done)
! (cond ((looking-at c-opt-postfix-decl-spec-key)
(setq injava-inher (cons cont (point))
done t))
((or (not (c-safe (c-forward-sexp -1) t))
***************
*** 3057,3076 ****
(save-excursion
;; Note: We use the fact that lim is always after any
;; preceding brace sexp.
! (while (and (= (c-backward-token-1 1 t lim) 0)
(not (looking-at "[;<,=]"))))
(or (memq (char-after) '(?, ?=))
(and (c-major-mode-is 'c++-mode)
! (= (c-backward-token-1 1 nil lim) 0)
(eq (char-after) ?<)))))
(goto-char indent-point)
! (c-beginning-of-member-init-list lim)
(cond
;; CASE 5D.1: hanging member init colon, but watch out
;; for bogus matches on access specifiers inside classes.
! ((and (save-excursion
(setq placeholder (point))
! (c-backward-token-1 1 t lim)
(and (eq (char-after) ?:)
(not (eq (char-before) ?:))))
(save-excursion
--- 5923,5944 ----
(save-excursion
;; Note: We use the fact that lim is always after any
;; preceding brace sexp.
! (while (and (zerop (c-backward-token-2 1 t lim))
(not (looking-at "[;<,=]"))))
(or (memq (char-after) '(?, ?=))
(and (c-major-mode-is 'c++-mode)
! (zerop (c-backward-token-2 1 nil lim))
(eq (char-after) ?<)))))
(goto-char indent-point)
! (setq placeholder
! (c-beginning-of-member-init-list lim))
(cond
;; CASE 5D.1: hanging member init colon, but watch out
;; for bogus matches on access specifiers inside classes.
! ((and placeholder
! (save-excursion
(setq placeholder (point))
! (c-backward-token-2 1 t lim)
(and (eq (char-after) ?:)
(not (eq (char-before) ?:))))
(save-excursion
***************
*** 3118,3129 ****
(c-beginning-of-statement-1 lim)
(setq placeholder (point))
(if (looking-at "static\\>[^_]")
! (c-forward-token-1 1 nil indent-point))
(and (looking-at c-class-key)
! (= (c-forward-token-1 2 nil indent-point) 0)
(if (eq (char-after) ?<)
(c-with-syntax-table c++-template-syntax-table
! (= (c-forward-token-1 1 t indent-point) 0))
t)
(eq (char-after) ?:))))
(goto-char placeholder)
--- 5986,5997 ----
(c-beginning-of-statement-1 lim)
(setq placeholder (point))
(if (looking-at "static\\>[^_]")
! (c-forward-token-2 1 nil indent-point))
(and (looking-at c-class-key)
! (zerop (c-forward-token-2 2 nil indent-point))
(if (eq (char-after) ?<)
(c-with-syntax-table c++-template-syntax-table
! (zerop (c-forward-token-2 1 t indent-point)))
t)
(eq (char-after) ?:))))
(goto-char placeholder)
***************
*** 3144,3150 ****
;; the first variable declaration. C.f. case 5N.
'topmost-intro-cont
'statement-cont)
! nil containing-sexp paren-state))
))
;; CASE 5E: we are looking at a access specifier
((and inclass-p
--- 6012,6018 ----
;; the first variable declaration. C.f. case 5N.
'topmost-intro-cont
'statement-cont)
! nil nil nil containing-sexp paren-state))
))
;; CASE 5E: we are looking at a access specifier
((and inclass-p
***************
*** 3153,3166 ****
(setq placeholder (c-add-class-syntax 'inclass inclass-p
paren-state))
;; Append access-label with the same anchor point as inclass gets.
! (nconc syntax (list (cons 'access-label placeholder))))
! ;; CASE 5F: extern-lang-close or namespace-close?
((and inenclosing-p
(eq char-after-ip ?}))
! (setq tmpsymbol (if (eq inenclosing-p 'extern)
! 'extern-lang-close
! 'namespace-close))
! (c-add-syntax tmpsymbol (aref inclass-p 0)))
;; CASE 5G: we are looking at the brace which closes the
;; enclosing nested class decl
((and inclass-p
--- 6021,6032 ----
(setq placeholder (c-add-class-syntax 'inclass inclass-p
paren-state))
;; Append access-label with the same anchor point as inclass gets.
! (c-append-syntax 'access-label placeholder))
! ;; CASE 5F: Close of a non-class declaration level block.
((and inenclosing-p
(eq char-after-ip ?}))
! (c-add-syntax (intern (concat inenclosing-p "-close"))
! (aref inclass-p 0)))
;; CASE 5G: we are looking at the brace which closes the
;; enclosing nested class decl
((and inclass-p
***************
*** 3169,3175 ****
(save-restriction
(widen)
(forward-char 1)
! (and (c-safe (progn (c-backward-sexp 1) t))
(= (point) (aref inclass-p 1))
))))
(c-add-class-syntax 'class-close inclass-p paren-state))
--- 6035,6041 ----
(save-restriction
(widen)
(forward-char 1)
! (and (c-safe (c-backward-sexp 1) t)
(= (point) (aref inclass-p 1))
))))
(c-add-class-syntax 'class-close inclass-p paren-state))
***************
*** 3193,3198 ****
--- 6059,6075 ----
(looking-at c-opt-method-key))
(c-beginning-of-statement-1 lim)
(c-add-syntax 'objc-method-intro (c-point 'boi)))
+ ;; CASE 5P: AWK pattern or function or continuation
+ ;; thereof.
+ ((c-mode-is-new-awk-p)
+ (setq placeholder (point))
+ (c-add-stmt-syntax
+ (if (and (eq (c-beginning-of-statement-1) 'same)
+ (/= (point) placeholder))
+ 'topmost-intro-cont
+ 'topmost-intro)
+ nil nil nil
+ containing-sexp paren-state))
;; CASE 5N: At a variable declaration that follows a class
;; definition or some other block declaration that doesn't
;; end at the closing '}'. C.f. case 5D.5.
***************
*** 3212,3218 ****
(c-end-of-decl-1)
(> (point) indent-point))))))
(goto-char placeholder)
! (c-add-stmt-syntax 'topmost-intro-cont nil
containing-sexp paren-state))
;; CASE 5J: we are at the topmost level, make
;; sure we skip back past any access specifiers
--- 6089,6095 ----
(c-end-of-decl-1)
(> (point) indent-point))))))
(goto-char placeholder)
! (c-add-stmt-syntax 'topmost-intro-cont nil nil nil
containing-sexp paren-state))
;; CASE 5J: we are at the topmost level, make
;; sure we skip back past any access specifiers
***************
*** 3221,3232 ****
c-opt-access-key
(not (bobp))
(save-excursion
! (c-safe (progn (c-backward-sexp 1) t))
(looking-at c-opt-access-key)))
(c-backward-sexp 1)
(c-backward-syntactic-ws lim))
(or (bobp)
! (memq (char-before) '(?\; ?}))
(and (c-major-mode-is 'objc-mode)
(progn
(c-beginning-of-statement-1 lim)
--- 6098,6111 ----
c-opt-access-key
(not (bobp))
(save-excursion
! (c-safe (c-backward-sexp 1) t)
(looking-at c-opt-access-key)))
(c-backward-sexp 1)
(c-backward-syntactic-ws lim))
(or (bobp)
! (if (c-mode-is-new-awk-p)
! (not (c-awk-prev-line-incomplete-p))
! (memq (char-before) '(?\; ?})))
(and (c-major-mode-is 'objc-mode)
(progn
(c-beginning-of-statement-1 lim)
***************
*** 3243,3254 ****
(goto-char (aref inclass-p 1))
(or (= (point) (c-point 'boi))
(goto-char (aref inclass-p 0)))
! (cond
! ((eq inenclosing-p 'extern)
! (c-add-syntax 'inextern-lang (c-point 'boi)))
! ((eq inenclosing-p 'namespace)
! (c-add-syntax 'innamespace (c-point 'boi)))
! (t (c-add-class-syntax 'inclass inclass-p paren-state)))
))
(when (and c-syntactic-indentation-in-macros
macro-start
--- 6122,6131 ----
(goto-char (aref inclass-p 1))
(or (= (point) (c-point 'boi))
(goto-char (aref inclass-p 0)))
! (if inenclosing-p
! (c-add-syntax (intern (concat "in" inenclosing-p))
! (c-point 'boi))
! (c-add-class-syntax 'inclass inclass-p paren-state))
))
(when (and c-syntactic-indentation-in-macros
macro-start
***************
*** 3284,3299 ****
(c-looking-at-special-brace-list)))
(eq (char-after containing-sexp) ?{)))
(cond
! ;; CASE 7A: we are looking at the arglist closing paren
((memq char-after-ip '(?\) ?\]))
(goto-char containing-sexp)
(setq placeholder (c-point 'boi))
! (when (and (c-safe (backward-up-list 1) t)
! (> (point) placeholder))
! (forward-char)
! (skip-chars-forward " \t")
! (setq placeholder (point)))
! (c-add-syntax 'arglist-close placeholder))
;; CASE 7B: Looking at the opening brace of an
;; in-expression block or brace list. C.f. cases 4, 16A
;; and 17E.
--- 6161,6180 ----
(c-looking-at-special-brace-list)))
(eq (char-after containing-sexp) ?{)))
(cond
! ;; CASE 7A: we are looking at the arglist closing paren.
! ;; C.f. case 7F.
((memq char-after-ip '(?\) ?\]))
(goto-char containing-sexp)
(setq placeholder (c-point 'boi))
! (if (and (c-safe (backward-up-list 1) t)
! (> (point) placeholder))
! (progn
! (forward-char)
! (skip-chars-forward " \t"))
! (goto-char placeholder))
! (c-add-stmt-syntax 'arglist-close (list containing-sexp) t nil
! (c-most-enclosing-brace paren-state (point))
! (c-whack-state-after (point) paren-state)))
;; CASE 7B: Looking at the opening brace of an
;; in-expression block or brace list. C.f. cases 4, 16A
;; and 17E.
***************
*** 3315,3321 ****
)))
(goto-char placeholder)
(back-to-indentation)
! (c-add-stmt-syntax (car tmpsymbol) t
(c-most-enclosing-brace paren-state (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) placeholder)
--- 6196,6202 ----
)))
(goto-char placeholder)
(back-to-indentation)
! (c-add-stmt-syntax (car tmpsymbol) nil t nil
(c-most-enclosing-brace paren-state (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) placeholder)
***************
*** 3336,3342 ****
;; these things as statements
((progn
(goto-char containing-sexp)
! (and (c-safe (progn (c-forward-sexp -1) t))
(looking-at "\\<for\\>[^_]")))
(goto-char (1+ containing-sexp))
(c-forward-syntactic-ws indent-point)
--- 6217,6223 ----
;; these things as statements
((progn
(goto-char containing-sexp)
! (and (c-safe (c-forward-sexp -1) t)
(looking-at "\\<for\\>[^_]")))
(goto-char (1+ containing-sexp))
(c-forward-syntactic-ws indent-point)
***************
*** 3359,3365 ****
;; but the preceding argument is on the same line as the
;; opening paren. This case includes multi-line
;; mathematical paren groupings, but we could be on a
! ;; for-list continuation line
((progn
(goto-char (1+ containing-sexp))
(skip-chars-forward " \t")
--- 6240,6246 ----
;; but the preceding argument is on the same line as the
;; opening paren. This case includes multi-line
;; mathematical paren groupings, but we could be on a
! ;; for-list continuation line. C.f. case 7A.
((progn
(goto-char (1+ containing-sexp))
(skip-chars-forward " \t")
***************
*** 3367,3378 ****
(not (looking-at "\\\\$"))))
(goto-char containing-sexp)
(setq placeholder (c-point 'boi))
! (when (and (c-safe (backward-up-list 1) t)
! (> (point) placeholder))
! (forward-char)
! (skip-chars-forward " \t")
! (setq placeholder (point)))
! (c-add-syntax 'arglist-cont-nonempty placeholder))
;; CASE 7G: we are looking at just a normal arglist
;; continuation line
(t (c-forward-syntactic-ws indent-point)
--- 6248,6263 ----
(not (looking-at "\\\\$"))))
(goto-char containing-sexp)
(setq placeholder (c-point 'boi))
! (if (and (c-safe (backward-up-list 1) t)
! (> (point) placeholder))
! (progn
! (forward-char)
! (skip-chars-forward " \t"))
! (goto-char placeholder))
! (c-add-stmt-syntax 'arglist-cont-nonempty (list containing-sexp)
! t nil
! (c-most-enclosing-brace c-state-cache (point))
! (c-whack-state-after (point) paren-state)))
;; CASE 7G: we are looking at just a normal arglist
;; continuation line
(t (c-forward-syntactic-ws indent-point)
***************
*** 3383,3389 ****
(save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
! (looking-at c-opt-decl-spec-key)))
(goto-char indent-point)
(skip-chars-forward " \t")
(cond
--- 6268,6274 ----
(save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
! (looking-at c-opt-postfix-decl-spec-key)))
(goto-char indent-point)
(skip-chars-forward " \t")
(cond
***************
*** 3400,3411 ****
(c-add-syntax 'inher-cont (point))
)))
;; CASE 9: we are inside a brace-list
! ((setq special-brace-list
! (or (and c-special-brace-lists
! (save-excursion
! (goto-char containing-sexp)
! (c-looking-at-special-brace-list)))
! (c-inside-bracelist-p containing-sexp paren-state)))
(cond
;; CASE 9A: In the middle of a special brace list opener.
((and (consp special-brace-list)
--- 6285,6297 ----
(c-add-syntax 'inher-cont (point))
)))
;; CASE 9: we are inside a brace-list
! ((and (not (c-mode-is-new-awk-p)) ; Maybe this isn't needed (ACM,
2002/3/29)
! (setq special-brace-list
! (or (and c-special-brace-lists
! (save-excursion
! (goto-char containing-sexp)
! (c-looking-at-special-brace-list)))
! (c-inside-bracelist-p containing-sexp paren-state))))
(cond
;; CASE 9A: In the middle of a special brace list opener.
((and (consp special-brace-list)
***************
*** 3418,3428 ****
(if (and (bolp)
(assoc 'statement-cont
(setq placeholder (c-guess-basic-syntax))))
! (setq syntax placeholder)
(c-beginning-of-statement-1
(c-safe-position (1- containing-sexp) paren-state))
! (c-forward-token-1 0)
! (if (looking-at "typedef\\>[^_]") (c-forward-token-1 1))
(c-add-syntax 'brace-list-open (c-point 'boi))))
;; CASE 9B: brace-list-close brace
((if (consp special-brace-list)
--- 6304,6316 ----
(if (and (bolp)
(assoc 'statement-cont
(setq placeholder (c-guess-basic-syntax))))
! (setq c-syntactic-context placeholder)
(c-beginning-of-statement-1
(c-safe-position (1- containing-sexp) paren-state))
! (c-forward-token-2 0)
! (while (looking-at c-specifier-key)
! (goto-char (match-end 1))
! (c-forward-syntactic-ws))
(c-add-syntax 'brace-list-open (c-point 'boi))))
;; CASE 9B: brace-list-close brace
((if (consp special-brace-list)
***************
*** 3438,3464 ****
(eq (1+ (point)) (cdr (car special-brace-list))))
;; We were before the special close char.
(and (eq (char-after) (cdr (cdr special-brace-list)))
! (= (c-forward-token-1) 0)
(eq (1+ (point)) (cdr (car special-brace-list)))))))
;; Normal brace list check.
(and (eq char-after-ip ?})
! (c-safe (progn (goto-char (c-up-list-backward (point)))
! t))
(= (point) containing-sexp)))
(if (eq (point) (c-point 'boi))
(c-add-syntax 'brace-list-close (point))
(setq lim (c-most-enclosing-brace c-state-cache (point)))
(c-beginning-of-statement-1 lim)
! (c-add-stmt-syntax 'brace-list-close t lim
! (c-whack-state-after (point) paren-state)
! t)))
(t
;; Prepare for the rest of the cases below by going to the
;; token following the opening brace
(if (consp special-brace-list)
(progn
(goto-char (car (car special-brace-list)))
! (c-forward-token-1 1 nil indent-point))
(goto-char containing-sexp))
(forward-char)
(let ((start (point)))
--- 6326,6350 ----
(eq (1+ (point)) (cdr (car special-brace-list))))
;; We were before the special close char.
(and (eq (char-after) (cdr (cdr special-brace-list)))
! (zerop (c-forward-token-2))
(eq (1+ (point)) (cdr (car special-brace-list)))))))
;; Normal brace list check.
(and (eq char-after-ip ?})
! (c-safe (goto-char (c-up-list-backward (point))) t)
(= (point) containing-sexp)))
(if (eq (point) (c-point 'boi))
(c-add-syntax 'brace-list-close (point))
(setq lim (c-most-enclosing-brace c-state-cache (point)))
(c-beginning-of-statement-1 lim)
! (c-add-stmt-syntax 'brace-list-close nil t t lim
! (c-whack-state-after (point) paren-state))))
(t
;; Prepare for the rest of the cases below by going to the
;; token following the opening brace
(if (consp special-brace-list)
(progn
(goto-char (car (car special-brace-list)))
! (c-forward-token-2 1 nil indent-point))
(goto-char containing-sexp))
(forward-char)
(let ((start (point)))
***************
*** 3475,3483 ****
(c-add-syntax 'brace-list-intro (point))
(setq lim (c-most-enclosing-brace c-state-cache (point)))
(c-beginning-of-statement-1 lim)
! (c-add-stmt-syntax 'brace-list-intro t lim
! (c-whack-state-after (point) paren-state)
! t)))
;; CASE 9D: this is just a later brace-list-entry or
;; brace-entry-open
(t (if (or (eq char-after-ip ?{)
--- 6361,6368 ----
(c-add-syntax 'brace-list-intro (point))
(setq lim (c-most-enclosing-brace c-state-cache (point)))
(c-beginning-of-statement-1 lim)
! (c-add-stmt-syntax 'brace-list-intro nil t t lim
! (c-whack-state-after (point) paren-state))))
;; CASE 9D: this is just a later brace-list-entry or
;; brace-entry-open
(t (if (or (eq char-after-ip ?{)
***************
*** 3491,3499 ****
))
))))
;; CASE 10: A continued statement or top level construct.
! ((and (not (memq char-before-ip '(?\; ?:)))
! (or (not (eq char-before-ip ?}))
! (c-looking-at-inexpr-block-backward c-state-cache))
(> (point)
(save-excursion
(c-beginning-of-statement-1 containing-sexp)
--- 6376,6386 ----
))
))))
;; CASE 10: A continued statement or top level construct.
! ((and (if (c-mode-is-new-awk-p)
! (c-awk-prev-line-incomplete-p containing-sexp) ; ACM
2002/3/29
! (and (not (memq char-before-ip '(?\; ?:)))
! (or (not (eq char-before-ip ?}))
! (c-looking-at-inexpr-block-backward
c-state-cache))))
(> (point)
(save-excursion
(c-beginning-of-statement-1 containing-sexp)
***************
*** 3510,3516 ****
(goto-char containing-sexp)
(setq lim (c-most-enclosing-brace c-state-cache containing-sexp))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'case-label t lim paren-state))
;; CASE 15: any other label
((looking-at c-label-key)
(goto-char containing-sexp)
--- 6397,6404 ----
(goto-char containing-sexp)
(setq lim (c-most-enclosing-brace c-state-cache containing-sexp))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'case-label nil t nil
! lim paren-state))
;; CASE 15: any other label
((looking-at c-label-key)
(goto-char containing-sexp)
***************
*** 3525,3531 ****
'case-label
'label)))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax tmpsymbol t lim paren-state))
;; CASE 16: block close brace, possibly closing the defun or
;; the class
((eq char-after-ip ?})
--- 6413,6420 ----
'case-label
'label)))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax tmpsymbol nil t nil
! lim paren-state))
;; CASE 16: block close brace, possibly closing the defun or
;; the class
((eq char-after-ip ?})
***************
*** 3539,3545 ****
;; e.g. a macro argument.
((c-after-conditional)
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'block-close t lim paren-state))
;; CASE 16A: closing a lambda defun or an in-expression
;; block? C.f. cases 4, 7B and 17E.
((setq placeholder (c-looking-at-inexpr-block
--- 6428,6435 ----
;; e.g. a macro argument.
((c-after-conditional)
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'block-close nil t nil
! lim paren-state))
;; CASE 16A: closing a lambda defun or an in-expression
;; block? C.f. cases 4, 7B and 17E.
((setq placeholder (c-looking-at-inexpr-block
***************
*** 3554,3566 ****
(c-add-syntax tmpsymbol (point))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol t
(c-most-enclosing-brace paren-state (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) (cdr placeholder))
(c-add-syntax (car placeholder)))))
;; CASE 16B: does this close an inline or a function in
! ;; an extern block or namespace?
((setq placeholder (c-search-uplist-for-classkey paren-state))
(c-backward-to-decl-anchor lim)
(back-to-indentation)
--- 6444,6456 ----
(c-add-syntax tmpsymbol (point))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol nil t nil
(c-most-enclosing-brace paren-state (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) (cdr placeholder))
(c-add-syntax (car placeholder)))))
;; CASE 16B: does this close an inline or a function in
! ;; a non-class declaration level block?
((setq placeholder (c-search-uplist-for-classkey paren-state))
(c-backward-to-decl-anchor lim)
(back-to-indentation)
***************
*** 3584,3590 ****
(back-to-indentation)
(if (/= (point) containing-sexp)
(goto-char placeholder))
! (c-add-stmt-syntax 'defun-close t lim paren-state))
;; CASE 16C: if there an enclosing brace that hasn't
;; been narrowed out by a class, then this is a
;; block-close. C.f. case 17H.
--- 6474,6481 ----
(back-to-indentation)
(if (/= (point) containing-sexp)
(goto-char placeholder))
! (c-add-stmt-syntax 'defun-close nil t nil
! lim paren-state))
;; CASE 16C: if there an enclosing brace that hasn't
;; been narrowed out by a class, then this is a
;; block-close. C.f. case 17H.
***************
*** 3603,3609 ****
(goto-char containing-sexp)
;; c-backward-to-block-anchor not necessary here; those
;; situations are handled in case 16E above.
! (c-add-stmt-syntax 'block-close t lim paren-state)))
;; CASE 16D: find out whether we're closing a top-level
;; class or a defun
(t
--- 6494,6501 ----
(goto-char containing-sexp)
;; c-backward-to-block-anchor not necessary here; those
;; situations are handled in case 16E above.
! (c-add-stmt-syntax 'block-close nil t nil
! lim paren-state)))
;; CASE 16D: find out whether we're closing a top-level
;; class or a defun
(t
***************
*** 3634,3640 ****
;; CASE 17B: continued statement
((and (eq step-type 'same)
(/= (point) indent-point))
! (c-add-stmt-syntax 'statement-cont nil
containing-sexp paren-state))
;; CASE 17A: After a case/default label?
((progn
--- 6526,6532 ----
;; CASE 17B: continued statement
((and (eq step-type 'same)
(/= (point) indent-point))
! (c-add-stmt-syntax 'statement-cont nil nil nil
containing-sexp paren-state))
;; CASE 17A: After a case/default label?
((progn
***************
*** 3646,3659 ****
(c-add-stmt-syntax (if (eq char-after-ip ?{)
'statement-case-open
'statement-case-intro)
! t containing-sexp paren-state))
;; CASE 17D: any old statement
((progn
(while (eq step-type 'label)
(setq step-type
(c-beginning-of-statement-1 containing-sexp)))
(eq step-type 'previous))
! (c-add-stmt-syntax 'statement t containing-sexp paren-state)
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
;; CASE 17I: Inside a substatement block.
--- 6538,6552 ----
(c-add-stmt-syntax (if (eq char-after-ip ?{)
'statement-case-open
'statement-case-intro)
! nil t nil containing-sexp paren-state))
;; CASE 17D: any old statement
((progn
(while (eq step-type 'label)
(setq step-type
(c-beginning-of-statement-1 containing-sexp)))
(eq step-type 'previous))
! (c-add-stmt-syntax 'statement nil t nil
! containing-sexp paren-state)
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
;; CASE 17I: Inside a substatement block.
***************
*** 3664,3670 ****
(setq lim (c-most-enclosing-brace paren-state containing-sexp))
(c-after-conditional))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'statement-block-intro t lim paren-state)
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
;; CASE 17E: first statement in an in-expression block.
--- 6557,6564 ----
(setq lim (c-most-enclosing-brace paren-state containing-sexp))
(c-after-conditional))
(c-backward-to-block-anchor lim)
! (c-add-stmt-syntax 'statement-block-intro nil t nil
! lim paren-state)
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
;; CASE 17E: first statement in an in-expression block.
***************
*** 3680,3686 ****
(c-add-syntax tmpsymbol (point))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol t
(c-most-enclosing-brace c-state-cache (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) (cdr placeholder))
--- 6574,6580 ----
(c-add-syntax tmpsymbol (point))
(goto-char (cdr placeholder))
(back-to-indentation)
! (c-add-stmt-syntax tmpsymbol nil t nil
(c-most-enclosing-brace c-state-cache (point))
(c-whack-state-after (point) paren-state))
(if (/= (point) (cdr placeholder))
***************
*** 3691,3700 ****
;; statement in a top-level defun. we can tell this is it
;; if there are no enclosing braces that haven't been
;; narrowed out by a class (i.e. don't use bod here).
- ;; However, we first check for statements that we can
- ;; recognize by keywords. That increases the robustness in
- ;; cases where statements are used on the top level,
- ;; e.g. in macro definitions.
((save-excursion
(save-restriction
(widen)
--- 6585,6590 ----
***************
*** 3715,3721 ****
(back-to-indentation)
(if (/= (point) containing-sexp)
(goto-char placeholder))
! (c-add-stmt-syntax 'defun-block-intro t lim paren-state))
;; CASE 17H: First statement in a block. C.f. case 16C.
(t
;; If the block is preceded by a case/switch label on the
--- 6605,6612 ----
(back-to-indentation)
(if (/= (point) containing-sexp)
(goto-char placeholder))
! (c-add-stmt-syntax 'defun-block-intro nil t nil
! lim paren-state))
;; CASE 17H: First statement in a block. C.f. case 16C.
(t
;; If the block is preceded by a case/switch label on the
***************
*** 3731,3737 ****
(goto-char containing-sexp)
;; c-backward-to-block-anchor not necessary here; those
;; situations are handled in case 17I above.
! (c-add-stmt-syntax 'statement-block-intro t lim paren-state))
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
))
--- 6622,6629 ----
(goto-char containing-sexp)
;; c-backward-to-block-anchor not necessary here; those
;; situations are handled in case 17I above.
! (c-add-stmt-syntax 'statement-block-intro nil t nil
! lim paren-state))
(if (eq char-after-ip ?{)
(c-add-syntax 'block-open)))
))
***************
*** 3741,3774 ****
(skip-chars-forward " \t")
;; are we looking at a comment only line?
(when (and (looking-at c-comment-start-regexp)
! (/= (c-forward-token-1 0 nil (c-point 'eol)) 0))
! (c-add-syntax 'comment-intro))
;; we might want to give additional offset to friends (in C++).
(when (and c-opt-friend-key
(looking-at c-opt-friend-key))
! (c-add-syntax 'friend))
;; Start of or a continuation of a preprocessor directive?
(if (and macro-start
(eq macro-start (c-point 'boi))
(not (and (c-major-mode-is 'pike-mode)
(eq (char-after (1+ macro-start)) ?\"))))
! (c-add-syntax 'cpp-macro)
(when (and c-syntactic-indentation-in-macros macro-start)
(if in-macro-expr
! (when (or (< syntactic-relpos macro-start)
! (not (or (assq 'arglist-intro syntax)
! (assq 'arglist-cont syntax)
! (assq 'arglist-cont-nonempty syntax)
! (assq 'arglist-close syntax))))
;; If inside a cpp expression, i.e. anywhere in a
;; cpp directive except a #define body, we only let
;; through the syntactic analysis that is internal
;; in the expression. That means the arglist
;; elements, if they are anchored inside the cpp
;; expression.
! (setq syntax `((cpp-macro-cont . ,macro-start))))
(when (and (eq macro-start syntactic-relpos)
! (not (assq 'cpp-define-intro syntax))
(save-excursion
(goto-char macro-start)
(or (not (c-forward-to-cpp-define-body))
--- 6633,6680 ----
(skip-chars-forward " \t")
;; are we looking at a comment only line?
(when (and (looking-at c-comment-start-regexp)
! (/= (c-forward-token-2 0 nil (c-point 'eol)) 0))
! (c-append-syntax 'comment-intro))
;; we might want to give additional offset to friends (in C++).
(when (and c-opt-friend-key
(looking-at c-opt-friend-key))
! (c-append-syntax 'friend))
!
! ;; Set syntactic-relpos.
! (let ((p c-syntactic-context))
! (while (and p
! (if (integerp (car-safe (cdr-safe (car p))))
! (progn
! (setq syntactic-relpos (car (cdr (car p))))
! nil)
! t))
! (setq p (cdr p))))
!
;; Start of or a continuation of a preprocessor directive?
(if (and macro-start
(eq macro-start (c-point 'boi))
(not (and (c-major-mode-is 'pike-mode)
(eq (char-after (1+ macro-start)) ?\"))))
! (c-append-syntax 'cpp-macro)
(when (and c-syntactic-indentation-in-macros macro-start)
(if in-macro-expr
! (when (or
! (< syntactic-relpos macro-start)
! (not (or
! (assq 'arglist-intro c-syntactic-context)
! (assq 'arglist-cont c-syntactic-context)
! (assq 'arglist-cont-nonempty c-syntactic-context)
! (assq 'arglist-close c-syntactic-context))))
;; If inside a cpp expression, i.e. anywhere in a
;; cpp directive except a #define body, we only let
;; through the syntactic analysis that is internal
;; in the expression. That means the arglist
;; elements, if they are anchored inside the cpp
;; expression.
! (setq c-syntactic-context nil)
! (c-add-syntax 'cpp-macro-cont macro-start))
(when (and (eq macro-start syntactic-relpos)
! (not (assq 'cpp-define-intro c-syntactic-context))
(save-excursion
(goto-char macro-start)
(or (not (c-forward-to-cpp-define-body))
***************
*** 3779,3791 ****
;; indentation of the #define body.
(c-add-syntax 'cpp-define-intro)))))
;; return the syntax
! syntax))))
! (defun c-echo-parsing-error (&optional quiet)
! (when (and c-report-syntactic-errors c-parsing-error (not quiet))
! (c-benign-error "%s" c-parsing-error))
! c-parsing-error)
(defun c-evaluate-offset (offset langelem symbol)
;; offset can be a number, a function, a variable, a list, or one of
--- 6685,6694 ----
;; indentation of the #define body.
(c-add-syntax 'cpp-define-intro)))))
;; return the syntax
! c-syntactic-context))))
! ;; Indentation calculation.
(defun c-evaluate-offset (offset langelem symbol)
;; offset can be a number, a function, a variable, a list, or one of
***************
*** 3799,3805 ****
((eq offset '/) (/ (- c-basic-offset) 2))
((numberp offset) offset)
((functionp offset) (c-evaluate-offset
! (funcall offset langelem) langelem symbol))
((vectorp offset) offset)
((null offset) nil)
((listp offset)
--- 6702,6711 ----
((eq offset '/) (/ (- c-basic-offset) 2))
((numberp offset) offset)
((functionp offset) (c-evaluate-offset
! (funcall offset
! (cons (car langelem)
! (car-safe (cdr langelem))))
! langelem symbol))
((vectorp offset) offset)
((null offset) nil)
((listp offset)
***************
*** 3813,3822 ****
(t (symbol-value offset))
))
! (defun c-get-offset (langelem)
! "Get offset from LANGELEM which is a cons cell of the form:
! \(SYMBOL . RELPOS). The symbol is matched against `c-offsets-alist'
! and the offset found there is returned."
(let* ((symbol (car langelem))
(match (assq symbol c-offsets-alist))
(offset (cdr-safe match)))
--- 6719,6731 ----
(t (symbol-value offset))
))
! (defun c-calc-offset (langelem)
! ;; Get offset from LANGELEM which is a list beginning with the
! ;; syntactic symbol and followed by any analysis data it provides.
! ;; That data may be zero or more elements, but if at least one is
! ;; given then the first is the relpos (or nil). The symbol is
! ;; matched against `c-offsets-alist' and the offset calculated from
! ;; that is returned.
(let* ((symbol (car langelem))
(match (assq symbol c-offsets-alist))
(offset (cdr-safe match)))
***************
*** 3832,3865 ****
0))
))
(defun c-get-syntactic-indentation (langelems)
! "Apply `c-get-offset' to a list of langelem cells to get the total
! syntactic indentation. The anchor position, whose column is used as a
! base for all the collected offsets, is taken from the first element
! with a relpos."
;; Note that topmost-intro always has a relpos at bol, for
;; historical reasons. It's often used together with other symbols
;; that has more sane positions. Since we always use the first
;; found relpos, we rely on that these other symbols always precede
;; topmost-intro in the LANGELEMS list.
(let ((indent 0) anchor)
! (catch 'done
! (while langelems
! (let ((res (c-get-offset (car langelems))))
! (if (vectorp res)
! (throw 'done (elt res 0))
! (unless anchor
! (let ((relpos (cdr (car langelems))))
! (if relpos
! (setq anchor relpos))))
! (setq indent (+ indent res)
! langelems (cdr langelems)))))
! (+ indent
! (if anchor
! (save-excursion
! (goto-char anchor)
! (current-column))
! 0)))))
(cc-provide 'cc-engine)
--- 6741,6796 ----
0))
))
+ (defun c-get-offset (langelem)
+ ;; This is a compatibility wrapper for `c-calc-offset' in case
+ ;; someone is calling it directly. It takes an old style syntactic
+ ;; element on the form (SYMBOL . RELPOS) and converts it to the new
+ ;; list form.
+ (if (cdr langelem)
+ (c-calc-offset (list (car langelem) (cdr langelem)))
+ (c-calc-offset langelem)))
+
(defun c-get-syntactic-indentation (langelems)
! ;; Calculate the syntactic indentation from a syntactic description
! ;; as returned by `c-guess-syntax'.
! ;;
;; Note that topmost-intro always has a relpos at bol, for
;; historical reasons. It's often used together with other symbols
;; that has more sane positions. Since we always use the first
;; found relpos, we rely on that these other symbols always precede
;; topmost-intro in the LANGELEMS list.
(let ((indent 0) anchor)
!
! (while langelems
! (let* ((c-syntactic-element (car langelems))
! (res (c-calc-offset c-syntactic-element)))
!
! (if (vectorp res)
! ;; Got an absolute column that overrides any indentation
! ;; we've collected so far, but not the relative
! ;; indentation we might get for the nested structures
! ;; further down the langelems list.
! (setq indent (elt res 0)
! anchor (point-min)) ; A position at column 0.
!
! ;; Got a relative change of the current calculated
! ;; indentation.
! (setq indent (+ indent res))
!
! ;; Use the anchor position from the first syntactic
! ;; element with one.
! (unless anchor
! (let ((relpos (car-safe (cdr (car langelems)))))
! (if relpos
! (setq anchor relpos)))))
!
! (setq langelems (cdr langelems))))
!
! (if anchor
! (+ indent (save-excursion
! (goto-char anchor)
! (current-column)))
! indent)))
(cc-provide 'cc-engine)
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el,
Martin Stjernholm <=