Resolve issues with using exceptions for flow control

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -120,11 +120,9 @@ private static function parseAtRule(ParserState $oParserState) {
 			return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {
 			$sCharset = CSSString::parse($oParserState);
-			try {
-				$oParserState->consumeWhiteSpace();
+			$oParserState->consumeWhiteSpace();
+			if (!$oParserState->isEnd()) {
 				$oParserState->consume(';');
-			} catch (UnexpectedEOFException $e) {
-				// Nothing fatal, file ended before ; was found
 			}
 			return new Charset($sCharset, $iIdentifierLineNum);
 		} else if (self::identifierIs($sIdentifier, 'keyframes')) {
@@ -143,11 +141,7 @@ private static function parseAtRule(ParserState $oParserState) {
 				$sPrefix = $mUrl;
 				$mUrl = Value::parsePrimitiveValue($oParserState);
 			}
-			try {
-				$oParserState->consume(';');
-			} catch (UnexpectedEOFException $e) {
-				// Nothing fatal, file ended before ; was found
-			}
+			$oParserState->consume(';');
 			if ($sPrefix !== null && !is_string($sPrefix)) {
 				throw new UnexpectedTokenException('Wrong namespace prefix', $sPrefix, 'custom', $iIdentifierLineNum);
 			}

lib/Sabberworm/CSS/Parsing/ParserState.php

@@ -216,30 +216,24 @@ public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, a
 		$out = '';
 		$start = $this->iCurrentPosition;
 
-		try {
-			while (true) {
-				$char = $this->consume(1);
-				if (in_array($char, $aEnd)) {
-					if ($bIncludeEnd) {
-						$out .= $char;
-					} elseif (!$consumeEnd) {
-						$this->iCurrentPosition -= $this->strlen($char);
-					}
-					return $out;
-				}
-				$out .= $char;
-				if ($comment = $this->consumeComment()) {
-					$comments[] = $comment;
+		while (!$this->isEnd()) {
+			$char = $this->consume(1);
+			if (in_array($char, $aEnd)) {
+				if ($bIncludeEnd) {
+					$out .= $char;
+				} elseif (!$consumeEnd) {
+					$this->iCurrentPosition -= $this->strlen($char);
 				}
-			}
-		} catch (UnexpectedEOFException $e) {
-			if (in_array(self::EOF, $aEnd)) {
 				return $out;
-			} else {
-				// Reset the position and forward the EOF exception, so the caller can distinguish between EOF and the standard unexpected token error
-				$this->iCurrentPosition = $start;
-				throw $e;
 			}
+			$out .= $char;
+			if ($comment = $this->consumeComment()) {
+				$comments[] = $comment;
+			}
+		}
+
+		if (in_array(self::EOF, $aEnd)) {
+			return $out;
 		}
 
 		$this->iCurrentPosition = $start;