diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/css/CSSParser.cpp | 37 | ||||
| -rw-r--r-- | src/plugins/xml/XmlParser.cpp | 3 |
2 files changed, 7 insertions, 33 deletions
diff --git a/src/plugins/css/CSSParser.cpp b/src/plugins/css/CSSParser.cpp index 22752dd..6653d9e 100644 --- a/src/plugins/css/CSSParser.cpp +++ b/src/plugins/css/CSSParser.cpp @@ -125,18 +125,9 @@ void CSSParser::parseSelectors(Rooted<SelectorNode> root, case 2: // as the parseSelector is supposed to parse only a SelectorPath // there should not be more than one leaf. -<<<<<<< HEAD:application/src/core/CSSParser.cpp - throw LoggableException{ - "Internal Error: More than one leaf in SelectorPath!", true, - tokenizer.getInput()}; -======= throw ParserException{ - "Internal Error: More than one leaf in SelectorPath!", "", - // TODO: Line handling? - // tokenizer.getInput().getLine(), - // tokenizer.getInput().getColumn() - }; ->>>>>>> 8a4203636865b6edc380b731c68d3483ca110a27:application/src/plugins/css/CSSParser.cpp + "Internal Error: More than one leaf in SelectorPath!", + tokenizer.getInput()}; } // if we find a comma, we can proceed parsing selectors. Token t; @@ -298,27 +289,11 @@ bool CSSParser::expect(int expectedType, CodeTokenizer &tokenizer, Token &t, if (end || t.tokenId != expectedType) { if (force) { if (end) { -<<<<<<< HEAD:application/src/core/CSSParser.cpp - throw LoggableException{"Unexpected end of file!", true, - tokenizer.getInput()}; - } else { - throw LoggableException{"Unexpected token!", true, - tokenizer.getInput()}; -======= - throw ParserException{ - "Unexpected end of file!", "", - // TODO: Line handling? - // tokenizer.getInput().getLine(), - // tokenizer.getInput().getColumn() - }; + throw ParserException{"Unexpected end of file!", + tokenizer.getInput()}; } else { - throw ParserException{ - "Unexpected token!", "", - // TODO: Line handling? - // tokenizer.getInput().getLine(), - // tokenizer.getInput().getColumn() - }; ->>>>>>> 8a4203636865b6edc380b731c68d3483ca110a27:application/src/plugins/css/CSSParser.cpp + throw ParserException{"Unexpected token!", + tokenizer.getInput()}; } } else { tokenizer.resetPeek(); diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp index afc7f14..ce2857e 100644 --- a/src/plugins/xml/XmlParser.cpp +++ b/src/plugins/xml/XmlParser.cpp @@ -208,8 +208,7 @@ Rooted<Node> XmlParser::parse(std::istream &is, ParserContext &ctx) const int column = XML_GetCurrentColumnNumber(&p); const XML_Error code = XML_GetErrorCode(&p); const std::string msg = std::string{XML_ErrorString(code)}; - throw ParserException{"XML Syntax Error: " + msg, line, column, - false}; + throw ParserException{"XML Syntax Error: " + msg, line, column}; } // Abort once there are no more bytes in the stream |