]> git.eshelyaron.com Git - emacs.git/commitdiff
semantic: Do not strip '*' from operator
authorEric Ludlam <eric@siege-engine.com>
Sun, 1 Mar 2015 14:37:01 +0000 (09:37 -0500)
committerDavid Engster <deng@randomsample.de>
Sun, 22 Jan 2017 21:24:59 +0000 (22:24 +0100)
* lisp/cedet/semantic/bovine/c.el (semantic-c-reconstitute-token): Do
 not strip a fcnpoint * off the name of an operator.

lisp/cedet/semantic/bovine/c.el

index 7ec8010867bb3237e845dc1090dde28afa2e9818..48521f91f503bbe7a9f5c6c6cb9449c8f215603f 100644 (file)
@@ -1313,14 +1313,15 @@ Optional argument STAR and REF indicate the number of * and & in the typedef."
                          (nth 10 tokenpart) ; initializers
                          )
                      (not (car (nth 3 tokenpart)))))
-               (fcnpointer (and (> (length (car tokenpart)) 0)
+               (operator (if (string-match "[a-zA-Z]" (car tokenpart))
+                             nil
+                           t))
+               (fcnpointer (and (not operator)
+                                (> (length (car tokenpart)) 1)
                                 (= (aref (car tokenpart) 0) ?*)))
                (fnname (if fcnpointer
                            (substring (car tokenpart) 1)
                          (car tokenpart)))
-               (operator (if (string-match "[a-zA-Z]" fnname)
-                             nil
-                           t))
                )
           ;; The function
           (semantic-tag-new-function