Merge pull request NV#37 from Munter/gh-pages

Improve error information about parse errors

Author: NV

lib/parse.js

@@ -55,6 +55,18 @@ CSSOM.parse = function parse(token) {
 
 	var atKeyframesRegExp = /@(-(?:\w+-)+)?keyframes/g;
 
+	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 + ')');
+			err.line = lines;
+			err.char = chars;
+			err.styleSheet = styleSheet;
+			throw err;
+		};
+
+
 	for (var character; character = token.charAt(i); i++) {
 
 		switch (character) {
@@ -73,7 +85,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 +102,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 +122,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 +226,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,10 +295,10 @@ 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
+					// Nesting rules aren't supported yet
 					styleSheet.cssRules.push(currentScope);
 					currentScope = styleSheet;
 					parentRule = null;