Merge pull request #89 from vim-jp/support-bin-number

Support binary number literals (e.g. 0b0, 0b1011)

Author: tyru

autoload/vimlparser.vim

@@ -2576,6 +2576,10 @@ function! s:ExprTokenizer.get2()
     let s = r.getn(3)
     let s .= r.read_xdigit()
     return self.token(s:TOKEN_NUMBER, s, pos)
+  elseif c ==# '0' && (r.p(1) ==# 'B' || r.p(1) ==# 'b') && (r.p(2) == '0' || r.p(2) == '1')
+    let s = r.getn(3)
+    let s .= r.read_bdigit()
+    return self.token(s:TOKEN_NUMBER, s, pos)
   elseif s:isdigit(c)
     let s = r.read_digit()
     if r.p(0) ==# '.' && s:isdigit(r.p(1))
@@ -3945,6 +3949,14 @@ function! s:StringReader.read_xdigit()
   return r
 endfunction
 
+function! s:StringReader.read_bdigit()
+  let r = ''
+  while self.peekn(1) == '0' || self.peekn(1) == '1'
+    let r .= self.getn(1)
+  endwhile
+  return r
+endfunction
+
 function! s:StringReader.read_integer()
   let r = ''
   let c = self.peekn(1)

js/vimlparser.js

@@ -2324,6 +2324,11 @@ ExprTokenizer.prototype.get2 = function() {
         s += r.read_xdigit();
         return this.token(TOKEN_NUMBER, s, pos);
     }
+    else if (c == "0" && (r.p(1) == "B" || r.p(1) == "b") && (r.p(2) == "0" || r.p(2) == "1")) {
+        var s = r.getn(3);
+        s += r.read_bdigit();
+        return this.token(TOKEN_NUMBER, s, pos);
+    }
     else if (isdigit(c)) {
         var s = r.read_digit();
         if (r.p(0) == "." && isdigit(r.p(1))) {
@@ -3849,6 +3854,14 @@ StringReader.prototype.read_xdigit = function() {
     return r;
 }
 
+StringReader.prototype.read_bdigit = function() {
+    var r = "";
+    while (this.peekn(1) == "0" || this.peekn(1) == "1") {
+        r += this.getn(1);
+    }
+    return r;
+}
+
 StringReader.prototype.read_integer = function() {
     var r = "";
     var c = this.peekn(1);

py/vimlparser.py

@@ -1856,6 +1856,10 @@ def get2(self):
             s = r.getn(3)
             s += r.read_xdigit()
             return self.token(TOKEN_NUMBER, s, pos)
+        elif c == "0" and (r.p(1) == "B" or r.p(1) == "b") and (r.p(2) == "0" or r.p(2) == "1"):
+            s = r.getn(3)
+            s += r.read_bdigit()
+            return self.token(TOKEN_NUMBER, s, pos)
         elif isdigit(c):
             s = r.read_digit()
             if r.p(0) == "." and isdigit(r.p(1)):
@@ -3059,6 +3063,12 @@ def read_xdigit(self):
             r += self.getn(1)
         return r
 
+    def read_bdigit(self):
+        r = ""
+        while self.peekn(1) == "0" or self.peekn(1) == "1":
+            r += self.getn(1)
+        return r
+
     def read_integer(self):
         r = ""
         c = self.peekn(1)

test/test_number.ok

@@ -2,7 +2,13 @@
 (echo 1.0)
 (echo 1.23)
 (echo 0xdeadbeef)
+(echo 0Xdeadbeef)
 (echo 033)
 (echo 1.2e-3)
 (echo 4.5E+67)
 (echo 4.5e8)
+(echo 0b1011)
+(echo 0b0)
+(echo 0B1011)
+(echo 0B0)
+(echo 0b01 23)

test/test_number.vim

@@ -2,7 +2,13 @@ echo 1
 echo 1.0
 echo 1.23
 echo 0xdeadbeef
+echo 0Xdeadbeef
 echo 033
 echo 1.2e-3
 echo 4.5E+67
 echo 4.5e8
+echo 0b1011
+echo 0b0
+echo 0B1011
+echo 0B0
+echo 0b0123