comparison lisp/progmodes/cc-engine.el @ 21106:5e5fa0a34cb0

(c-inside-bracelist-p): Fix for enum test. (c-collect-line-comments): Require same comment start column. (c-guess-basic-syntax): Fixes for nesting of and repeated defun-open's inside extern and namespace clauses. This is done by passing a relpos to `inextern-lang' and `innamespace'. Also, the relpos in `defun-open' is no longer always bol. It's always bol when on the top level, however. Changed cases: 5A.5, 5I, 14A. (c-forward-token-1, c-backward-token-1): New functions to move by tokens. c-guess-basic-syntax): Fixes for Java 1.1 array initialization brace lists.

21105:b40ae72a5b26

      (forward-comment hugenum)
      (c-beginning-of-macro))
    (if lim (goto-char (max (point) lim)))))


;; Return `c' if in a C-style comment, `c++' if in a C++ style
;; comment, `string' if in a string literal, `pound' if on a
;; preprocessor line, or nil if not in a comment at all.  Optional LIM
;; is used as the backward limit of the search.  If omitted, or nil,
;; `beginning-of-defun' is used."

(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 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 ((beg (point)))
	      (while (and (not (bobp))
			  (forward-comment -1)
			  (looking-at "//"))
		(setq beg (point)))
	      (cons beg (progn
			  (goto-char (cdr range))
			  (while (looking-at "[ \t]*//")
			    (forward-comment 1))
			  (point))))
	  range)
      (error range))))




  ;; N.B.: This algorithm can potentially get confused by cpp macros
  ;; places in inconvenient locations.  Its a trade-off we make for
  ;; speed.
  (or
   ;; this will pick up enum lists
   (condition-case ()
       (save-excursion
	 (goto-char containing-sexp)
	 (forward-sexp -1)
	 (if (and (or (looking-at "enum[\t\n ]+")
		      (progn (forward-sexp -1)
			     (looking-at "enum[\t\n ]+")))
		  (progn (c-end-of-statement-1)
			 (> (point) containing-sexp)))
	     (point)))
     (error nil))
   ;; this will pick up array/aggregate init lists, even if they are nested.
   (save-excursion
     (let (bufpos failedp)
       (while (and (not bufpos)
		   containing-sexp)
	 (if (consp containing-sexp)
	     (setq containing-sexp (car brace-state)
		   brace-state (cdr brace-state))
	   ;; see if significant character just before brace is an equal
	   (goto-char containing-sexp)
	   (setq failedp nil)
	   (condition-case ()
	       (progn
		 (forward-sexp -1)
		 (forward-sexp 1)
		 (c-forward-syntactic-ws containing-sexp))
	     (error (setq failedp t)))
	   (if (or failedp (not (eq (char-after) ?=)))
	       ;; lets see if we're nested. find the most nested
	       ;; containing brace
	       (setq containing-sexp (car brace-state)
		     brace-state (cdr brace-state))
	     ;; we've hit the beginning of the aggregate list

		(if (looking-at "typedef[^_]")
		    (progn (forward-sexp 1)
			   (c-forward-syntactic-ws indent-point)))
		(setq placeholder (c-point 'boi))
		(and (or (looking-at "enum[ \t\n]+")
			 (eq char-before-ip ?=))
		     (save-excursion
		       (skip-chars-forward "^;(" indent-point)
		       (not (memq (char-after) '(?\; ?\()))
		       )))
	      (c-add-syntax 'brace-list-open placeholder))

	      (c-add-syntax 'inline-open)
	      (c-add-syntax 'inclass (aref inclass-p 0)))
	     ;; CASE 5A.5: ordinary defun open
	     (t
	      (goto-char placeholder)
	      (c-add-syntax 'defun-open (c-point 'bol))
	      )))
	   ;; CASE 5B: first K&R arg decl or member init
	   ((c-just-after-func-arglist-p)
	    (cond
	     ;; CASE 5B.1: a member init

	   ((and inclass-p
		 c-access-key
		 (looking-at c-access-key))
	    (c-add-syntax 'access-label (c-point 'bonl))
	    (c-add-syntax 'inclass (aref inclass-p 0)))
	   ;; CASE 5F: extern-lang-close?
	   ((and inenclosing-p
		 (eq char-after-ip ?}))
	    (setq tmpsymbol (if (eq inenclosing-p 'extern)
				'extern-lang-close
			      'namespace-close))

		    (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))
		     ((eq inenclosing-p 'namespace)
		      (c-add-syntax 'innamespace))
		     (t (c-add-syntax 'inclass (c-point 'boi))))
		    ))
	      ))
	   ;; CASE 5J: we are at an ObjC or Java method definition
	   ;; continuation line.

		(c-add-syntax 'class-open placeholder))
	       ;; CASE 9B.2: brace-list-open
	       ((or (save-excursion
		      (goto-char placeholder)
		      (looking-at "\\<enum\\>"))
		    (eq char-before-ip ?=))
		(c-add-syntax 'brace-list-open placeholder))
	       ;; CASE 9B.3: catch-all for unknown construct.
	       (t
		;; Can and should I add an extensibility hook here?
		;; Something like c-recognize-hook so support for

			   (goto-char containing-sexp)
			   (if (/= (point) (c-point 'boi))
			       (c-beginning-of-statement-1 lim))
			   (c-point 'boi))))
	    (cond
	     ;; CASE 14A: does this close an inline?
	     ((let ((inclass-p (progn
				 (goto-char containing-sexp)
				 (c-search-uplist-for-classkey state))))
		;; inenclosing-p in higher level let*
		(setq inenclosing-p (and inclass-p
					 (progn
					   (goto-char (aref inclass-p 0))
					   (looking-at c-extra-toplevel-key))))
		(and inclass-p (not inenclosing-p)))
	      (c-add-syntax 'inline-close relpos))
	     ;; CASE 14B: if there an enclosing brace that hasn't
	     ;; been narrowed out by a class, then this is a
	     ;; block-close
	     ((and (not inenclosing-p)
		   (c-most-enclosing-brace state))

21106:5e5fa0a34cb0

      (forward-comment hugenum)
      (c-beginning-of-macro))
    (if lim (goto-char (max (point) lim)))))


;; Moving by tokens, where a token is defined as all symbols and
;; identifiers which aren't syntactic whitespace.  COUNT specifies the
;; number of tokens to move forward; a negative COUNT moves backward.
;; 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.  Point is always left
;; at the beginning of a token or at LIM.  Returns the number of
;; tokens left to move (positive or negative).  If BALANCED is true, a
;; move over a balanced paren counts as one.

(defun c-forward-token-1 (&optional count balanced lim)
  (let* ((jump-syntax (if balanced
			  '(?w ?_ ?\" ?\\ ?/ ?$ ?' ?\( ?\))
			'(?w ?_ ?\" ?\\ ?/ ?$ ?'))))
    (or count (setq count 1))
    (condition-case nil
	(while (progn
		 (c-forward-syntactic-ws lim)
		 (> count 0))
	  (if (memq (char-syntax (char-after)) jump-syntax)
	      (goto-char (scan-sexps (point) 1))
	    (forward-char))
	  (setq count (1- count)))
      (error
       (and lim (> (point) lim) (goto-char lim))))
    count))

(defun c-backward-token-1 (&optional count balanced lim)
  (let* ((jump-syntax (if balanced
			  '(?w ?_ ?\" ?\\ ?/ ?$ ?' ?\( ?\))
			'(?w ?_ ?\" ?\\ ?/ ?$ ?')))
	 last)
    (or count (setq count 1))
    (condition-case nil
	(while (> count 0)
	  (setq last (point))
	  (c-backward-syntactic-ws lim)
	  (if (memq (char-syntax (char-before)) jump-syntax)
	      (goto-char (scan-sexps (point) -1))
	    (backward-char))
	  (setq count (1- count)))
      (error
       (goto-char last)
       (and lim (< (point) lim) (goto-char lim))))
    count))


;; Return `c' if in a C-style comment, `c++' if in a C++ style
;; comment, `string' if in a string literal, `pound' if on a
;; preprocessor line, or nil if not in a comment at all.  Optional LIM
;; is used as the backward limit of the search.  If omitted, or nil,
;; `beginning-of-defun' is used."

(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))
		  (end (cdr range)))
	      (while (and (not (bobp))
			  (forward-comment -1)
			  (looking-at "//")
			  (= col (current-column)))
		(setq beg (point)))
	      (goto-char end)
	      (while (progn
		       (skip-chars-forward " \t")
		       (and (looking-at "//")
			    (= col (current-column))))
		(forward-comment 1)
		(setq end (point)))
	      (cons beg end))
	  range)
      (error range))))




  ;; N.B.: This algorithm can potentially get confused by cpp macros
  ;; 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)
      (forward-sexp -1)
      (let (bracepos)
	(if (and (or (looking-at "enum[\t\n ]+")
		     (progn (forward-sexp -1)
			    (looking-at "enum[\t\n ]+")))
		 (setq bracepos (c-safe (scan-lists (point) 1 -1)))
		 (not (c-crosses-statement-barrier-p (point)
						     (- bracepos 2))))
	    (point)))))
   ;; this will pick up array/aggregate init lists, even if they are nested.
   (save-excursion
     (let (bufpos okp)
       (while (and (not bufpos)
		   containing-sexp)
	 (if (consp containing-sexp)
	     (setq containing-sexp (car brace-state)
		   brace-state (cdr brace-state))
	   ;; see if the open brace is preceded by a = in this statement
	   (goto-char containing-sexp)
	   (setq okp t)
	   (while (and (setq okp (= (c-backward-token-1 1 t) 0))
		       (not (memq (char-after) '(?= ?{ ?\;)))))
	   (if (not (and okp (eq (char-after) ?=)))
	       ;; lets see if we're nested. find the most nested
	       ;; containing brace
	       (setq containing-sexp (car brace-state)
		     brace-state (cdr brace-state))
	     ;; we've hit the beginning of the aggregate list

		(if (looking-at "typedef[^_]")
		    (progn (forward-sexp 1)
			   (c-forward-syntactic-ws indent-point)))
		(setq placeholder (c-point 'boi))
		(and (or (looking-at "enum[ \t\n]+")
			 (save-excursion
			   (goto-char indent-point)
			   (while (and (> (point) placeholder)
				       (= (c-backward-token-1 1 t) 0)
				       (/= (char-after) ?=)))
			   (eq (char-after) ?=)))
		     (save-excursion
		       (skip-chars-forward "^;(" indent-point)
		       (not (memq (char-after) '(?\; ?\()))
		       )))
	      (c-add-syntax 'brace-list-open placeholder))

	      (c-add-syntax 'inline-open)
	      (c-add-syntax 'inclass (aref inclass-p 0)))
	     ;; CASE 5A.5: ordinary defun open
	     (t
	      (goto-char placeholder)
	      (if inclass-p
		  (c-add-syntax 'defun-open (c-point 'boi))
		(c-add-syntax 'defun-open (c-point 'bol)))
	      )))
	   ;; CASE 5B: first K&R arg decl or member init
	   ((c-just-after-func-arglist-p)
	    (cond
	     ;; CASE 5B.1: a member init

	   ((and inclass-p
		 c-access-key
		 (looking-at c-access-key))
	    (c-add-syntax 'access-label (c-point 'bonl))
	    (c-add-syntax 'inclass (aref inclass-p 0)))
	   ;; 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))

		    (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-syntax 'inclass (c-point 'boi))))
		    ))
	      ))
	   ;; CASE 5J: we are at an ObjC or Java method definition
	   ;; continuation line.

		(c-add-syntax 'class-open placeholder))
	       ;; CASE 9B.2: brace-list-open
	       ((or (save-excursion
		      (goto-char placeholder)
		      (looking-at "\\<enum\\>"))
		    (save-excursion
		      (goto-char indent-point)
		      (while (and (> (point) placeholder)
				  (= (c-backward-token-1 1 t) 0)
				  (/= (char-after) ?=)))
		      (eq (char-after) ?=)))
		(c-add-syntax 'brace-list-open placeholder))
	       ;; CASE 9B.3: catch-all for unknown construct.
	       (t
		;; Can and should I add an extensibility hook here?
		;; Something like c-recognize-hook so support for

			   (goto-char containing-sexp)
			   (if (/= (point) (c-point 'boi))
			       (c-beginning-of-statement-1 lim))
			   (c-point 'boi))))
	    (cond
	     ;; CASE 14A: does this close an inline or a function in
	     ;; an extern block or namespace?
	     ((progn
		(goto-char containing-sexp)
		(setq placeholder (c-search-uplist-for-classkey state)))
	      (goto-char (aref placeholder 0))
	      (if (looking-at c-extra-toplevel-key)
		  (c-add-syntax 'defun-close relpos)
		(c-add-syntax 'inline-close relpos)))
	     ;; CASE 14B: if there an enclosing brace that hasn't
	     ;; been narrowed out by a class, then this is a
	     ;; block-close
	     ((and (not inenclosing-p)
		   (c-most-enclosing-brace state))