Add new table impl

bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/TableValueImpl.java

@@ -103,7 +103,6 @@ private void addData(ArrayValue data) {
         }
     }
 
-
     @Override
     public IteratorValue getIterator() {
         return new TableIterator<K, V>(entries.values().iterator());

compiler/ballerina-lang/src/main/java/org/ballerinalang/model/tree/expressions/IndexBasedAccessNode.java

@@ -27,6 +27,4 @@ public interface IndexBasedAccessNode extends VariableReferenceNode {
     ExpressionNode getExpression();
 
     ExpressionNode getIndex();
-
-    TableMultiKeyExpressionNode getMultiKeyExpr();
 }

compiler/ballerina-lang/src/main/java/org/ballerinalang/model/tree/types/TableTypeNode.java

@@ -21,9 +21,9 @@
 import org.ballerinalang.model.tree.TableKeyTypeConstraintNode;
 
 /**
- * table<Person> key(...);.
+ * {@code TableTypeNode} represents a table type node in Ballerina.
  *
- * @since 1.2.0
+ * @since 1.3.0
  */
 public interface TableTypeNode extends TypeNode {
 

compiler/ballerina-lang/src/main/java/org/ballerinalang/model/types/TableType.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *  Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  *  WSO2 Inc. licenses this file to you under the Apache License,
  *  Version 2.0 (the "License"); you may not use this file except

compiler/ballerina-lang/src/main/java/org/ballerinalang/util/diagnostic/DiagnosticCode.java

@@ -406,7 +406,7 @@ public enum DiagnosticCode {
     MISSING_REQUIRED_METHOD_NEXT("missing.required.method.next"),
 
     // Table related codes
-    TABLE_CONSTRAINT_INVALID_SUBTYPE("invalid.stream.constraint.subtype"),
+    TABLE_CONSTRAINT_INVALID_SUBTYPE("invalid.table.constraint.subtype"),
     TABLE_KEY_SPECIFIER_MISMATCH("table.key.specifier.mismatch"),
     KEY_SPECIFIER_SIZE_MISMATCH_WITH_KEY_CONSTRAINT("key.specifier.size.mismatch.with.key.constraint"),
     KEY_SPECIFIER_MISMATCH_WITH_KEY_CONSTRAINT("key.specifier.mismatch.with.key.constraint"),

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java

@@ -81,6 +81,7 @@
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStatementExpression;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStringTemplateLiteral;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableConstructorExpr;
+import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableMultiKeyExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTernaryExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTrapExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTupleVarRef;
@@ -747,6 +748,14 @@ public void visit(BLangInvocation iExpr) {
         result = iExpr;
     }
 
+    @Override
+    public void visit(BLangTableMultiKeyExpr tableMultiKeyExpr) {
+        List<BLangExpression> exprList = new ArrayList<>();
+        tableMultiKeyExpr.multiKeyIndexExprs.forEach(expression -> exprList.add(rewriteExpr(expression)));
+        tableMultiKeyExpr.multiKeyIndexExprs = exprList;
+        result = tableMultiKeyExpr;
+    }
+
     public void visit(BLangTypeInit typeInitExpr) {
         typeInitExpr.initInvocation = rewriteExpr(typeInitExpr.initInvocation);
         result = typeInitExpr;

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java

@@ -509,7 +509,6 @@ public void visit(BLangFieldBasedAccess fieldAccessExpr) {
     public void visit(BLangIndexBasedAccess indexAccessExpr) {
         indexAccessExpr.expr = rewrite(indexAccessExpr.expr);
         indexAccessExpr.indexExpr = rewrite(indexAccessExpr.indexExpr);
-        indexAccessExpr.multiKeyExpr = rewrite(indexAccessExpr.multiKeyExpr);
         result = indexAccessExpr;
     }
 

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java

@@ -153,6 +153,7 @@
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStatementExpression;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStringTemplateLiteral;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableConstructorExpr;
+import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableMultiKeyExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTernaryExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTrapExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTupleVarRef;
@@ -3566,12 +3567,12 @@ public void visit(BLangIndexBasedAccess indexAccessExpr) {
             targetVarRef = new BLangXMLAccessExpr(indexAccessExpr.pos, indexAccessExpr.expr,
                     indexAccessExpr.indexExpr);
         } else if (varRefType.tag == TypeTags.TABLE) {
-            if (targetVarRef.multiKeyExpr != null) {
-                BLangTupleLiteral listConstructorExpr =
-                        new BLangTupleLiteral();
-                listConstructorExpr.exprs = indexAccessExpr.multiKeyExpr.multiKeyIndexExprs;
+            if (targetVarRef.indexExpr.getKind() == NodeKind.TABLE_MULTI_KEY) {
+                BLangTupleLiteral listConstructorExpr = new BLangTupleLiteral();
+                listConstructorExpr.exprs = ((BLangTableMultiKeyExpr) indexAccessExpr.indexExpr).multiKeyIndexExprs;
                 List<BType> memberTypes = new ArrayList<>();
-                indexAccessExpr.multiKeyExpr.multiKeyIndexExprs.forEach(expression -> memberTypes.add(expression.type));
+                ((BLangTableMultiKeyExpr) indexAccessExpr.indexExpr).multiKeyIndexExprs.
+                        forEach(expression -> memberTypes.add(expression.type));
                 listConstructorExpr.type = new BTupleType(memberTypes);
                 indexAccessExpr.indexExpr = listConstructorExpr;
             }
@@ -3584,6 +3585,12 @@ public void visit(BLangIndexBasedAccess indexAccessExpr) {
         result = targetVarRef;
     }
 
+    @Override
+    public void visit(BLangTableMultiKeyExpr tableMultiKeyExpr) {
+        rewriteExprs(tableMultiKeyExpr.multiKeyIndexExprs);
+        result = tableMultiKeyExpr;
+    }
+
     @Override
     public void visit(BLangInvocation iExpr) {
         BLangInvocation genIExpr = iExpr;

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangPackageBuilder.java

@@ -1800,7 +1800,7 @@ void createIndexBasedAccessNode(DiagnosticPos pos, Set<Whitespace> ws) {
         indexBasedAccess.pos = pos;
         indexBasedAccess.addWS(ws);
         if (tableMultiKeyExpressionNodeStack.size() == 1) {
-            indexBasedAccess.multiKeyExpr = (BLangTableMultiKeyExpr) tableMultiKeyExpressionNodeStack.pop();
+            indexBasedAccess.indexExpr = (BLangTableMultiKeyExpr) tableMultiKeyExpressionNodeStack.pop();
         } else {
             indexBasedAccess.indexExpr = (BLangExpression) exprNodeStack.pop();
         }

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/NodeCloner.java

@@ -307,7 +307,6 @@ private void cloneBLangAccessExpression(BLangAccessExpression source, BLangAcces
     private void cloneBLangIndexBasedAccess(BLangIndexBasedAccess source, BLangIndexBasedAccess clone) {
 
         clone.indexExpr = clone(source.indexExpr);
-        clone.multiKeyExpr = clone(source.multiKeyExpr);
         cloneBLangAccessExpression(source, clone);
     }
 

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java

@@ -1996,7 +1996,6 @@ public void visit(BLangFieldBasedAccess fieldAccessExpr) {
     public void visit(BLangIndexBasedAccess indexAccessExpr) {
         analyzeExpr(indexAccessExpr.indexExpr);
         analyzeExpr(indexAccessExpr.expr);
-        analyzeExpr(indexAccessExpr.multiKeyExpr);
     }
 
     public void visit(BLangTableMultiKeyExpr tableMultiKeyExpr) {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java

@@ -749,7 +749,6 @@ public void visit(BLangFieldBasedAccess fieldAccessExpr) {
     public void visit(BLangIndexBasedAccess indexAccessExpr) {
         analyzeNode(indexAccessExpr.expr, env);
         analyzeNode(indexAccessExpr.indexExpr, env);
-        analyzeNode(indexAccessExpr.multiKeyExpr, env);
     }
 
     @Override

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TaintAnalyzer.java

@@ -91,6 +91,7 @@
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStatementExpression;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStringTemplateLiteral;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableConstructorExpr;
+import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableMultiKeyExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTernaryExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTrapExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTypeConversionExpr;
@@ -1032,6 +1033,11 @@ public void visit(BLangIndexBasedAccess indexAccessExpr) {
         indexAccessExpr.expr.accept(this);
     }
 
+    @Override
+    public void visit(BLangTableMultiKeyExpr tableMultiKeyExpr) {
+        analyzeExprList(tableMultiKeyExpr.multiKeyIndexExprs);
+    }
+
     @Override
     public void visit(BLangInvocation invocationExpr) {
         // handle error constructor invocation

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java

@@ -117,6 +117,7 @@
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangSimpleVarRef;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangStringTemplateLiteral;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableConstructorExpr;
+import org.wso2.ballerinalang.compiler.tree.expressions.BLangTableMultiKeyExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTernaryExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTrapExpr;
 import org.wso2.ballerinalang.compiler.tree.expressions.BLangTupleVarRef;
@@ -1983,7 +1984,8 @@ public void visit(BLangIndexBasedAccess indexBasedAccessExpr) {
                 indexBasedAccessExpr.compoundAssignmentLhsVar;
         checkExpr(indexBasedAccessExpr.expr, this.env, symTable.noType);
 
-        if (indexBasedAccessExpr.multiKeyExpr != null && indexBasedAccessExpr.expr.type.tag != TypeTags.TABLE) {
+        if (indexBasedAccessExpr.indexExpr.getKind() == NodeKind.TABLE_MULTI_KEY &&
+                indexBasedAccessExpr.expr.type.tag != TypeTags.TABLE) {
             dlog.error(indexBasedAccessExpr.pos, DiagnosticCode.MULTI_KEY_MEMBER_ACCESS_NOT_SUPPORTED,
                     indexBasedAccessExpr.expr.type);
             resultType = symTable.semanticError;
@@ -5276,15 +5278,16 @@ private BType checkIndexAccessExpr(BLangIndexBasedAccess indexBasedAccessExpr) {
                 }
             }
 
-            if (indexExpr != null) {
+            if (indexExpr.getKind() != NodeKind.TABLE_MULTI_KEY) {
                 checkExpr(indexExpr, this.env, keyTypeConstraint);
                 if (indexExpr.type == symTable.semanticError) {
                     dlog.error(indexBasedAccessExpr.pos, DiagnosticCode.INVALID_KEY_CONSTRAINT_PROVIDED_FOR_ACCESS,
                             keyTypeConstraint);
                     return symTable.semanticError;
                 }
             } else {
-                List<BLangExpression> multiKeyExpressionList = indexBasedAccessExpr.multiKeyExpr.multiKeyIndexExprs;
+                List<BLangExpression> multiKeyExpressionList = ((BLangTableMultiKeyExpr)
+                        indexBasedAccessExpr.indexExpr).multiKeyIndexExprs;
                 List<BType> keyConstraintTypes = ((BTupleType) keyTypeConstraint).tupleTypes;
                 if (keyConstraintTypes.size() != multiKeyExpressionList.size()) {
                     dlog.error(indexBasedAccessExpr.pos, DiagnosticCode.INVALID_KEY_CONSTRAINT_PROVIDED_FOR_ACCESS,

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java

@@ -547,7 +547,6 @@ private boolean isAssignable(BType source, BType target, Set<TypePair> unresolve
                     unresolvedTypes);
         }
 
-        //TODO Need to check the key specifier
         if (targetTag == TypeTags.TABLE && sourceTag == TypeTags.TABLE) {
             return isAssignableTableType((BTableType) source, (BTableType) target);
         }

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangIndexBasedAccess.java

@@ -32,7 +32,6 @@
 public class BLangIndexBasedAccess extends BLangAccessExpression implements IndexBasedAccessNode {
 
     public BLangExpression indexExpr;
-    public BLangTableMultiKeyExpr multiKeyExpr;
 
     // Only used at Desugar and after.
     public boolean isStoreOnCreation = false;
@@ -49,16 +48,7 @@ public BLangExpression getIndex() {
 
     @Override
     public String toString() {
-        if (indexExpr != null) {
-            return String.valueOf(expr) + "[" + String.valueOf(indexExpr) + "]";
-        } else {
-            return String.valueOf(expr) + "[" + multiKeyExpr.toString();
-        }
-    }
-
-    @Override
-    public BLangTableMultiKeyExpr getMultiKeyExpr() {
-        return this.multiKeyExpr;
+        return String.valueOf(expr) + "[" + String.valueOf(indexExpr) + "]";
     }
 
     @Override

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangTableConstructorExpr.java

@@ -28,9 +28,8 @@
 import java.util.List;
 
 /**
- * BLangTableConstructorExpr class.
+ * Implementation of Table constructor expression.
  *
- * @see BLangTableConstructorExpr
  * @since 1.3.0
  */
 public class BLangTableConstructorExpr extends BLangExpression implements TableConstructorExprNode {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangTableMultiKeyExpr.java

@@ -25,6 +25,8 @@
 import java.util.List;
 
 /**
+ * Represents an expression which can hold expressions related to table member access.
+ *
  * @since 1.3.0
  */
 public class BLangTableMultiKeyExpr extends BLangAccessExpression implements TableMultiKeyExpressionNode {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/types/BLangTableTypeNode.java

@@ -27,6 +27,8 @@
 import org.wso2.ballerinalang.compiler.tree.BLangTableKeyTypeConstraint;
 
 /**
+ * {@code BLangTableTypeNode} represents a table type node in Ballerina.
+ *
  * @since 1.3.0
  */
 public class BLangTableTypeNode extends BLangType implements TableTypeNode {

compiler/ballerina-lang/src/main/resources/compiler.properties

@@ -1009,7 +1009,7 @@ error.error.type.expected = \
 error.missing.required.method.next = \
   ''{0}'' must implement ''public function next() returns {1}''.
 
-error.invalid.stream.constraint.subtype = \
+error.invalid.table.constraint.subtype = \
   invalid constraint type. expected subtype of ''map<any|error>'' but ''{0}''
 
 error.table.key.specifier.mismatch = \

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Filter.java

@@ -34,6 +34,7 @@
 /**
  * Native implementation of lang.table:filter(table<Type>, function).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "filter",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Foreach.java

@@ -31,6 +31,7 @@
 /**
  * Native implementation of lang.table:forEach(table<Type>, function).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "forEach",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Get.java

@@ -28,6 +28,7 @@
 /**
  * Native implementation of lang.table:get(table<Type>, KeyType).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "get",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetIterator.java

@@ -29,6 +29,7 @@
 /**
  * Native implementation of lang.table:iterator(table<Type>).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "iterator",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java

@@ -34,6 +34,8 @@
 /**
  * Extern function to get key arrays from the table.
  * ballerina.model.table:keys()
+ *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/HasKey.java

@@ -28,6 +28,8 @@
 /**
  * Extern function to check existence of key.
  * ballerina.model.table:hasKey(KeyType)
+ *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "hasKey",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Length.java

@@ -28,6 +28,7 @@
 /**
  * Native implementation of lang.table:length(map).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "length",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java

@@ -36,6 +36,7 @@
 /**
  * Native implementation of lang.table:map(table<Type>, function).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "map",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Next.java

@@ -33,6 +33,7 @@
 /**
  * Native implementation of lang.table.TableIterator:next().
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "next",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/NextKey.java

@@ -28,6 +28,8 @@
 /**
  * Extern function to get next key from the table.
  * ballerina.model.table:nextKey()
+ *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Reduce.java

@@ -33,6 +33,7 @@
 /**
  * Native implementation of lang.table:reduce(table<Type>, function).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "reduce",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Remove.java

@@ -28,6 +28,7 @@
 /**
  * Native implementation of lang.table:remove(table<Type>, KeyType).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "remove",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/RemoveAll.java

@@ -28,6 +28,7 @@
 /**
  * Native implementation of lang.table:removeAll(table<Type>).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "removeAll",

langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/RemoveIfHasKey.java

@@ -28,6 +28,7 @@
 /**
  * Native implementation of lang.table:removeIfHasKey(table<Type>, KeyType).
  *
+ * @since 1.3.0
  */
 @BallerinaFunction(
         orgName = "ballerina", packageName = "lang.table", functionName = "removeIfHasKey",