parser: Added line number, character number and current parsed style sheet to thrown errors

Author: Munter

lib/parse.js

@@ -55,14 +55,27 @@ 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;
+			err.styleSheet = styleSheet;
+			throw err;
+		};
+
+
 	for (var character; character = token.charAt(i); i++) {
 
 		switch (character) {
 
+		case "\n":
+			lineNumber += 1;
+			charNumber = 0;
 		case " ":
 		case "\t":
 		case "\r":
-		case "\n":
 		case "\f":
 			if (SIGNIFICANT_WHITESPACE[state]) {
 				buffer += character;
@@ -73,7 +86,7 @@ CSSOM.parse = function parse(token) {
 		case '"':
 			index = token.indexOf('"', i + 1) + 1;
 			if (!index) {
-				throw '" is missing';
+				parseError('Unmatched "');
 			}
 			buffer += token.slice(i, index);
 			i = index - 1;
@@ -90,7 +103,7 @@ CSSOM.parse = function parse(token) {
 		case "'":
 			index = token.indexOf("'", i + 1) + 1;
 			if (!index) {
-				throw "' is missing";
+				parseError("Unmatched '");
 			}
 			buffer += token.slice(i, index);
 			i = index - 1;
@@ -110,7 +123,7 @@ CSSOM.parse = function parse(token) {
 				i += 2;
 				index = token.indexOf("*/", i);
 				if (index === -1) {
-					throw new SyntaxError("Missing */");
+					parseError("Missing */");
 				} else {
 					i = index + 1;
 				}
@@ -214,7 +227,7 @@ CSSOM.parse = function parse(token) {
 			if (state === 'value') {
 				index = token.indexOf(')', i + 1);
 				if (index === -1) {
-					throw i + ': unclosed "("';
+					parseError('Unmatched "("');
 				}
 				buffer += token.slice(i, index + 1);
 				i = index;
@@ -283,7 +296,7 @@ CSSOM.parse = function parse(token) {
 				case "selector":
 					// End of media rule.
 					if (!parentRule) {
-						throw "unexpected }";
+						parseError("Unexpected }");
 					}
 					currentScope.__ends = i + 1;
 					// Nesting rules aren't supported yet
@@ -316,6 +329,8 @@ CSSOM.parse = function parse(token) {
 			buffer += character;
 			break;
 		}
+
+		charNumber += 1;
 	}
 
 	return styleSheet;