diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/css/CSSParser.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/css/CSSParser.cpp b/src/plugins/css/CSSParser.cpp index d239359..22752dd 100644 --- a/src/plugins/css/CSSParser.cpp +++ b/src/plugins/css/CSSParser.cpp @@ -125,12 +125,18 @@ 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 } // if we find a comma, we can proceed parsing selectors. Token t; @@ -292,6 +298,13 @@ 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? @@ -305,6 +318,7 @@ bool CSSParser::expect(int expectedType, CodeTokenizer &tokenizer, Token &t, // tokenizer.getInput().getLine(), // tokenizer.getInput().getColumn() }; +>>>>>>> 8a4203636865b6edc380b731c68d3483ca110a27:application/src/plugins/css/CSSParser.cpp } } else { tokenizer.resetPeek(); |