Update vimlparser{js,py}

Author: haya14busa

js/vimlparser.js

@@ -3659,15 +3659,19 @@ function StringReader() { this.__init__.apply(this, arguments); }
 StringReader.prototype.__init__ = function(lines) {
     this.buf = [];
     this.pos = [];
+    this.offset = [];
     var lnum = 0;
+    var offset = 0;
     while (lnum < viml_len(lines)) {
         var col = 0;
         var __c7 = viml_split(lines[lnum], "\\zs");
         for (var __i7 = 0; __i7 < __c7.length; ++__i7) {
             var c = __c7[__i7];
             viml_add(this.buf, c);
             viml_add(this.pos, [lnum + 1, col + 1]);
+            viml_add(this.offset, offset);
             col += viml_len(c);
+            offset += viml_len(c);
         }
         while (lnum + 1 < viml_len(lines) && viml_eqregh(lines[lnum + 1], "^\\s*\\\\")) {
             var skip = TRUE;
@@ -3683,17 +3687,23 @@ StringReader.prototype.__init__ = function(lines) {
                 else {
                     viml_add(this.buf, c);
                     viml_add(this.pos, [lnum + 2, col + 1]);
+                    viml_add(this.offset, offset);
                 }
                 col += viml_len(c);
+                offset += viml_len(c);
             }
             lnum += 1;
+            offset += 1;
         }
         viml_add(this.buf, "<EOL>");
         viml_add(this.pos, [lnum + 1, col + 1]);
+        viml_add(this.offset, offset);
         lnum += 1;
+        offset += 1;
     }
     // for <EOF>
     viml_add(this.pos, [lnum + 1, 0]);
+    viml_add(this.offset, offset);
     this.i = 0;
 }
 
@@ -3792,7 +3802,7 @@ StringReader.prototype.getpos = function() {
     var __tmp = this.pos[this.i];
     var lnum = __tmp[0];
     var col = __tmp[1];
-    return {"i":this.i, "lnum":lnum, "col":col};
+    return {"i":this.i, "lnum":lnum, "col":col, "offset":this.offset[this.i]};
 }
 
 StringReader.prototype.setpos = function(pos) {

py/vimlparser.py

@@ -2920,13 +2920,17 @@ class StringReader:
     def __init__(self, lines):
         self.buf = []
         self.pos = []
+        self.offset = []
         lnum = 0
+        offset = 0
         while lnum < viml_len(lines):
             col = 0
             for c in viml_split(lines[lnum], "\\zs"):
                 viml_add(self.buf, c)
                 viml_add(self.pos, [lnum + 1, col + 1])
+                viml_add(self.offset, offset)
                 col += viml_len(c)
+                offset += viml_len(c)
             while lnum + 1 < viml_len(lines) and viml_eqregh(lines[lnum + 1], "^\\s*\\\\"):
                 skip = TRUE
                 col = 0
@@ -2937,13 +2941,19 @@ def __init__(self, lines):
                     else:
                         viml_add(self.buf, c)
                         viml_add(self.pos, [lnum + 2, col + 1])
+                        viml_add(self.offset, offset)
                     col += viml_len(c)
+                    offset += viml_len(c)
                 lnum += 1
+                offset += 1
             viml_add(self.buf, "<EOL>")
             viml_add(self.pos, [lnum + 1, col + 1])
+            viml_add(self.offset, offset)
             lnum += 1
+            offset += 1
         # for <EOF>
         viml_add(self.pos, [lnum + 1, 0])
+        viml_add(self.offset, offset)
         self.i = 0
 
     def eof(self):
@@ -3016,7 +3026,7 @@ def getstr(self, begin, end):
 
     def getpos(self):
         lnum, col = self.pos[self.i]
-        return AttributeDict({"i":self.i, "lnum":lnum, "col":col})
+        return AttributeDict({"i":self.i, "lnum":lnum, "col":col, "offset":self.offset[self.i]})
 
     def setpos(self, pos):
         self.i = pos.i