Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
c4439f33
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,体验更适合开发者的 AI 搜索 >>
提交
c4439f33
编写于
5月 31, 2012
作者:
J
James Strachan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoided JS compile barf in JS generation and fix compile error of Node vals in generated DOM API
上级
fe68aeaa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
45 deletion
+34
-45
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
.../lang/types/expressions/BasicExpressionTypingVisitor.java
+2
-1
js/js.libraries/src/core/dom.kt
js/js.libraries/src/core/dom.kt
+30
-30
libraries/pom.xml
libraries/pom.xml
+0
-4
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
...est/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
+2
-10
未找到文件。
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
浏览文件 @
c4439f33
...
...
@@ -105,7 +105,8 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
}
// To report NO_CLASS_OBJECT when no namespace found
if
(
classifier
!=
null
)
{
context
.
trace
.
report
(
NO_CLASS_OBJECT
.
on
(
expression
,
classifier
));
// TODO is this really required? seems to break "Node.ELEMENT_NODE" expressions
// context.trace.report(NO_CLASS_OBJECT.on(expression, classifier));
context
.
trace
.
record
(
REFERENCE_TARGET
,
expression
,
classifier
);
return
classifier
.
getDefaultType
();
}
...
...
js/js.libraries/src/core/dom.kt
浏览文件 @
c4439f33
...
...
@@ -98,9 +98,9 @@ native public trait DOMError {
fun
getSeverity
():
Short
=
js
.
noImpl
fun
getRelatedException
():
Any
=
js
.
noImpl
fun
getRelatedData
():
Any
=
js
.
noImpl
public
val
SEVERITY_WARNING
:
Short
=
1
public
val
SEVERITY_ERROR
:
Short
=
2
public
val
SEVERITY_FATAL_ERROR
:
Short
=
3
public
val
SEVERITY_WARNING
:
Short
public
val
SEVERITY_ERROR
:
Short
public
val
SEVERITY_FATAL_ERROR
:
Short
}
native
public
trait
DOMErrorHandler
{
...
...
@@ -221,24 +221,24 @@ native public trait Node {
fun
isDefaultNamespace
(
arg1
:
String
):
Boolean
=
js
.
noImpl
fun
lookupNamespaceURI
(
arg1
:
String
):
String
=
js
.
noImpl
fun
isEqualNode
(
arg1
:
Node
):
Boolean
=
js
.
noImpl
public
val
ELEMENT_NODE
:
Short
=
1
public
val
ATTRIBUTE_NODE
:
Short
=
2
public
val
TEXT_NODE
:
Short
=
3
public
val
CDATA_SECTION_NODE
:
Short
=
4
public
val
ENTITY_REFERENCE_NODE
:
Short
=
5
public
val
ENTITY_NODE
:
Short
=
6
public
val
PROCESSING_INSTRUCTION_NODE
:
Short
=
7
public
val
COMMENT_NODE
:
Short
=
8
public
val
DOCUMENT_NODE
:
Short
=
9
public
val
DOCUMENT_TYPE_NODE
:
Short
=
10
public
val
DOCUMENT_FRAGMENT_NODE
:
Short
=
11
public
val
NOTATION_NODE
:
Short
=
12
public
val
DOCUMENT_POSITION_DISCONNECTED
:
Short
=
1
public
val
DOCUMENT_POSITION_PRECEDING
:
Short
=
2
public
val
DOCUMENT_POSITION_FOLLOWING
:
Short
=
4
public
val
DOCUMENT_POSITION_CONTAINS
:
Short
=
8
public
val
DOCUMENT_POSITION_CONTAINED_BY
:
Short
=
16
public
val
DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC
:
Short
=
32
public
val
ELEMENT_NODE
:
Short
public
val
ATTRIBUTE_NODE
:
Short
public
val
TEXT_NODE
:
Short
public
val
CDATA_SECTION_NODE
:
Short
public
val
ENTITY_REFERENCE_NODE
:
Short
public
val
ENTITY_NODE
:
Short
public
val
PROCESSING_INSTRUCTION_NODE
:
Short
public
val
COMMENT_NODE
:
Short
public
val
DOCUMENT_NODE
:
Short
public
val
DOCUMENT_TYPE_NODE
:
Short
public
val
DOCUMENT_FRAGMENT_NODE
:
Short
public
val
NOTATION_NODE
:
Short
public
val
DOCUMENT_POSITION_DISCONNECTED
:
Short
public
val
DOCUMENT_POSITION_PRECEDING
:
Short
public
val
DOCUMENT_POSITION_FOLLOWING
:
Short
public
val
DOCUMENT_POSITION_CONTAINS
:
Short
public
val
DOCUMENT_POSITION_CONTAINED_BY
:
Short
public
val
DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC
:
Short
}
native
public
trait
NodeList
{
...
...
@@ -268,18 +268,18 @@ native public trait TypeInfo {
fun
getTypeName
():
String
=
js
.
noImpl
fun
getTypeNamespace
():
String
=
js
.
noImpl
fun
isDerivedFrom
(
arg1
:
String
,
arg2
:
String
,
arg3
:
Int
):
Boolean
=
js
.
noImpl
public
val
DERIVATION_RESTRICTION
:
Int
=
1
public
val
DERIVATION_EXTENSION
:
Int
=
2
public
val
DERIVATION_UNION
:
Int
=
4
public
val
DERIVATION_LIST
:
Int
=
8
public
val
DERIVATION_RESTRICTION
:
Int
public
val
DERIVATION_EXTENSION
:
Int
public
val
DERIVATION_UNION
:
Int
public
val
DERIVATION_LIST
:
Int
}
native
public
trait
UserDataHandler
{
fun
handle
(
arg1
:
Short
,
arg2
:
String
,
arg3
:
Any
,
arg4
:
Node
,
arg5
:
Node
):
Unit
=
js
.
noImpl
public
val
NODE_CLONED
:
Short
=
1
public
val
NODE_IMPORTED
:
Short
=
2
public
val
NODE_DELETED
:
Short
=
3
public
val
NODE_RENAMED
:
Short
=
4
public
val
NODE_ADOPTED
:
Short
=
5
public
val
NODE_CLONED
:
Short
public
val
NODE_IMPORTED
:
Short
public
val
NODE_DELETED
:
Short
public
val
NODE_RENAMED
:
Short
public
val
NODE_ADOPTED
:
Short
}
libraries/pom.xml
浏览文件 @
c4439f33
...
...
@@ -65,12 +65,8 @@
<module>
examples/kotlin-java-example
</module>
<!--
TODO - disabled until the JS compiler can handle "Node.ELEMENT_NODE" expressions in DOM
<module>
examples/js-example
</module>
<module>
examples/browser-example
</module>
-->
</modules>
<dependencies>
...
...
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
浏览文件 @
c4439f33
...
...
@@ -74,16 +74,8 @@ import js.noImpl
if
(
field
!=
null
)
{
val
modifiers
=
field
.
getModifiers
()
if
(
Modifier
.
isStatic
(
modifiers
)
&&
Modifier
.
isPublic
(
modifiers
))
{
try
{
val
value
=
field
.
get
(
null
)
if
(
value
!=
null
)
{
val
fieldType
=
simpleTypeName
(
field
.
getType
())
println
(
" public val ${field.getName()}: $fieldType = $value"
)
}
}
catch
(
e
:
Exception
)
{
println
(
"Caught: $e"
)
e
.
printStackTrace
()
}
val
fieldType
=
simpleTypeName
(
field
.
getType
())
println
(
" public val ${field.getName()}: $fieldType"
)
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录