small refactorings regarding InputReader::parseAttributes()

Author: mgieseki

src/InputReader.cpp

@@ -371,11 +371,11 @@ string InputReader::getLine () {
 
 /** Parses a sequence of key-value pairs of the form KEY=VALUE or KEY="VALUE".
  *  If parameter 'requireValues' is false, attributes may also consist of a key only.
- *  @param[out] attr the scanned attributes
  *  @param[in] requireValues true if all attributes require a value
  *  @param[in] quotechars recognized quote characters used to enclose the attribute values
- *  @return number of attributes scanned */
-int InputReader::parseAttributes (map<string,string> &attr, bool requireValues, const char *quotechars) {
+ *  @return the scanned attributes  */
+map<string,string> InputReader::parseAttributes (bool requireValues, const char *quotechars) {
+	map<string,string> attribs;
 	while (!eof()) {
 		string key;
 		skipSpace();
@@ -389,12 +389,24 @@ int InputReader::parseAttributes (map<string,string> &attr, bool requireValues,
 			get();
 			skipSpace();
 			string val = getQuotedString(quotechars);
-			attr.emplace(std::move(key), std::move(val));
+			attribs.emplace(std::move(key), std::move(val));
 		}
 		else if (!requireValues)
-			attr.emplace(std::move(key), "");
+			attribs.emplace(std::move(key), "");
 	}
-	return int(attr.size());
+	return attribs;
+}
+
+
+/** Parses a sequence of key-value pairs of the form KEY=VALUE or KEY="VALUE".
+ *  If parameter 'requireValues' is false, attributes may also consist of a key only.
+ *  @param[out] attribs the scanned attributes
+ *  @param[in] requireValues true if all attributes require a value
+ *  @param[in] quotechars recognized quote characters used to enclose the attribute values
+ *  @return number of attributes scanned */
+int InputReader::parseAttributes (map<string,string> &attribs, bool requireValues, const char *quotechars) {
+	attribs = parseAttributes(requireValues, quotechars);
+	return int(attribs.size());
 }
 
 //////////////////////////////////////////
@@ -424,4 +436,4 @@ streamsize BufferInputReader::read (char *buf, streamsize size) {
 	while (c >= 0 && size-- > 0)
 		*p++ = char(c);
 	return p-buf;
-}
+}

src/InputReader.hpp

@@ -56,6 +56,7 @@ class InputReader {
 		virtual std::string getString (const char *delim);
 		virtual std::string getLine ();
 		virtual int parseAttributes (std::map<std::string,std::string> &attr, bool requireValues, const char *quotechars=nullptr);
+		virtual std::map<std::string,std::string> parseAttributes (bool requireValues, const char *quotechars=nullptr);
 		virtual operator bool () const {return !eof();}
 };
 

src/PsSpecialHandler.cpp

@@ -231,8 +231,7 @@ bool PsSpecialHandler::process (const string &prefix, istream &is, SpecialAction
 					fileType = FileType::BITMAP;
 			}
 			map<string,string> attr;
-			in.parseAttributes(attr, false);
-			imgfile(fileType, fname, attr);
+			imgfile(fileType, fname, in.parseAttributes(false));
 		}
 	}
 	else if (prefix == "ps::") {

src/XMLParser.cpp

@@ -185,11 +185,8 @@ XMLElement* XMLParser::openElement (const string &tag) {
 	string name = ir.getString("/ \t\n\r");
 	ir.skipSpace();
 	unique_ptr<XMLElement> elemNode{createElementPtr(name)};
-	map<string, string> attribs;
-	if (ir.parseAttributes(attribs, true, "\"'")) {
-		for (const auto &attrpair : attribs)
-			elemNode->addAttribute(attrpair.first, attrpair.second);
-	}
+	for (const auto &attrpair : ir.parseAttributes(true, "\"'"))
+		elemNode->addAttribute(attrpair.first, attrpair.second);
 	ir.skipSpace();
 	XMLElement *elemPtr = elemNode.get();
 	if (ir.peek() == '/')       // end of empty element tag