[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/last-cedet-merge 278c06c 31/50: semantic: Optimize
From: |
David Engster |
Subject: |
[Emacs-diffs] scratch/last-cedet-merge 278c06c 31/50: semantic: Optimize 'typeformbase' in C grammar |
Date: |
Wed, 25 Jan 2017 22:15:22 +0000 (UTC) |
branch: scratch/last-cedet-merge
commit 278c06c55479bca6ccbde13239de9a868fd8db23
Author: Eric Ludlam <address@hidden>
Commit: David Engster <address@hidden>
semantic: Optimize 'typeformbase' in C grammar
* admin/grammar/c.by (typeformbase): Replace two rules that could
match the same with one. Replace special
'namespace-symbol-for-typeformbase' with just 'namespace-symbol'.
(namespace-symbol): Force that a symbol @ end can
never have a template specifier.
(opt-namespace-symbol-more): This must now always be
'::namespace-symbol'.
(namespace-symbol-for-typeformbase): Deleted.
---
admin/grammars/c.by | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index ccdf808..094e8d8 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -712,11 +712,7 @@ typeformbase
(TYPE-TAG $2 $1 nil nil )
| builtintype
( ,$1 )
- | symbol template-specifier
- (TYPE-TAG $1 "class" nil nil :template-specifier $2)
- ;;| namespace-symbol opt-stars opt-template-specifier
- ;;| namespace-symbol opt-template-specifier
- | namespace-symbol-for-typeformbase opt-template-specifier
+ | namespace-symbol opt-template-specifier
(TYPE-TAG (car $1) "class" nil nil
:template-specifier $2)
| symbol
@@ -964,29 +960,16 @@ opt-varnamelist-more
namespace-symbol
: symbol opt-template-specifier opt-namespace-symbol-more
( (concat $1 (car $3) ) )
+ ;; Don't accept template specifiers at the end.
+ | symbol
+ ( $1 )
;
opt-namespace-symbol-more
: COLON COLON namespace-symbol
( (concat "::" (car $3)) )
- | ;; empty
- ( "" )
;
-;; Don't pull an optional template specifier at the end of the
-;; namespace symbol so that it can be picked up by the type.
-namespace-symbol-for-typeformbase
- : symbol opt-template-specifier COLON COLON namespace-symbol-for-typeformbase
- ( (concat $1 "::" (car $5)) )
- | symbol
- ( $1 )
- ;
-;; namespace-symbol
-;; : symbol COLON COLON namespace-symbol
-;; ( (concat $1 "::" (car $4)) )
-;; | symbol
-;; ( $1 )
-;; ;
namespace-opt-class
: symbol COLON COLON namespace-opt-class
- [Emacs-diffs] scratch/last-cedet-merge e698dc1 04/50: semantic: Add support for typedef references, (continued)
- [Emacs-diffs] scratch/last-cedet-merge e698dc1 04/50: semantic: Add support for typedef references, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 783fb86 46/50: semantic: Add 'fromfile' option to grammar package, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge d2a57bd 50/50: CEDET: Fix "unknown slot [...]" warnings, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge f11e08f 10/50: semantic: Fix wisent parser recursion, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge e4e864a 39/50: semantic: Properly create canonical name for C++ type tag, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 8571383 16/50: semantic: Incorporate local scope when finding type, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ec4505d 17/50: semantic: Accept FLAGS in texinfo-mode for analyzing completions, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 0a2b38b 26/50: EDE: Expand file name, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 2b42323 35/50: EDE: Fix for project detection, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cfd7139 28/50: semantic: Some C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 278c06c 31/50: semantic: Optimize 'typeformbase' in C grammar,
David Engster <=
- [Emacs-diffs] scratch/last-cedet-merge 8daca76 30/50: semantic: C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 74263b1 37/50: semantic: Change unary expression rule, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cfc56f5 38/50: semantic: Fix for db-global, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ebc8418 40/50: semantic: Check if slot is bound, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b4bcc84 32/50: semantic: completion fixes, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b893e8a 41/50: semantic: Allow empty type relation separation character, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 592b5fe 48/50: semantic: Improve C++ 'friend' parsing, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 742013b 42/50: semantic: Improve grammar-mode, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 9c2feac 49/50: CEDET: Fix "obsolete name arg [...] to constructor" warnings, David Engster, 2017/01/25