Token: renamed props

src/Neon/Lexer.php

@@ -61,7 +61,7 @@ public function tokenize(string $input): TokenStream
 		$tokens = [];
 		foreach ($matches as $match) {
 			$type = $types[count($match) - 2];
-			$tokens[] = new Token($match[0], $type === Token::Char ? $match[0] : $type);
+			$tokens[] = new Token($type === Token::Char ? $match[0] : $type, $match[0]);
 			$offset += strlen($match[0]);
 		}
 

src/Neon/Parser.php

@@ -132,14 +132,14 @@ private function parseValue(): Node
 	{
 		if ($token = $this->tokens->consume(Token::String)) {
 			try {
-				$node = new Node\StringNode(Node\StringNode::parse($token->value));
+				$node = new Node\StringNode(Node\StringNode::parse($token->text));
 				$this->injectPos($node, $this->tokens->getPosition() - 1);
 			} catch (Exception $e) {
 				$this->tokens->error($e->getMessage(), $this->tokens->getPosition() - 1);
 			}
 		} elseif ($token = $this->tokens->consume(Token::Literal)) {
 			$pos = $this->tokens->getPosition() - 1;
-			$node = new Node\LiteralNode(Node\LiteralNode::parse($token->value, $this->tokens->isNext(':', '=')));
+			$node = new Node\LiteralNode(Node\LiteralNode::parse($token->text, $this->tokens->isNext(':', '=')));
 			$this->injectPos($node, $pos);
 
 		} elseif ($this->tokens->isNext('[', '(', '{')) {
@@ -163,7 +163,7 @@ private function parseEntity(Node $node): Node
 		$entities[] = $this->injectPos(new Node\EntityNode($node, $attributes->items), $node->startTokenPos, $attributes->endTokenPos);
 
 		while ($token = $this->tokens->consume(Token::Literal)) {
-			$valueNode = new Node\LiteralNode(Node\LiteralNode::parse($token->value));
+			$valueNode = new Node\LiteralNode(Node\LiteralNode::parse($token->text));
 			$this->injectPos($valueNode, $this->tokens->getPosition() - 1);
 			if ($this->tokens->isNext('(')) {
 				$attributes = $this->parseBraces();
@@ -183,8 +183,8 @@ private function parseEntity(Node $node): Node
 	private function parseBraces(): Node\InlineArrayNode
 	{
 		$token = $this->tokens->consume();
-		$endBrace = ['[' => ']', '{' => '}', '(' => ')'][$token->value];
-		$res = new Node\InlineArrayNode($token->value);
+		$endBrace = ['[' => ']', '{' => '}', '(' => ')'][$token->text];
+		$res = new Node\InlineArrayNode($token->text);
 		$this->injectPos($res, $this->tokens->getPosition() - 1);
 		$keyCheck = [];
 
@@ -256,7 +256,7 @@ private function initLines(): void
 		$line = 1;
 		foreach ($this->tokens->getTokens() as $token) {
 			$this->posToLine[] = $line;
-			$line += substr_count($token->value, "\n");
+			$line += substr_count($token->text, "\n");
 		}
 
 		$this->posToLine[] = $line;

src/Neon/Token.php

@@ -22,8 +22,8 @@ final class Token
 
 
 	public function __construct(
-		public string $value,
 		public int|string $type,
+		public string $text,
 	) {
 	}
 }

src/Neon/TokenStream.php

@@ -66,7 +66,7 @@ public function getIndentation(): string
 	{
 		return in_array($this->tokens[$this->pos - 2]->type ?? null, [Token::Newline, null], strict: true)
 			&& ($this->tokens[$this->pos - 1]->type ?? null) === Token::Whitespace
-			? $this->tokens[$this->pos - 1]->value
+			? $this->tokens[$this->pos - 1]->text
 			: '';
 	}
 
@@ -81,15 +81,15 @@ public function error(?string $message = null, ?int $pos = null): void
 				break;
 			}
 
-			$input .= $token->value;
+			$input .= $token->text;
 		}
 
 		$line = substr_count($input, "\n") + 1;
 		$col = strlen($input) - strrpos("\n" . $input, "\n") + 1;
 		$token = $this->tokens[$pos] ?? null;
 		$message ??= 'Unexpected ' . ($token === null
 			? 'end'
-			: "'" . str_replace("\n", '<new line>', substr($this->tokens[$pos]->value, 0, 40)) . "'");
+			: "'" . str_replace("\n", '<new line>', substr($this->tokens[$pos]->text, 0, 40)) . "'");
 		throw new Exception("$message on line $line, column $col.");
 	}
 }

tests/Neon/Parser.nodes.phpt

@@ -58,7 +58,7 @@ $traverser = new Traverser;
 $traverser->traverse($node, function (Node $node) use ($stream) {
 	@$node->code = ''; // dynamic property is deprecated
 	foreach (array_slice($stream->getTokens(), $node->startTokenPos, $node->endTokenPos - $node->startTokenPos + 1) as $token) {
-		$node->code .= $token->value;
+		$node->code .= $token->text;
 	}
 
 	unset($node->startTokenPos, $node->endTokenPos);