From 948437b5359952e9f3bca21ec0a4b41d6748d9e9 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Sun, 27 May 2012 21:53:02 +0200
Subject: [PATCH] in Ox.doc, fix item.line; in Ox.tokenize, make line and
 column start at 1, not 0

---
 source/Ox/js/JavaScript.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/source/Ox/js/JavaScript.js b/source/Ox/js/JavaScript.js
index a0e009c1..e8bf4c3b 100644
--- a/source/Ox/js/JavaScript.js
+++ b/source/Ox/js/JavaScript.js
@@ -162,8 +162,7 @@ Ox.doc = (function() {
                     // main item
                     // include leading whitespace
                     item.source = parseTokens(tokens[i]);
-                    item.line = source.slice(0, item.source[0].offset)
-                        .split('\n').length;
+                    item.line = item.source[0].line;
                     items.push(item);
                 } else {
                     // property of a function item
@@ -700,11 +699,11 @@ Ox.tokenize = (function() {
 
     return function(source) {
         var char,
-            column = 0,
+            column = 1,
             cursor = 0,
             delimiter,
             length = source.length,
-            line = 0,
+            line = 1,
             lines,
             next,
             tokens = [],
@@ -763,7 +762,7 @@ Ox.tokenize = (function() {
                 column = lines[lines.length - 1].length;
                 line += lines.length - 1;
             } else if (type == 'linebreak') {
-                column = 0;
+                column = 1;
                 line += value.length;
             } else {
                 column += value.length;