Merge branch 'toml-0.4' into toml-0.5

Author: hattya

autoload/vital/__vital__/Text/TOML.vim

@@ -26,12 +26,11 @@ endfunction
 "
 " private api
 "
-" work around: '[^\r\n]*' doesn't work well in old-vim, but "[^\r\n]*" works well
-let s:skip_pattern = '\C^\%(\_s\+\|' . "#[^\r\n]*" . '\)'
+let s:skip_pattern = '\C^\%(\%(\s\|\r\?\n\)\+\|#[^\r\n]*\)'
 let s:bare_key_pattern = '\%([A-Za-z0-9_-]\+\)'
 
 function! s:_skip(input) abort
-  while s:_match(a:input, '\%(\_s\|#\)')
+  while s:_match(a:input, '\%(\s\|\r\?\n\|#\)')
     let a:input.p = matchend(a:input.text, s:skip_pattern, a:input.p)
   endwhile
 endfunction
@@ -67,14 +66,10 @@ function! s:_eof(input) abort
 endfunction
 
 function! s:_error(input) abort
-  let buf = []
-  let offset = 0
-  while (a:input.p + offset) < a:input.length && a:input.text[a:input.p + offset] !~# "[\r\n]"
-    let buf += [a:input.text[a:input.p + offset]]
-    let offset += 1
-  endwhile
+  let s = matchstr(a:input.text, s:regex_prefix . '.\{-}\ze\%(\r\?\n\|$\)', a:input.p)
+  let s = substitute(s, '\r', '\\r', 'g')
 
-  throw printf("vital: Text.TOML: Illegal TOML format at `%s'.", join(buf, ''))
+  throw printf("vital: Text.TOML: Illegal TOML format at `%s'.", s)
 endfunction
 
 function! s:_parse(input) abort
@@ -168,8 +163,8 @@ endfunction
 function! s:_multiline_basic_string(input) abort
   let s = s:_consume(a:input, '"\{3}\%(\\.\|\_.\)\{-}"\{,2}"\{3}')
   let s = s[3 : -4]
-  let s = substitute(s, "^\n", '', '')
-  let s = substitute(s, '\\\s*' . "\n" . '\_s*', '', 'g')
+  let s = substitute(s, '^\r\?\n', '', '')
+  let s = substitute(s, '\\\%(\s\|\r\?\n\)*', '', 'g')
   return s:_unescape(s)
 endfunction
 
@@ -181,7 +176,7 @@ endfunction
 function! s:_multiline_literal(input) abort
   let s = s:_consume(a:input, "'\\{3}.\\{-}'\\{,2}'\\{3}")
   let s = s[3 : -4]
-  let s = substitute(s, "^\n", '', '')
+  let s = substitute(s, '^\r\?\n', '', '')
   return s
 endfunction
 

test/Text/TOML.vim

@@ -148,48 +148,57 @@ function! s:suite.__parse__()
     let multiline_basic_strings = themis#suite('Multi-line basic strings')
 
     function! multiline_basic_strings.trims_first_newline()
-      let data = s:TOML.parse(join([
-      \ 'str1 = """',
-      \ 'Roses are red',
-      \ 'Violets are blue"""',
-      \], "\n"))
-
-      call s:assert.same(data.str1, "Roses are red\nViolets are blue")
+      for newline in ["\n", "\r\n"]
+        let data = s:TOML.parse(join([
+        \ 'str1 = """',
+        \ 'Roses are red',
+        \ 'Violets are blue"""',
+        \], newline))
+
+        call s:assert.same(data.str1, join([
+        \ 'Roses are red',
+        \ 'Violets are blue'
+        \], newline))
+      endfor
     endfunction
 
     function! multiline_basic_strings.trims_whitespaces_after_backslash()
-      let data = s:TOML.parse(join([
-      \ 'str2 = """',
-      \ 'The quick brown \',
-      \ '',
-      \ '',
-      \ '  fox jumps over \',
-      \ '    the lazy dog."""',
-      \ 'str3 = """\',
-      \ '    The quick brown \',
-      \ '    fox jumps over \',
-      \ '    the lazy dog.\',
-      \ '    """',
-      \], "\n"))
-
-      call s:assert.same(data.str2, 'The quick brown fox jumps over the lazy dog.')
-      call s:assert.same(data.str3, 'The quick brown fox jumps over the lazy dog.')
+      for newline in ["\n", "\r\n"]
+        let data = s:TOML.parse(join([
+        \ 'str2 = """',
+        \ 'The quick brown \',
+        \ '',
+        \ '',
+        \ '  fox jumps over \',
+        \ '    the lazy dog."""',
+        \ 'str3 = """\',
+        \ '    The quick brown \',
+        \ '    fox jumps over \',
+        \ '    the lazy dog.\',
+        \ '    """',
+        \], newline))
+
+        call s:assert.same(data.str2, 'The quick brown fox jumps over the lazy dog.')
+        call s:assert.same(data.str3, 'The quick brown fox jumps over the lazy dog.')
+      endfor
     endfunction
 
     function! multiline_basic_strings.includes_escaped_character()
-      let data = s:TOML.parse(join([
-      \ 'str4 = """Here are two quotation marks: "". Simple enough."""',
-      \ 'str5 = """Here are three quotation marks: ""\"."""',
-      \ 'str6 = """Here are fifteen quotation marks: ""\"""\"""\"""\"""\"."""',
-      \ '',
-      \ '# "This," she said, "is just a pointless statement."',
-      \ 'str7 = """"This," she said, "is just a pointless statement.""""',
-      \], "\n"))
-
-      call s:assert.same(data.str4, 'Here are two quotation marks: "". Simple enough.')
-      call s:assert.same(data.str5, 'Here are three quotation marks: """.')
-      call s:assert.same(data.str6, 'Here are fifteen quotation marks: """"""""""""""".')
-      call s:assert.same(data.str7, '"This," she said, "is just a pointless statement."')
+      for newline in ["\n", "\r\n"]
+        let data = s:TOML.parse(join([
+        \ 'str4 = """Here are two quotation marks: "". Simple enough."""',
+        \ 'str5 = """Here are three quotation marks: ""\"."""',
+        \ 'str6 = """Here are fifteen quotation marks: ""\"""\"""\"""\"""\"."""',
+        \ '',
+        \ '# "This," she said, "is just a pointless statement."',
+        \ 'str7 = """"This," she said, "is just a pointless statement.""""',
+        \], newline))
+
+        call s:assert.same(data.str4, 'Here are two quotation marks: "". Simple enough.')
+        call s:assert.same(data.str5, 'Here are three quotation marks: """.')
+        call s:assert.same(data.str6, 'Here are fifteen quotation marks: """"""""""""""".')
+        call s:assert.same(data.str7, '"This," she said, "is just a pointless statement."')
+      endfor
     endfunction
   endfunction
 
@@ -208,31 +217,33 @@ function! s:suite.__parse__()
   endfunction
 
   function! parse.multiline_literal_string()
-    let data = s:TOML.parse(join([
-    \ 'regex2 = ''''''I [dw]on''t need \d{2} apples''''''',
-    \ 'lines  = ''''''',
-    \ 'The first newline is',
-    \ 'trimmed in raw strings.',
-    \ '   All other whitespace',
-    \ '   is preserved.',
-    \ '''''''',
-    \ '',
-    \ 'quot15 = ''''''Here fifteen quotation marks: """""""""""""""''''''',
-    \ '',
-    \ "# 'That's still pointless', she said.",
-    \ "str = ''''That's still pointless', she said.'''",
-    \], "\n"))
-
-    call s:assert.same(data.regex2, 'I [dw]on''t need \d{2} apples')
-    call s:assert.same(data.lines,  join([
-    \ 'The first newline is',
-    \ 'trimmed in raw strings.',
-    \ '   All other whitespace',
-    \ '   is preserved.',
-    \ '',
-    \], "\n"))
-    call s:assert.same(data.quot15, 'Here fifteen quotation marks: """""""""""""""')
-    call s:assert.same(data.str,    '''That''s still pointless'', she said.')
+    for newline in ["\n", "\r\n"]
+      let data = s:TOML.parse(join([
+      \ 'regex2 = ''''''I [dw]on''t need \d{2} apples''''''',
+      \ 'lines  = ''''''',
+      \ 'The first newline is',
+      \ 'trimmed in raw strings.',
+      \ '   All other whitespace',
+      \ '   is preserved.',
+      \ '''''''',
+      \ '',
+      \ 'quot15 = ''''''Here fifteen quotation marks: """""""""""""""''''''',
+      \ '',
+      \ "# 'That's still pointless', she said.",
+      \ "str = ''''That's still pointless', she said.'''",
+      \], newline))
+
+      call s:assert.same(data.regex2, 'I [dw]on''t need \d{2} apples')
+      call s:assert.same(data.lines,  join([
+      \ 'The first newline is',
+      \ 'trimmed in raw strings.',
+      \ '   All other whitespace',
+      \ '   is preserved.',
+      \ '',
+      \], newline))
+      call s:assert.same(data.quot15, 'Here fifteen quotation marks: """""""""""""""')
+      call s:assert.same(data.str,    '''That''s still pointless'', she said.')
+    endfor
   endfunction
 
   function! parse.__integer__()