Fix heredoc

Author: mattn

autoload/vimlparser.vim

@@ -1495,7 +1495,7 @@ function! s:VimLParser.parse_heredoc()
 
   while s:TRUE
     call self.reader.skip_white()
-    let key = self.reader.read_alpha()
+    let key = self.reader.read_word()
     if key == ''
       break
     endif
@@ -1506,7 +1506,7 @@ function! s:VimLParser.parse_heredoc()
       call add(node.rlist, key)
     endif
   endwhile
-  if node.op ==# '' || node.op !~# '^[^a-z]\S\+$'
+  if node.op ==# ''
     throw s:Err('E172: Missing marker', self.reader.getpos())
   endif
   call self.parse_trail()

js/vimlparser.js

@@ -1781,7 +1781,7 @@ VimLParser.prototype.parse_heredoc = function() {
     node.body = [];
     while (TRUE) {
         this.reader.skip_white();
-        var key = this.reader.read_alpha();
+        var key = this.reader.read_word();
         if (key == "") {
             break;
         }
@@ -1793,7 +1793,7 @@ VimLParser.prototype.parse_heredoc = function() {
             viml_add(node.rlist, key);
         }
     }
-    if (node.op == "" || !viml_eqregh(node.op, "^[^a-z]\\S\\+$")) {
+    if (node.op == "") {
         throw Err("E172: Missing marker", this.reader.getpos());
     }
     this.parse_trail();

py/vimlfunc.py

@@ -83,6 +83,7 @@ class AttributeDict(dict):
   "^[0-9A-Fa-f][0-9A-Fa-f]$" : "^[0-9A-Fa-f][0-9A-Fa-f]$",
   "^\.[0-9A-Fa-f]$" : "^\.[0-9A-Fa-f]$",
   "^[0-9A-Fa-f][^0-9A-Fa-f]$" : "^[0-9A-Fa-f][^0-9A-Fa-f]$",
+  "^[^a-z]\\S\\+$": "^[^a-z]\\S\\+$",
 }
 
 def viml_add(lst, item):

py/vimlparser.py

@@ -83,6 +83,7 @@ class AttributeDict(dict):
   "^[0-9A-Fa-f][0-9A-Fa-f]$" : "^[0-9A-Fa-f][0-9A-Fa-f]$",
   "^\.[0-9A-Fa-f]$" : "^\.[0-9A-Fa-f]$",
   "^[0-9A-Fa-f][^0-9A-Fa-f]$" : "^[0-9A-Fa-f][^0-9A-Fa-f]$",
+  "^[^a-z]\\S\\+$": "^[^a-z]\\S\\+$",
 }
 
 def viml_add(lst, item):
@@ -1412,15 +1413,15 @@ def parse_heredoc(self):
         node.body = []
         while TRUE:
             self.reader.skip_white()
-            key = self.reader.read_alpha()
+            key = self.reader.read_word()
             if key == "":
                 break
             if not islower(key[0]):
                 node.op = key
                 break
             else:
                 viml_add(node.rlist, key)
-        if node.op == "" or not viml_eqregh(node.op, "^[^a-z]\\S\\+$"):
+        if node.op == "":
             raise VimLParserException(Err("E172: Missing marker", self.reader.getpos()))
         self.parse_trail()
         while TRUE: