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

equal deleted inserted replaced

-:967f73af64a4
+:9187f0439ca9
 	 *  - https://userbase.kde.org/KDE_System_Administration/Configuration_Files#Shell_Expansion
 	 *  - https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
 	 */
 	bool allowSubKeys = true;
+	/**
+	 * This might be configurable.
+	 *
+	 * Classic INI uses „key=value“ syntax.
+	 * But some other formats/dialects might use key:value.
+	 *
+	 * Only single character separators are supported.
+	 * If multiple separators should be recognized (e.g. both „=“ and „:“), this string will contain all of them,
+	 * i.e. „:=“ does not mean that the „key:=value“ syntax, but „key=value“ or „key:value“.
+	 */
+	std::string keyValueSeparators = "=";
 	int lineNumber = 1;
 	int eventNumber = 0;
 	/**
 	 * Should be always used instead of input.peek().
 	void processContinuingLine(std::stringstream& result) {
 		if (consumeLeadingSpacesOnContinuingLines) readSpacesAndTabs();
 		else result.put('\n');
 	}
-	std::string readUntil(char until, bool* found = nullptr) {
+	std::string readUntil(const char until, bool* found = nullptr) {
+		return readUntil(std::string(1, until), found);
+	}
+	std::string readUntil(const std::string& until, bool* found = nullptr) {
 		std::stringstream result;
-		for (char ch = peek(); input.good() && ch != until; ch = peek()) {
+		for (char ch = peek(); input.good() && !oneOf(ch, until); ch = peek()) {
 			if (ch == '\\') {
 				get();
 				ch = get();
-				if (ch == until && ch == '\n') processContinuingLine(result);
+				if (oneOf(ch, until) && ch == '\n') processContinuingLine(result);
-				else if (ch == until) result.put(ch);
+				else if (oneOf(ch, until)) result.put(ch);
 				else if (ch == std::istream::traits_type::eof()) break;
 				else result.put('\\').put(ch);
-				// TODO: two-stage and modular unescaping: here unescape only \+LF or more genereally: unescape only the until character and rest leave untouched
+				// unescaping is done in two phases:
-				// second escaping stage move to separate class/wrapper (similar to hierarchical wrappers)
+				// here we unescape just the \n (LF)
+				// other escape sequences are leaved untouched and will be processed in later phases, see see UnescapingINIHandler
 			} else {
 				ch = get();
 				result.put(ch);
 			}
 		}
-		if (peek() == until) {
+		if (oneOf(peek(), until)) {
 			get();
 			if (found) *found = true;
 		} else {
 			if (found) *found = false;
 		}
 		return result.str();
 	}
-	std::string readToken(char until, char* quote = nullptr, bool* found = nullptr) {
+	std::string readToken(const char until, char* quote = nullptr, bool* found = nullptr) {
+		return readToken(std::string(1, until), quote, found);
+	}
+	std::string readToken(const std::string& until, char* quote = nullptr, bool* found = nullptr) {
 		std::string result;
 		char ch = peek();
 		if (isQuote(ch)) {
 			if (quote) *quote = ch;
-			result = readUntil(get(), found);
+			result = readUntil(std::string(1, get()), found);
 		} else {
 			if (quote) *quote = 0;
 			result = readUntil(until, found);
 		}
 		return result;
 	}
 	std::string readTokenAndEatTerminator(char until, char* quote = nullptr, bool* found = nullptr) {
+		return readTokenAndEatTerminator(std::string(1, until), quote, found);
+	}
+	std::string readTokenAndEatTerminator(const std::string& until, char* quote = nullptr, bool* found = nullptr) {
 		std::string result = readToken(until, quote, found);
 		if (*quote) {
 			readAllWhitespace();
-			if (get() != until) throw std::logic_error(std::string("missing „") + std::string(1, until) + "“ after quoted section name");
+			if (!oneOf(get(), until)) throw std::logic_error(std::string("missing „") + until + "“ after quoted section name");
 		}
 		return result;
 	}
 	bool isComment(char ch) {
 		return ch == '#' || ch == ';';
 	}
 	bool isQuote(char ch) {
 		return ch == '"' || ch == '\'';
+	}
+	/**
+	 * @param ch character to be evaluated
+	 * @param options list of options (characters)
+	 * @return whether ch is one of options
+	 */
+	bool oneOf(char ch, const std::string& options) {
+		return options.find(ch) != std::string::npos;
 	}
 	std::string trim(std::string s) {
 		return std::regex_replace(s, std::regex("^\\s+|\\s+$"), "");
 	}
 			} else {
 				INIContentHandler::EntryEvent event;
 				event.lineNumber = lineNumber;
 				event.eventNumber = ++eventNumber;
-				std::string fullKey = readToken('=', &quote, &found);
+				std::string fullKey = readToken(keyValueSeparators, &quote, &found);
 				if (!found) throw std::logic_error(std::string("missing = after key: '") + fullKey + "'");
 				if (!quote) fullKey = trim(fullKey);
 				readSpacesAndTabs();
 				if (quote) {
 					ch = get();
-					if (ch == '=') readSpacesAndTabs();
+					if (oneOf(ch, keyValueSeparators)) readSpacesAndTabs();
 					else throw std::logic_error(std::string("missing = after quoted key: '") + fullKey + "'");
 				}
 				std::string value = readToken('\n', &quote, &found);
 				if (!quote) value = trim(value);

branch	v_0
changeset 20	9187f0439ca9
parent 19	967f73af64a4
child 21	b35baebf5005