add offset in pos

Author: haya14busa

autoload/vimlparser.vim

@@ -3768,15 +3768,13 @@ endfunction
 function! s:StringReader.__init__(lines)
   let self.buf = []
   let self.pos = []
-  let self.offset = []
   let lnum = 0
   let offset = 0
   while lnum < len(a:lines)
     let col = 0
     for c in split(a:lines[lnum], '\zs')
       call add(self.buf, c)
-      call add(self.pos, [lnum + 1, col + 1])
-      call add(self.offset, offset)
+      call add(self.pos, [lnum + 1, col + 1, offset])
       let col += len(c)
       let offset += len(c)
     endfor
@@ -3790,8 +3788,7 @@ function! s:StringReader.__init__(lines)
           endif
         else
           call add(self.buf, c)
-          call add(self.pos, [lnum + 2, col + 1])
-          call add(self.offset, offset)
+          call add(self.pos, [lnum + 2, col + 1, offset])
         endif
         let col += len(c)
         let offset += len(c)
@@ -3800,14 +3797,12 @@ function! s:StringReader.__init__(lines)
       let offset += 1
     endwhile
     call add(self.buf, '<EOL>')
-    call add(self.pos, [lnum + 1, col + 1])
-    call add(self.offset, offset)
+    call add(self.pos, [lnum + 1, col + 1, offset])
     let lnum += 1
     let offset += 1
   endwhile
   " for <EOF>
-  call add(self.pos, [lnum + 1, 0])
-  call add(self.offset, offset)
+  call add(self.pos, [lnum + 1, 0, offset])
   let self.i = 0
 endfunction
 
@@ -3901,8 +3896,8 @@ function! s:StringReader.getstr(begin, end)
 endfunction
 
 function! s:StringReader.getpos()
-  let [lnum, col] = self.pos[self.i]
-  return {'i': self.i, 'lnum': lnum, 'col': col, 'offset': self.offset[self.i]}
+  let [lnum, col, offset] = self.pos[self.i]
+  return {'i': self.i, 'lnum': lnum, 'col': col, 'offset': offset}
 endfunction
 
 function! s:StringReader.setpos(pos)

js/vimlparser.js

@@ -3662,7 +3662,6 @@ 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)) {
@@ -3671,8 +3670,7 @@ StringReader.prototype.__init__ = function(lines) {
         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);
+            viml_add(this.pos, [lnum + 1, col + 1, offset]);
             col += viml_len(c);
             offset += viml_len(c);
         }
@@ -3689,8 +3687,7 @@ StringReader.prototype.__init__ = function(lines) {
                 }
                 else {
                     viml_add(this.buf, c);
-                    viml_add(this.pos, [lnum + 2, col + 1]);
-                    viml_add(this.offset, offset);
+                    viml_add(this.pos, [lnum + 2, col + 1, offset]);
                 }
                 col += viml_len(c);
                 offset += viml_len(c);
@@ -3699,14 +3696,12 @@ StringReader.prototype.__init__ = function(lines) {
             offset += 1;
         }
         viml_add(this.buf, "<EOL>");
-        viml_add(this.pos, [lnum + 1, col + 1]);
-        viml_add(this.offset, offset);
+        viml_add(this.pos, [lnum + 1, col + 1, offset]);
         lnum += 1;
         offset += 1;
     }
     // for <EOF>
-    viml_add(this.pos, [lnum + 1, 0]);
-    viml_add(this.offset, offset);
+    viml_add(this.pos, [lnum + 1, 0, offset]);
     this.i = 0;
 }
 
@@ -3805,7 +3800,8 @@ 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, "offset":this.offset[this.i]};
+    var offset = __tmp[2];
+    return {"i":this.i, "lnum":lnum, "col":col, "offset":offset};
 }
 
 StringReader.prototype.setpos = function(pos) {

py/vimlparser.py

@@ -2920,15 +2920,13 @@ 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)
+                viml_add(self.pos, [lnum + 1, col + 1, offset])
                 col += viml_len(c)
                 offset += viml_len(c)
             while lnum + 1 < viml_len(lines) and viml_eqregh(lines[lnum + 1], "^\\s*\\\\"):
@@ -2940,20 +2938,17 @@ def __init__(self, lines):
                             skip = FALSE
                     else:
                         viml_add(self.buf, c)
-                        viml_add(self.pos, [lnum + 2, col + 1])
-                        viml_add(self.offset, offset)
+                        viml_add(self.pos, [lnum + 2, col + 1, 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)
+            viml_add(self.pos, [lnum + 1, col + 1, offset])
             lnum += 1
             offset += 1
         # for <EOF>
-        viml_add(self.pos, [lnum + 1, 0])
-        viml_add(self.offset, offset)
+        viml_add(self.pos, [lnum + 1, 0, offset])
         self.i = 0
 
     def eof(self):
@@ -3025,8 +3020,8 @@ def getstr(self, begin, end):
         return r
 
     def getpos(self):
-        lnum, col = self.pos[self.i]
-        return AttributeDict({"i":self.i, "lnum":lnum, "col":col, "offset":self.offset[self.i]})
+        lnum, col, offset = self.pos[self.i]
+        return AttributeDict({"i":self.i, "lnum":lnum, "col":col, "offset":offset})
 
     def setpos(self, pos):
         self.i = pos.i