relpipe/relpipe-in-ini.cpp: comparison src/lib/INIReader.cpp

equal deleted inserted replaced

-:b1f6fa3a6555
+:e9aad9dd823a
 class INIReaderImpl : public INIReader {
 private:
 	std::istream& input;
 	std::vector<INIContentHandler*> handlers;
+	class ConfiguredUnescapingProcessor {
+	public:
+		std::shared_ptr<UnescapingProcessor> processor;
+		const std::string uri;
+		bool enbaled;
+		ConfiguredUnescapingProcessor(std::shared_ptr<UnescapingProcessor> processor, const std::string uri, bool enbaled) : processor(processor), uri(uri), enbaled(enbaled) {
+		}
+	};
+	std::vector<ConfiguredUnescapingProcessor> unescapingProcessors;
 	/**
 	 * By default, we ignore all leading whitespace on continuing lines.
 	 * If there should be some spaces or tabs, they should be placed on the previous line before the „\“.
 	 * If a line break is desired, it should be written as \n (escaped) or the value should be quoted in " or '.
 	 *
 			if (!oneOf(get(), until)) throw std::logic_error(std::string("missing „") + until + "“ after quoted section name");
 		}
 		return result;
 	}
+	std::string unescape(const std::string& value, UnescapingProcessor::TextType type) {
+		std::string result = value;
+		for (ConfiguredUnescapingProcessor p : unescapingProcessors) if (p.enbaled) result = p.processor->unescape(result, type);
+		return result;
+	}
 	bool isComment(char ch) {
 		return oneOf(ch, commentSeparators);
 	}
 	bool isQuote(char ch) {
 		} else {
 			throw std::invalid_argument(std::string("Unsupported INI dialect: ") + name);
 		}
 	}
+	bool setUnescaping(const std::string& uri, const std::string& value) {
+		for (ConfiguredUnescapingProcessor& p : unescapingProcessors) {
+			if (p.uri == uri) {
+				p.enbaled = parseBoolean(value);
+				return true;
+			}
+		}
+		return false;
+	}
 public:
 	INIReaderImpl(std::istream& input) : input(input) {
 	}
 		else if (uri == "allow-sub-keys") allowSubKeys = parseBoolean(value);
 		else if (uri == "comment-separators") commentSeparators = value;
 		else if (uri == "key-value-separators") keyValueSeparators = value;
 		else if (uri == "quotes") quotes = value;
 		else if (uri == "dialect") setDialect(value);
+		else if (setUnescaping(uri, value));
 		else throw std::invalid_argument(std::string("Invalid parser option: „") + uri + "“ with value: „" + value + "“");
 	}
 	void addHandler(INIContentHandler* handler) override {
 		handlers.push_back(handler);
+	}
+	void addUnescapingProcessor(std::shared_ptr<UnescapingProcessor> processor, const std::string uri, bool enabledByDefault) override {
+		unescapingProcessors.push_back({processor, uri, enabledByDefault});
 	}
 	void process() override {
 		for (INIContentHandler* handler : handlers) handler->startDocument();
 				event.eventNumber = ++eventNumber;
 				get();
 				readAllWhitespace();
 				event.name = readTokenAndEatTerminator(']', &quote, &found);
 				if (!quote) event.name = trim(event.name);
+				event.name = unescape(event.name, UnescapingProcessor::TextType::SectionName);
 				readSpacesAndTabs();
 				if (allowSectionTags && peek() == '[') {
 					get();
 					event.tag = readTokenAndEatTerminator(']', &quote, &found);
+					event.tag = unescape(event.tag, UnescapingProcessor::TextType::SectionTag);
 				}
 				readSpacesAndTabs();
 				ch = peek();
 				if (isComment(ch)) {
 					get();
 					readSpacesAndTabs();
 					event.comment = readUntil('\n', &found);
+					event.comment = unescape(event.comment, UnescapingProcessor::TextType::SectionComment);
 				} else if (ch == '\n') {
 					get();
 				} else {
 					throw std::logic_error(std::string("unexpected content after the section: '") + event.name + "'");
 				}
 				event.lineNumber = lineNumber;
 				event.eventNumber = ++eventNumber;
 				get();
 				readSpacesAndTabs();
 				event.comment = readUntil('\n', &found);
+				event.comment = unescape(event.comment, UnescapingProcessor::TextType::Comment);
 				for (INIContentHandler* handler : handlers) handler->comment(event);
 			} else {
 				INIContentHandler::EntryEvent event;
 				event.lineNumber = lineNumber;
 				event.eventNumber = ++eventNumber;
 					std::smatch match;
 					if (std::regex_match(fullKey, match, std::regex("([^\\[]+)\\[([^\\[]+)\\]"))) {
 						event.key = match[1];
 						event.subKey = match[2];
 						event.fullKey = fullKey;
+						event.subKey = unescape(event.subKey, UnescapingProcessor::TextType::EntryKey);
 					}
 				}
+				event.key = unescape(event.key, UnescapingProcessor::TextType::EntryKey);
+				event.fullKey = unescape(event.fullKey, UnescapingProcessor::TextType::EntryKey);
+				event.value = unescape(event.value, UnescapingProcessor::TextType::EntryValue);
 				if (quote) {
 					readSpacesAndTabs();
 					ch = peek();
 					if (isComment(ch)) {
 						get();
 						readSpacesAndTabs();
 						event.comment = readUntil('\n', &found);
+						event.comment = unescape(event.comment, UnescapingProcessor::TextType::EntryComment);
 					} else if (ch == '\n') {
 						get();
 					} else {
 						// TODO: optional support for multiple tokens in a single entry?
 						// modes: array, concatenate

branch	v_0
changeset 27	e9aad9dd823a
parent 26	b1f6fa3a6555
child 28	596a724fbb83