Remove unneeded block type from stack

Author: rattrayalex

src/plugins/lightscript.js

@@ -369,18 +369,6 @@ pp.parseNamedArrowFromCallExpression = function (node, call) {
   return this.finishNode(node, isMember ? "NamedArrowMemberExpression" : "NamedArrowExpression");
 };
 
-pp.pushBlockState = function (blockType, indentLevel) {
-  this.state.blockStack.push({ blockType, indentLevel });
-};
-
-pp.matchBlockState = function(blockType, indentLevel) {
-  return this.state.blockStack.some( (x) => x.blockType === blockType && x.indentLevel === indentLevel );
-};
-
-pp.popBlockState = function() {
-  this.state.blockStack.pop();
-};
-
 // c/p parseIfStatement
 
 pp.parseIf = function (node, isExpression) {
@@ -389,7 +377,7 @@ pp.parseIf = function (node, isExpression) {
   node.test = this.parseParenExpression();
 
   const isColon = this.match(tt.colon);
-  if (isColon) this.pushBlockState("if", indentLevel);
+  if (isColon) this.state.ifWhiteBlockStack.push(indentLevel);
 
   if (isExpression) {
     if (this.match(tt.braceL)) {
@@ -405,7 +393,7 @@ pp.parseIf = function (node, isExpression) {
 
   node.alternate = this.parseIfAlternate(node, isExpression, isColon, indentLevel);
 
-  if (isColon) this.popBlockState();
+  if (isColon) this.state.ifWhiteBlockStack.pop();
 
   return this.finishNode(node, isExpression ? "IfExpression" : "IfStatement");
 };
@@ -417,11 +405,9 @@ pp.parseIfAlternate = function (node, isExpression, ifIsWhiteBlock, ifIndentLeve
   // it matches with a whiteblock `if` higher on the stack, then this alternate
   // clause does not match the current `if` -- so unwind the recursive descent.
   const alternateIndentLevel = this.state.indentLevel;
-  if (
-    (alternateIndentLevel !== ifIndentLevel) &&
-    (ifIsWhiteBlock || this.matchBlockState("if", alternateIndentLevel))
-  ) {
-    return null;
+  if (alternateIndentLevel !== ifIndentLevel) {
+    if (ifIsWhiteBlock) return null;
+    if (this.state.ifWhiteBlockStack.some(x => x === alternateIndentLevel)) return null;
   }
 
   if (this.match(tt._elif)) {

src/tokenizer/state.js

@@ -33,7 +33,7 @@ export default class State {
     this.leadingComments  = [];
     this.commentStack     = [];
 
-    this.blockStack = [];
+    this.ifWhiteBlockStack = [];
 
     this.pos = this.lineStart = 0;
     this.curLine = options.startLine;