[New Compiler] Fix failure to compile commands such as MenuMode when they are also block types

cnf13 · cnf13 · commit 1110389c267b · 2026-01-19T18:35:52.000-05:00
diff --git a/nvse/nvse/NVSELexer.cpp b/nvse/nvse/NVSELexer.cpp
@@ -282,13 +282,6 @@ NVSEToken NVSELexer::GetNextToken(bool useStack) {
 			if (_stricmp(identifier.c_str(), "false") == 0) return MakeToken(NVSETokenType::Bool, identifier, 0);
 			if (_stricmp(identifier.c_str(), "null") == 0) return MakeToken(NVSETokenType::Number, identifier, 0);
 
-			// See if it is a begin block type
-			for (auto& g_eventBlockCommandInfo : g_eventBlockCommandInfos) {
-				if (!_stricmp(g_eventBlockCommandInfo.longName, identifier.c_str())) {
-					return MakeToken(NVSETokenType::BlockType, identifier);
-				}
-			}
-
 			return MakeToken(NVSETokenType::Identifier, identifier);
 		}
 	}
diff --git a/nvse/nvse/NVSELexer.h b/nvse/nvse/NVSELexer.h
@@ -14,7 +14,6 @@ enum class NVSETokenType {
     Fn,
     Return,
     For,
-    BlockType,
     Name,
     Continue,
     Break,
@@ -90,7 +89,6 @@ static const char* TokenTypeStr[]{
     "Fn",
     "Return",
     "For",
-    "Begin",
     "Name",
     "Continue",
     "Break",
diff --git a/nvse/nvse/NVSEParser.cpp b/nvse/nvse/NVSEParser.cpp
@@ -73,7 +73,7 @@ std::optional<NVSEScript> NVSEParser::Parse() {
 					Expect(NVSETokenType::RightParen, "Expected ')'.");
 				}
 				// Get event or udf block
-				else if (Peek(NVSETokenType::BlockType)) {
+				else if (PeekBlockType()) {
 					blocks.emplace_back(Begin());
 				}
 				else if (Match(NVSETokenType::Fn)) {
@@ -113,7 +113,8 @@ std::optional<NVSEScript> NVSEParser::Parse() {
 }
 
 StmtPtr NVSEParser::Begin() {
-	Match(NVSETokenType::BlockType);
+	ExpectBlockType("Expected block type");
+
 	auto blockName = previousToken;
 	auto blockNameStr = blockName.lexeme;
 
@@ -936,6 +937,39 @@ bool NVSEParser::PeekType() const {
 			Peek(NVSETokenType::ArrayType) || Peek(NVSETokenType::StringType);
 }
 
+bool NVSEParser::PeekBlockType() const {
+	if (!Peek(NVSETokenType::Identifier)) {
+		return false;
+	}
+
+	const auto identifier = currentToken.lexeme;
+	for (const auto& g_eventBlockCommandInfo : g_eventBlockCommandInfos) {
+		if (!_stricmp(g_eventBlockCommandInfo.longName, identifier.c_str())) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+NVSEToken NVSEParser::ExpectBlockType(const std::string &&message) {
+	if (!PeekBlockType()) {
+		Error(currentToken, message);
+		return previousToken;
+	}
+
+	const auto identifier = currentToken.lexeme;
+	for (const auto& g_eventBlockCommandInfo : g_eventBlockCommandInfos) {
+		if (!_stricmp(g_eventBlockCommandInfo.longName, identifier.c_str())) {
+			Advance();
+			return previousToken;
+		}
+	}
+
+	Error(currentToken, message);
+	return previousToken;
+}
+
 void NVSEParser::Error(std::string message) {
 	panicMode = true;
 	hadError = true;
@@ -973,7 +1007,6 @@ void NVSEParser::Synchronize() {
 		case NVSETokenType::For:
 		case NVSETokenType::Return:
 		case NVSETokenType::RightBrace:
-		case NVSETokenType::BlockType:
 			panicMode = false;
 			return;
 		default: ;
diff --git a/nvse/nvse/NVSEParser.h b/nvse/nvse/NVSEParser.h
@@ -15,7 +15,6 @@ class NVSEParser {
 public:
     NVSEParser(NVSELexer& tokenizer);
     std::optional<NVSEScript> Parse();
-    StmtPtr Begin();
 
 private:
     NVSELexer& lexer;
@@ -27,6 +26,7 @@ class NVSEParser {
     std::shared_ptr<FnDeclStmt> FnDecl();
     std::shared_ptr<VarDeclStmt> VarDecl(bool allowValue = true, bool allowOnlyOneVarDecl = false);
 
+    StmtPtr Begin();
     StmtPtr Statement();
     StmtPtr ExpressionStatement();
     StmtPtr ForStatement();
@@ -65,6 +65,10 @@ class NVSEParser {
     bool MatchesType();
     bool Peek(NVSETokenType type) const;
     bool PeekType() const;
+
+    bool PeekBlockType() const;
+    NVSEToken ExpectBlockType(const std::string&& message);
+
     void Error(std::string message);
     void Error(NVSEToken token, std::string message);
     NVSEToken Expect(NVSETokenType type, std::string message);

Original file line number	Diff line number	Diff line change
`@@ -282,13 +282,6 @@ NVSEToken NVSELexer::GetNextToken(bool useStack) {`
`282`	`282`	`if (_stricmp(identifier.c_str(), "false") == 0) return MakeToken(NVSETokenType::Bool, identifier, 0);`
`283`	`283`	`if (_stricmp(identifier.c_str(), "null") == 0) return MakeToken(NVSETokenType::Number, identifier, 0);`
`284`	`284`
`285`		`- // See if it is a begin block type`
`286`		`- for (auto& g_eventBlockCommandInfo : g_eventBlockCommandInfos) {`
`287`		`- if (!_stricmp(g_eventBlockCommandInfo.longName, identifier.c_str())) {`
`288`		`- return MakeToken(NVSETokenType::BlockType, identifier);`
`289`		`- }`
`290`		`- }`
`291`		`-`
`292`	`285`	`return MakeToken(NVSETokenType::Identifier, identifier);`
`293`	`286`	`}`
`294`	`287`	`}`