Use reference type for "expected an array or a tuple" error

ballerina-platform · Apr 7, 2022 · ab9f63b · ab9f63b
1 parent 2f6ee41
commit ab9f63b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
@@ -1775,17 +1775,17 @@ private BType checkArrayType(BLangListConstructorExpr listConstructor, BArrayTyp
 
             BLangExpression spreadOpExpr = ((BLangListConstructorSpreadOpExpr) expr).expr;
             BType spreadOpType = checkExpr(spreadOpExpr, this.env);
-            spreadOpType = Types.getReferredType(spreadOpType);
+            BType spreadOpReferredType = Types.getReferredType(spreadOpType);
 
-            switch (spreadOpType.tag) {
+            switch (spreadOpReferredType.tag) {
                 case TypeTags.ARRAY:
-                    BType spreadOpeType = ((BArrayType) spreadOpType).eType;
+                    BType spreadOpeType = ((BArrayType) spreadOpReferredType).eType;
                     if (types.typeIncompatible(spreadOpExpr.pos, spreadOpeType, eType)) {
                         return symTable.semanticError;
                     }
                     break;
                 case TypeTags.TUPLE:
-                    BTupleType spreadOpTuple = (BTupleType) spreadOpType;
+                    BTupleType spreadOpTuple = (BTupleType) spreadOpReferredType;
                     List<BType> tupleTypes = spreadOpTuple.tupleTypes;
                     for (BType tupleMemberType : tupleTypes) {
                         if (types.typeIncompatible(spreadOpExpr.pos, tupleMemberType, eType)) {
@@ -1880,11 +1880,11 @@ private BType checkTupleType(BLangListConstructorExpr listConstructor, BTupleTyp
 
             BLangExpression spreadOpExpr = ((BLangListConstructorSpreadOpExpr) expr).expr;
             BType spreadOpType = checkExpr(spreadOpExpr, this.env);
-            spreadOpType = Types.getReferredType(spreadOpType);
+            BType spreadOpReferredType = Types.getReferredType(spreadOpType);
 
-            switch (spreadOpType.tag) {
+            switch (spreadOpReferredType.tag) {
                 case TypeTags.ARRAY:
-                    BArrayType spreadOpArray = (BArrayType) spreadOpType;
+                    BArrayType spreadOpArray = (BArrayType) spreadOpReferredType;
                     if (spreadOpArray.state == BArrayState.CLOSED) {
                         for (int i = 0; i < spreadOpArray.size && nonRestTypeIndex < memberTypeSize;
                              i++, nonRestTypeIndex++) {
@@ -1913,7 +1913,7 @@ private BType checkTupleType(BLangListConstructorExpr listConstructor, BTupleTyp
                     }
                     break;
                 case TypeTags.TUPLE:
-                    BTupleType spreadOpTuple = (BTupleType) spreadOpType;
+                    BTupleType spreadOpTuple = (BTupleType) spreadOpReferredType;
                     int spreadOpMemberTypeSize = spreadOpTuple.tupleTypes.size();
 
                     if (isFixedLengthTuple(spreadOpTuple)) {

diff --git a/...org/ballerinalang/test/expressions/listconstructor/ListConstructorSpreadOperatorTest.java b/...org/ballerinalang/test/expressions/listconstructor/ListConstructorSpreadOperatorTest.java
@@ -146,12 +146,14 @@ public void testSpreadOperatorNegative() {
                 "invalid usage of spread operator: fixed member expected for 'string'", 170, 41);
         BAssertUtil.validateError(resultNegative, i++,
                 "invalid usage of spread operator: fixed member expected for 'string'", 173, 38);
-        BAssertUtil.validateError(resultNegative, i++, "incompatible types: expected 'int', found 'string'", 187, 23);
+        BAssertUtil.validateError(resultNegative, i++, "incompatible types: expected 'int', found 'string'", 189, 23);
         BAssertUtil.validateError(resultNegative, i++,
-                "invalid usage of spread operator: fixed length list expected", 190, 24);
-        BAssertUtil.validateError(resultNegative, i++, "incompatible types: expected 'string', found 'int'", 192, 20);
+                "invalid usage of spread operator: fixed length list expected", 192, 24);
+        BAssertUtil.validateError(resultNegative, i++, "incompatible types: expected 'string', found 'int'", 194, 20);
         BAssertUtil.validateError(resultNegative, i++,
-                "invalid usage of spread operator: fixed length list expected", 195, 17);
+                "invalid usage of spread operator: fixed length list expected", 197, 17);
+        BAssertUtil.validateError(resultNegative, i++,
+                "incompatible types: expected an array or a tuple, found 'Qux'", 200, 26);
         Assert.assertEquals(resultNegative.getErrorCount(), i);
     }
 

diff --git a/...st/resources/test-src/expressions/listconstructor/list_constructor_spread_op_negative.bal b/...st/resources/test-src/expressions/listconstructor/list_constructor_spread_op_negative.bal
@@ -183,6 +183,8 @@ type Bar [int, string];
 
 type Baz int[]|string|boolean;
 
+type Qux int;
+
 function testSpreadOpWithListTypeBeingTypeRef() {
     IntArr _ = [1, ...[2, "s"]]; // error
 
@@ -193,6 +195,9 @@ function testSpreadOpWithListTypeBeingTypeRef() {
 
     Foo t = [3, ...["s"]]; // OK
     Bar _ = [...t]; // error
+
+    Qux x = 3;
+    IntArr _ = [1, 2, ...x]; // error
 }
 
 function testTypeCheckingForArrayArrayCompatibilityPositive() {