Merge pull request #175 from Level-2/Tokenizer-Rewrite

Tokenizer rewrite
Level-2 · Dec 9, 2017 · a9e060e · a9e060e
2 parents 8a12d16 + a1074b4
commit a9e060e
Show file tree

Hide file tree

Showing 68 changed files with 587 additions and 366 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 /** Builds a Transphorm instance from the 3 constituent parts. XML template string, TSS string and data */
 class Builder {

diff --git a/src/Cache.php b/src/Cache.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 class Cache {
 	private $cache;

diff --git a/src/Config.php b/src/Config.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 class Config {
 	private $properties = [];

diff --git a/src/Exception.php b/src/Exception.php
@@ -1,5 +1,10 @@
 <?php
-namespace Transphporm;
+/* @description     Transformation Style Sheets - Revolutionising PHP templating    *
+ * @author          Tom Butler tom@r.je                                             *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
+ * @version         1.2                                                             */
+ namespace Transphporm;
 class Exception extends \Exception {
     const PROPERTY = 'property';
     const TSS_FUNCTION = 'function';

diff --git a/src/FilePath.php b/src/FilePath.php
@@ -1,5 +1,10 @@
 <?php
-namespace Transphporm;
+/* @description     Transformation Style Sheets - Revolutionising PHP templating    *
+ * @author          Tom Butler tom@r.je                                             *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
+ * @version         1.2                                                             */
+ namespace Transphporm;
 class FilePath {
 	private $paths = ['.'];
 	private $baseDir;

diff --git a/src/Formatter/Date.php b/src/Formatter/Date.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Formatter;
 /** Date/time formatting for use in formmat: property*/
 class Date {

diff --git a/src/Formatter/HTMLFormatter.php b/src/Formatter/HTMLFormatter.php
@@ -1,5 +1,10 @@
 <?php
-namespace Transphporm\Formatter;
+/* @description     Transformation Style Sheets - Revolutionising PHP templating    *
+ * @author          Tom Butler tom@r.je                                             *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
+ * @version         1.2                                                             */
+ namespace Transphporm\Formatter;
 class HTMLFormatter {
     private $templateFunction;
 

diff --git a/src/Formatter/Nl2brFormat.php b/src/Formatter/Nl2brFormat.php
@@ -1,5 +1,10 @@
 <?php
-namespace Transphporm\Formatter;
+/* @description     Transformation Style Sheets - Revolutionising PHP templating    *
+ * @author          Tom Butler tom@r.je                                             *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
+ * @version         1.2                                                             */
+ namespace Transphporm\Formatter;
 class Nl2brFormat {
 	public function nl2br($var) {
 		$parts = explode("\n", $var);

diff --git a/src/Formatter/Number.php b/src/Formatter/Number.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Formatter;
 class Number {
 	private $locale;

diff --git a/src/Formatter/StringFormatter.php b/src/Formatter/StringFormatter.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Formatter;
 class StringFormatter {
 	public function uppercase($val) {

diff --git a/src/FunctionSet.php b/src/FunctionSet.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 /* Handles data() and iteration() function calls from the stylesheet */
 class FunctionSet {

diff --git a/src/Hook.php b/src/Hook.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 interface Hook {
 	public function run(\DomElement $element);

diff --git a/src/Hook/ElementData.php b/src/Hook/ElementData.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Hook;
 /* Maps which data is applied to which element */
 class ElementData {

diff --git a/src/Hook/Formatter.php b/src/Hook/Formatter.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Hook;
 /** Handles format: foo bar properties in the stylesheet */
 class Formatter {

diff --git a/src/Hook/PostProcess.php b/src/Hook/PostProcess.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Hook;
 /** Hooks into the template system, gets assigned as `ul li` or similar and `run()` is called with any elements that match */
 class PostProcess implements \Transphporm\Hook {

diff --git a/src/Hook/PropertyHook.php b/src/Hook/PropertyHook.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Hook;
 /** Hooks into the template system, gets assigned as `ul li` or similar and `run()` is called with any elements that match */
 class PropertyHook implements \Transphporm\Hook {

diff --git a/src/Hook/PseudoMatcher.php b/src/Hook/PseudoMatcher.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Hook;
 use \Transphporm\Parser\Tokenizer;
 /** Determines whether $element matches the pseudo rule such as nth-child() or [attribute="value"] */

diff --git a/src/Module.php b/src/Module.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm;
 interface Module {
 	public function load(Config $config);

diff --git a/src/Module/Basics.php b/src/Module/Basics.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Module;
 /** Assigns all the basic properties repeat, comment, etc to a $builder instance */
 class Basics implements \Transphporm\Module {

diff --git a/src/Module/Format.php b/src/Module/Format.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Module;
 /** Module for loading a formatter with a locale */
 class Format implements \Transphporm\Module {

diff --git a/src/Module/Functions.php b/src/Module/Functions.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Module;
 use Transphporm\TSSFunction\Math;
 /** Assigns all the basic functions, data(), key(), iteration(), template(), etc    */

diff --git a/src/Module/Pseudo.php b/src/Module/Pseudo.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Module;
 /** Module for loading a formatter with a locale */
 class Pseudo implements \Transphporm\Module {

diff --git a/src/Parser/CssToXpath.php b/src/Parser/CssToXpath.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Parser;
 class CssToXpath {
 	private $specialChars = [Tokenizer::WHITESPACE, Tokenizer::DOT, Tokenizer::GREATER_THAN,
@@ -20,7 +20,7 @@ public function __construct(\Transphporm\FunctionSet $functionSet, $prefix = '',
 
 		$this->translators = [
 			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-            Tokenizer::MULTIPLY => function () { return '*'; },
+			Tokenizer::MULTIPLY => function () { return '*'; },
 			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
 			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/' . $prefix  . $string; },
 			Tokenizer::NUM_SIGN => function($string) { return '[@id=\'' . $string . '\']'; },
@@ -43,15 +43,14 @@ public static function processAttr($attr, $element, $hash) {
 		$functionSet = self::$instances[$hash]->functionSet;
 		$functionSet->setElement($element[0]);
 
-		$attributes = array();
-        foreach($element[0]->attributes as $attribute_name => $attribute_node) {
-            $attributes[$attribute_name] = $attribute_node->nodeValue;
-        }
+		$attributes = [];
+		foreach($element[0]->attributes as $name => $node) {
+			$attributes[$name] = $node->nodeValue;
+		}
 
-        $parser = new \Transphporm\Parser\Value($functionSet, true);
+		$parser = new \Transphporm\Parser\Value($functionSet, true);
 		$return = $parser->parseTokens($attr, $attributes);
-
-		return $return[0] === '' ? false : $return[0];
+		return $return[0] === '' ? false : $return[0];		
 	}
 
 	public function cleanup() {
@@ -89,12 +88,17 @@ public function getXpath($css) {
 	}
 
 	private function removeSpacesFromDirectDecend($css) {
-		$tokens = [];
-		foreach ($css->splitOnToken(Tokenizer::GREATER_THAN) as $token) {
-			foreach ($token->trim() as $t) $tokens[]  = $t;
-			$tokens[] = ['type' => Tokenizer::GREATER_THAN];
+		$tokens = new Tokens;
+		$split = $css->splitOnToken(Tokenizer::GREATER_THAN);
+
+		if (count($split) <= 1) return $css;
+
+		for ($i = 0; $i < count($split); $i++) {
+			$tokens->add($split[$i]->trim());
+			if (isset($split[$i+1])) $tokens->add(['type' => Tokenizer::GREATER_THAN]);
 		}
-		return new Tokens(array_slice($tokens, 0, -1));
+
+		return $tokens;
 	}
 
 

diff --git a/src/Parser/Last.php b/src/Parser/Last.php
@@ -1,9 +1,9 @@
 <?php
 /* @description     Transformation Style Sheets - Revolutionising PHP templating    *
  * @author          Tom Butler tom@r.je                                             *
- * @copyright       2015 Tom Butler <tom@r.je> | https://r.je/                      *
+ * @copyright       2017 Tom Butler <tom@r.je> | https://r.je/                      *
  * @license         http://www.opensource.org/licenses/bsd-license.php  BSD License *
- * @version         1.0                                                             */
+ * @version         1.2                                                             */
 namespace Transphporm\Parser;
 /** Parses "string" and function(args) e.g. data(foo) or iteration(bar) */
 class Last {