Added Origin types

Added an Origin function and Origin variable types.

Author: gregpriday

CSSParser.php

@@ -146,6 +146,25 @@ private function parseStringValue() {
 		return new CSSString($sResult);
 	}
 
+	private function parseOriginVariable() {
+		$this->consume('$');
+		$sValue = $this->parseIdentifier(false);
+		
+		return new CSSOriginVariable($sValue);
+	}
+	
+	private function parseOriginFunction() {
+		$this->consume('@');
+		
+		// Get the function name
+		$fName = $this->parseIdentifier(false);
+		$this->consume('(');
+		$result = new CSSOriginFunction($fName, $this->parseValue(array('=', ',')));
+		$this->consume(')');
+		return $result;
+		
+	}
+	
 	private function parseCharacter($bIsForIdentifier) {
 		if($this->peek() === '\\') {
 			$this->consume('\\');
@@ -176,7 +195,8 @@ private function parseCharacter($bIsForIdentifier) {
 			return iconv('utf-32le', $this->sCharset, $sUtf32);
 		}
 		if($bIsForIdentifier) {
-			if(preg_match('/[a-zA-Z0-9]|-|_/u', $this->peek()) === 1) {
+			// We modified this to allow $section->name variables inside CSS functions
+			if(preg_match('/[a-zA-Z0-9\>\$]|-|_/u', $this->peek()) === 1) {
 				return $this->consume(1);
 			} else if(ord($this->peek()) > 0xa1) {
 				return $this->consume(1);
@@ -291,6 +311,11 @@ private function parsePrimitiveValue() {
 			$oValue = $this->parseURLValue();
 		} else if($this->comes("'") || $this->comes('"')){
 			$oValue = $this->parseStringValue();
+		} else if($this->comes('$')) {
+			// This is part of the custom origin variable parsing
+			$oValue = $this->parseOriginVariable();
+		} else if($this->comes('@')) {
+			$oValue = $this->parseOriginFunction();
 		} else {
 			$oValue = $this->parseIdentifier();
 		}
@@ -461,5 +486,4 @@ private function consumeUntil($sEnd) {
 	private function inputLeft() {
 		return mb_substr($this->sText, $this->iCurrentPosition, -1, $this->sCharset);
 	}
-}
-
+}

README.md

@@ -3,6 +3,18 @@ PHP CSS Parser
 
 A Parser for CSS Files written in PHP. Allows extraction of CSS files into a data structure, manipulation of said structure and output as (optimized) CSS.
 
+## Modifications
+
+This version of PHP CSS Parser has been modified to work with the origin framework.
+
+### CSS Origin Function
+
+Added an Origin Function type, based on a standard CSS function. It's prefixed by @
+
+### Origin Variable
+
+Variables entered into CSS. Prefixed with $
+
 ## Usage
 
 ### Installation

lib/CSSList.php

@@ -149,27 +149,37 @@ public function getSelectorsBySpecificity($sSpecificitySearch = null) {
 		return $aResult;
 	}
 
-  /**
-   * Expands all shorthand properties to their long value
-   */ 
-  public function expandShorthands()
-  {
-    foreach($this->getAllDeclarationBlocks() as $oDeclaration)
-    {
-      $oDeclaration->expandShorthands();
-    }
-  }
+	/**
+	* Expands all shorthand properties to their long value
+	*/ 
+	public function expandShorthands() {
+		foreach($this->getAllDeclarationBlocks() as $oDeclaration) {
+			$oDeclaration->expandShorthands();
+		}
+	}
 
-  /*
-   * Create shorthands properties whenever possible
-   */
-  public function createShorthands()
-  {
-    foreach($this->getAllDeclarationBlocks() as $oDeclaration)
-    {
-      $oDeclaration->createShorthands();
-    }
-  }
+	/*
+	* Create shorthands properties whenever possible
+	*/
+	public function createShorthands() {
+		foreach($this->getAllDeclarationBlocks() as $oDeclaration) {
+			$oDeclaration->createShorthands();
+		}
+	}
+	
+	/**
+	 * Inserts values and executes functions defined by the executor.
+	 */
+	public function originProcess($values, $executor){
+		
+	}
+	
+	/**
+	 * @return array() Which origin variables affect which rules
+	 */
+	public function originGetRules(){
+		
+	}
 }
 
 /**

lib/CSSProperties.php

@@ -108,3 +108,36 @@ public function __toString() {
 	}
 }
 
+/**
+ * An Origin framework style variable.
+ */
+class CSSOriginVariable extends CSSPrimitiveValue {
+	private $v;
+	
+	/**
+	 * @var string The proccessed variable
+	 */
+	private $pr;
+	
+	public function __construct($v){
+		$this->v = $v;
+		$this->p = null;
+	}
+	
+	public function getVar(){
+		return $this->v;
+	}
+	
+	/**
+	 * Substitutes values from the values array.
+	 *
+	 * @para array $values The values
+	 */
+	public function process($values){
+		
+	}
+	
+	public function __toString() {
+		return $this->p;
+	}
+}

lib/CSSRule.php

@@ -89,4 +89,36 @@ public function getColorDescription() {
 	}
 }
 
+class CSSOriginFunction extends CSSValueList {
+	private $sName;
+	public function __construct($sName, $aArguments) {
+		$this->sName = $sName;
+		parent::__construct($aArguments);
+	}
+	
+	/**
+	 * Executes an origin function
+	 */
+	public function execute($executor) {
+		
+	}
+
+	public function getName() {
+		return $this->sName;
+	}
+
+	public function setName($sName) {
+		$this->sName = $sName;
+	}
+
+	public function getArguments() {
+		return $this->aComponents;
+	}
+
+	public function __toString() {
+		$aArguments = parent::__toString();
+		return "{$this->sName}({$aArguments})";
+	}
+}
+