From b98d05bd7340b658fcdf22d4134d94c4c4c75730 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Sat, 14 Sep 2013 21:51:40 +0400 Subject: [PATCH] 'suppress' annotation added to built-ins #KT-3319 In Progress --- .../frontend/builtins/jet/.kotlin_class_names | Bin 752 -> 756 bytes .../frontend/builtins/jet/.kotlin_name_table | Bin 5276 -> 5302 bytes .../frontend/builtins/jet/.kotlin_package | Bin 291 -> 291 bytes .../builtins/jet/suppress.kotlin_class | Bin 0 -> 53 bytes .../builtins/jet/volatile.kotlin_class | 4 ++-- compiler/testData/builtin-classes.txt | 4 ++++ .../jet/lang/types/lang/KotlinBuiltIns.java | 5 +++++ idea/builtinsSrc/jet/Library.jet | 1 + 8 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 compiler/frontend/builtins/jet/suppress.kotlin_class diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 19121b1e97ecf50c6929ac872e129d15f7a7e5a9..217d719bc653114f391b01d08ac58fbb7b88b6fa 100644 GIT binary patch delta 18 Ycmeys`h}H+fq`MqMwT~BKn7zR05z`!wEzGB delta 13 Ucmeyu`hk^&fq`N7MwT~B03W0TQ2+n{ diff --git a/compiler/frontend/builtins/jet/.kotlin_name_table b/compiler/frontend/builtins/jet/.kotlin_name_table index 964f216fcde2526a10c6a0f4f3107f3c38295732..4e391c72de62f0f9adcd71b7a28b7baacecdeda8 100644 GIT binary patch delta 47 zcmbQExlNPt+D1lJ0si9Bf`X#d;$kk=yu{qp;>j!m&Wv|9dkBQEaB{J8FbLdZl3)M; DZrKe^ delta 21 dcmdm{IY*Q6=tf3Xfyv?mj*OQ#M+$_n002z`26X@c diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 105adc87a8d87b75d31b743d3abbafb8d2cc560c..1780444e4bdc059d158736044b43100152d1ca49 100644 GIT binary patch delta 62 zcmZ3?w3tbR%aDUjiHCzhfK`i)i%Eb{g3;jqL=iux2TT(kMJHBfh(2Vp;s#1TVv=G3 O$yV7Bv2Ei&T)**/) +} + public final annotation class volatile : jet.Annotation { /*primary*/ public constructor volatile() } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 646cfc6eb78..72e6653b08c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -373,6 +373,11 @@ public class KotlinBuiltIns { return getBuiltInClassByName("data"); } + @NotNull + public ClassDescriptor getSuppressAnnotationClass() { + return getBuiltInClassByName("suppress"); + } + @NotNull public ClassDescriptor getVolatileAnnotationClass() { return getBuiltInClassByName("volatile"); diff --git a/idea/builtinsSrc/jet/Library.jet b/idea/builtinsSrc/jet/Library.jet index ab4e2c39222..fe19c3f8db0 100644 --- a/idea/builtinsSrc/jet/Library.jet +++ b/idea/builtinsSrc/jet/Library.jet @@ -6,6 +6,7 @@ public annotation class volatile : Annotation public annotation class atomic : Annotation public annotation class data : Annotation public annotation class deprecated(value: String) : Annotation +public annotation class suppress(vararg names: String) public fun synchronized(lock: Any, block : () -> R) : R