➖ ᴛᴏᴋᴇɴsᴛʀᴇᴀᴍ.ᴊs — Simplify function (peekTypeEquals)

Author: CiroZDP

playground/static/js/ast/parsers/function.parser.js

@@ -28,7 +28,7 @@ export class ASTFunctionParser {
 
         this.stream.expect('fn');
 
-        if (!this.stream.peekTypeEquals("ID"))
+        if (qrtTypeOf(this.stream.peek()) !== "ID")
             return this.stream.error(Errors.AST.Fn_MissingIdentifier);
 
         func.name = this.stream.pop();
@@ -42,11 +42,12 @@ export class ASTFunctionParser {
             return this.stream.error(Errors.AST.Fn_MalformedArgs);
 
         while (!this.stream.next(")")) {
-            if (!this.stream.peekTypeEquals(["TYPE", "ID"]))
+            if (qrtTypeOf(this.stream.peek()) !== 'TYPE'
+                && qrtTypeOf(this.stream.peek()) !== 'ID')
                 return this.stream.error(Errors.TYPECHECK.Fn_InvalidArgType);
 
             const name = this.stream.pop();
-            if (!this.stream.peekTypeEquals("ID"))
+            if (qrtTypeOf(this.stream.peek()) !== 'ID')
                 return this.stream.error(Errors.AST.Fn_InvalidArgName);
 
             const value = this.stream.pop();
@@ -58,7 +59,9 @@ export class ASTFunctionParser {
     }
 
     parseReturnType(func) {
-        if (this.stream.peekTypeEquals(["ID", "TYPE"])) { // TODO: use RTTypeOf
+        if (qrtTypeOf(this.stream.peek()) === 'TYPE'
+                || qrtTypeOf(this.stream.peek()) === 'ID')
+        {
             func.returnType = this.stream.pop();
             return true;
         }

playground/static/js/ast/parsers/variable.parser.js

@@ -16,7 +16,7 @@ export class ASTVariableParser {
         if (!this.stream.expect('let'))
             return this.stream.error(Errors.AST.Let_MalformedDeclaration);
 
-        if (!this.stream.peekTypeEquals('ID'))
+        if (qrtTypeOf(this.stream.peek()) !== 'ID')
             return this.stream.error(Errors.AST.Let_MissingIdentifier);
 
         variable.name = this.stream.pop();
@@ -25,7 +25,7 @@ export class ASTVariableParser {
 
         // Type declaration
         if (this.stream.next(':')) {
-            if (!this.stream.peekTypeEquals("TYPE"))
+            if (qrtTypeOf(this.stream.peek()) !== 'TYPE')
                 return this.stream.error(Errors.TYPECHECK.Let_InvalidType);
 
             variable.varType = this.stream.pop();

playground/static/js/compiler/util/tokenstream.js

@@ -10,13 +10,6 @@ export class TokenStream {
         this.index   = 0;
     }
 
-    peekTypeEquals(type) {
-        if (!Array.isArray(type))
-            return qrtTypeOf(this.peek()) === type;
-
-        return type.some(t => this.peekTypeEquals(t));
-    }
-
     pop() {
         return this.tokens[this.index++];
     }

playground/static/js/tokens/types.js

@@ -58,3 +58,5 @@ export function qrtTypeOf(s) {
     return t;
 }
 
+window.qrtTypeOf = qrtTypeOf;
+