fix: issue with the deserializer and tokenizer

reflektone-games · Nov 10, 2023 · c886d9f · c886d9f
1 parent ba1d45a
commit c886d9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/internal/lexicalAnalysis/tokenizer.ts b/src/internal/lexicalAnalysis/tokenizer.ts
@@ -65,18 +65,6 @@ export class Tokenizer {
         else if (this.eachDividerChars.has(c)) return this.compileToken(TokenType.EachDivider);
         else if (this.separatorChars.has(c)) return undefined;
 
-        const [isLocationToken, locationLength] = this.tryScanLocationToken();
-        if (isLocationToken) {
-            this._current += locationLength - 1;
-            return this.compileToken(TokenType.Location);
-        }
-
-        const [isSlideDeclaration, slideLength] = this.isReadingSlideDeclaration();
-        if (isSlideDeclaration) {
-            this._current += slideLength - 1;
-            return this.compileToken(TokenType.Slide);
-        }
-
         switch (c) {
             case ",":
                 return this.compileToken(TokenType.TimeStep);
@@ -106,10 +94,21 @@ export class Tokenizer {
 
                 return undefined;
             }
+        }
+
+        const [isLocationToken, locationLength] = this.tryScanLocationToken();
+        if (isLocationToken) {
+            this._current += locationLength - 1;
+            return this.compileToken(TokenType.Location);
+        }
 
-            default:
-                throw new UnsupportedSyntaxException(this._line, this._charIndex);
+        const [isSlideDeclaration, slideLength] = this.isReadingSlideDeclaration();
+        if (isSlideDeclaration) {
+            this._current += slideLength - 1;
+            return this.compileToken(TokenType.Slide);
         }
+
+        throw new UnsupportedSyntaxException(this._line, this._charIndex);
     }
 
     /**

diff --git a/src/internal/syntacticAnalysis/deserializer.ts b/src/internal/syntacticAnalysis/deserializer.ts
@@ -165,7 +165,7 @@ export class Deserializer {
         let group = NoteGroup.Tap;
 
         if (isSensor) {
-            group = NoteGroup[token.lexeme[0].charCodeAt(0) - "A".charCodeAt(0) + 1] as unknown as NoteGroup;
+            group = (token.lexeme[0].charCodeAt(0) - "A".charCodeAt(0) + 1) as NoteGroup;
 
             if (group === NoteGroup.CSensor) {
                 return [true, new Location(0, group)];