diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2015-01-23 19:45:35 +0000 |
|---|---|---|
| committer | Ramkumar Ramachandra <artagnon@gmail.com> | 2015-01-23 19:45:35 +0000 |
| commit | c3c8b27616a119369ffbe2033c5eb645fde5d358 (patch) | |
| tree | 1ecbb668aabf9fa7267a0cca75fdd5e8f74eb5ca /llvm/utils/emacs/llvm-mode.el | |
| parent | d1c13736e0132718b550824ffb05764679d17eb4 (diff) | |
| download | bcm5719-llvm-c3c8b27616a119369ffbe2033c5eb645fde5d358.tar.gz bcm5719-llvm-c3c8b27616a119369ffbe2033c5eb645fde5d358.zip | |
[emacs] llvm-mode: fix parens, font-lock i*
In llvm-mode, with electric-pair-mode turned on, typing a literal '['
would print out '[[', and '(' would print a '(('. This was a very
annoying bug caused by overzealous syntax-table entries: the parens are
already part of the '(' and ')' class by default. Fix this.
While at it, notice that i32, i64, i1 etc. are not font-locked despite a
clear intent to do so. The issue is that regexp-opt doesn't accept
regular expressions. So, spell out the common literal integers with
different widths.
Differential Revision: http://reviews.llvm.org/D7036
llvm-svn: 226931
Diffstat (limited to 'llvm/utils/emacs/llvm-mode.el')
| -rw-r--r-- | llvm/utils/emacs/llvm-mode.el | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/llvm/utils/emacs/llvm-mode.el b/llvm/utils/emacs/llvm-mode.el index 6d8395cc111..890d0a3e189 100644 --- a/llvm/utils/emacs/llvm-mode.el +++ b/llvm/utils/emacs/llvm-mode.el @@ -23,7 +23,7 @@ ;; Unnamed variable slots '("%[-]?[0-9]+" . font-lock-variable-name-face) ;; Types - `(,(regexp-opt '("void" "i[0-9]+" "float" "double" "type" "label" "opaque") 'words) . font-lock-type-face) + `(,(regexp-opt '("void" "i1" "i8" "i16" "i32" "i64" "i128" "float" "double" "type" "label" "opaque") 'words) . font-lock-type-face) ;; Integer literals '("\\b[-]?[0-9]+\\b" . font-lock-preprocessor-face) ;; Floating point constants @@ -83,7 +83,7 @@ ;; word constituents (`w') ;;[?< "w"] ;;[?> "w"] - [?\% "w"] + [?% "w"] ;;[?_ "w "] ;; comments [?\; "< "] @@ -93,16 +93,9 @@ ;; symbol constituents (`_') ;; punctuation (`.') ;; open paren (`(') - [?\( "("] - [?\[ "("] - [?\{ "("] ;; close paren (`)') - [?\) ")"] - [?\] ")"] - [?\} ")"] ;; string quote ('"') - [?\" "\""] - )))) + [?\" "\""])))) ;; --------------------- Abbrev table ----------------------------- |
