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

[artagnon]

Summary

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.

[• rafael]

I can reproduce that i32 is not colored correctly.

I cannot reproduce the (( or [[ issue. What do I have to do for email to print out a (( instead of a (?

[artagnon]

In D7036#112704, @rafael wrote:

I cannot reproduce the (( or [[ issue. What do I have to do for email to print out a (( instead of a (?

Oh, I should have mentioned in the original commit message: you have to turn on electric-pair-mode. It's supposed to insert ) when you type (, but in llvm-mode, it inserts a duplicate ( due to the mangled syntax table.

[• rafael]

LGTM

utils/emacs/llvm-mode.el

(defvar llvm-font-lock-keywords
    '("%[-a-zA-Z$\._][-a-zA-Z$\._0-9]*" . font-lock-variable-name-face)
    ;; Labels
    '("[-a-zA-Z$\._0-9]+:" . font-lock-variable-name-face)
    ;; Strings
    '("\"[^\"]+\"" . font-lock-string-face)
    ;; 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
    '("\\b[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?\\b" . font-lock-preprocessor-face)
    ;; Hex constants
    '("\\b0x[0-9A-Fa-f]+\\b" . font-lock-preprocessor-face)
    ;; Keywords
    `(,(regexp-opt '("begin" "end" "true" "false" "zeroinitializer" "declare"
(progn
               [?\^m " "]
               [?\f  " "]
               [?\n  " "]
               [?\t  " "]
               [?\   " "]
               ;; word constituents (`w')
               ;;[?<  "w"]
               ;;[?>  "w"]
-              [?\%  "w"]
+              [?%  "w"]
               ;;[?_  "w  "]
               ;; comments
               [?\;  "< "]
               [?\n  "> "]
               ;;[?\r  "> "]
               ;;[?\^m "> "]
               ;; symbol constituents (`_')
               ;; punctuation (`.')
               ;; open paren (`(')
-              [?\( "("]
-              [?\[ "("]
-              [?\{ "("]
               ;; close paren (`)')
-              [?\) ")"]
-              [?\] ")"]
-              [?\} ")"]
               ;; string quote ('"')
-              [?\" "\""]
-              ))))
+              [?\" "\""]))))
 
 ;; --------------------- Abbrev table -----------------------------
 
 (defvar llvm-mode-abbrev-table nil
   "Abbrev table used while in LLVM mode.")
 (define-abbrev-table 'llvm-mode-abbrev-table ())
 
 (defvar llvm-mode-hook nil)