Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / cc-engine.el

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f9eae213ca8508e89f2d2473ee67b5ba4226d658..4aff0dc14e094dfa05715b2f18f0bee96527c4da 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -3501,6 +3501,9 @@ comment at the start of cc-engine.el for more info."
 (make-variable-buffer-local 'c-parse-state-state)
 (defun c-record-parse-state-state ()
   (setq c-parse-state-point (point))
+  (when (markerp (cdr (assq 'c-state-old-cpp-beg c-parse-state-state)))
+    (move-marker (cdr (assq 'c-state-old-cpp-beg c-parse-state-state)) nil)
+    (move-marker (cdr (assq 'c-state-old-cpp-end c-parse-state-state)) nil))
   (setq c-parse-state-state
        (mapcar
         (lambda (arg)
@@ -5838,12 +5841,14 @@ comment at the start of cc-engine.el for more info."
                nil
              (cond ((looking-at c-keywords-regexp)
                     (c-forward-keyword-clause 1))
-                   ((looking-at c-noise-macro-with-parens-name-re)
+                   ((and c-opt-cpp-prefix
+                         (looking-at c-noise-macro-with-parens-name-re))
                     (c-forward-noise-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)))
+     (when (memq res '(t known found prefix maybe))
+       (when c-record-type-identifiers
+        ,(if (eq type 'type)
+             `(c-record-type-id c-last-identifier-range)
+           `(c-record-ref-id c-last-identifier-range)))
        t)))
 
 (defmacro c-forward-id-comma-list (type update-safe-pos)
@@ -6410,13 +6415,15 @@ comment at the start of cc-engine.el for more info."
                    (eq (char-after) ?<))
               ;; Maybe an angle bracket arglist.
               (when (let ((c-record-type-identifiers t)
-                          (c-record-found-types t))
+                          (c-record-found-types t)
+                          (c-last-identifier-range))
                       (c-forward-<>-arglist nil))
 
-                (c-add-type start (1+ pos))
                 (c-forward-syntactic-ws)
-                (setq pos (point)
-                      c-last-identifier-range nil)
+                (unless (eq (char-after) ?\()
+                  (setq c-last-identifier-range nil)
+                  (c-add-type start (1+ pos)))
+                (setq pos (point))
 
                 (if (and c-opt-identifier-concat-key
                          (looking-at c-opt-identifier-concat-key))
@@ -6430,7 +6437,8 @@ comment at the start of cc-engine.el for more info."
                       (c-forward-syntactic-ws)
                       t)
 
-                  (when (and c-record-type-identifiers id-start)
+                  (when (and c-record-type-identifiers id-start
+                             (not (eq (char-after) ?\()))
                     (c-record-type-id (cons id-start id-end)))
                   (setq res 'template)
                   nil)))
@@ -6506,7 +6514,8 @@ comment at the start of cc-engine.el for more info."
       (while (cond
              ((looking-at c-decl-hangon-key)
               (c-forward-keyword-clause 1))
-             ((looking-at c-noise-macro-with-parens-name-re)
+             ((and c-opt-cpp-prefix
+                   (looking-at c-noise-macro-with-parens-name-re))
               (c-forward-noise-clause))))
 
       (setq pos (point))
@@ -6611,9 +6620,18 @@ comment at the start of cc-engine.el for more info."
                           ;; It's an identifier that might be a type.
                           'maybe))))
            ((eq name-res 'template)
-            ;; A template is a type.
+            ;; A template is sometimes a type.
             (goto-char id-end)
-            (setq res t))
+            (c-forward-syntactic-ws)
+            (setq res
+                  (if (eq (char-after) ?\()
+                      (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)
+                    t)))
            (t
             ;; Otherwise it's an operator identifier, which is not a type.
             (goto-char start)
@@ -6911,7 +6929,8 @@ comment at the start of cc-engine.el for more info."
                  (cond
                   ((looking-at c-decl-hangon-key)
                    (c-forward-keyword-clause 1))
-                  ((looking-at c-noise-macro-with-parens-name-re)
+                  ((and c-opt-cpp-prefix
+                        (looking-at c-noise-macro-with-parens-name-re))
                    (c-forward-noise-clause))
                   ((and (looking-at c-type-decl-prefix-key)
                         (if (and (c-major-mode-is 'c++-mode)
@@ -6966,7 +6985,8 @@ comment at the start of cc-engine.el for more info."
              (while (cond
                      ((looking-at c-decl-hangon-key)
                       (c-forward-keyword-clause 1))
-                     ((looking-at c-noise-macro-with-parens-name-re)
+                     ((and c-opt-cpp-prefix
+                           (looking-at c-noise-macro-with-parens-name-re))
                       (c-forward-noise-clause))))
              (<= (point) limit))
 
@@ -7161,7 +7181,8 @@ comment at the start of cc-engine.el for more info."
            (save-excursion
              (c-forward-keyword-clause 1)
              (setq kwd-clause-end (point))))
-          ((looking-at c-noise-macro-with-parens-name-re)
+          ((and c-opt-cpp-prefix
+                (looking-at c-noise-macro-with-parens-name-re))
            (setq noise-start (point))
            (c-forward-noise-clause)
            (setq kwd-clause-end (point))))
@@ -7267,7 +7288,8 @@ comment at the start of cc-engine.el for more info."
       (while
          (cond ((looking-at c-decl-hangon-key)
                 (c-forward-keyword-clause 1))
-               ((looking-at c-noise-macro-with-parens-name-re)
+               ((and c-opt-cpp-prefix
+                     (looking-at c-noise-macro-with-parens-name-re))
                 (c-forward-noise-clause))))
       (setq id-start (point)))
 
@@ -9038,7 +9060,8 @@ comment at the start of cc-engine.el for more info."
          ((eq (char-after) ?\()
           (and (eq (c-backward-token-2) 0)
                (or (looking-at c-decl-hangon-key)
-                   (looking-at c-noise-macro-with-parens-name-re))))
+                   (and c-opt-cpp-prefix
+                        (looking-at c-noise-macro-with-parens-name-re)))))
 
          ((and c-recognize-<>-arglists
                (eq (char-after) ?<)
@@ -10303,7 +10326,8 @@ comment at the start of cc-engine.el for more info."
              (while (cond
                      ((looking-at c-specifier-key)
                       (c-forward-keyword-clause 1))
-                     ((looking-at c-noise-macro-with-parens-name-re)
+                     ((and c-opt-cpp-prefix
+                           (looking-at c-noise-macro-with-parens-name-re))
                       (c-forward-noise-clause))))
              (setq placeholder (c-point 'boi))
              (or (consp special-brace-list)
@@ -10359,7 +10383,8 @@ comment at the start of cc-engine.el for more info."
              (while (cond
                      ((looking-at c-specifier-key)
                       (c-forward-keyword-clause 1))
-                     ((looking-at c-noise-macro-with-parens-name-re)
+                     ((and c-opt-cpp-prefix
+                           (looking-at c-noise-macro-with-parens-name-re))
                       (c-forward-noise-clause))))
              (c-add-syntax 'defun-open (c-point 'boi))
              ;; Bogus to use bol here, but it's the legacy.  (Resolved,
@@ -10994,7 +11019,8 @@ comment at the start of cc-engine.el for more info."
            (while (cond
                    ((looking-at c-specifier-key)
                     (c-forward-keyword-clause 1))
-                   ((looking-at c-noise-macro-with-parens-name-re)
+                   ((and c-opt-cpp-prefix
+                         (looking-at c-noise-macro-with-parens-name-re))
                     (c-forward-noise-clause))))
            (c-add-syntax 'brace-list-open (c-point 'boi))))