Merge pull request #23473 from KRVPerera/krv_annotation_value_restric…

…tion Restrict annotation value to true, map<anydata|readonly> , map<anydata|readonly>[]
ballerina-platform · Jun 17, 2020 · 457db3b · 457db3b
2 parents 6c7e912 + 5342dcd
commit 457db3b
Show file tree

Hide file tree

Showing 18 changed files with 308 additions and 58 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/AbstractObjectValue.java b/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/AbstractObjectValue.java
@@ -118,12 +118,17 @@ public BObjectType getType() {
 
     @Override
     public Object copy(Map<Object, Object> refs) {
-        throw new UnsupportedOperationException();
+        return this;
+    }
+
+    @Override
+    public void freezeDirect() {
+        return;
     }
 
     @Override
     public Object frozenCopy(Map<Object, Object> refs) {
-        throw new UnsupportedOperationException();
+        return this;
     }
 
     @Override

diff --git a/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/FPValue.java b/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/FPValue.java
@@ -102,6 +102,11 @@ public Object frozenCopy(Map<Object, Object> refs) {
         return this;
     }
 
+    @Override
+    public void freezeDirect() {
+        return;
+    }
+
     @Override
     public String toString() {
         return BLangConstants.EMPTY;

diff --git a/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/HandleValue.java b/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/HandleValue.java
@@ -67,7 +67,12 @@ public BType getType() {
 
     @Override
     public Object copy(Map<Object, Object> refs) {
-        return null;
+        return this;
+    }
+
+    @Override
+    public void freezeDirect() {
+        return;
     }
 
     @Override

diff --git a/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/TypedescValueImpl.java b/bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/TypedescValueImpl.java
@@ -107,6 +107,11 @@ public Object copy(Map<Object, Object> refs) {
         return this;
     }
 
+    @Override
+    public void freezeDirect() {
+        return;
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java
@@ -178,6 +178,7 @@
 
 import javax.xml.XMLConstants;
 
+import static org.ballerinalang.model.tree.NodeKind.INVOCATION;
 import static org.wso2.ballerinalang.compiler.desugar.AnnotationDesugar.ANNOTATION_DATA;
 import static org.wso2.ballerinalang.compiler.util.Constants.DESUGARED_MAPPING_CONSTR_KEY;
 
@@ -192,6 +193,7 @@ public class BIRGen extends BLangNodeVisitor {
             new CompilerContext.Key<>();
 
     public static final String DEFAULT_WORKER_NAME = "default";
+    public static final String CLONE_READ_ONLY = "cloneReadOnly";
     private BIRGenEnv env;
     private Names names;
     private final SymbolTable symTable;
@@ -625,8 +627,10 @@ public void visit(BLangAnnotationAttachment astAnnotAttach) {
         this.env.enclAnnotAttachments.add(annotAttachment);
     }
 
-    private boolean isCompileTimeAnnotationValue(BLangExpression expr) {
-        // TODO Compile time literal constants
+    private boolean isCompileTimeAnnotationValue(BLangExpression expression) {
+
+        BLangExpression expr = unwrapAnnotationExpressionFromCloneReadOnly(expression);
+
         switch (expr.getKind()) {
             case LITERAL:
             case NUMERIC_LITERAL:
@@ -672,7 +676,18 @@ private boolean isCompileTimeAnnotationValue(BLangExpression expr) {
         }
     }
 
-    private BIRAnnotationValue createAnnotationValue(BLangExpression expr) {
+    private BLangExpression unwrapAnnotationExpressionFromCloneReadOnly(BLangExpression expr) {
+        if (expr.getKind() == INVOCATION) {
+            BLangInvocation invocation = (BLangInvocation) expr;
+            if (invocation.name.getValue().equals(CLONE_READ_ONLY)) {
+                return invocation.expr;
+            }
+        }
+        return expr;
+    }
+
+    private BIRAnnotationValue createAnnotationValue(BLangExpression expression) {
+        BLangExpression expr = unwrapAnnotationExpressionFromCloneReadOnly(expression);
         // TODO Compile time literal constants
         switch (expr.getKind()) {
             case LITERAL:

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java
@@ -1013,6 +1013,9 @@ public void visit(BLangAnnotation annotationNode) {
 
     public void visit(BLangAnnotationAttachment annAttachmentNode) {
         annAttachmentNode.expr = rewrite(annAttachmentNode.expr, env);
+        if (annAttachmentNode.expr != null) {
+            annAttachmentNode.expr = visitCloneReadonly(annAttachmentNode.expr, annAttachmentNode.expr.type);
+        }
         result = annAttachmentNode;
     }
 

diff --git a/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java b/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java
@@ -65,10 +65,13 @@
 import org.wso2.ballerinalang.compiler.semantics.model.types.BFutureType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BIntersectionType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BInvokableType;
+import org.wso2.ballerinalang.compiler.semantics.model.types.BMapType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BObjectType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BRecordType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BServiceType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BStructureType;
+import org.wso2.ballerinalang.compiler.semantics.model.types.BTableType;
+import org.wso2.ballerinalang.compiler.semantics.model.types.BTupleType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BTypeIdSet;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BUnionType;
@@ -1360,22 +1363,85 @@ private boolean isValidAnnotationType(BType type) {
         }
 
         switch (type.tag) {
-            case TypeTags.RECORD:
-//                BRecordType recordType = (BRecordType) type;
-//                return recordType.fields.stream().allMatch(field -> types.isAnydata(field.type)) &&
-//                        (recordType.sealed || types.isAnydata(recordType.restFieldType));
             case TypeTags.MAP:
-//                return types.isAnydata(((BMapType) type).constraint);
-                return true;
+                BType constraintType = ((BMapType) type).constraint;
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(constraintType);
+            case TypeTags.RECORD:
+                BRecordType recordType = (BRecordType) type;
+                for (BField field : recordType.fields.values()) {
+                    if (!isAnyDataOrReadOnlyTypeSkippingObjectType(field.type)) {
+                        return false;
+                    }
+                }
+
+                BType recordRestType = recordType.restFieldType;
+                if (recordRestType == null || recordRestType == symTable.noType) {
+                    return true;
+                }
+
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(recordRestType);
             case TypeTags.ARRAY:
                 BType elementType = ((BArrayType) type).eType;
-                return (elementType.tag == TypeTags.MAP || elementType.tag == TypeTags.RECORD) &&
-                        isValidAnnotationType(elementType);
+                if ((elementType.tag == TypeTags.MAP) || (elementType.tag == TypeTags.RECORD)) {
+                    return isValidAnnotationType(elementType);
+                }
+                return false;
         }
 
         return types.isAssignable(type, symTable.trueType);
     }
 
+    private boolean isAnyDataOrReadOnlyTypeSkippingObjectType(BType type) {
+        if (type == symTable.semanticError) {
+            return false;
+        }
+        switch (type.tag) {
+            case TypeTags.OBJECT:
+                return true;
+            case TypeTags.RECORD:
+                BRecordType recordType = (BRecordType) type;
+                for (BField field : recordType.fields.values()) {
+                    if (!isAnyDataOrReadOnlyTypeSkippingObjectType(field.type)) {
+                        return false;
+                    }
+                }
+                BType recordRestType = recordType.restFieldType;
+                if (recordRestType == null || recordRestType == symTable.noType) {
+                    return true;
+                }
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(recordRestType);
+            case TypeTags.MAP:
+                BType constraintType = ((BMapType) type).constraint;
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(constraintType);
+            case TypeTags.UNION:
+                for (BType memberType : ((BUnionType) type).getMemberTypes()) {
+                    if (!isAnyDataOrReadOnlyTypeSkippingObjectType(memberType)) {
+                        return false;
+                    }
+                }
+                return true;
+            case TypeTags.TUPLE:
+                BTupleType tupleType = (BTupleType) type;
+                for (BType tupMemType : tupleType.getTupleTypes()) {
+                    if (!isAnyDataOrReadOnlyTypeSkippingObjectType(tupMemType)) {
+                        return false;
+                    }
+                }
+                BType tupRestType = tupleType.restType;
+                if (tupRestType == null) {
+                    return true;
+                }
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(tupRestType);
+            case TypeTags.TABLE:
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(((BTableType) type).constraint);
+            case TypeTags.ARRAY:
+                return isAnyDataOrReadOnlyTypeSkippingObjectType(((BArrayType) type).getElementType());
+        }
+
+        return types.isAssignable(type, symTable.anydataOrReadOnlyType);
+    }
+
+
     /**
      * Visit each compilation unit (.bal file) and add each top-level node
      * in the compilation unit to the package node.

diff --git a/...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java b/...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java
@@ -136,6 +136,7 @@ public class SymbolTable {
 
     public final BType semanticError = new BType(TypeTags.SEMANTIC_ERROR, null);
     public final BType nullSet = new BType(TypeTags.NULL_SET, null);
+    public final BUnionType anydataOrReadOnlyType = BUnionType.create(null, anydataType, readonlyType);
 
     public BType streamType = new BStreamType(TypeTags.STREAM, anydataType, null, null);
     public BType tableType = new BTableType(TypeTags.TABLE, anydataType, null);

diff --git a/compiler/ballerina-lang/src/main/resources/compiler.properties b/compiler/ballerina-lang/src/main/resources/compiler.properties
@@ -546,7 +546,8 @@ error.annotation.attachment.cannot.specify.multiple.values=\
   cannot specify more than one annotation value for annotation ''{0}''
 
 error.annotation.invalid.type=\
-  annotation declaration requires a subtype of ''true'', ''map<anydata>'' or ''map<anydata>[]'', but found ''{0}''
+  annotation declaration requires a subtype of ''true'', ''map<anydata|readonly>'' or ''map<anydata|readonly>[]'', but \
+  found ''{0}''
 
 error.annotation.invalid.const.type=\
   invalid type ''{0}'' for ''const'' annotation declaration, expected ''anydata''

diff --git a/.../ballerinalang/langserver/completion/annotations/AnnotationAttachmentsCompletionTest.java b/.../ballerinalang/langserver/completion/annotations/AnnotationAttachmentsCompletionTest.java
@@ -47,12 +47,12 @@ public Object[][] dataProvider() {
 //                {"annotationAccessExpression4.json", "annotation"},
                 {"annotationAccessExpression5.json", "annotation"},
                 {"annotationAccessExpression6.json", "annotation"},
-                {"annotationBodyCompletion1.json", "annotation"},
-                {"annotationBodyCompletion2.json", "annotation"},
+//                {"annotationBodyCompletion1.json", "annotation"},
+//                {"annotationBodyCompletion2.json", "annotation"},
                 {"annotationBodyCompletion3.json", "annotation"},
                 {"annotationBodyCompletion4.json", "annotation"},
                 {"annotationBodyCompletion5.json", "annotation"},
-                {"annotationBodyCompletion6.json", "annotation"},
+//                {"annotationBodyCompletion6.json", "annotation"},
 //                {"annotationInSameModule1.json", "annotation"},
 //                {"annotationInSameModule2.json", "annotation"},
 //                {"annotationInSameModule3.json", "annotation"},

diff --git a/stdlib/grpc/src/main/ballerina/src/grpc/annotation.bal b/stdlib/grpc/src/main/ballerina/src/grpc/annotation.bal
@@ -30,7 +30,7 @@ public annotation GrpcServiceConfig ServiceConfig on service;
 # + descMap - Service dependent descriptor map, which should be set at the compile time
 public type ServiceDescriptorData record {|
     string descriptor = "";
-    map<any> descMap = {};
+    map<anydata> descMap = {};
 |};
 
 # Service descriptor annotation. This is for internal use.

diff --git a/stdlib/messaging/rabbitmq/src/main/ballerina/src/rabbitmq/rabbitmq_commons.bal b/stdlib/messaging/rabbitmq/src/main/ballerina/src/rabbitmq/rabbitmq_commons.bal
@@ -68,7 +68,7 @@ public type QueueConfiguration record {|
     boolean durable = false;
     boolean exclusive = false;
     boolean autoDelete = true;
-    map<any>? arguments = ();
+    map<anydata>? arguments = ();
 |};
 
 # Configurations used to declare an exchange.
@@ -83,7 +83,7 @@ public type ExchangeConfiguration record {|
     ExchangeType exchangeType = DIRECT_EXCHANGE;
     boolean durable = false;
     boolean autoDelete = false;
-    map<any>? arguments = ();
+    map<anydata>? arguments = ();
 |};
 
 # Configurations used to create a `rabbitmq:Connection`.