list short_list short_array nodes and fix array node

node/expr/array.go

@@ -12,23 +12,20 @@ type Array struct {
 	node.SimpleNode
 	opentToken token.Token
 	closeToken token.Token
-	items []node.Node
-	isShortSyntax bool
+	items      []node.Node
 }
 
-func NewArray(opentToken token.Token, closeToken token.Token, items []node.Node, isShortSyntax bool) node.Node {
+func NewArray(opentToken token.Token, closeToken token.Token, items []node.Node) node.Node {
 	return Array{
 		node.SimpleNode{Name: "Array", Attributes: make(map[string]string)},
 		opentToken,
 		closeToken,
 		items,
-		isShortSyntax,
 	}
 }
 
 func (n Array) Print(out io.Writer, indent string) {
 	fmt.Fprintf(out, "\n%v%v [%d %d]", indent, n.Name, n.opentToken.StartLine, n.closeToken.EndLine)
-	fmt.Fprintf(out, "\n%visShortSyntax: %t", indent+"  ", n.isShortSyntax)
 
 	if n.items != nil {
 		fmt.Fprintf(out, "\n%vitems:", indent+"  ")

node/expr/list.go

@@ -0,0 +1,31 @@
+package expr
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/z7zmey/php-parser/node"
+)
+
+type List struct {
+	node.SimpleNode
+	items []node.Node
+}
+
+func NewList(items []node.Node) node.Node {
+	return List{
+		node.SimpleNode{Name: "List", Attributes: make(map[string]string)},
+		items,
+	}
+}
+
+func (n List) Print(out io.Writer, indent string) {
+	fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name)
+
+	if n.items != nil {
+		fmt.Fprintf(out, "\n%vitems:", indent+"  ")
+		for _, nn := range n.items {
+			nn.Print(out, indent+"    ")
+		}
+	}
+}

node/expr/short_array.go

@@ -0,0 +1,36 @@
+package expr
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/z7zmey/php-parser/node"
+	"github.com/z7zmey/php-parser/token"
+)
+
+type ShortArray struct {
+	node.SimpleNode
+	opentToken token.Token
+	closeToken token.Token
+	items      []node.Node
+}
+
+func NewShortArray(opentToken token.Token, closeToken token.Token, items []node.Node) node.Node {
+	return ShortArray{
+		node.SimpleNode{Name: "ShortArray", Attributes: make(map[string]string)},
+		opentToken,
+		closeToken,
+		items,
+	}
+}
+
+func (n ShortArray) Print(out io.Writer, indent string) {
+	fmt.Fprintf(out, "\n%v%v [%d %d]", indent, n.Name, n.opentToken.StartLine, n.closeToken.EndLine)
+
+	if n.items != nil {
+		fmt.Fprintf(out, "\n%vitems:", indent+"  ")
+		for _, nn := range n.items {
+			nn.Print(out, indent+"    ")
+		}
+	}
+}

node/expr/short_list.go

@@ -0,0 +1,31 @@
+package expr
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/z7zmey/php-parser/node"
+)
+
+type ShortList struct {
+	node.SimpleNode
+	items []node.Node
+}
+
+func NewShortList(items []node.Node) node.Node {
+	return ShortList{
+		node.SimpleNode{Name: "ShortList", Attributes: make(map[string]string)},
+		items,
+	}
+}
+
+func (n ShortList) Print(out io.Writer, indent string) {
+	fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name)
+
+	if n.items != nil {
+		fmt.Fprintf(out, "\n%vitems:", indent+"  ")
+		for _, nn := range n.items {
+			nn.Print(out, indent+"    ")
+		}
+	}
+}