InlineArrayNode: added property $bracket

src/Neon/Encoder.php

@@ -55,7 +55,12 @@ public function valueToNode($val, bool $blockMode = false): Node
 			);
 
 		} elseif (is_object($val) || is_array($val)) {
-			$node = $blockMode ? new Node\BlockArrayNode : new Node\InlineArrayNode;
+			if ($blockMode) {
+				$node = new Node\BlockArrayNode;
+			} else {
+				$isList = is_array($val) && (!$val || array_keys($val) === range(0, count($val) - 1));
+				$node = new Node\InlineArrayNode($isList ? '[' : '{');
+			}
 			$node->items = $this->arrayToNodes($val, $blockMode);
 			return $node;
 

src/Neon/Node/InlineArrayNode.php

@@ -13,16 +13,21 @@
 /** @internal */
 final class InlineArrayNode extends ArrayNode
 {
-	public function __construct(int $pos = null)
+	/** @var string */
+	public $bracket;
+
+
+	public function __construct(string $bracket, int $pos = null)
 	{
+		$this->bracket = $bracket;
 		$this->startPos = $this->endPos = $pos;
 	}
 
 
 	public function toString(): string
 	{
-		$isList = !array_filter($this->items, function ($item) { return $item->key; });
-		$res = ArrayItemNode::itemsToInlineString($this->items);
-		return ($isList ? '[' : '{') . $res . ($isList ? ']' : '}');
+		return $this->bracket
+			. ArrayItemNode::itemsToInlineString($this->items)
+			. ['[' => ']', '{' => '}', '(' => ')'][$this->bracket];
 	}
 }

src/Neon/Parser.php

@@ -165,7 +165,7 @@ private function parseBraces(): Node\InlineArrayNode
 	{
 		$token = $this->tokens->consume();
 		$endBrace = ['[' => ']', '{' => '}', '(' => ')'][$token->value];
-		$res = new Node\InlineArrayNode($this->tokens->getPos() - 1);
+		$res = new Node\InlineArrayNode($token->value, $this->tokens->getPos() - 1);
 		$keyCheck = [];
 
 		loop:

tests/Neon/Encoder.phpt

@@ -131,12 +131,12 @@ Assert::same(
 );
 
 Assert::same(
-	'[]',
+	'{}',
 	Neon::encode((object) [])
 );
 
 Assert::same(
-	'[]',
+	'{}',
 	Neon::encode(new stdClass)
 );
 

tests/Neon/fixtures/Encoder.nodes.txt

@@ -1,11 +1,13 @@
 Nette\Neon\Node\InlineArrayNode
+   bracket: '{'
    items: array (7)
    |  0 => Nette\Neon\Node\ArrayItemNode
    |  |  key: Nette\Neon\Node\LiteralNode
    |  |  |  value: 'map'
    |  |  |  startPos: null
    |  |  |  endPos: null
    |  |  value: Nette\Neon\Node\InlineArrayNode
+   |  |  |  bracket: '{'
    |  |  |  items: array (2)
    |  |  |  |  0 => Nette\Neon\Node\ArrayItemNode
    |  |  |  |  |  key: Nette\Neon\Node\LiteralNode
@@ -39,6 +41,7 @@ Nette\Neon\Node\InlineArrayNode
    |  |  |  startPos: null
    |  |  |  endPos: null
    |  |  value: Nette\Neon\Node\InlineArrayNode
+   |  |  |  bracket: '['
    |  |  |  items: array (3)
    |  |  |  |  0 => Nette\Neon\Node\ArrayItemNode
    |  |  |  |  |  key: null
@@ -74,6 +77,7 @@ Nette\Neon\Node\InlineArrayNode
    |  |  |  startPos: null
    |  |  |  endPos: null
    |  |  value: Nette\Neon\Node\InlineArrayNode
+   |  |  |  bracket: '{'
    |  |  |  items: array (4)
    |  |  |  |  0 => Nette\Neon\Node\ArrayItemNode
    |  |  |  |  |  key: null

tests/Neon/fixtures/Parser.nodes.neon

@@ -2,7 +2,7 @@ first:
 	- a
 
 next:
-	- {k, l, m: null, n}
+	- [k, l, m: null, n]
 
 second:
 	sub:

tests/Neon/fixtures/Parser.nodes.txt

@@ -74,6 +74,7 @@ Nette\Neon\Node\BlockArrayNode
    |  |  |  |  |  |  |  '[k,\n
    |  |  |  |  |  |  |   \t    \t    l, m:\n
    |  |  |  |  |  |  |   \t    n]'
+   |  |  |  |  |  |  bracket: '['
    |  |  |  |  |  |  items: array (4) ...
    |  |  |  |  |  |  startPos: unset
    |  |  |  |  |  |  endPos: unset