Level-2 / Transphporm

src/Parser/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 		if ($char === self::STRING) {
 			$string = $this->extractString($i);
 			$length = strlen($string)+1;
-			$string = str_replace('\\' . $this->str[$i], $this->str[$i], $string);
+			$string = str_replace('\\'.$this->str[$i], $this->str[$i], $string);
 			$tokens[] = ['type' => self::STRING, 'value' => $string, 'line' => $this->lineNo];
 			return $length;
 		}

Indentation +2 added lines, -2 removed lines

@@ -73,8 +73,8 @@
 		for ($i = 0; $i < strlen($this->str); $i++) {
 			$char = $this->identifyChar($this->str[$i]);
 
-            $i += $this->doSingleLineComments($tokens, $char, $i);
-            $i += $this->doMultiLineComments($tokens, $char, $i);
+			$i += $this->doSingleLineComments($tokens, $char, $i);
+			$i += $this->doMultiLineComments($tokens, $char, $i);
 
 			$this->doNewLine($tokens, $char);
 			$this->doSimpleTokens($tokens, $char);

Braces +38 added lines, -15 removed lines

@@ -83,22 +83,30 @@ 
 			$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 doSingleLineComments(&$tokens, $char, $i) {
 		if ($char == Tokenizer::DIVIDE && isset($this->str[$i+1]) && $this->identifyChar($this->str[$i+1]) == Tokenizer::DIVIDE) {
 			$pos = strpos($this->str, "\n", $i);
-			if ($pos && $i === 0) return $pos;
-			else if ($pos) return $pos-2;
+			if ($pos && $i === 0) {
+				return $pos;
+			} else if ($pos) {
+				return $pos-2;
+			}
 		}
 	}
 
 	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;
 		}
 	}
@@ -137,10 +145,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) {
@@ -173,7 +186,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);
 	}
@@ -182,18 +197,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;
+		}
 	}
 }