Convert some more code to make use of ParserState::EOF and UnexpectedEOFException

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -114,16 +114,12 @@ private static function parseAtRule(ParserState $oParserState) {
 			if (!$oParserState->comes(';')) {
 				$sMediaQuery = trim($oParserState->consumeUntil(array(';', ParserState::EOF)));
 			}
-			if (!$oParserState->isEnd()) {
-				$oParserState->consume(';');
-			}
+			$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
 			return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {
 			$sCharset = CSSString::parse($oParserState);
 			$oParserState->consumeWhiteSpace();
-			if (!$oParserState->isEnd()) {
-				$oParserState->consume(';');
-			}
+			$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
 			return new Charset($sCharset, $iIdentifierLineNum);
 		} else if (self::identifierIs($sIdentifier, 'keyframes')) {
 			$oResult = new KeyFrame($iIdentifierLineNum);
@@ -141,9 +137,7 @@ private static function parseAtRule(ParserState $oParserState) {
 				$sPrefix = $mUrl;
 				$mUrl = Value::parsePrimitiveValue($oParserState);
 			}
-			if (!$oParserState->isEnd()) {
-				$oParserState->consume(';');
-			}
+			$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
 			if ($sPrefix !== null && !is_string($sPrefix)) {
 				throw new UnexpectedTokenException('Wrong namespace prefix', $sPrefix, 'custom', $iIdentifierLineNum);
 			}

lib/Sabberworm/CSS/Parsing/ParserState.php

@@ -237,7 +237,7 @@ public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, a
 		}
 
 		$this->iCurrentPosition = $start;
-		throw new UnexpectedTokenException('One of ("'.implode('","', $aEnd).'")', $this->peek(5), 'search', $this->iLineNo);
+		throw new UnexpectedEOFException('One of ("'.implode('","', $aEnd).'")', $this->peek(5), 'search', $this->iLineNo);
 	}
 
 	private function inputLeft() {