summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Ludlam <eric@siege-engine.com>2015-03-01 09:37:01 -0500
committerDavid Engster <deng@randomsample.de>2017-01-22 22:24:59 +0100
commit0391760cacbeda11bab3409b6aacc6faa4eb6d71 (patch)
treef88fce2889de68a164d3350675daced6dd148b6c
parent47471b96bfc53013d2d8a2a0d1b3d1e51ad2fab7 (diff)
downloademacs-0391760cacbeda11bab3409b6aacc6faa4eb6d71.tar.gz
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.
-rw-r--r--lisp/cedet/semantic/bovine/c.el9
1 files changed, 5 insertions, 4 deletions
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