WIP: improve helper method

KennethanCeyer · Mar 29, 2018 · 024fb51 · 024fb51
1 parent 79a2e03
commit 024fb51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/token/token.helper.base.ts b/src/token/token.helper.base.ts
@@ -3,7 +3,12 @@ import { TokenTypeHelper } from './token.type.helper';
 
 export abstract class TokenHelperBase extends TokenTypeHelper {
     public static isToken(token: Token.Token): boolean {
-        return token && (this.isNumeric(token) || this.isSymbol(token) || this.isObject(token));
+        const validators = [
+            TokenHelperBase.isNumeric,
+            TokenHelperBase.isSymbol,
+            TokenHelperBase.isObject
+        ];
+        return token && validators.some(validator => validator(token));
     }
 
     public static isUnkown(token: Token.Token): boolean {

diff --git a/src/token/token.type.helper.ts b/src/token/token.type.helper.ts
@@ -18,6 +18,6 @@ export abstract class TokenTypeHelper {
     }
 
     public static isValue(token: Token.Token): boolean {
-        return this.isObject(token) || this.isNumeric(token);
+        return TokenTypeHelper.isObject(token) || TokenTypeHelper.isNumeric(token);
     }
 }