From: Eric Ludlam <eric@siege-engine.com>
Date: Sun, 1 Mar 2015 14:37:01 +0000 (-0500)
Subject: semantic: Do not strip '*' from operator
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0391760cacbeda11bab3409b6aacc6faa4eb6d71;p=emacs.git

semantic: Do not strip '*' from operator

* lisp/cedet/semantic/bovine/c.el (semantic-c-reconstitute-token): Do
 not strip a fcnpoint * off the name of an operator.
---

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 7ec8010867b..48521f91f50 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -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