Parse simple expressions

src/Value/CSSFunction.php

@@ -67,7 +67,7 @@ private static function parseName(ParserState $oParserState, bool $bIgnoreCase =
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
      */
-    private static function parseArguments(ParserState $oParserState)
+    protected static function parseArguments(ParserState $oParserState)
     {
         return Value::parseValue($oParserState, ['=', ' ', ',']);
     }

src/Value/Expression.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Sabberworm\CSS\Value;
+
+use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parsing\ParserState;
+
+/**
+ * An `Expression` represents a special kind of value that is comprised of multiple components wrapped in parenthesis.
+ * Examle `height: (vh - 10);`.
+ */
+class Expression extends CSSFunction
+{
+    /**
+     * @throws SourceException
+     * @throws UnexpectedEOFException
+     * @throws UnexpectedTokenException
+     */
+    public static function parse(ParserState $oParserState, bool $bIgnoreCase = false): Expression
+    {
+        $oParserState->consume('(');
+        $aArguments = parent::parseArguments($oParserState);
+        $mResult = new Expression("", $aArguments, ',', $oParserState->currentLine());
+        $oParserState->consume(')');
+        return $mResult;
+    }
+}

src/Value/Value.php

@@ -162,6 +162,8 @@ public static function parsePrimitiveValue(ParserState $oParserState)
             $oValue = LineName::parse($oParserState);
         } elseif ($oParserState->comes('U+')) {
             $oValue = self::parseUnicodeRangeValue($oParserState);
+        } elseif ($oParserState->comes("(")) {
+            $oValue = Expression::parse($oParserState);
         } else {
             $sNextChar = $oParserState->peek(1);
             try {

tests/ParserTest.php

@@ -513,6 +513,20 @@ public function expandShorthands(): void
         self::assertSame($sExpected, $oDoc->render());
     }
 
+    /**
+     * @test
+     */
+    public function parseExpressions(): void
+    {
+        $oDoc = self::parsedStructureForFile('expressions');
+        $sExpected = 'div {height: (vh - 10);}'
+            . "\n"
+            . 'div {height: (vh - 10)/2;}'
+            . "\n"
+            . 'div {height: max(5,(vh - 10));}';
+        self::assertSame($sExpected, $oDoc->render());
+    }
+
     /**
      * @test
      */
@@ -689,8 +703,8 @@ public function calcNestedInFile(): void
     public function invalidCalcInFile(): void
     {
         $oDoc = self::parsedStructureForFile('calc-invalid', Settings::create()->withMultibyteSupport(true));
-        $sExpected = 'div {}
-div {}
+        $sExpected = 'div {height: calc (25% - 1em);}
+div {height: calc (25% - 1em);}
 div {}
 div {height: -moz-calc;}
 div {height: calc;}';
@@ -1239,6 +1253,19 @@ public function lonelyImport(): void
         self::assertSame($sExpected, $oDoc->render());
     }
 
+    /**
+     * @test
+     */
+    public function functionArithmeticInFile(): void
+    {
+        $oDoc = self::parsedStructureForFile('function-arithmetic', Settings::create()->withMultibyteSupport(true));
+        $sExpected = 'div {height: max(300,vh + 10);}
+div {height: max(300,vh - 10);}
+div {height: max(300,vh * 10);}
+div {height: max(300,vh / 10);}';
+        self::assertSame($sExpected, $oDoc->render());
+    }
+
     public function escapedSpecialCaseTokens(): void
     {
         $oDoc = $this->parsedStructureForFile('escaped-tokens');

tests/Value/ExpressionTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Sabberworm\CSS\Tests\Value;
+
+use PHPUnit\Framework\TestCase;
+use Sabberworm\CSS\Parsing\ParserState;
+use Sabberworm\CSS\Settings;
+use Sabberworm\CSS\Value\Value;
+use Sabberworm\CSS\Value\ValueList;
+use Sabberworm\CSS\Value\Expression;
+use Sabberworm\CSS\Rule\Rule;
+
+/**
+ * @covers \Sabberworm\CSS\Value\Expression
+ */
+final class ExpressionTest extends TestCase
+{
+    /**
+     * @return array<0, array{string: string}>
+     */
+    public static function provideExpressions(): array
+    {
+        return [
+            [
+                'input' => '(vh - 10) / 2',
+                'expected_output' => '(vh - 10)/2',
+                'expression_index' => 0,
+            ],
+            [
+                'input' => 'max(5, (vh - 10))',
+                'expected_output' => 'max(5,(vh - 10))',
+                'expression_index' => 1
+            ],
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @dataProvider provideExpressions
+     */
+    public function parseExpressions(string $input, string $expected, int $expression_index): void
+    {
+        $val = Value::parseValue(
+            new ParserState($input, Settings::create()),
+            $this->getDelimiters('height')
+        );
+
+        self::assertInstanceOf(ValueList::class, $val);
+        self::assertInstanceOf(Expression::class, $val->getListComponents()[$expression_index]);
+        self::assertSame($expected, (string) $val);
+    }
+
+    private function getDelimiters(string $rule): array
+    {
+        $closure = function($rule) {
+            return self::listDelimiterForRule($rule);
+        };
+
+        $getter = $closure->bindTo(null, Rule::class);
+        return $getter($rule);
+    }
+}

tests/fixtures/expressions.css

@@ -0,0 +1,11 @@
+div {
+    height: (vh - 10);
+}
+
+div {
+    height: (vh - 10) / 2;
+}
+
+div {
+    height: max(5, (vh - 10));
+}

tests/fixtures/function-arithmetic.css

@@ -0,0 +1,12 @@
+div {
+    height: max(300, vh + 10);
+}
+div {
+    height: max(300, vh - 10);
+}
+div {
+    height: max(300, vh * 10);
+}
+div {
+    height: max(300, vh / 10);
+}