Begin selector parsing impl

Author: sabberworm

lib/Sabberworm/CSS/OutputFormat.php

@@ -38,6 +38,11 @@ class OutputFormat {
 	// This is what’s printed before and after the comma if a declaration block contains multiple selectors.
 	public $sSpaceBeforeSelectorSeparator = '';
 	public $sSpaceAfterSelectorSeparator = ' ';
+
+	// This is what’s printed before and after combinators in selectors
+	public $sSpaceBeforeSelectorCombinator = ' ';
+	public $sSpaceAfterSelectorCombinator = ' ';
+
 	// This is what’s printed after the comma of value lists
 	public $sSpaceBeforeListArgumentSeparator = '';
 	public $sSpaceAfterListArgumentSeparator = '';
@@ -147,11 +152,22 @@ public static function create() {
 	}
 
 	public static function createCompact() {
-		return self::create()->set('Space*Rules', "")->set('Space*Blocks', "")->setSpaceAfterRuleName('')->setSpaceBeforeOpeningBrace('')->setSpaceAfterSelectorSeparator('');
+		return self::create()
+			->set('Space*Rules', "")
+			->set('Space*Blocks', "")
+			->setSpaceAfterRuleName('')
+			->setSpaceBeforeOpeningBrace('')
+			->setSpaceAfterSelectorSeparator('')
+			->setSpaceBeforeSelectorCombinator('')
+			->setSpaceAfterSelectorCombinator('');
 	}
 
 	public static function createPretty() {
-		return self::create()->set('Space*Rules', "\n")->set('Space*Blocks', "\n")->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', array('default' => '', ',' => ' '));
+		return self::create()
+			->set('Space*Rules', "\n")
+			->set('Space*Blocks', "\n")
+			->setSpaceBetweenBlocks("\n\n")
+			->set('SpaceAfterListArgumentSeparator', array('default' => '', ',' => ' '));
 	}
 }
 
@@ -211,6 +227,14 @@ public function spaceAfterSelectorSeparator() {
 		return $this->space('AfterSelectorSeparator');
 	}
 
+	public function spaceBeforeSelectorCombinator() {
+		return $this->space('AfterSelectorSeparator');
+	}
+
+	public function spaceAfterSelectorCombinator() {
+		return $this->space('AfterSelectorSeparator');
+	}
+
 	public function spaceBeforeListArgumentSeparator($sSeparator) {
 		return $this->space('BeforeListArgumentSeparator', $sSeparator);
 	}

lib/Sabberworm/CSS/Property/Selector.php

@@ -2,10 +2,13 @@
 
 namespace Sabberworm\CSS\Property;
 
+use Sabberworm\CSS\Renderable;
+use Sabberworm\CSS\Parsing\ParserState;
+
 /**
  * Class representing a single CSS selector. Selectors have to be split by the comma prior to being passed into this class.
  */
-class Selector {
+class Selector implements Renderable {
 
 	//Regexes for specificity calculations
 	const NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX = '/
@@ -37,14 +40,20 @@ class Selector {
 
 	private $sSelector;
 	private $iSpecificity;
+	private $iLineNo;
 
-	public function __construct($sSelector, $bCalculateSpecificity = false) {
+	public function __construct($sSelector, $bCalculateSpecificity = false, $iLineNo = 0) {
 		$this->setSelector($sSelector);
+		$this->iLineNo = $iLineNo;
 		if ($bCalculateSpecificity) {
 			$this->getSpecificity();
 		}
 	}
 
+	public static function parse(ParserState $oParserState, $aExpectedEnd = array('{', ',')) {
+		
+	}
+
 	public function getSelector() {
 		return $this->sSelector;
 	}
@@ -58,6 +67,10 @@ public function __toString() {
 		return $this->getSelector();
 	}
 
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return $this->getSelector();
+	}
+
 	public function getSpecificity() {
 		if ($this->iSpecificity === null) {
 			$a = 0;

lib/Sabberworm/CSS/RuleSet/Selector/AdjacentSiblingCombinator.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+abstract class AdjacentSiblingCombinator extends SelectorPart {
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return $oOutputFormat->spaceBeforeSelectorCombinator().'+'.$oOutputFormat->spaceAfterSelectorCombinator();
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/AttributeSelector.php

@@ -0,0 +1 @@
+WIP

lib/Sabberworm/CSS/RuleSet/Selector/ChildCombinator.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+abstract class ChildCombinator extends SelectorPart {
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return $oOutputFormat->spaceBeforeSelectorCombinator().'>'.$oOutputFormat->spaceAfterSelectorCombinator();
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/ClassSelector.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+use Sabberworm\CSS\Renderable;
+
+abstract class ClassSelector extends SelectorPart {
+	private $sClassName;
+
+	public function __construct($sClassName = false, $iLineNo = 0) {
+		parent::__construct($iLineNo);
+		$this->sClassName = $sClassName;
+	}
+
+	public function getClassName() {
+		return $this->sClassName;
+	}
+
+	public function setClassName($sClassName) {
+		$this->sClassName = $sClassName;
+	}
+
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return '.' . $this->sClassName;
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/DescendantCombinator.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+abstract class DescendantCombinator extends SelectorPart {
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return ' ';
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/GeneralSiblingCombinator.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+abstract class GeneralSiblingCombinator extends SelectorPart {
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return $oOutputFormat->spaceBeforeSelectorCombinator().'~'.$oOutputFormat->spaceAfterSelectorCombinator();
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/IDSelector.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet\Selector;
+
+use Sabberworm\CSS\Renderable;
+
+abstract class IDSelector extends SelectorPart {
+	private $sId;
+
+	public function __construct($sId = false, $iLineNo = 0) {
+		parent::__construct($iLineNo);
+		$this->sId = $sId;
+	}
+
+	public function getId() {
+		return $this->sId;
+	}
+
+	public function setId($sId) {
+		$this->sId = $sId;
+	}
+
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return '#' . $this->sId;
+	}
+}

lib/Sabberworm/CSS/RuleSet/Selector/NamespaceSelector.php

@@ -0,0 +1 @@
+WIP