Fix parsing of variable declaration nodes combined with sequence node (#773)

Fixes #772

Author: antonmedv

parser/parser.go

@@ -323,13 +323,13 @@ func (p *parser) parseConditional(node Node) Node {
 		p.next()
 
 		if !p.current.Is(Operator, ":") {
-			expr1 = p.parseSequenceExpression()
+			expr1 = p.parseExpression(0)
 			p.expect(Operator, ":")
-			expr2 = p.parseSequenceExpression()
+			expr2 = p.parseExpression(0)
 		} else {
 			p.next()
 			expr1 = node
-			expr2 = p.parseSequenceExpression()
+			expr2 = p.parseExpression(0)
 		}
 
 		node = p.createNode(&ConditionalNode{

parser/parser_test.go

@@ -683,37 +683,71 @@ world`},
 			},
 		},
 		{
-			"true ? 1; 2; 3 : 4",
-			&ConditionalNode{
-				Cond: &BoolNode{Value: true},
-				Exp1: &SequenceNode{
-					Nodes: []Node{
-						&IntegerNode{Value: 1},
-						&IntegerNode{Value: 2},
-						&IntegerNode{Value: 3}}},
-				Exp2: &IntegerNode{Value: 4}},
+			"true ? 1 : 2; 3 ; 4",
+			&SequenceNode{
+				Nodes: []Node{
+					&ConditionalNode{
+						Cond: &BoolNode{Value: true},
+						Exp1: &IntegerNode{Value: 1},
+						Exp2: &IntegerNode{Value: 2}},
+					&IntegerNode{Value: 3},
+					&IntegerNode{Value: 4},
+				},
+			},
 		},
 		{
-			"true ? 1 : 2; 3 ; 4",
+			"true ? 1 : ( 2; 3; 4 )",
 			&ConditionalNode{
 				Cond: &BoolNode{Value: true},
 				Exp1: &IntegerNode{Value: 1},
 				Exp2: &SequenceNode{
 					Nodes: []Node{
 						&IntegerNode{Value: 2},
 						&IntegerNode{Value: 3},
-						&IntegerNode{Value: 4}}}},
+						&IntegerNode{Value: 4},
+					},
+				},
+			},
 		},
 		{
 			"true ?: 1; 2; 3",
-			&ConditionalNode{
-				Cond: &BoolNode{Value: true},
-				Exp1: &BoolNode{Value: true},
-				Exp2: &SequenceNode{
-					Nodes: []Node{
-						&IntegerNode{Value: 1},
-						&IntegerNode{Value: 2},
-						&IntegerNode{Value: 3}}}},
+			&SequenceNode{
+				Nodes: []Node{
+					&ConditionalNode{
+						Cond: &BoolNode{Value: true},
+						Exp1: &BoolNode{Value: true},
+						Exp2: &IntegerNode{Value: 1}},
+					&IntegerNode{Value: 2},
+					&IntegerNode{Value: 3},
+				},
+			},
+		},
+		{
+			`let x = true ? 1 : 2; x`,
+			&VariableDeclaratorNode{
+				Name: "x",
+				Value: &ConditionalNode{
+					Cond: &BoolNode{Value: true},
+					Exp1: &IntegerNode{Value: 1},
+					Exp2: &IntegerNode{Value: 2}},
+				Expr: &IdentifierNode{Value: "x"}},
+		},
+		{
+			"let x = true ? 1 : ( 2; 3; 4 ); x",
+			&VariableDeclaratorNode{
+				Name: "x",
+				Value: &ConditionalNode{
+					Cond: &BoolNode{Value: true},
+					Exp1: &IntegerNode{Value: 1},
+					Exp2: &SequenceNode{
+						Nodes: []Node{
+							&IntegerNode{Value: 2},
+							&IntegerNode{Value: 3},
+							&IntegerNode{Value: 4},
+						},
+					},
+				},
+				Expr: &IdentifierNode{Value: "x"}},
 		},
 		{
 			"if true { 1; 2; 3 } else { 4; 5; 6 }",