Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
ab820492
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,发现更多精彩内容 >>
提交
ab820492
编写于
5月 25, 2012
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MutableDeclarationDescriptor removed
上级
3c0c08c6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
65 deletion
+34
-65
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
...g/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
+1
-4
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
...ains/jet/lang/descriptors/MutableClassDescriptorLite.java
+33
-1
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java
...ns/jet/lang/descriptors/MutableDeclarationDescriptor.java
+0
-60
未找到文件。
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
浏览文件 @
ab820492
...
...
@@ -27,10 +27,7 @@ import java.util.Map;
/**
* @author abreslav
*/
public
abstract
class
ClassDescriptorBase
extends
MutableDeclarationDescriptor
implements
ClassDescriptor
{
public
ClassDescriptorBase
(
DeclarationDescriptor
containingDeclaration
)
{
super
(
containingDeclaration
);
}
public
abstract
class
ClassDescriptorBase
implements
ClassDescriptor
{
protected
abstract
JetScope
getScopeForMemberLookup
();
...
...
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
浏览文件 @
ab820492
...
...
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
;
import
org.jetbrains.jet.lang.resolve.BindingTrace
;
import
org.jetbrains.jet.lang.resolve.name.Name
;
import
org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper
;
import
org.jetbrains.jet.lang.resolve.scopes.JetScope
;
import
org.jetbrains.jet.lang.resolve.scopes.WritableScope
;
...
...
@@ -60,9 +61,12 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
private
ClassReceiver
implicitReceiver
;
private
Name
name
;
private
final
DeclarationDescriptor
containingDeclaration
;
public
MutableClassDescriptorLite
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
ClassKind
kind
)
{
super
(
containingDeclaration
)
;
this
.
containingDeclaration
=
containingDeclaration
;
this
.
kind
=
kind
;
}
...
...
@@ -76,6 +80,29 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
return
false
;
}
@NotNull
@Override
public
DeclarationDescriptor
getContainingDeclaration
()
{
return
containingDeclaration
;
}
@NotNull
@Override
public
Name
getName
()
{
return
name
;
}
public
void
setName
(
@NotNull
Name
name
)
{
assert
this
.
name
==
null
:
this
.
name
;
this
.
name
=
name
;
}
@NotNull
@Override
public
DeclarationDescriptor
getOriginal
()
{
return
this
;
}
private
static
boolean
isStatic
(
DeclarationDescriptor
declarationDescriptor
)
{
if
(
declarationDescriptor
instanceof
NamespaceDescriptor
)
{
return
true
;
...
...
@@ -277,6 +304,11 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
return
visitor
.
visitClassDescriptor
(
this
,
data
);
}
@Override
public
void
acceptVoid
(
DeclarationDescriptorVisitor
<
Void
,
Void
>
visitor
)
{
visitor
.
visitClassDescriptor
(
this
,
null
);
}
@Override
public
List
<
AnnotationDescriptor
>
getAnnotations
()
{
return
annotations
;
...
...
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java
已删除
100644 → 0
浏览文件 @
3c0c08c6
/*
* Copyright 2010-2012 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.descriptors
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.resolve.name.Name
;
/**
* @author abreslav
*/
public
abstract
class
MutableDeclarationDescriptor
implements
DeclarationDescriptor
{
private
Name
name
;
private
final
DeclarationDescriptor
containingDeclaration
;
public
MutableDeclarationDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
)
{
this
.
containingDeclaration
=
containingDeclaration
;
}
@NotNull
@Override
public
Name
getName
()
{
return
name
;
}
public
void
setName
(
@NotNull
Name
name
)
{
assert
this
.
name
==
null
:
this
.
name
;
this
.
name
=
name
;
}
@NotNull
@Override
public
DeclarationDescriptor
getOriginal
()
{
return
this
;
}
@NotNull
@Override
public
DeclarationDescriptor
getContainingDeclaration
()
{
return
containingDeclaration
;
}
@Override
public
void
acceptVoid
(
DeclarationDescriptorVisitor
<
Void
,
Void
>
visitor
)
{
accept
(
visitor
,
null
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录