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

"lazy" keyword dropped

Browse Source
This commit is contained in:
Andrey Breslav
2011-01-25 22:58:12 +03:00
parent 1206ed2f80
commit ccfccc6645
15 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lexer/JetTokens.java
+5 -6
View File
@@ -111,7 +111,6 @@ public interface JetTokens {
JetKeywordToken IMPORT_KEYWORD = JetKeywordToken.softKeyword("import"); JetKeywordToken IMPORT_KEYWORD = JetKeywordToken.softKeyword("import");
JetKeywordToken WHERE_KEYWORD = JetKeywordToken.softKeyword("where"); JetKeywordToken WHERE_KEYWORD = JetKeywordToken.softKeyword("where");
JetKeywordToken BY_KEYWORD = JetKeywordToken.softKeyword("by"); JetKeywordToken BY_KEYWORD = JetKeywordToken.softKeyword("by");
JetKeywordToken LAZY_KEYWORD = JetKeywordToken.softKeyword("lazy");
JetKeywordToken GET_KEYWORD = JetKeywordToken.softKeyword("get"); JetKeywordToken GET_KEYWORD = JetKeywordToken.softKeyword("get");
JetKeywordToken SET_KEYWORD = JetKeywordToken.softKeyword("set"); JetKeywordToken SET_KEYWORD = JetKeywordToken.softKeyword("set");
JetKeywordToken ABSTRACT_KEYWORD = JetKeywordToken.softKeyword("abstract"); JetKeywordToken ABSTRACT_KEYWORD = JetKeywordToken.softKeyword("abstract");
@@ -125,12 +124,12 @@ public interface JetTokens {
JetKeywordToken INTERNAL_KEYWORD = JetKeywordToken.softKeyword("internal"); JetKeywordToken INTERNAL_KEYWORD = JetKeywordToken.softKeyword("internal");
JetKeywordToken PROTECTED_KEYWORD = JetKeywordToken.softKeyword("protected"); JetKeywordToken PROTECTED_KEYWORD = JetKeywordToken.softKeyword("protected");
JetKeywordToken CATCH_KEYWORD = JetKeywordToken.softKeyword("catch"); JetKeywordToken CATCH_KEYWORD = JetKeywordToken.softKeyword("catch");
// TODO: support these as annotations on arguments. Then, they probably can not be har keywords
JetKeywordToken OUT_KEYWORD = JetKeywordToken.softKeyword("out"); JetKeywordToken OUT_KEYWORD = JetKeywordToken.softKeyword("out");
JetKeywordToken REF_KEYWORD = JetKeywordToken.softKeyword("ref");
JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally"); JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally");
// TODO: support this as an annotation on arguments. Then, they it probably can not be a soft keyword
JetKeywordToken REF_KEYWORD = JetKeywordToken.softKeyword("ref");
TokenSet KEYWORDS = TokenSet.create(NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, TokenSet KEYWORDS = TokenSet.create(NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD,
THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD,
NULL_KEYWORD, TYPEOF_KEYWORD, NEW_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, NULL_KEYWORD, TYPEOF_KEYWORD, NEW_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
@@ -139,13 +138,13 @@ public interface JetTokens {
NOT_IN, NOT_IS, CAPITALIZED_THIS_KEYWORD NOT_IN, NOT_IS, CAPITALIZED_THIS_KEYWORD
); );
TokenSet SOFT_KEYWORDS = TokenSet.create(WRAPS_KEYWORD, IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, LAZY_KEYWORD, GET_KEYWORD, TokenSet SOFT_KEYWORDS = TokenSet.create(WRAPS_KEYWORD, IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
SET_KEYWORD, ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ATTRIBUTE_KEYWORD, SET_KEYWORD, ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ATTRIBUTE_KEYWORD,
OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD,
CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD
); );
TokenSet MODIFIER_KEYWORDS = TokenSet.create(LAZY_KEYWORD, ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD, TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD,
OPEN_KEYWORD, ATTRIBUTE_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, OPEN_KEYWORD, ATTRIBUTE_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD
); );
idea/testData/psi/Attributes.jet
+1 -2
View File
@@ -12,7 +12,7 @@ private
protected protected
public public
internal internal
lazy [foo<A, B>(a, b),ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo] [foo<A, B>(a, b),ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df] [df]
in in
[sdfsdf] [sdfsdf]
@@ -34,7 +34,6 @@ private
protected protected
public public
internal internal
lazy
in in
out out
ref T> { ref T> {
idea/testData/psi/Attributes.txt
-4
View File
@@ -35,8 +35,6 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
@@ -274,8 +272,6 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace('\n')
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(out)('out') PsiElement(out)('out')
idea/testData/psi/Attributes_ERR.jet
+1 -2
View File
@@ -13,7 +13,7 @@ private
protected protected
public public
internal internal
lazy [foo<A, B>(a, b), ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo] [foo<A, B>(a, b), ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df] [df]
in in
[sdfsdf,] [sdfsdf,]
@@ -33,7 +33,6 @@ private
protected protected
public public
internal internal
lazy
in in
out out
ref T> { ref T> {
idea/testData/psi/Attributes_ERR.txt
-4
View File
@@ -40,8 +40,6 @@ JetFile: Attributes_ERR.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
@@ -241,8 +239,6 @@ JetFile: Attributes_ERR.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace('\n')
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(out)('out') PsiElement(out)('out')
idea/testData/psi/FunctionTypes.jet
+1 -1
View File
@@ -13,7 +13,7 @@ type f = {(foo, a : a) : b}
type f = {(foo, a : {(a) : b}) : b} type f = {(foo, a : {(a) : b}) : b}
type f = {(foo, a : {(a) : b}) : {() : ()}} type f = {(foo, a : {(a) : b}) : {() : ()}}
type f = {(lazy foo, out a : {(ref a) : b}) : {() : ()}} type f = {(ref foo, ref a : {(ref a) : b}) : {() : ()}}
type f = {T.() : ()} type f = {T.() : ()}
type f = {T.T.() : ()} type f = {T.T.() : ()}
idea/testData/psi/FunctionTypes.txt
+2 -2
View File
@@ -475,7 +475,7 @@ JetFile: FunctionTypes.jet
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') PsiElement(ref)('ref')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
@@ -485,7 +485,7 @@ JetFile: FunctionTypes.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_PARAMETER VALUE_PARAMETER
MODIFIER_LIST MODIFIER_LIST
PsiElement(out)('out') PsiElement(ref)('ref')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/psi/LocalDeclarations.jet
+2 -2
View File
@@ -1,10 +1,10 @@
fun foo() { fun foo() {
lazy out
1 1
[a] abstract class foof {} [a] abstract class foof {}
abstract [a] class foof {} abstract [a] class foof {}
lazy val foo = 5 out val foo = 5
[a] var foo = 4 [a] var foo = 4
type f = {T.() : ()} type f = {T.() : ()}
idea/testData/psi/LocalDeclarations.txt
+2 -2
View File
@@ -14,7 +14,7 @@ JetFile: LocalDeclarations.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy') PsiElement(IDENTIFIER)('out')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
INTEGER_CONSTANT INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1') PsiElement(INTEGER_LITERAL)('1')
@@ -67,7 +67,7 @@ JetFile: LocalDeclarations.jet
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
PROPERTY PROPERTY
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') PsiElement(out)('out')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/psi/SimpleModifiers.jet
-2
View File
@@ -12,7 +12,6 @@ private
protected protected
public public
internal internal
lazy
in in
out out
ref ref
@@ -28,7 +27,6 @@ ref
protected protected
public public
internal internal
lazy
in in
out out
ref T> { ref T> {
idea/testData/psi/SimpleModifiers.txt
-4
View File
@@ -35,8 +35,6 @@ JetFile: SimpleModifiers.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace('\n')
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(out)('out') PsiElement(out)('out')
@@ -74,8 +72,6 @@ JetFile: SimpleModifiers.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(lazy)('lazy')
PsiWhiteSpace('\n ')
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(out)('out') PsiElement(out)('out')
idea/testData/psi/SoftKeywords.jet
+4 -8
View File
@@ -15,11 +15,10 @@ private
protected protected
public public
internal internal
lazy
in in
out out
ref ref
class Bar<abstract, abstract enum : T, lazy virtual, class Bar<abstract, abstract enum : T, out virtual,
public protected private internal abstract public protected private internal abstract
virtual virtual
enum enum
@@ -31,8 +30,7 @@ ref
private private
protected protected
public public
internal internal open
lazy open
> wraps (a : B) : A by b { > wraps (a : B) : A by b {
public protected private internal val abstract public protected private internal val abstract
val virtual val virtual
@@ -121,8 +119,7 @@ ref
private private
protected protected
public public
internal internal open : t
lazy open : t
) )
@@ -164,8 +161,7 @@ class F(val foo : bar,
private private
protected protected
public public
internal internal open : b
lazy open : b
) { ) {
} }
idea/testData/psi/SoftKeywords.txt
+1 -9
View File
@@ -48,8 +48,6 @@ JetFile: SoftKeywords.jet
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(lazy)('lazy')
PsiWhiteSpace('\n')
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(out)('out') PsiElement(out)('out')
@@ -81,7 +79,7 @@ JetFile: SoftKeywords.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_PARAMETER TYPE_PARAMETER
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') PsiElement(out)('out')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('virtual') PsiElement(IDENTIFIER)('virtual')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
@@ -119,8 +117,6 @@ JetFile: SoftKeywords.jet
PsiElement(public)('public') PsiElement(public)('public')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n ')
PsiElement(lazy)('lazy')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('open') PsiElement(IDENTIFIER)('open')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
@@ -1028,8 +1024,6 @@ JetFile: SoftKeywords.jet
PsiElement(public)('public') PsiElement(public)('public')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n ')
PsiElement(lazy)('lazy')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('open') PsiElement(IDENTIFIER)('open')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -1351,8 +1345,6 @@ JetFile: SoftKeywords.jet
PsiElement(public)('public') PsiElement(public)('public')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PsiElement(internal)('internal') PsiElement(internal)('internal')
PsiWhiteSpace('\n ')
PsiElement(lazy)('lazy')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('open') PsiElement(IDENTIFIER)('open')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/psi/examples/Builder.jet
+3 -3
View File
@@ -1,16 +1,16 @@
val foo = object AntBuilder() { val foo = object AntBuilder() {
lazy val groovy = library { [lazy] val groovy = library {
classpath("$libs/groovy-...") classpath("$libs/groovy-...")
} }
lazy val gant = library { [lazy] val gant = library {
new File("$gantHome/lib").files.each { new File("$gantHome/lib").files.each {
classpath(it) classpath(it)
} }
} }
lazy val JPS = module { [lazy] val JPS = module {
targetLevel = "1.5" targetLevel = "1.5"
classpath(antLayout, gant, groovy) classpath(antLayout, gant, groovy)
src("$projectHome/antLayout/src") src("$projectHome/antLayout/src")
idea/testData/psi/examples/Builder.txt
+24 -3
View File
@@ -27,7 +27,14 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
PROPERTY PROPERTY
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -57,7 +64,14 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
PROPERTY PROPERTY
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -116,7 +130,14 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
PROPERTY PROPERTY
MODIFIER_LIST MODIFIER_LIST
PsiElement(lazy)('lazy') ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')