Level-2 / Transphporm

src/Parser/Tokenizer.php

Indentation +7 added lines, -7 removed lines

@@ -73,9 +73,9 @@ 
 		for ($i = 0; $i < strlen($this->str); $i++) {
 			$char = $this->identifyChar($this->str[$i]);
 			if ($commentChangeI = $this->doComments($tokens, $char, $i)) {
-                $i = $commentChangeI;
-                continue;
-            }
+				$i = $commentChangeI;
+				continue;
+			}
 
 			$this->doNewLine($tokens, $char);
 			$this->doSimpleTokens($tokens, $char);
@@ -88,10 +88,10 @@ 
 		else return $tokens;
 	}
 
-    private function doComments(&$tokens, $char, $i) {
-        return $this->doSingleLineComments($tokens, $char, $i) +
-               $this->doMultiLineComments($tokens, $char, $i);
-    }
+	private function doComments(&$tokens, $char, $i) {
+		return $this->doSingleLineComments($tokens, $char, $i) +
+			   $this->doMultiLineComments($tokens, $char, $i);
+	}
 
 	private function doSingleLineComments(&$tokens, $char, $i) {
 		if ($char == Tokenizer::DIVIDE && isset($this->str[$i+1]) && $this->identifyChar($this->str[$i+1]) == Tokenizer::DIVIDE) {

Braces +33 added lines, -13 removed lines

@@ -84,8 +84,11 @@ 
 			$i += $this->doBrackets($tokens, $char, $i);
 
 		}
-		if ($returnObj) return new Tokens($tokens);
-		else return $tokens;
+		if ($returnObj) {
+			return new Tokens($tokens);
+		} else {
+			return $tokens;
+		}
 	}
 
     private function doComments(&$tokens, $char, $i) {
@@ -103,7 +106,9 @@ 
 	private function doMultiLineComments(&$tokens, $char, $i) {
 		if ($char == Tokenizer::DIVIDE && isset($this->str[$i+1]) && $this->identifyChar($this->str[$i+1]) == Tokenizer::MULTIPLY) {
 			$pos = strpos($this->str, '*/', $i)+2;
-			if ($this->str[$pos] == "\n") $pos++;
+			if ($this->str[$pos] == "\n") {
+				$pos++;
+			}
 			return $pos ? $pos : 0;
 		}
 	}
@@ -142,10 +147,15 @@ 
 	}
 
 	private function processLiterals(&$tokens, $name) {
-		if (is_numeric($name)) $tokens[] = ['type' => self::NUMERIC, 'value' => $name];
-		else if ($name == 'true') $tokens[] = ['type' => self::BOOL, 'value' => true];
-		else if ($name == 'false') $tokens[] = ['type' => self::BOOL, 'value' => false];
-		else $tokens[] = ['type' => self::NAME, 'value' => $name, 'line' => $this->lineNo];
+		if (is_numeric($name)) {
+			$tokens[] = ['type' => self::NUMERIC, 'value' => $name];
+		} else if ($name == 'true') {
+			$tokens[] = ['type' => self::BOOL, 'value' => true];
+		} else if ($name == 'false') {
+			$tokens[] = ['type' => self::BOOL, 'value' => false];
+		} else {
+			$tokens[] = ['type' => self::NAME, 'value' => $name, 'line' => $this->lineNo];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -178,7 +188,9 @@ 
 	private function extractString($pos) {
 		$char = $this->str[$pos];
 		$end = strpos($this->str, $char, $pos+1);
-		while ($end !== false && $this->str[$end-1] == '\\') $end = strpos($this->str, $char, $end+1);
+		while ($end !== false && $this->str[$end-1] == '\\') {
+			$end = strpos($this->str, $char, $end+1);
+		}
 
 		return substr($this->str, $pos+1, $end-$pos-1);
 	}
@@ -187,18 +199,26 @@ 
 		$close = strpos($this->str, $closeBracket, $open);
 
 		$cPos = $open+1;
-		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) $close = strpos($this->str, $closeBracket, $close+1);
+		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) {
+			$close = strpos($this->str, $closeBracket, $close+1);
+		}
 		return substr($this->str, $open+1, $close-$open-1);
 	}
 
 	private function identifyChar($chr) {
-		if (isset($this->chars[$chr])) return $this->chars[$chr];
-		else return self::NAME;
+		if (isset($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return self::NAME;
+		}
 	}
 
 	private function getChar($num) {
 		$chars = array_reverse($this->chars);
-		if (isset($chars[$num])) return $chars[$num];
-		else return false;
+		if (isset($chars[$num])) {
+			return $chars[$num];
+		} else {
+			return false;
+		}
 	}
 }