Inline keyword removal

core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineStrategy.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.types.lang;
+
+public enum InlineStrategy {
+    AS_FUNCTION,
+    IN_PLACE,
+    NOT_INLINE;
+}

core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.types.lang;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
+import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
+import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
+import org.jetbrains.jet.lang.resolve.constants.EnumValue;
+
+import java.util.List;
+
+public class InlineUtil {
+
+    @NotNull
+    public static InlineStrategy getInlineType(@NotNull Annotated annotated) {
+        return getInlineType(annotated.getAnnotations());
+    }
+
+    public static boolean hasNoinlineAnnotation(@NotNull CallableDescriptor valueParameterDescriptor) {
+        KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
+        return KotlinBuiltIns.containsAnnotation(valueParameterDescriptor, builtIns.getNoinlineClassAnnotation());
+    }
+
+    @NotNull
+    public static InlineStrategy getInlineType(@Nullable List<AnnotationDescriptor> annotations) {
+        KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
+        ClassDescriptor annotationClass = builtIns.getInlineClassAnnotation();
+        AnnotationDescriptor annotation = getAnnotation(annotations, annotationClass);
+        if (annotation != null) {
+            ValueParameterDescriptor parameterDescriptor = annotationClass.getConstructors().iterator().next().getValueParameters().get(0);
+            CompileTimeConstant<?> argument = annotation.getValueArgument(parameterDescriptor);
+            if (argument == null) {
+                //default parameter
+                return InlineStrategy.AS_FUNCTION;
+            }
+            else {
+                assert argument instanceof EnumValue : "Inline annotation parameter should be inline entry but was: " + argument + "!";
+                PropertyDescriptor value = ((EnumValue)argument).getValue();
+                String name = value.getName().asString();
+                return name.equals(InlineStrategy.IN_PLACE.name()) ? InlineStrategy.IN_PLACE : InlineStrategy.AS_FUNCTION;
+            }
+        }
+        else {
+            return InlineStrategy.NOT_INLINE;
+        }
+    }
+
+    @Nullable
+    private static AnnotationDescriptor getAnnotation(@Nullable List<AnnotationDescriptor> annotations, @NotNull ClassDescriptor annotationClass) {
+        if (annotations != null) {
+            for (AnnotationDescriptor annotation : annotations) {
+                if (annotationClass.equals(annotation.getType().getConstructor().getDeclarationDescriptor())) {
+                    return annotation;
+                }
+            }
+        }
+        return null;
+    }
+
+
+}
+

core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java

@@ -24,10 +24,14 @@ import org.jetbrains.jet.lang.DefaultModuleConfiguration;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
 import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
+import org.jetbrains.jet.lang.resolve.constants.EnumValue;
+import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.name.SpecialNames;
@@ -36,7 +40,6 @@ import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl;
 import org.jetbrains.jet.lang.types.*;
-import org.jetbrains.jet.storage.LockBasedStorageManager;
 
 import java.io.IOException;
 import java.util.*;
@@ -379,6 +382,15 @@ public class KotlinBuiltIns {
         return getBuiltInClassByName("data");
     }
 
+    public ClassDescriptor getNoinlineClassAnnotation() {
+        return getBuiltInClassByName("noinline");
+    }
+
+    @NotNull
+    public ClassDescriptor getInlineClassAnnotation() {
+        return getBuiltInClassByName("inline");
+    }
+
     @NotNull
     public ClassDescriptor getSuppressAnnotationClass() {
         return getBuiltInClassByName("suppress");
@@ -943,7 +955,7 @@ public class KotlinBuiltIns {
         return containsAnnotation(declarationDescriptor, getDeprecatedAnnotation());
     }
 
-    private static boolean containsAnnotation(DeclarationDescriptor descriptor, ClassDescriptor annotationClass) {
+    static boolean containsAnnotation(DeclarationDescriptor descriptor, ClassDescriptor annotationClass) {
         List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations();
         if (annotations != null) {
             for (AnnotationDescriptor annotation : annotations) {