From 22b1c2604b389234b88929fa256f7c98e046eeb9 Mon Sep 17 00:00:00 2001
From: Twan van Laarhoven <twanvl@gmail.com>
Date: Fri, 22 May 2020 01:23:53 +0200
Subject: [PATCH] Remove reader_pragma_handler hack

---
 src/data/locale.cpp    | 14 --------------
 src/util/io/reader.cpp |  6 ------
 2 files changed, 20 deletions(-)

diff --git a/src/data/locale.cpp b/src/data/locale.cpp
index 01a502b7..059bbd3a 100644
--- a/src/data/locale.cpp
+++ b/src/data/locale.cpp
@@ -23,19 +23,6 @@
 
 // ----------------------------------------------------------------------------- : Locale class
 
-// when reading, ignore "#_ADD" start of line pragmas
-
-typedef void (*ReaderPragmaHandler)(String&);
-DECLARE_DYNAMIC_ARG(ReaderPragmaHandler,reader_pragma_handler);
-
-void ignore_add_pragma(String& str) {
-  if      (starts_with(str,_("#_ADD "))) str = str.substr(6);
-  else if (starts_with(str,_("#_ADD")))  str = str.substr(5);
-  else if (starts_with(str,_("#_DEL")))  str.clear();
-}
-
-// ----------------------------------------------------------------------------- : Locale class
-
 LocaleP the_locale;
 
 String Locale::typeName() const { return _("locale"); }
@@ -47,7 +34,6 @@ LocaleP Locale::byName(const String& name) {
 
 IMPLEMENT_REFLECTION_NO_SCRIPT(Locale) {
   REFLECT_BASE(Packaged);
-  WITH_DYNAMIC_ARG(reader_pragma_handler, ignore_add_pragma);
   REFLECT_N("menu",        translations[LOCALE_CAT_MENU]);
   REFLECT_N("help",        translations[LOCALE_CAT_HELP]);
   REFLECT_N("tool",        translations[LOCALE_CAT_TOOL]);
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index 05ffca02..cd1ecc98 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -15,10 +15,6 @@
 #undef small
 using boost::tribool;
 
-typedef void (*ReaderPragmaHandler)(String&);
-DECLARE_DYNAMIC_ARG  (ReaderPragmaHandler,reader_pragma_handler);
-IMPLEMENT_DYNAMIC_ARG(ReaderPragmaHandler,reader_pragma_handler,nullptr);
-
 // ----------------------------------------------------------------------------- : Reader
 
 Reader::Reader(wxInputStream& input, Packaged* package, const String& filename, bool ignore_invalid)
@@ -201,8 +197,6 @@ void Reader::readLine(bool in_string) {
   } catch (const ParseError& e) {
     throw ParseError(e.what() + String(_(" on line ")) << line_number);
   }
-  // pragma handler
-  if (reader_pragma_handler()) reader_pragma_handler()(line);
   // read indentation
   indent = 0;
   while ((UInt)indent < line.size() && line.GetChar(indent) == _('\t')) {