implement #{ ... } syntax

Author: tyru

autoload/vimlparser.vim

@@ -205,6 +205,7 @@ let s:TOKEN_DOTDOTDOT = 63
 let s:TOKEN_SHARP = 64
 let s:TOKEN_ARROW = 65
 let s:TOKEN_BLOB = 66
+let s:TOKEN_RAWCOPEN = 67
 
 let s:MAX_FUNC_ARGS = 20
 
@@ -2754,8 +2755,13 @@ function! s:ExprTokenizer.get2()
     call r.seek_cur(1)
     return self.token(s:TOKEN_COLON, ':', pos)
   elseif c ==# '#'
-    call r.seek_cur(1)
-    return self.token(s:TOKEN_SHARP, '#', pos)
+    if r.p(1) ==# '{'
+      call r.seek_cur(2)
+      return self.token(s:TOKEN_RAWCOPEN, '#{', pos)
+    else
+      call r.seek_cur(2)
+      return self.token(s:TOKEN_SHARP, '#', pos)
+    endif
   elseif c ==# '('
     call r.seek_cur(1)
     return self.token(s:TOKEN_POPEN, '(', pos)
@@ -2875,6 +2881,29 @@ function! s:ExprTokenizer.get_dstring()
   return s
 endfunction
 
+function! s:ExprTokenizer.get_dict_literal_key()
+  call self.reader.skip_white()
+  let r = self.reader
+  let c = r.peek()
+  if !s:isalnum(c) && c != '_' && c != '-'
+    throw s:Err(printf('unexpected token: %s', token.value), token.pos)
+  endif
+  let s = c
+  call self.reader.seek_cur(1)
+  while s:TRUE
+    let c = self.reader.p(0)
+    if c ==# '<EOF>' || c ==# '<EOL>'
+      throw s:Err('unexpectd EOL', self.reader.getpos())
+    endif
+    if !s:isalnum(c) && c != '_' && c != '-'
+      break
+    endif
+    call self.reader.seek_cur(1)
+    let s .= c
+  endwhile
+  return s
+endfunction
+
 let s:ExprParser = {}
 
 function! s:ExprParser.new(...)
@@ -3363,6 +3392,7 @@ endfunction
 "        'string'
 "        [expr1, ...]
 "        {expr1: expr1, ...}
+"        #{literal_key1: expr1, ...}
 "        {args -> expr1}
 "        &option
 "        (expr1)
@@ -3419,7 +3449,8 @@ function! s:ExprParser.parse_expr9()
         endif
       endwhile
     endif
-  elseif token.type == s:TOKEN_COPEN
+  elseif token.type == s:TOKEN_COPEN || token.type == s:TOKEN_RAWCOPEN
+    let is_rawdict = token.type == s:TOKEN_RAWCOPEN
     let savepos = self.reader.tell()
     let nodepos = token.pos
     let token = self.tokenizer.get()
@@ -3507,7 +3538,7 @@ function! s:ExprParser.parse_expr9()
       return node
     endif
     while 1
-      let key = self.parse_expr1()
+      let key = is_rawdict ? self.parse_dict_literal_key() : self.parse_expr1()
       let token = self.tokenizer.get()
       if token.type == s:TOKEN_CCLOSE
         if !empty(node.value)
@@ -3572,6 +3603,13 @@ function! s:ExprParser.parse_expr9()
   return node
 endfunction
 
+function! s:ExprParser.parse_dict_literal_key()
+  let node = s:Node(s:NODE_STRING)
+  let node.pos = self.reader.tell()
+  let node.value = "'" . self.tokenizer.get_dict_literal_key() . "'"
+  return node
+endfunction
+
 " SUBSCRIPT or CONCAT
 "   dict "." [0-9A-Za-z_]+ => (subscript dict key)
 "   str  "." expr6         => (concat str expr6)

test/test_rawdict.ok

@@ -0,0 +1,8 @@
+(echo (dict))
+(echo (dict ('foo-bar' 42)))
+(echo (dict ('foo-' 42)))
+(echo (dict ('-bar' 42)))
+(echo (dict ('1-1' 0)))
+(echo (dict ('one' 1) ('two2' 2) ('3three' 3) ('44' 4)))
+(echo (dict ('x' (dict))))
+(echo (list (dict)))

test/test_rawdict.vim

@@ -0,0 +1,8 @@
+echo #{}
+echo #{foo-bar: 42}
+echo #{foo-: 42}
+echo #{-bar: 42}
+echo #{1-1:0}
+echo #{one: 1, two2: 2, 3three: 3, 44: 4}
+echo #{x : {},}
+echo [#{},]