Fix parse blob literal

Author: mattn

autoload/vimlparser.vim

@@ -3955,14 +3955,14 @@ function! s:StringReader.read_blob()
   let r = ''
   while 1
     let s = self.peekn(2)
-    if s == ''
-      break
-    elseif s =~# '^[0-9A-Fa-f][0-9A-Fa-f]$'
+    if s =~# '^[0-9A-Fa-f][0-9A-Fa-f]$'
       let r .= self.getn(2)
     elseif s =~# '^\.[0-9A-Fa-f]$'
       let r .= self.getn(1)
-    else
+    elseif s =~# '^[0-9A-Fa-f][^0-9A-Fa-f]$'
       throw s:Err('E973: Blob literal should have an even number of hex characters:' . s, self.getpos())
+    else
+      break
     endif
   endwhile
   return r

js/vimlparser.js

@@ -3862,18 +3862,18 @@ StringReader.prototype.read_blob = function() {
     var r = "";
     while (1) {
         var s = this.peekn(2);
-        if (s == "") {
-            break;
-        }
-        else if (viml_eqregh(s, "^[0-9A-Fa-f][0-9A-Fa-f]$")) {
+        if (viml_eqregh(s, "^[0-9A-Fa-f][0-9A-Fa-f]$")) {
             r += this.getn(2);
         }
         else if (viml_eqregh(s, "^\\.[0-9A-Fa-f]$")) {
             r += this.getn(1);
         }
-        else {
+        else if (viml_eqregh(s, "^[0-9A-Fa-f][^0-9A-Fa-f]$")) {
             throw Err("E973: Blob literal should have an even number of hex characters:" + s, this.getpos());
         }
+        else {
+            break;
+        }
     }
     return r;
 }

py/vimlparser.py

@@ -3073,14 +3073,14 @@ def read_blob(self):
         r = ""
         while 1:
             s = self.peekn(2)
-            if s == "":
-                break
-            elif viml_eqregh(s, "^[0-9A-Fa-f][0-9A-Fa-f]$"):
+            if viml_eqregh(s, "^[0-9A-Fa-f][0-9A-Fa-f]$"):
                 r += self.getn(2)
             elif viml_eqregh(s, "^\\.[0-9A-Fa-f]$"):
                 r += self.getn(1)
-            else:
+            elif viml_eqregh(s, "^[0-9A-Fa-f][^0-9A-Fa-f]$"):
                 raise VimLParserException(Err("E973: Blob literal should have an even number of hex characters:" + s, self.getpos()))
+            else:
+                break
         return r
 
     def read_xdigit(self):

test/test_blob.ok

@@ -5,3 +5,4 @@
 (echo 0zDEADBEEF)
 (echo 0ZDEADBEEF)
 (echo 0ZDEAD.BEEF)
+(echo (+ 0z00 0zFF))

test/test_blob.vim

@@ -5,3 +5,4 @@ echo 0Zdeadbeef
 echo 0zDEADBEEF
 echo 0ZDEADBEEF
 echo 0ZDEAD.BEEF
+echo 0z00 + 0zFF