Streamline parsing functions

Author: raxbg

src/Value/CSSFunction.php

@@ -3,6 +3,7 @@
 namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parsing\ParserState;
 
 /**
  * A `CSSFunction` represents a special kind of value that also contains a function name and where the values are the
@@ -32,6 +33,26 @@ public function __construct($sName, $aArguments, $sSeparator = ',', $iLineNo = 0
         parent::__construct($aArguments, $sSeparator, $iLineNo);
     }
 
+    /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
+     * @return CSSFunction
+     *
+     * @throws SourceException
+     * @throws UnexpectedEOFException
+     * @throws UnexpectedTokenException
+     */
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
+    {
+        $mResult = $oParserState->parseIdentifier($bIgnoreCase);
+        $oParserState->consume('(');
+        $aArguments = Value::parseValue($oParserState, array('=', ' ', ','));
+        $mResult = new CSSFunction($mResult, $aArguments, ',', $oParserState->currentLine());
+        $oParserState->consume(')');
+        return $mResult;
+    }
+
     /**
      * @return string
      */

src/Value/CalcFunction.php

@@ -19,12 +19,15 @@ class CalcFunction extends CSSFunction
     const T_OPERATOR = 2;
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return CalcFunction
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aOperators = ['+', '-', '*', '/'];
         $sFunction = $oParserState->parseIdentifier();

src/Value/Color.php

@@ -23,12 +23,15 @@ public function __construct(array $aColor, $iLineNo = 0)
     }
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return Color|CSSFunction
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aColor = [];
         if ($oParserState->comes('#')) {

src/Value/Value.php

@@ -110,17 +110,13 @@ public static function parseIdentifierOrFunction(ParserState $oParserState, $bIg
         $mResult = $oParserState->parseIdentifier($bIgnoreCase);
 
         if ($oParserState->comes('(')) {
+            $oAnchor->backtrack();
             if ($oParserState->streql('url', $mResult)) {
-                $oAnchor->backtrack();
                 $mResult = URL::parse($oParserState);
             } else if ($oParserState->streql('calc', $mResult) || $oParserState->streql('-webkit-calc', $mResult) || $oParserState->streql('-moz-calc', $mResult)) {
-                $oAnchor->backtrack();
                 $mResult = CalcFunction::parse($oParserState);
             } else {
-                $oParserState->consume('(');
-                $aArguments = Value::parseValue($oParserState, array('=', ' ', ','));
-                $mResult = new CSSFunction($mResult, $aArguments, ',', $oParserState->currentLine());
-                $oParserState->consume(')');
+                $mResult = CSSFunction::parse($oParserState, $bIgnoreCase);
             }
         }