From b4685e06d45336e7ce7cb138f8261ac120a2d6d3 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 25 Jan 2019 03:27:13 +0000
Subject: Remove all 2.0 config compatibility code.

---
 src/configparser.cpp | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/configparser.cpp')

diff --git a/src/configparser.cpp b/src/configparser.cpp
index c8e07c2a9..ffd2d06cc 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -23,9 +23,6 @@
 
 enum ParseFlags
 {
-	// Legacy config parsing should be used.
-	FLAG_USE_COMPAT = 1,
-
 	// Executable includes are disabled.
 	FLAG_NO_EXEC = 2,
 
@@ -193,7 +190,7 @@ struct Parser
 		while (1)
 		{
 			ch = next();
-			if (ch == '&' && !(flags & FLAG_USE_COMPAT))
+			if (ch == '&')
 			{
 				std::string varname;
 				while (1)
@@ -235,16 +232,6 @@ struct Parser
 					value.append(var->second);
 				}
 			}
-			else if (ch == '\\' && (flags & FLAG_USE_COMPAT))
-			{
-				int esc = next();
-				if (esc == 'n')
-					value.push_back('\n');
-				else if (isalpha(esc))
-					throw CoreException("Unknown escape character \\" + std::string(1, esc));
-				else
-					value.push_back(esc);
-			}
 			else if (ch == '"')
 				break;
 			else if (ch != '\r')
@@ -307,24 +294,12 @@ struct Parser
 		}
 		else if (stdalgo::string::equalsci(name, "define"))
 		{
-			if (flags & FLAG_USE_COMPAT)
-				throw CoreException("<define> tags may only be used in XML-style config (add <config format=\"xml\">)");
 			std::string varname = tag->getString("name");
 			std::string value = tag->getString("value");
 			if (varname.empty())
 				throw CoreException("Variable definition must include variable name");
 			stack.vars[varname] = value;
 		}
-		else if (stdalgo::string::equalsci(name, "config"))
-		{
-			std::string format = tag->getString("format");
-			if (stdalgo::string::equalsci(format, "xml"))
-				flags &= ~FLAG_USE_COMPAT;
-			else if (stdalgo::string::equalsci(format, "compat"))
-				flags |= FLAG_USE_COMPAT;
-			else if (!format.empty())
-				throw CoreException("Unknown configuration format " + format);
-		}
 		else
 		{
 			stack.output.insert(std::make_pair(name, tag));
-- 
cgit v1.3.1-10-gc9f91