From d35003d92ae97c515b6fd2c319df2d7a8f14e28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 19 Feb 2019 08:55:04 +0100
Subject: [PATCH] GDScript: Remove unused `switch`, `case` and `do` CF keywords

They had been reserved for future implementation, but we now have the
`match` CF keyword which does the same and more.

According to @reduz `do` was even added by mistake when copying from
the shader language parser, it was never intended to add support for
`do`... `while` loops, as the syntax would be awkward in GDScript,
and the added sugar is not worth it.

Fixes #25787.
---
 main/tests/test_gdscript.cpp            | 3 ---
 modules/gdscript/gdscript_compiler.cpp  | 3 ---
 modules/gdscript/gdscript_parser.h      | 1 -
 modules/gdscript/gdscript_tokenizer.cpp | 9 ---------
 modules/gdscript/gdscript_tokenizer.h   | 5 +----
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
index 27ff2addf38..b0b7fc83571 100644
--- a/main/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
@@ -359,9 +359,6 @@ static void _parser_show_block(const GDScriptParser::BlockNode *p_block, int p_i
 					} break;
 					case GDScriptParser::ControlFlowNode::CF_MATCH: {
 						// FIXME: Implement
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_SWITCH: {
-
 					} break;
 					case GDScriptParser::ControlFlowNode::CF_CONTINUE: {
 
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index e59b57b39a9..d256918b229 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -1507,9 +1507,6 @@ Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::Blo
 
 						codegen.opcodes.write[break_addr + 1] = codegen.opcodes.size();
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_SWITCH: {
-
 					} break;
 					case GDScriptParser::ControlFlowNode::CF_BREAK: {
 
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
index d1ddf9aa125..5ded4668a7a 100644
--- a/modules/gdscript/gdscript_parser.h
+++ b/modules/gdscript/gdscript_parser.h
@@ -445,7 +445,6 @@ public:
 			CF_IF,
 			CF_FOR,
 			CF_WHILE,
-			CF_SWITCH,
 			CF_BREAK,
 			CF_CONTINUE,
 			CF_RETURN,
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index 127a00a9f35..0f2f0bbb26e 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -80,10 +80,7 @@ const char *GDScriptTokenizer::token_names[TK_MAX] = {
 	"elif",
 	"else",
 	"for",
-	"do",
 	"while",
-	"switch (reserved)",
-	"case (reserved)",
 	"break",
 	"continue",
 	"pass",
@@ -224,9 +221,6 @@ static const _kws _keyword_list[] = {
 	{ GDScriptTokenizer::TK_CF_ELSE, "else" },
 	{ GDScriptTokenizer::TK_CF_FOR, "for" },
 	{ GDScriptTokenizer::TK_CF_WHILE, "while" },
-	{ GDScriptTokenizer::TK_CF_DO, "do" },
-	{ GDScriptTokenizer::TK_CF_SWITCH, "switch" },
-	{ GDScriptTokenizer::TK_CF_CASE, "case" },
 	{ GDScriptTokenizer::TK_CF_BREAK, "break" },
 	{ GDScriptTokenizer::TK_CF_CONTINUE, "continue" },
 	{ GDScriptTokenizer::TK_CF_RETURN, "return" },
@@ -291,9 +285,6 @@ bool GDScriptTokenizer::is_token_literal(int p_offset, bool variable_safe) const
 		case TK_CF_ELSE:
 		case TK_CF_FOR:
 		case TK_CF_WHILE:
-		case TK_CF_DO:
-		case TK_CF_SWITCH:
-		case TK_CF_CASE:
 		case TK_CF_BREAK:
 		case TK_CF_CONTINUE:
 		case TK_CF_RETURN:
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h
index e4315f79699..88e44c6e0fb 100644
--- a/modules/gdscript/gdscript_tokenizer.h
+++ b/modules/gdscript/gdscript_tokenizer.h
@@ -86,10 +86,7 @@ public:
 		TK_CF_ELIF,
 		TK_CF_ELSE,
 		TK_CF_FOR,
-		TK_CF_DO,
 		TK_CF_WHILE,
-		TK_CF_SWITCH,
-		TK_CF_CASE,
 		TK_CF_BREAK,
 		TK_CF_CONTINUE,
 		TK_CF_PASS,
@@ -118,7 +115,7 @@ public:
 		TK_PR_REMOTE,
 		TK_PR_SYNC,
 		TK_PR_MASTER,
-		TK_PR_SLAVE,
+		TK_PR_SLAVE, // Deprecated by TK_PR_PUPPET, to remove in 4.0
 		TK_PR_PUPPET,
 		TK_PR_REMOTESYNC,
 		TK_PR_MASTERSYNC,