Updated parser to fix validation issues (fixes #219)

Author: Nicholas C. Zakas

lib/parserlib.js

@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v0.1.1, Build time: 4-January-2012 09:10:14 */
+/* Version v0.1.2, Build time: 4-January-2012 05:14:28 */
 var parserlib = {};
 (function(){
 
@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v0.1.1, Build time: 4-January-2012 09:10:14 */
+/* Version v0.1.2, Build time: 4-January-2012 05:14:28 */
 (function(){
 var EventTarget = parserlib.util.EventTarget,
 TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -5660,7 +5660,7 @@ var Validation = {
                         if (literals.length) {
                             msg.push("one of (" + literals.join(" | ") + ")");
                         }
-                        throw new ValidationError("Expected " + msg.join(" or ") + " but found '" + part + "'.", value.line, value.col);
+                        throw new ValidationError("Expected " + (msg.join(" or ") || "end of value") + " but found '" + part + "'.", value.line, value.col);
                     }
 
 
@@ -5669,9 +5669,9 @@ var Validation = {
             }
 
             //for groups, make sure all items are there
-            if (group && group.total != types.length){
-                throw new ValidationError("Expected all of (" + types.join(", ") + ") but found '" + value + "'.", value.line, value.col);
-            }
+            //if (group && group.total != types.length){
+            //    throw new ValidationError("Expected all of (" + types.join(", ") + ") but found '" + value + "'.", value.line, value.col);
+            //}
         }
 
     },
@@ -5916,6 +5916,7 @@ var Validation = {
         "<shadow>": function(expression) {
             //inset? && [ <length>{2,4} && <color>? ]
             var result  = false,
+                inset   = false,
                 count   = 0,
                 part;
 
@@ -5925,6 +5926,7 @@ var Validation = {
                 if (this.literal(part, "inset")){
                     expression.next();
                     part = expression.peek();
+                    inset = true;
                 }
 
                 while (part && this["<length>"](part) && count < 4) {
@@ -5937,9 +5939,14 @@ var Validation = {
                 if (part) {
                     if (this["<color>"](part)) {
                         expression.next();
+                        part = expression.peek();
                     }
                 }
 
+                if (part && this.literal(part, "inset") && !inset){
+                    expression.next();
+                }                
+                
                 result = (count >= 2 && count <= 4);
 
             }