Fixed issues with the pattern matchers for tokenising.

Enabled value class to understand how to parse and compile arithmetic operators.

Author: hexydec

src/cssdoc/cssdoc.php

@@ -11,8 +11,8 @@ class cssdoc {
 	   'whitespace' => '\s++',
 	   'comment' => '\\/\\*[\d\D]*?\\*\\/',
 	   'quotes' => '(?<!\\\\)("(?:[^"\\\\]++|\\\\.)*+"|\'(?:[^\'\\\\]++|\\\\.)*+\')',
-	   'join' => '[>+~]',
 	   'comparison' => '[\^*$<>]?=', // comparison operators for media queries or attribute selectors
+	   'join' => '[>+~*\\/-]',
 	   'curlyopen' => '{',
 	   'curlyclose' => '}',
 	   'squareopen' => '\[',
@@ -23,7 +23,7 @@ class cssdoc {
 	   'colon' => ':',
 	   'semicolon' => ';',
 	   'directive' => '@[a-z-]++',
-	   'string' => '!?[^\[\]{}\(\):;,>+~\^$!" \n\r\t]++'
+	   'string' => '!?[^\[\]{}\(\):;,>+~\^$!" \n\r\t\/]++'
 	];
 
 	/**

src/cssdoc/tokens/selector.php

@@ -40,6 +40,11 @@ public function parse(array &$tokens) : bool {
 						$join = ' ';
 					}
 					break;
+				case 'join':
+					if ($token['value'] != '*') {
+						$join = $token['value'];
+						break;
+					}
 				case 'string':
 					$this->selectors[] = [
 						'selector' => $token['value'],
@@ -102,9 +107,6 @@ public function parse(array &$tokens) : bool {
 				case 'comma':
 					prev($tokens);
 					break 2;
-				case 'join':
-					$join = $token['value'];
-					break;
 			}
 		} while (($token = next($tokens)) !== false);
 		return !empty($this->selectors);

src/cssdoc/tokens/value.php

@@ -36,6 +36,7 @@ public function parse(array &$tokens) : bool {
 		do {
 			switch ($token['type']) {
 				case 'string':
+				case 'join':
 					if ($token['value'] == '!important') {
 						prev($tokens);
 						break 2;
@@ -130,7 +131,7 @@ public function compile(array $options) : string {
 				}
 				$css .= '('.$item->compile($options).')';
 				$join = ' ';
-			} elseif ($item == ':') {
+			} elseif (in_array($item, [':', '-', '+'])) {
 				$css .= $item;
 				$join = '';
 			} else {