Fix heredoc

Author: mattn

autoload/vimlparser.vim

@@ -409,7 +409,7 @@ endfunction
 " CURLYNAMEPART .value
 " CURLYNAMEEXPR .value
 " LAMBDA .rlist .left
-" HEREDOC .rlist .op .str
+" HEREDOC .rlist .op .body
 function! s:Node(type)
   return {'type': a:type}
 endfunction
@@ -1491,7 +1491,7 @@ function! s:VimLParser.parse_heredoc()
   let node.pos = self.ea.cmdpos
   let node.op = ''
   let node.rlist = []
-  let node.str = ''
+  let node.body = []
 
   let words = []
   while s:TRUE
@@ -1500,25 +1500,27 @@ function! s:VimLParser.parse_heredoc()
     if key == ''
       break
     endif
-    if key == 'trim'
-      call add(words, key)
-    else
+    if key !~# '^[a-z]'
       let node.op = key
+      break
+    else
+      call add(words, key)
     endif
   endwhile
+  if node.op ==# ''
+    return s:NIL
+  endif
   let node.rlist = words
-  let lines = []
   call self.parse_trail()
   while s:TRUE
     if self.reader.peek() ==# '<EOF>'
       break
     endif
     let line = self.reader.getn(-1)
     if line ==# node.op
-      let node.str = join(lines, "\n") . "\n"
       return node
     endif
-    call add(lines, line)
+    call add(node.body, line)
     call self.reader.get()
   endwhile
   return s:NIL
@@ -4895,7 +4897,9 @@ function! s:Compiler.compile_lambda(node)
 endfunction
 
 function! s:Compiler.compile_heredoc(node)
-  return printf('(heredoc (%s) %s %s))', join(a:node.rlist, ' '), self.escape_string(a:node.op), self.escape_string(a:node.str))
+  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, ' '))
 endfunction
 
 " TODO: under construction

js/vimlparser.js

@@ -582,7 +582,7 @@ function ExArg() {
 // CURLYNAMEPART .value
 // CURLYNAMEEXPR .value
 // LAMBDA .rlist .left
-// HEREDOC .rlist .op .str
+// HEREDOC .rlist .op .body
 function Node(type) {
     return {"type":type};
 }
@@ -1778,34 +1778,36 @@ VimLParser.prototype.parse_heredoc = function() {
     node.pos = this.ea.cmdpos;
     node.op = "";
     node.rlist = [];
-    node.str = "";
+    node.body = [];
     var words = [];
     while (TRUE) {
         this.reader.skip_white();
         var key = this.reader.read_alpha();
         if (key == "") {
             break;
         }
-        if (key == "trim") {
-            viml_add(words, key);
+        if (!viml_eqregh(key, "^[a-z]")) {
+            node.op = key;
+            break;
         }
         else {
-            node.op = key;
+            viml_add(words, key);
         }
     }
+    if (node.op == "") {
+        return NIL;
+    }
     node.rlist = words;
-    var lines = [];
     this.parse_trail();
     while (TRUE) {
         if (this.reader.peek() == "<EOF>") {
             break;
         }
         var line = this.reader.getn(-1);
         if (line == node.op) {
-            node.str = viml_join(lines, "\n") + "\n";
             return node;
         }
-        viml_add(lines, line);
+        viml_add(node.body, line);
         this.reader.get();
     }
     return NIL;
@@ -4882,7 +4884,9 @@ Compiler.prototype.compile_lambda = function(node) {
 }
 
 Compiler.prototype.compile_heredoc = function(node) {
-    return viml_printf("(heredoc (%s) %s %s))", viml_join(node.rlist, " "), this.escape_string(node.op), this.escape_string(node.str));
+    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, " "));
 }
 
 // TODO: under construction

py/vimlparser.py

@@ -522,7 +522,7 @@ def ExArg():
 # CURLYNAMEPART .value
 # CURLYNAMEEXPR .value
 # LAMBDA .rlist .left
-# HEREDOC .rlist .op .str
+# HEREDOC .rlist .op .body
 def Node(type):
     return AttributeDict({"type":type})
 
@@ -1409,28 +1409,29 @@ def parse_heredoc(self):
         node.pos = self.ea.cmdpos
         node.op = ""
         node.rlist = []
-        node.str = ""
+        node.body = []
         words = []
         while TRUE:
             self.reader.skip_white()
             key = self.reader.read_alpha()
             if key == "":
                 break
-            if key == "trim":
-                viml_add(words, key)
-            else:
+            if not viml_eqregh(key, "^[a-z]"):
                 node.op = key
+                break
+            else:
+                viml_add(words, key)
+        if node.op == "":
+            return NIL
         node.rlist = words
-        lines = []
         self.parse_trail()
         while TRUE:
             if self.reader.peek() == "<EOF>":
                 break
             line = self.reader.getn(-1)
             if line == node.op:
-                node.str = viml_join(lines, "\n") + "\n"
                 return node
-            viml_add(lines, line)
+            viml_add(node.body, line)
             self.reader.get()
         return NIL
 
@@ -3824,7 +3825,9 @@ def compile_lambda(self, node):
         return viml_printf("(lambda (%s) %s)", viml_join(rlist, " "), self.compile(node.left))
 
     def compile_heredoc(self, node):
-        return viml_printf("(heredoc (%s) %s %s))", viml_join(node.rlist, " "), self.escape_string(node.op), self.escape_string(node.str))
+        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, " "))
 
 # TODO: under construction
 class RegexpParser:

test/test_heredoc.ok

@@ -1,2 +1,2 @@
-(let =<< a (heredoc () "EOS" "hello\n world\n")))
-(let =<< a (heredoc (trim) "EOS" "\thello\nworld\n")))
+(let =<< a (heredoc (list ) "EOS" (list "hello" " world")))
+(let =<< a (heredoc (list "trim") "EOS" (list "\thello" "world")))