[TableGen] Update editor modes for new keywords.

[simon_tatham]

Summary

D71407 and D71474 added new keywords to the Tablegen language:
defvar, if, then and else. This commit updates the various
editor modes to highlight them appropriately.

Some of the modes also didn't include defset, so I've added that too
while I was there.

[lebedev.ri]

llvm/utils/kate/llvm-tablegen.xml

11

I think defvar should go next to def

[simon_tatham]

llvm/utils/kate/llvm-tablegen.xml

11

That would mean putting it in the 'class-like' section, which I thought probably wasn't right, on the grounds that defvar does not open a block with further declarations inside it, whereas def does, in common with the other 'class-like' keywords.

I admit I'm not a Kate user, though, so I don't know what difference (if any) that would actually make during editing.

[lebedev.ri]

LG in principle.

llvm/utils/kate/llvm-tablegen.xml

11

On a second thought, let seems like a closer fit.

[simon_tatham]

llvm/utils/kate/llvm-tablegen.xml

11

Oh yes, I hadn't noticed def appeared in the objects category as well! OK, I'll put defvar there, alongside let.

llvm/utils/emacs/tablegen-mode.el

 ;;; Code:
 
 (defvar td-decorators-face 'td-decorators-face
   "Face method decorators.")
 (make-face 'td-decorators-face)
 
 (defvar tablegen-font-lock-keywords
   (let ((kw (regexp-opt '("class" "defm" "def" "field" "include" "in"
-                         "let" "multiclass" "foreach")
+                         "let" "multiclass" "foreach" "if" "then" "else"
+                         "defvar" "defset")
                         'words))
         (type-kw (regexp-opt '("bit" "bits" "code" "dag" "int" "list" "string")
                              'words))
         )
     (list
      ;; Comments
 ;;     '("\/\/" . font-lock-comment-face)
      ;; Strings

llvm/utils/kate/llvm-tablegen.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="LLVM TableGen" section="Sources" version="1.00" kateversion="3.4.4" extensions="*.td" mimetype="" author="LLVM Team" license="LLVM Release License">
   <highlighting>
     <list name="keywords">
       <item> foreach </item>
       <item> field </item>
+      <item> if </item>
+      <item> then </item>
+      <item> else </item>
     </list>
     <list name="operator-keywords">
       <item> in </item>
     </list>
     <list name="bang-operators">
       <item> !eq </item>
       <item> !if </item>
       <item> !head </item>
       <item> !tail </item>
<list name="bang-operators">
       <item> !ne </item>
     </list>
     <list name="objects">
       <item> class </item>
       <item> def </item>
       <item> defm </item>
       <item> defset </item>
       <item> let </item>
+      <item> defvar </item>
       <item> multiclass </item>
     </list>
     <list name="class-like">
       <item> class </item>
       <item> def </item>
       <item> defm </item>
       <item> defset </item>
       <item> multiclass </item>

llvm/utils/vim/syntax/tablegen.vim

 " Vim syntax file
 " Language:   TableGen
 " Maintainer: The LLVM team, http://llvm.org/
 " Version:    $Revision$
 
 if version < 600
   syntax clear
 elseif exists("b:current_syntax")
   finish
 endif
 
 " May be changed if you have a really slow machine
 syntax sync minlines=100
 
 syn case match
 
-syn keyword tgKeyword   def let in code dag field include defm foreach
+syn keyword tgKeyword   def let in code dag field include defm foreach defset defvar if then else
 syn keyword tgType      class int string list bit bits multiclass
 
 syn match   tgNumber    /\<\d\+\>/
 syn match   tgNumber    /\<\d\+\.\d*\>/
 syn match   tgNumber    /\<0b[01]\+\>/
 syn match   tgNumber    /\<0x[0-9a-fA-F]\+\>/
 syn region  tgString    start=/"/ skip=/\\"/ end=/"/    oneline
 

llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage

<dict>
   <key>patterns</key>
   <array>
     <dict>
       <key>include</key>
       <string>#comments</string>
     </dict>
     <dict>
       <key>match</key>
-      <string>\b(def|let|in|code|dag|string|list|bits|bit|field|include|defm|foreach|class|multiclass|int)\b</string>
+      <string>\b(def|let|in|code|dag|string|list|bits|bit|field|include|defm|foreach|class|multiclass|int|defvar|defset|if|then|else)\b</string>
       <key>name</key>
       <string>keyword.control.tablegen</string>
     </dict>
     <dict>
       <key>begin</key>
       <string>"</string>
       <key>end</key>
       <string>"</string>