[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/last-cedet-merge 0391760 13/50: semantic: Do not s
From: |
David Engster |
Subject: |
[Emacs-diffs] scratch/last-cedet-merge 0391760 13/50: semantic: Do not strip '*' from operator |
Date: |
Wed, 25 Jan 2017 22:15:21 +0000 (UTC) |
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
- [Emacs-diffs] scratch/last-cedet-merge fa84466 07/50: semantic: Fix current symbol info, (continued)
- [Emacs-diffs] scratch/last-cedet-merge fa84466 07/50: semantic: Fix current symbol info, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge a7276f6 08/50: ; semantic: Add TODO comment regarding arg indexing, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 307b510 09/50: semantic: Deal with missing prefix when completing symbol, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge fdd5968 15/50: semantic: New function to calculate scope around tag, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ebc59a5 19/50: semantic: Accept FLAGS parameter for srecode-template-mode, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 47471b9 12/50: EDE: Add missing require and silence byte compiler, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 7308eaf 18/50: semantic: Accept FLAGS parameter for makefile-mode for analyzing completions, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b4d1399 14/50: EDE: Rework config file detection, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 95f8a69 29/50: semantic: More C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge deaa8c9 24/50: semantic: New function to find library with macro definition, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 0391760 13/50: semantic: Do not strip '*' from operator,
David Engster <=
- [Emacs-diffs] scratch/last-cedet-merge 6ca095c 21/50: semantic: Add autoload for Add autoload for `semantic-analyze-debug-assist', David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge f3674d0 33/50: semantic: Parse C++ override/final correctly, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge fb127f2 34/50: semantic: C grammar fixes, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cc30b46 11/50: EDE: Move ede-global-list-sanity-check to ede/files.el, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 5cb7aed 22/50: semantic: New c-mode override for analyzing tag type members, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge c2d4ad8 23/50: semantic: Update keybinings for grammar mode, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 03c5f0d 25/50: semantic: Add more syntax modifications for scheme lexer, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 6b57c5b 20/50: semantic: Introduce `semantic-analyze-tag-type-members', David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 02644fe 36/50: semantic: Add missing save-excursion for scope calculation, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 50139fb 45/50: semantic: Fix scope calculation for 'enum', David Engster, 2017/01/25