Fix heredoc

Author: mattn

autoload/vimlparser.vim

@@ -1493,24 +1493,22 @@ function! s:VimLParser.parse_heredoc()
   let node.rlist = []
   let node.body = []
 
-  let words = []
   while s:TRUE
     call self.reader.skip_white()
     let key = self.reader.read_alpha()
     if key == ''
       break
     endif
-    if key !~# '^[a-z]'
+    if !s:islower(key[0])
       let node.op = key
       break
     else
-      call add(words, key)
+      call add(node.rlist, key)
     endif
   endwhile
-  if node.op ==# ''
-    return s:NIL
+  if node.op ==# '' || node.op !~# '^[^a-z]\S\+$'
+    throw s:Err('E172: Missing marker', self.reader.getpos())
   endif
-  let node.rlist = words
   call self.parse_trail()
   while s:TRUE
     if self.reader.peek() ==# '<EOF>'
@@ -1523,7 +1521,7 @@ function! s:VimLParser.parse_heredoc()
     call add(node.body, line)
     call self.reader.get()
   endwhile
-  return s:NIL
+  throw s:Err(printf("E990: Missing end marker '%s'", node.op), self.reader.getpos())
 endfunction
 
 function! s:VimLParser.parse_cmd_let()
@@ -4897,9 +4895,18 @@ function! s:Compiler.compile_lambda(node)
 endfunction
 
 function! s:Compiler.compile_heredoc(node)
-  let rlist = map(a:node.rlist, 'self.escape_string(v:val)')
-  let body = map(a:node.body, 'self.escape_string(v:val)')
-  return printf('(heredoc (list %s) %s (list %s))', join(rlist, ' '), self.escape_string(a:node.op), join(body, ' '))
+  if empty(a:node.rlist)
+    let rlist = '(list)'
+  else
+    let rlist = '(list ' . join(map(a:node.rlist, 'self.escape_string(v:val)'), ' ') . ')'
+  endif
+  if empty(a:node.body)
+    let body = '(list)'
+  else
+    let body = '(list ' . join(map(a:node.body, 'self.escape_string(v:val)'), ' ') . ')'
+  endif
+  let op = self.escape_string(a:node.op)
+  return printf('(heredoc %s %s %s)', rlist, op, body)
 endfunction
 
 " TODO: under construction

js/vimlparser.js

@@ -1779,25 +1779,23 @@ VimLParser.prototype.parse_heredoc = function() {
     node.op = "";
     node.rlist = [];
     node.body = [];
-    var words = [];
     while (TRUE) {
         this.reader.skip_white();
         var key = this.reader.read_alpha();
         if (key == "") {
             break;
         }
-        if (!viml_eqregh(key, "^[a-z]")) {
+        if (!islower(key[0])) {
             node.op = key;
             break;
         }
         else {
-            viml_add(words, key);
+            viml_add(node.rlist, key);
         }
     }
-    if (node.op == "") {
-        return NIL;
+    if (node.op == "" || !viml_eqregh(node.op, "^[^a-z]\\S\\+$")) {
+        throw Err("E172: Missing marker", this.reader.getpos());
     }
-    node.rlist = words;
     this.parse_trail();
     while (TRUE) {
         if (this.reader.peek() == "<EOF>") {
@@ -1810,7 +1808,7 @@ VimLParser.prototype.parse_heredoc = function() {
         viml_add(node.body, line);
         this.reader.get();
     }
-    return NIL;
+    throw Err(viml_printf("E990: Missing end marker '%s'", node.op), this.reader.getpos());
 }
 
 VimLParser.prototype.parse_cmd_let = function() {
@@ -4884,9 +4882,20 @@ Compiler.prototype.compile_lambda = function(node) {
 }
 
 Compiler.prototype.compile_heredoc = function(node) {
-    var rlist = node.rlist.map((function(vval) { return this.escape_string(vval); }).bind(this));
-    var body = node.body.map((function(vval) { return this.escape_string(vval); }).bind(this));
-    return viml_printf("(heredoc (list %s) %s (list %s))", viml_join(rlist, " "), this.escape_string(node.op), viml_join(body, " "));
+    if (viml_empty(node.rlist)) {
+        var rlist = "(list)";
+    }
+    else {
+        var rlist = "(list " + viml_join(node.rlist.map((function(vval) { return this.escape_string(vval); }).bind(this)), " ") + ")";
+    }
+    if (viml_empty(node.body)) {
+        var body = "(list)";
+    }
+    else {
+        var body = "(list " + viml_join(node.body.map((function(vval) { return this.escape_string(vval); }).bind(this)), " ") + ")";
+    }
+    var op = this.escape_string(node.op);
+    return viml_printf("(heredoc %s %s %s)", rlist, op, body);
 }
 
 // TODO: under construction

py/vimlparser.py

@@ -1410,20 +1410,18 @@ def parse_heredoc(self):
         node.op = ""
         node.rlist = []
         node.body = []
-        words = []
         while TRUE:
             self.reader.skip_white()
             key = self.reader.read_alpha()
             if key == "":
                 break
-            if not viml_eqregh(key, "^[a-z]"):
+            if not islower(key[0]):
                 node.op = key
                 break
             else:
-                viml_add(words, key)
-        if node.op == "":
-            return NIL
-        node.rlist = words
+                viml_add(node.rlist, key)
+        if node.op == "" or not viml_eqregh(node.op, "^[^a-z]\\S\\+$"):
+            raise VimLParserException(Err("E172: Missing marker", self.reader.getpos()))
         self.parse_trail()
         while TRUE:
             if self.reader.peek() == "<EOF>":
@@ -1433,7 +1431,7 @@ def parse_heredoc(self):
                 return node
             viml_add(node.body, line)
             self.reader.get()
-        return NIL
+        raise VimLParserException(Err(viml_printf("E990: Missing end marker '%s'", node.op), self.reader.getpos()))
 
     def parse_cmd_let(self):
         pos = self.reader.tell()
@@ -3825,9 +3823,16 @@ def compile_lambda(self, node):
         return viml_printf("(lambda (%s) %s)", viml_join(rlist, " "), self.compile(node.left))
 
     def compile_heredoc(self, node):
-        rlist = [self.escape_string(vval) for vval in node.rlist]
-        body = [self.escape_string(vval) for vval in node.body]
-        return viml_printf("(heredoc (list %s) %s (list %s))", viml_join(rlist, " "), self.escape_string(node.op), viml_join(body, " "))
+        if viml_empty(node.rlist):
+            rlist = "(list)"
+        else:
+            rlist = "(list " + viml_join([self.escape_string(vval) for vval in node.rlist], " ") + ")"
+        if viml_empty(node.body):
+            body = "(list)"
+        else:
+            body = "(list " + viml_join([self.escape_string(vval) for vval in node.body], " ") + ")"
+        op = self.escape_string(node.op)
+        return viml_printf("(heredoc %s %s %s)", rlist, op, body)
 
 # TODO: under construction
 class RegexpParser: