Bunch of TODOs; inline warnings/errors etc

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/utils.js b/lib/utils.js
index 8bc0ba59b..159d3fdd1 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -50,7 +50,7 @@ function expandTabs(line) {
 exports.expandTabs = expandTabs;
 
 function parseOutput(lines, inputFilename) {
-    var re = /^<source>[:(]([0-9]+)(:[0-9]+:)?[):]*\s*(.*)/;
+    var re = /^<source>[:(]([0-9]+)(:([0-9]+):)?[):]*\s*(.*)/;
     var result = [];
     eachLine(lines, function (line) {
         line = line.trim().replace(inputFilename, '<source>');
@@ -58,7 +58,11 @@ function parseOutput(lines, inputFilename) {
             var lineObj = {text: line};
             var match = line.match(re);
             if (match) {
-                lineObj.tag = {line: parseInt(match[1]), text: match[3].trim()};
+                lineObj.tag = {
+                    line: parseInt(match[1]),
+                    column: parseInt(match[3] || "0"),
+                    text: match[4].trim()
+                };
             }
             result.push(lineObj);
         }