[PATCH] [emacs] fix parens, font-lock i* in llvm-mode

Ramkumar Ramachandra artagnon at gmail.com
Sat Jan 17 12:36:26 PST 2015


Hi rafael,

In llvm-mode, 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.

http://reviews.llvm.org/D7036

Files:
  utils/emacs/llvm-mode.el

Index: utils/emacs/llvm-mode.el
===================================================================
--- utils/emacs/llvm-mode.el
+++ 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 -----------------------------

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7036.18347.patch
Type: text/x-patch
Size: 1384 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150117/eb7427a5/attachment.bin>


More information about the llvm-commits mailing list