[Emacs-diffs] scratch/last-cedet-merge 0391760 13/37: semantic: Do not strip '*' from operator

[David Engster]

branch: scratch/last-cedet-merge
commit 0391760cacbeda11bab3409b6aacc6faa4eb6d71
Author: Eric Ludlam <address@hidden>
Commit: David Engster <address@hidden>

    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.
---
 lisp/cedet/semantic/bovine/c.el |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 7ec8010..48521f9 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