parse.js: Changed line counting for error reporting to happen inside error handler

Author: Munter

lib/parse.js

@@ -55,12 +55,13 @@ CSSOM.parse = function parse(token) {
 
 	var atKeyframesRegExp = /@(-(?:\w+-)+)?keyframes/g;
 
-	var lineNumber = 1,
-		charNumber = 0,
-		parseError = function (msg) {
-			var err = new Error(msg + ' at Line ' + lineNumber + ', char ' + charNumber, null, lineNumber);
-			err.line = lineNumber;
-			err.char = charNumber;
+	var parseError = function (msg) {
+			var tmp = token.substring(0, i).split('\n'),
+				lines = tmp.length,
+				chars = tmp.pop().length;
+			var err = new Error(msg + ' (line ' + lines + ', char ' + chars + ')', null, lines);
+			err.line = lines;
+			err.char = chars;
 			err.styleSheet = styleSheet;
 			throw err;
 		};
@@ -70,12 +71,10 @@ CSSOM.parse = function parse(token) {
 
 		switch (character) {
 
-		case "\n":
-			lineNumber += 1;
-			charNumber = 0;
 		case " ":
 		case "\t":
 		case "\r":
+		case "\n":
 		case "\f":
 			if (SIGNIFICANT_WHITESPACE[state]) {
 				buffer += character;
@@ -329,8 +328,6 @@ CSSOM.parse = function parse(token) {
 			buffer += character;
 			break;
 		}
-
-		charNumber += 1;
 	}
 
 	return styleSheet;