Level-2 / Transphporm

src/Parser/Tokens.php

Indentation +82 added lines, -82 removed lines

@@ -6,28 +6,28 @@ 
  * @version         1.0                                                             */
 namespace Transphporm\Parser;
 class Tokens implements \Iterator, \Countable {
-    private $tokens;
-    private $iterator = 0;
+	private $tokens;
+	private $iterator = 0;
 
-    public function __construct(array $tokens) {
-        $this->tokens = $tokens;
-    }
+	public function __construct(array $tokens) {
+		$this->tokens = $tokens;
+	}
 
-    public function count() {
-        return count($this->tokens);
-    }
+	public function count() {
+		return count($this->tokens);
+	}
 
-    // Iterator Functions
-    public function current() {
-        return $this->tokens[$this->iterator];
-    }
+	// Iterator Functions
+	public function current() {
+		return $this->tokens[$this->iterator];
+	}
 
-    public function key() {
-        return $this->iterator;
-    }
+	public function key() {
+		return $this->iterator;
+	}
 
-    public function next() {
-        ++$this->iterator;
+	public function next() {
+		++$this->iterator;
 	}
 
 	public function valid() {
@@ -38,75 +38,75 @@ 
 		$this->iterator = 0;
 	}
 
-    private function getKeysOfTokenType($tokenType) {
-        return array_keys(array_column($this->tokens, 'type'), $tokenType);
-    }
-
-    private function getKeyToSlice($tokenType) {
-        $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return false;
-        $key = $keys[0];
-        for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
-        return $key;
-    }
-
-    public function from($tokenType, $inclusive = false) {
-        return $this->sliceTokens($tokenType, "from", !$inclusive);
-    }
-
-    public function to($tokenType, $inclusive = false) {
-        return $this->sliceTokens($tokenType, "to", $inclusive);
-    }
-
-    private function sliceTokens($tokenType, $type, $increment = false) {
-        $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if ($increment) $key++;
-        if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
-        else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
-    }
-
-    public function skip($count) {
-        $this->iterator += $count;
-    }
-
-    public function splitOnToken($tokenType) {
-        $splitTokens = [];
+	private function getKeysOfTokenType($tokenType) {
+		return array_keys(array_column($this->tokens, 'type'), $tokenType);
+	}
+
+	private function getKeyToSlice($tokenType) {
+		$keys = $this->getKeysOfTokenType($tokenType);
+		if (empty($keys)) return false;
+		$key = $keys[0];
+		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
+		return $key;
+	}
+
+	public function from($tokenType, $inclusive = false) {
+		return $this->sliceTokens($tokenType, "from", !$inclusive);
+	}
+
+	public function to($tokenType, $inclusive = false) {
+		return $this->sliceTokens($tokenType, "to", $inclusive);
+	}
+
+	private function sliceTokens($tokenType, $type, $increment = false) {
+		$key = $this->getKeyToSlice($tokenType);
+		if ($key === false) return new Tokens([]);
+		if ($increment) $key++;
+		if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
+		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+	}
+
+	public function skip($count) {
+		$this->iterator += $count;
+	}
+
+	public function splitOnToken($tokenType) {
+		$splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-        return array_map(function ($tokens) {
-            return new Tokens($tokens);
-        }, $splitTokens);
+		return array_map(function ($tokens) {
+			return new Tokens($tokens);
+		}, $splitTokens);
 		//return $splitTokens;
-    }
-
-    public function trim() {
-        $tokens = $this->tokens;
-        // Remove end whitespace
-        while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
-            array_pop($tokens);
-        }
-        // Remove begining whitespace
-        while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
-            array_shift($tokens);
-        }
-        return new Tokens($tokens);
-    }
-
-    public function removeLine() {
-        $tokens = $this->tokens;
-        foreach ($tokens as &$token) unset($token['line']);
-        return new Tokens($tokens);
-    }
-
-    public function read($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
-    }
-
-    public function type($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;
-    }
+	}
+
+	public function trim() {
+		$tokens = $this->tokens;
+		// Remove end whitespace
+		while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
+			array_pop($tokens);
+		}
+		// Remove begining whitespace
+		while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
+			array_shift($tokens);
+		}
+		return new Tokens($tokens);
+	}
+
+	public function removeLine() {
+		$tokens = $this->tokens;
+		foreach ($tokens as &$token) unset($token['line']);
+		return new Tokens($tokens);
+	}
+
+	public function read($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
+	}
+
+	public function type($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;
+	}
 }

Braces +25 added lines, -9 removed lines

@@ -44,9 +44,13 @@ 
 
     private function getKeyToSlice($tokenType) {
         $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return false;
+        if (empty($keys)) {
+        	return false;
+        }
         $key = $keys[0];
-        for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
+        for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) {
+        	$key = $keys[$i];
+        }
         return $key;
     }
 
@@ -60,10 +64,17 @@ 
 
     private function sliceTokens($tokenType, $type, $increment = false) {
         $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if ($increment) $key++;
-        if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
-        else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+        if ($key === false) {
+        	return new Tokens([]);
+        }
+        if ($increment) {
+        	$key++;
+        }
+        if ($type === "from") {
+        	return new Tokens(array_slice($this->tokens, $key));
+        } else {
+        	return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+        }
     }
 
     public function skip($count) {
@@ -74,8 +85,11 @@ 
         $splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
-			if ($token['type'] === $tokenType) $i++;
-			else $splitTokens[$i][] = $token;
+			if ($token['type'] === $tokenType) {
+				$i++;
+			} else {
+				$splitTokens[$i][] = $token;
+			}
 		}
         return array_map(function ($tokens) {
             return new Tokens($tokens);
@@ -98,7 +112,9 @@ 
 
     public function removeLine() {
         $tokens = $this->tokens;
-        foreach ($tokens as &$token) unset($token['line']);
+        foreach ($tokens as &$token) {
+        	unset($token['line']);
+        }
         return new Tokens($tokens);
     }