azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intrinsic renamed to Intrinsic

Browse Source
This commit is contained in:
Alex Tkachman
2012-02-21 15:31:05 +02:00
parent 5e7de3f5ab
commit fb8fa8bf9e
7 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java
+1 -1
View File
@@ -52,7 +52,7 @@ public abstract class AnnotationCodegen {
if(!valueArguments.isEmpty()) {
// todo: temporary hack for intrinsics in stdlib
if(valueArguments.size()==1 && "intrinsic".equals(annotationDescriptor.getType().getConstructor().getDeclarationDescriptor().getName())) {
if(valueArguments.size()==1 && "Intrinsic".equals(annotationDescriptor.getType().getConstructor().getDeclarationDescriptor().getName())) {
annotationVisitor.visit("value", valueArguments.get(0).getValue());
}
else
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class BinaryOp implements IntrinsicMethod {
expectedType = JetTypeMapper.unboxType(expectedType);
}
if (arguments.size() == 1) {
// intrinsic is called as an ordinary function
// Intrinsic is called as an ordinary function
if (receiver != null) {
receiver.put(expectedType, v);
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+1 -1
View File
@@ -244,7 +244,7 @@ public class IntrinsicMethods {
List<AnnotationDescriptor> annotations = descriptor.getAnnotations();
if (annotations != null) {
for (AnnotationDescriptor annotation : annotations) {
if("intrinsic".equals(annotation.getType().getConstructor().getDeclarationDescriptor().getName())) {
if("Intrinsic".equals(annotation.getType().getConstructor().getDeclarationDescriptor().getName())) {
intrinsicMethod = namedMethods.get(annotation.getValueArguments().get(0).getValue());
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
-7
View File
@@ -1315,13 +1315,6 @@ public class JavaDescriptorResolver {
@Nullable
private FunctionDescriptorImpl resolveMethodToFunctionDescriptor(ClassOrNamespaceDescriptor owner, final PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, final PsiMethodWrapper method) {
PsiAnnotation[] applicableAnnotations = method.getPsiMethod().getModifierList().getAnnotations();
for (PsiAnnotation applicableAnnotation : applicableAnnotations) {
if("jet.runtime.intrinsic".equals(applicableAnnotation.getQualifiedName())) {
PsiAnnotationMemberValue value = applicableAnnotation.findAttributeValue("value");
}
}
PsiType returnType = method.getReturnType();
if (returnType == null) {
return null;
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+2 -2
View File
@@ -100,7 +100,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
Collection<? extends DeclarationDescriptor> declarationDescriptors = bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, myExpression);
if (declarationDescriptors != null) return null;
// TODO: Need a better resolution for intrinsic function (KT-975)
// TODO: Need a better resolution for Intrinsic function (KT-975)
return file;
}
@@ -115,7 +115,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
for (DeclarationDescriptor descriptor : declarationDescriptors) {
PsiElement element = bindingContext.get(DESCRIPTOR_TO_DECLARATION, descriptor);
if (element == null) {
// TODO: Need a better resolution for intrinsic function (KT-975)
// TODO: Need a better resolution for Intrinsic function (KT-975)
element = file;
}
stdlib/ktSrc/JavaLang.kt
+3 -3
View File
@@ -3,9 +3,9 @@ package std
import java.lang.Class
import java.lang.Object
import jet.runtime.intrinsic
import jet.runtime.Intrinsic
val <T> T.javaClass : Class<T>
[intrinsic("std.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class<T>
[Intrinsic("std.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class<T>
[intrinsic("std.javaClass.function")] fun <T> javaClass() : Class<T> = null as Class<T>
[Intrinsic("std.javaClass.function")] fun <T> javaClass() : Class<T> = null as Class<T>
stdlib/src/jet/runtime/Intrinsic.java
+1 -1
View File
@@ -26,6 +26,6 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface intrinsic {
public @interface Intrinsic {
String value();
}