Implement token equality

ygormutti · Jul 4, 2018 · 23ab9c3 · 23ab9c3
1 parent 4d52817
commit 23ab9c3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/diffless/array/model.ts b/diffless/array/model.ts
@@ -10,6 +10,14 @@ export class Token extends Excerpt {
     ) {
         super(content, location);
     }
+
+    equals(other: Token): boolean {
+        return !(other instanceof ValuedToken) && this.type === other.type;
+    }
+
+    static equals(a: Token, b: Token) {
+        return a.equals(b);
+    }
 }
 
 export class ValuedToken<TTokenValue> extends Token {
@@ -18,8 +26,14 @@ export class ValuedToken<TTokenValue> extends Token {
         content: string,
         type: number,
         readonly value: TTokenValue,
-        readonly equals: Equals<TTokenValue>,
+        readonly valueEquals: Equals<TTokenValue>,
     ) {
         super(location, content, type);
     }
+
+    equals(other: Token): boolean {
+        return other instanceof ValuedToken
+            && this.type === other.type
+            && this.valueEquals(this.value, other.value);
+    }
 }
diff --git a/diffless/languages/json/index.ts b/diffless/languages/json/index.ts
@@ -1,9 +1,11 @@
 import { characterDiff, compose } from '../..';
 import { ArrayDiffTool } from '../../array/diff';
+import { Token } from '../../array/model';
 import { DiffLevel } from '../../model';
 import { tokenize } from './lexer';
 
 const jsonLexicalDiffTool = new ArrayDiffTool({
+    equals: Token.equals,
     excerptMapper: tokenize,
     level: DiffLevel.Lexical,
     similarityThreshold: 0,