Add sameAs field to DuplicatedRuleWarning

imcatta · Jan 21, 2020 · e2271e4 · e2271e4
1 parent 63b5e2a
commit e2271e4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ll1-validator",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A tool that checks if a given grammar is LL(1).",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/parser.js b/src/parser.js
@@ -103,8 +103,9 @@ class Visitor {
       const tmpRules = [];
       grammar[nonTerminal].forEach((rule, index) => {
         const equalToRule = v => JSON.stringify(v) === JSON.stringify(rule);
-        if (tmpRules.some(equalToRule)) {
-          result.push(new warnings.DuplicatedRuleWarning(nonTerminal, index));
+        const sameAs = tmpRules.findIndex(equalToRule);
+        if (sameAs !== -1) {
+          result.push(new warnings.DuplicatedRuleWarning(nonTerminal, index, sameAs));
         }
         tmpRules.push(rule);
       });

diff --git a/src/warnings.js b/src/warnings.js
@@ -1,8 +1,9 @@
 class DuplicatedRuleWarning {
-    constructor(nonTerminal, index) {
+    constructor(nonTerminal, index, sameAs) {
         this.message = 'Duplicated rule';
         this.nonTerminal = nonTerminal;
         this.index = index;
+        this.sameAs = sameAs;
     }
 }
 

diff --git a/test/test-parser.js b/test/test-parser.js
@@ -211,7 +211,7 @@ test('duplicated rule case 1', t => {
         rulesNumber: 2,
         terminals: ['a'],
         nonTerminals: ['S'],
-        warnings: [new warnings.DuplicatedRuleWarning('S', 1)],
+        warnings: [new warnings.DuplicatedRuleWarning('S', 1, 0)],
     });
 });
 
@@ -249,8 +249,8 @@ test('duplicated rule case 2', t => {
         terminals: ['a', 'b'],
         nonTerminals: ['A', 'S'],
         warnings: [
-            new warnings.DuplicatedRuleWarning('S', 2),
-            new warnings.DuplicatedRuleWarning('S', 3),
+            new warnings.DuplicatedRuleWarning('S', 2, 0),
+            new warnings.DuplicatedRuleWarning('S', 3, 0),
         ],
     });
 });
@@ -277,7 +277,7 @@ test('duplicated rule case 3', t => {
         rulesNumber: 3,
         terminals: ['a'],
         nonTerminals: ['A', 'S'],
-        warnings: [new warnings.DuplicatedRuleWarning('A', 1)],
+        warnings: [new warnings.DuplicatedRuleWarning('A', 1, 0)],
     });
 });