From 6a979e540d2f1c314ac318a40eb04936f92f62a5 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Tue, 15 Nov 2011 15:18:42 +0400 Subject: [PATCH] set with keyword updated --- src/org/jetbrains/jet/j2k/ast/Node.java | 5 +--- .../ast/callChainExpression/statement/sout.kt | 2 +- .../ast/constructors/file/customerBuilder.kt | 4 ++-- .../ast/enum/class/runnableImplementation.kt | 2 +- .../ast/identifier/statement/keywords.jav | 6 +---- testData/ast/identifier/statement/keywords.kt | 23 +++++-------------- .../complicatedExampleFromJavaTutorial.kt | 2 +- .../statement/callWithKeywords.kt | 2 +- .../expression/newClassWithAnonymousScope.kt | 2 +- 9 files changed, 15 insertions(+), 33 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/ast/Node.java b/src/org/jetbrains/jet/j2k/ast/Node.java index 5e5a275f718..e29f53214c1 100644 --- a/src/org/jetbrains/jet/j2k/ast/Node.java +++ b/src/org/jetbrains/jet/j2k/ast/Node.java @@ -17,10 +17,7 @@ public abstract class Node implements INode { } final static Set ONLY_KOTLIN_KEYWORDS = new HashSet(Arrays.asList( - "namespace", "in", "val", "var", "when", "object", - "out", "in", "is", "as", "ref", "override", - "open", "attribute", "lazy", "set", "get", - "fun", "where", "by", "trait", "type", "This" + "namespace", "as", "type", "val", "var", "fun", "is", "in", "object", "when", "trait", "This" )); public final static Set PRIMITIVE_TYPES = new HashSet(Arrays.asList( diff --git a/testData/ast/callChainExpression/statement/sout.kt b/testData/ast/callChainExpression/statement/sout.kt index fcb68d6e04d..183416fbb5f 100644 --- a/testData/ast/callChainExpression/statement/sout.kt +++ b/testData/ast/callChainExpression/statement/sout.kt @@ -1 +1 @@ -System.`out`?.println("Hello, world") \ No newline at end of file +System.out?.println("Hello, world") \ No newline at end of file diff --git a/testData/ast/constructors/file/customerBuilder.kt b/testData/ast/constructors/file/customerBuilder.kt index 7092cd9f155..4940f8f8b50 100644 --- a/testData/ast/constructors/file/customerBuilder.kt +++ b/testData/ast/constructors/file/customerBuilder.kt @@ -38,8 +38,8 @@ public open class User() { class object { open public fun main() : Unit { var customer : Customer? = org.test.customer.CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build() -System.`out`?.println(customer?.getFirstName()) -System.`out`?.println(customer?.getLastName()) +System.out?.println(customer?.getFirstName()) +System.out?.println(customer?.getLastName()) } } } diff --git a/testData/ast/enum/class/runnableImplementation.kt b/testData/ast/enum/class/runnableImplementation.kt index 36d35060e78..b1cb4065b22 100644 --- a/testData/ast/enum/class/runnableImplementation.kt +++ b/testData/ast/enum/class/runnableImplementation.kt @@ -5,6 +5,6 @@ RED YELLOW BLUE override public fun run() : Unit { -System.`out`?.println(("name()=" + name() + ", toString()=" + toString())) +System.out?.println(("name()=" + name() + ", toString()=" + toString())) } } \ No newline at end of file diff --git a/testData/ast/identifier/statement/keywords.jav b/testData/ast/identifier/statement/keywords.jav index 659f1e02d04..12cf781ef6d 100644 --- a/testData/ast/identifier/statement/keywords.jav +++ b/testData/ast/identifier/statement/keywords.jav @@ -1,5 +1 @@ -int -namespace, in, val, var, when, object, -out, in, is, as, ref, override, -open, attribute, lazy, set, get, -fun, where, by, trait, type, This; \ No newline at end of file +int namespace, as, type, val, var, fun, is, in, object, when, trait, This; \ No newline at end of file diff --git a/testData/ast/identifier/statement/keywords.kt b/testData/ast/identifier/statement/keywords.kt index a91868c5570..4458510a622 100644 --- a/testData/ast/identifier/statement/keywords.kt +++ b/testData/ast/identifier/statement/keywords.kt @@ -1,23 +1,12 @@ var `namespace` : Int -var `in` : Int +var `as` : Int +var `type` : Int var `val` : Int var `var` : Int -var `when` : Int -var `object` : Int -var `out` : Int -var `in` : Int -var `is` : Int -var `as` : Int -var `ref` : Int -var `override` : Int -var `open` : Int -var `attribute` : Int -var `lazy` : Int -var `set` : Int -var `get` : Int var `fun` : Int -var `where` : Int -var `by` : Int +var `is` : Int +var `in` : Int +var `object` : Int +var `when` : Int var `trait` : Int -var `type` : Int var `This` : Int \ No newline at end of file diff --git a/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt b/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt index 4959a4593a2..fbdba6d9552 100644 --- a/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt +++ b/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt @@ -21,7 +21,7 @@ break@test } } } -System.`out`?.println((if (foundIt) +System.out?.println((if (foundIt) "Found it" else "Didn't find it")) \ No newline at end of file diff --git a/testData/ast/methodCallExpression/statement/callWithKeywords.kt b/testData/ast/methodCallExpression/statement/callWithKeywords.kt index 92c6a067e95..489e2d97b10 100644 --- a/testData/ast/methodCallExpression/statement/callWithKeywords.kt +++ b/testData/ast/methodCallExpression/statement/callWithKeywords.kt @@ -1 +1 @@ -`when`(`open`, `trait`) \ No newline at end of file +`when`(open, `trait`) \ No newline at end of file diff --git a/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt index a6f4ca93dba..10ca89407e6 100644 --- a/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt +++ b/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt @@ -1,5 +1,5 @@ java.lang.Runnable() { override public fun run() : Unit { -System.`out`?.println("Run") +System.out?.println("Run") } } \ No newline at end of file