Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
b6590a38
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b6590a38
编写于
1月 19, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
codegen: fix calls to global functions when loaded from java descriptors
上级
021fb14c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
41 addition
and
19 deletion
+41
-19
compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
...ckend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
+1
-1
compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java
...backend/src/org/jetbrains/jet/codegen/CodegenContext.java
+1
-1
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
...ackend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+1
-1
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
.../backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+11
-4
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
...ckend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+11
-5
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+4
-2
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java
...brains/jet/lang/resolve/java/JavaNamespaceDescriptor.java
+8
-1
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
...iler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+2
-2
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
...org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+2
-2
未找到文件。
compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
浏览文件 @
b6590a38
...
...
@@ -35,7 +35,7 @@ public class ClassFileFactory {
String
fqName
=
JetPsiUtil
.
getFQName
(
file
);
NamespaceCodegen
codegen
=
ns2codegen
.
get
(
fqName
);
if
(
codegen
==
null
)
{
final
ClassBuilder
builder
=
newVisitor
(
NamespaceCodegen
.
getJVMClassName
(
fqName
)
+
".class"
);
final
ClassBuilder
builder
=
newVisitor
(
NamespaceCodegen
.
getJVMClassName
(
fqName
,
true
)
+
".class"
);
codegen
=
new
NamespaceCodegen
(
builder
,
fqName
,
state
,
file
.
getContainingFile
());
ns2codegen
.
put
(
fqName
,
codegen
);
}
...
...
compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java
浏览文件 @
b6590a38
...
...
@@ -92,7 +92,7 @@ public abstract class CodegenContext {
while
(!(
descriptor
instanceof
NamespaceDescriptor
))
{
descriptor
=
descriptor
.
getContainingDeclaration
();
}
return
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
descriptor
));
return
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
descriptor
)
,
true
);
}
public
OwnerKind
getContextKind
()
{
...
...
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
浏览文件 @
b6590a38
...
...
@@ -310,7 +310,7 @@ public class FunctionCodegen {
int
flags
=
ACC_PUBLIC
;
// TODO.
String
ownerInternalName
=
contextClass
instanceof
NamespaceDescriptor
?
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
contextClass
))
:
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
contextClass
)
,
true
)
:
state
.
getTypeMapper
().
mapType
(((
ClassDescriptor
)
contextClass
).
getDefaultType
(),
OwnerKind
.
IMPLEMENTATION
).
getInternalName
();
String
descriptor
=
jvmSignature
.
getDescriptor
().
replace
(
")"
,
"I)"
);
...
...
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
浏览文件 @
b6590a38
...
...
@@ -92,8 +92,11 @@ public class JetTypeMapper {
public
String
getOwner
(
DeclarationDescriptor
descriptor
,
OwnerKind
kind
)
{
String
owner
;
DeclarationDescriptor
containingDeclaration
=
descriptor
.
getContainingDeclaration
();
if
(
containingDeclaration
instanceof
NamespaceDescriptor
)
{
owner
=
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
((
NamespaceDescriptor
)
containingDeclaration
));
if
(
containingDeclaration
instanceof
JavaNamespaceDescriptor
)
{
JavaNamespaceDescriptor
javaNamespaceDescriptor
=
(
JavaNamespaceDescriptor
)
containingDeclaration
;
owner
=
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
((
NamespaceDescriptor
)
containingDeclaration
),
javaNamespaceDescriptor
.
isNamespace
());
}
else
if
(
containingDeclaration
instanceof
NamespaceDescriptor
)
{
owner
=
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
((
NamespaceDescriptor
)
containingDeclaration
),
true
);
}
else
if
(
containingDeclaration
instanceof
ClassDescriptor
)
{
ClassDescriptor
classDescriptor
=
(
ClassDescriptor
)
containingDeclaration
;
...
...
@@ -365,7 +368,11 @@ public class JetTypeMapper {
ClassDescriptor
thisClass
;
if
(
functionParent
instanceof
NamespaceDescriptor
)
{
assert
!
superCall
;
owner
=
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
functionParent
));
boolean
namespace
=
true
;
if
(
functionParent
instanceof
JavaNamespaceDescriptor
)
{
namespace
=
((
JavaNamespaceDescriptor
)
functionParent
).
isNamespace
();
}
owner
=
NamespaceCodegen
.
getJVMClassName
(
DescriptorUtils
.
getFQName
(
functionParent
),
namespace
);
invokeOpcode
=
INVOKESTATIC
;
thisClass
=
null
;
}
...
...
@@ -711,7 +718,7 @@ public class JetTypeMapper {
String
baseName
;
if
(
container
instanceof
JetFile
)
{
baseName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(((
JetFile
)
container
)));
baseName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(((
JetFile
)
container
))
,
true
);
}
else
{
ClassDescriptor
aClass
=
bindingContext
.
get
(
BindingContext
.
CLASS
,
container
);
...
...
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
浏览文件 @
b6590a38
...
...
@@ -34,7 +34,7 @@ public class NamespaceCodegen {
v
.
defineClass
(
sourceFile
,
V1_6
,
ACC_PUBLIC
/*|ACC_SUPER*/
,
getJVMClassName
(
fqName
),
getJVMClassName
(
fqName
,
true
),
null
,
//"jet/lang/Namespace",
"java/lang/Object"
,
...
...
@@ -118,7 +118,7 @@ public class NamespaceCodegen {
private
void
generateTypeInfoFields
(
JetFile
file
,
CodegenContext
context
)
{
if
(
context
.
typeInfoConstants
!=
null
)
{
String
jvmClassName
=
getJVMClassName
(
JetPsiUtil
.
getFQName
(
file
));
String
jvmClassName
=
getJVMClassName
(
JetPsiUtil
.
getFQName
(
file
)
,
true
);
for
(
int
index
=
0
;
index
!=
context
.
typeInfoConstantsCount
;
index
++)
{
JetType
type
=
context
.
reverseTypeInfoConstants
.
get
(
index
);
String
fieldName
=
"$typeInfoCache$"
+
index
;
...
...
@@ -205,14 +205,20 @@ public class NamespaceCodegen {
v
.
done
();
}
public
static
String
getJVMClassName
(
String
fqName
)
{
/**
* @param namespace true for "namespace" suffix
*/
public
static
String
getJVMClassName
(
String
fqName
,
boolean
namespace
)
{
if
(
fqName
.
length
()
==
0
)
{
return
JvmAbi
.
PACKAGE_CLASS
;
}
String
name
=
fqName
.
replace
(
'.'
,
'/'
)
+
"/"
+
JvmAbi
.
PACKAGE_CLASS
;
String
name
=
fqName
.
replace
(
'.'
,
'/'
);
if
(
name
.
startsWith
(
"<java_root>"
))
{
name
=
name
.
substring
(
"<java_root>"
.
length
()
+
1
,
name
.
length
()
-
1
-
JvmAbi
.
PACKAGE_CLASS
.
length
());
name
=
name
.
substring
(
"<java_root>"
.
length
()
+
1
,
name
.
length
());
}
if
(
namespace
)
{
name
+=
"/"
+
JvmAbi
.
PACKAGE_CLASS
;
}
return
name
;
}
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
b6590a38
...
...
@@ -633,7 +633,8 @@ public class JavaDescriptorResolver {
resolveParentDescriptor
(
psiPackage
),
Collections
.<
AnnotationDescriptor
>
emptyList
(),
// TODO
name
==
null
?
JAVA_ROOT
:
name
,
name
==
null
?
JAVA_ROOT
:
psiPackage
.
getQualifiedName
()
name
==
null
?
JAVA_ROOT
:
psiPackage
.
getQualifiedName
(),
true
);
namespaceData
.
namespaceDescriptor
.
setMemberScope
(
new
JavaPackageScope
(
psiPackage
.
getQualifiedName
(),
namespaceData
.
namespaceDescriptor
,
semanticServices
));
...
...
@@ -657,7 +658,8 @@ public class JavaDescriptorResolver {
resolveParentDescriptor
(
psiClass
),
Collections
.<
AnnotationDescriptor
>
emptyList
(),
// TODO
psiClass
.
getName
(),
psiClass
.
getQualifiedName
()
psiClass
.
getQualifiedName
(),
false
);
namespaceData
.
namespaceDescriptor
.
setMemberScope
(
new
JavaClassMembersScope
(
namespaceData
.
namespaceDescriptor
,
psiClass
,
semanticServices
,
true
));
semanticServices
.
getTrace
().
record
(
BindingContext
.
NAMESPACE
,
psiClass
,
namespaceData
.
namespaceDescriptor
);
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java
浏览文件 @
b6590a38
...
...
@@ -14,11 +14,14 @@ import java.util.List;
public
class
JavaNamespaceDescriptor
extends
AbstractNamespaceDescriptorImpl
{
private
JetScope
memberScope
;
private
final
String
qualifiedName
;
/** Namespace of class with static methods */
private
final
boolean
namespace
;
public
JavaNamespaceDescriptor
(
DeclarationDescriptor
containingDeclaration
,
List
<
AnnotationDescriptor
>
annotations
,
@NotNull
String
name
,
@NotNull
String
qualifiedName
)
{
@NotNull
String
name
,
@NotNull
String
qualifiedName
,
boolean
namespace
)
{
super
(
containingDeclaration
,
annotations
,
name
);
this
.
qualifiedName
=
qualifiedName
;
this
.
namespace
=
namespace
;
}
public
void
setMemberScope
(
@NotNull
JetScope
memberScope
)
{
...
...
@@ -34,4 +37,8 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
public
String
getQualifiedName
()
{
return
qualifiedName
;
}
public
boolean
isNamespace
()
{
return
namespace
;
}
}
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
浏览文件 @
b6590a38
...
...
@@ -91,7 +91,7 @@ public abstract class CodegenTestCase extends JetLiteFixture {
ClassFileFactory
codegens
=
generateClassesInFile
();
GeneratedClassLoader
loader
=
new
GeneratedClassLoader
(
codegens
);
String
fqName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
myFile
)).
replace
(
"/"
,
"."
);
String
fqName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
myFile
)
,
true
).
replace
(
"/"
,
"."
);
Class
<?>
namespaceClass
=
loader
.
loadClass
(
fqName
);
Method
method
=
namespaceClass
.
getMethod
(
"box"
);
return
(
String
)
method
.
invoke
(
null
);
...
...
@@ -111,7 +111,7 @@ public abstract class CodegenTestCase extends JetLiteFixture {
}
protected
Class
loadRootNamespaceClass
(
@NotNull
ClassFileFactory
state
)
{
String
fqName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
myFile
)).
replace
(
"/"
,
"."
);
String
fqName
=
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
myFile
)
,
true
).
replace
(
"/"
,
"."
);
Map
<
String
,
Class
>
classMap
=
loadAllClasses
(
state
);
return
classMap
.
get
(
fqName
);
}
...
...
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
浏览文件 @
b6590a38
...
...
@@ -119,10 +119,10 @@ public class JetPositionManager implements PositionManager {
else
{
JetFile
namespace
=
PsiTreeUtil
.
getParentOfType
(
sourcePosition
.
getElementAt
(),
JetFile
.
class
);
if
(
namespace
!=
null
)
{
names
.
add
(
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
namespace
)));
names
.
add
(
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
namespace
)
,
true
));
}
else
{
names
.
add
(
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
file
)));
names
.
add
(
NamespaceCodegen
.
getJVMClassName
(
JetPsiUtil
.
getFQName
(
file
)
,
true
));
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录