[grammar] remove Literal rule in favor of Value

Author: alunny

pbxproj.pegjs

@@ -77,7 +77,7 @@ CommentedIdentifier
     }
 
 CommentedValue
-  = literal:Literal _ comment:InlineComment
+  = literal:Value _ comment:InlineComment
     {
         var result = Object.create(null)
         result.comment = comment.trim();
@@ -117,22 +117,23 @@ Identifier
     { return id.join('') }
 
 Value
-  = obj:Object { return obj } / NumberValue / StringValue
-
-Literal
-  = StringValue
+  = Object / NumberValue / StringValue
 
 NumberValue
-  = number:Digit+ { return parseInt(number, 10) }
+  = !Alpha number:Digit+ !Alpha
+    { return parseInt(number, 10) }
 
 Digit
   = [0-9]
 
+Alpha
+  = [A-Za-z]
+
 StringValue
   = literal:LiteralChar+ { return literal.join('') }
 
 LiteralChar
-  = !InlineCommentOpen char:[^;\n]
+  = !InlineCommentOpen !LineTerminator char:[^;\n]
     { return char }
 
 SingleLineComment
@@ -153,6 +154,9 @@ NonLine
   = !NewLine char:Char
     { return char }
 
+LineTerminator
+  = NewLine / ";"
+
 NewLine
     = [\n\r]
 

test/hash.js

@@ -27,3 +27,8 @@ exports['should split out properties and comments'] = function (test) {
     test.equal(project['rootObject_comment'], 'Project object');
     test.done();
 }
+
+exports['should parse non-commented hash things'] = function (test) {
+    test.equal(project.nonObject, '29B97313FDCFA39411CA2CEF');
+    test.done();
+}

test/projects/hash.pbxproj

@@ -4,5 +4,6 @@
     classes = {
     };
     objectVersion = 45;
+    nonObject = 29B97313FDCFA39411CA2CEF;
     rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
 }