Merge pull request #8 from kevinastone/scope-modifiers

Added grouping and only: modifier for scopes

CHANGELOG.md

@@ -3,6 +3,10 @@
 ## master
 
 - Added start-of-line (<<) and end-of-line (>>) position operators
+- Added scope matching modifier and grouping (`only:` or `=`)
+  - =(scope1 scope2)
+  - only:scope1
+  - =scope1
 
 ## 0.4.0 - 2016-03-03
 

README.md

@@ -46,7 +46,7 @@ int square(int x)
 //                  ^ string.quoted.double
 
 // EOF Check (root scope)
-// >> source.c
+// >> =source.c
 ```
 
 Once you've defined your grammar test, you can simply plug into the Jasmine

lib/assertions.js

@@ -1,30 +1,22 @@
 'use babel';
 
 import parse from './grammar';
-import { matchScopes } from './scope';
+import { matcherBuilder } from './matchers';
 
 
 class Assertion {
-  constructor(line, column, ...scopes) {
+  constructor(line, column, matcher) {
     this.line = line;
     this.column = column;
-    this.scopes = scopes;
-  }
-
-  findMissing(...scopes) {
-    return this.scopes.filter((expected) =>
-      !scopes.some((actual) =>
-        matchScopes(actual, expected)
-      )
-    );
+    this.matcher = matcher;
   }
 
   findToken(...tokens) {
     return tokens.filter((token) => token.matches(this.column)).shift();
   }
 
   message() {
-    return `${this.scopes.join(', ')} at ${this.line}:${this.column}`;
+    return `${this.matcher.scopes.join(', ')} at ${this.line}:${this.column}`;
   }
 }
 
@@ -68,14 +60,16 @@ export class AssertionParser {
 
     for (const value of this.iterator) {
       try {
-        const [positions, scopes] = this.parseLine(value.line);
+        const [positions, [modifier, scopes]] = this.parseLine(value.line);
         if (!currentLine) {
           throw Error("Can't have assertion before any syntax");
         }
 
+        const matcher = matcherBuilder(modifier, ...scopes);
+
         for (const position of positions) {
           currentLine.assertions.push(
-            new Assertion(currentLine.lineNumber, position, ...scopes)
+            new Assertion(currentLine.lineNumber, position, matcher)
           );
         }
       } catch (_e) {