Merge pull request #1029 from Patternslib/depends-fixes-2.x

Depends fixes 2.x

Author: thet

Makefile

@@ -64,8 +64,9 @@ build:: bundle
 bundle bundle.js: $(GENERATED) $(SOURCES) build.js stamp-bower
 	node_modules/.bin/r.js -o build.js
 
-src/lib/depends_parse.js: src/lib/depends_parse.pegjs stamp-npm
-	$(PEGJS) $<
+.PHONY: depends-parser
+depends-parser:  stamp-npm
+	$(PEGJS) -O size -f commonjs src/lib/depends_parse.pegjs
 	sed -i~ -e '1s/.*/define(function() {/' -e '$$s/()//' $@ || rm -f $@
 
 clean::

package.json

@@ -19,7 +19,7 @@
     "generator-patternslib": "0.2.1",
     "http-server": "^0.7.5",
     "jshint": "~2.9.3",
-    "pegjs": "0.7.0",
+    "pegjs": "0.11.0-master.b7b87ea",
     "phantom-jasmine": "0.1.8",
     "phantomjs": "^1.9.18",
     "requirejs": "",

src/lib/depends_parse.js

@@ -46,9 +46,10 @@ simple_expression
     }
 
 equal_comparison "comparison operator"
-  = "="
+  = "=~"
   / "!="
   / "~="
+  / "="
 
 order_comparison "comparison operator"
   = "<="
@@ -75,9 +76,9 @@ number "number"
   }
 
 _
-  = (WhiteSpace)+ 
+  = (WhiteSpace)+
 
-__ 
+__
   = (WhiteSpace)*
 
 SourceCharacter
@@ -94,6 +95,7 @@ IdentifierPart
   / "_"
   / "-"
   / "."
+  / ":"
   / UnicodeCombiningMark
   / UnicodeDigit
   / UnicodeConnectorPunctuation

src/lib/depends_parse.pegjs

@@ -70,6 +70,12 @@ define(["pat-depends_parse"], function(parser) {
                                      input: "foo-bar"});
             });
 
+            it("Colons in name", function () {
+                var ast = parser.parse("foo:bar");
+                expect(ast).toEqual({type: "truthy",
+                                     input: "foo:bar"});
+            });
+
             it("Single quoted value", function() {
                 var ast = parser.parse("foo='bar buz'");
                 expect(ast).toEqual({type: "comparison",