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

Rename namespace->package in the token decala

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-12 19:50:14 +04:00
parent db59319f95
commit c78cb3cc19
26 changed files with 68 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+1
View File
@@ -88,6 +88,7 @@ public class JavaTypeTransformer {
if (psiClass instanceof PsiTypeParameter) {
PsiTypeParameter typeParameter = (PsiTypeParameter) psiClass;
TypeParameterDescriptor typeParameterDescriptor = resolver.resolveTypeParameter(typeParameter);
// return TypeUtils.makeNullable(typeParameterDescriptor.getDefaultType());
return typeParameterDescriptor.getDefaultType();
}
else {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+4 -4
View File
@@ -32,7 +32,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private static final TokenSet TYPE_ARGUMENT_LIST_STOPPERS = TokenSet.create(
INTEGER_LITERAL, FLOAT_LITERAL, CHARACTER_LITERAL, OPEN_QUOTE, RAW_STRING_LITERAL,
NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD,
PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD,
FUN_KEYWORD, FOR_KEYWORD, NULL_KEYWORD,
TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD,
CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, TRY_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD,
@@ -83,7 +83,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
IDENTIFIER, // SimpleName
FIELD_IDENTIFIER, // Field reference
NAMESPACE_KEYWORD // for absolute qualified names
PACKAGE_KEYWORD // for absolute qualified names
);
private static final TokenSet STATEMENT_FIRST = TokenSet.orSet(
@@ -509,7 +509,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
else if (at(HASH)) {
parseTupleExpression();
}
else if (at(NAMESPACE_KEYWORD)) {
else if (at(PACKAGE_KEYWORD)) {
parseOneTokenExpression(ROOT_NAMESPACE);
}
else if (at(THIS_KEYWORD)) {
@@ -865,7 +865,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
myJetParsing.parseAnnotations(false);
if (at(NAMESPACE_KEYWORD) || at(IDENTIFIER) || at(FUN_KEYWORD) || at(THIS_KEYWORD)) {
if (at(PACKAGE_KEYWORD) || at(IDENTIFIER) || at(FUN_KEYWORD) || at(THIS_KEYWORD)) {
PsiBuilder.Marker rollbackMarker = mark();
parseBinaryExpression(Precedence.ELVIS);
if (at(HASH)) {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+10 -10
View File
@@ -29,7 +29,7 @@ public class JetParsing extends AbstractJetParsing {
}
private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
FUN_KEYWORD, VAL_KEYWORD, NAMESPACE_KEYWORD);
FUN_KEYWORD, VAL_KEYWORD, PACKAGE_KEYWORD);
private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
FUN_KEYWORD, VAL_KEYWORD, IDENTIFIER);
@@ -117,8 +117,8 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker firstEntry = mark();
parseModifierList(MODIFIER_LIST, true);
if (at(NAMESPACE_KEYWORD)) {
advance(); // NAMESPACE_KEYWORD
if (at(PACKAGE_KEYWORD)) {
advance(); // PACKAGE_KEYWORD
parseNamespaceName();
if (at(LBRACE)) {
@@ -170,8 +170,8 @@ public class JetParsing extends AbstractJetParsing {
advance(); // IMPORT_KEYWORD
PsiBuilder.Marker qualifiedName = mark();
if (at(NAMESPACE_KEYWORD)) {
advance(); // NAMESPACE_KEYWORD
if (at(PACKAGE_KEYWORD)) {
advance(); // PACKAGE_KEYWORD
expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER, MUL, SEMICOLON));
}
@@ -233,7 +233,7 @@ public class JetParsing extends AbstractJetParsing {
IElementType keywordToken = tt();
JetNodeType declType = null;
// if (keywordToken == NAMESPACE_KEYWORD) {
// if (keywordToken == PACKAGE_KEYWORD) {
// declType = parseNamespaceBlock();
// }
// else
@@ -640,7 +640,7 @@ public class JetParsing extends AbstractJetParsing {
parseClassBody();
}
else {
expect(COLON, "Expecting ':'", TokenSet.create(IDENTIFIER, NAMESPACE_KEYWORD));
expect(COLON, "Expecting ':'", TokenSet.create(IDENTIFIER, PACKAGE_KEYWORD));
parseDelegationSpecifierList();
parseClassBody();
}
@@ -1253,7 +1253,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker typeRefMarker = mark();
parseAnnotations(false);
if (at(IDENTIFIER) || at(NAMESPACE_KEYWORD)) {
if (at(IDENTIFIER) || at(PACKAGE_KEYWORD)) {
parseUserType();
}
else if (at(HASH)) {
@@ -1340,8 +1340,8 @@ public class JetParsing extends AbstractJetParsing {
private void parseUserType() {
PsiBuilder.Marker userType = mark();
if (at(NAMESPACE_KEYWORD)) {
advance(); // NAMESPACE_KEYWORD
if (at(PACKAGE_KEYWORD)) {
advance(); // PACKAGE_KEYWORD
expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER));
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class JetImportDirective extends JetElement {
}
public boolean isAbsoluteInRootNamespace() {
return findChildByType(JetTokens.NAMESPACE_KEYWORD) != null;
return findChildByType(JetTokens.PACKAGE_KEYWORD) != null;
}
@Nullable @IfNotParsed
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class JetUserType extends JetTypeElement {
}
public boolean isAbsoluteInRootNamespace() {
return findChildByType(JetTokens.NAMESPACE_KEYWORD) != null;
return findChildByType(JetTokens.PACKAGE_KEYWORD) != null;
}
@Override
compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex
+1 -1
View File
@@ -162,7 +162,7 @@ LONG_TEMPLATE_ENTRY_END=\}
{RAW_STRING_LITERAL} { return JetTokens.RAW_STRING_LITERAL; }
"continue" { return JetTokens.CONTINUE_KEYWORD ;}
"package" { return JetTokens.NAMESPACE_KEYWORD ;}
"package" { return JetTokens.PACKAGE_KEYWORD ;}
"return" { return JetTokens.RETURN_KEYWORD ;}
"object" { return JetTokens.OBJECT_KEYWORD ;}
"while" { return JetTokens.WHILE_KEYWORD ;}
compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java
+2 -2
View File
@@ -31,7 +31,7 @@ public interface JetTokens {
JetToken RAW_STRING_LITERAL = new JetToken("RAW_STRING_LITERAL");
JetKeywordToken NAMESPACE_KEYWORD = JetKeywordToken.keyword("namespace");
JetKeywordToken PACKAGE_KEYWORD = JetKeywordToken.keyword("package");
JetKeywordToken AS_KEYWORD = JetKeywordToken.keyword("as");
JetKeywordToken TYPE_KEYWORD = JetKeywordToken.keyword("type");
JetKeywordToken CLASS_KEYWORD = JetKeywordToken.keyword("class");
@@ -145,7 +145,7 @@ public interface JetTokens {
// 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, TRAIT_KEYWORD,
TokenSet KEYWORDS = TokenSet.create(PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD,
THIS_KEYWORD, SUPER_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD,
NULL_KEYWORD,
TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java
+22 -22
View File
@@ -1,4 +1,4 @@
/* The following code was generated by JFlex 1.4.3 on 12/25/11 2:36 PM */
/* The following code was generated by JFlex 1.4.3 on 1/12/12 7:11 PM */
package org.jetbrains.jet.lexer;
@@ -13,7 +13,7 @@ import org.jetbrains.jet.lexer.JetTokens;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 12/25/11 2:36 PM from the specification file
* on 1/12/12 7:11 PM from the specification file
* <tt>/Users/abreslav/work/jet/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
*/
class _JetLexer implements FlexLexer {
@@ -1006,77 +1006,77 @@ class _JetLexer implements FlexLexer {
{ return JetTokens.MINUSEQ ;
}
case 138: break;
case 96:
{ return JetTokens.PACKAGE_KEYWORD ;
}
case 139: break;
case 87:
{ return JetTokens.THROW_KEYWORD ;
}
case 139: break;
case 140: break;
case 89:
{ return JetTokens.SUPER_KEYWORD ;
}
case 140: break;
case 141: break;
case 92:
{ return JetTokens.WHILE_KEYWORD ;
}
case 141: break;
case 142: break;
case 44:
{ return JetTokens.MINUSMINUS;
}
case 142: break;
case 143: break;
case 97:
{ return JetTokens.CONTINUE_KEYWORD ;
}
case 143: break;
case 144: break;
case 75:
{ return JetTokens.NOT_IN;
}
case 144: break;
case 145: break;
case 38:
{ return JetTokens.ATAT ;
}
case 145: break;
case 146: break;
case 6:
{ return JetTokens.DIV ;
}
case 146: break;
case 147: break;
case 37:
{ return JetTokens.LABEL_IDENTIFIER;
}
case 147: break;
case 148: break;
case 29:
{ return JetTokens.REGULAR_STRING_PART;
}
case 148: break;
case 149: break;
case 16:
{ return JetTokens.QUEST ;
}
case 149: break;
case 150: break;
case 60:
{ return JetTokens.OROR ;
}
case 150: break;
case 151: break;
case 20:
{ return JetTokens.PERC ;
}
case 151: break;
case 152: break;
case 76:
{ return JetTokens.EXCLEQEQEQ;
}
case 152: break;
case 153: break;
case 61:
{ return JetTokens.PERCEQ ;
}
case 153: break;
case 154: break;
case 43:
{ return JetTokens.RANGE ;
}
case 154: break;
case 155: break;
case 1:
{ return TokenType.BAD_CHARACTER;
}
case 155: break;
case 96:
{ return JetTokens.NAMESPACE_KEYWORD ;
}
case 156: break;
case 74:
{ return JetTokens.NOT_IS;
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+1 -1
View File
@@ -258,7 +258,7 @@ public class DescriptorRenderer implements Renderer {
@Override
public Void visitNamespaceDescriptor(NamespaceDescriptor namespaceDescriptor, StringBuilder builder) {
builder.append(renderKeyword(JetTokens.NAMESPACE_KEYWORD.getValue())).append(" ");
builder.append(renderKeyword(JetTokens.PACKAGE_KEYWORD.getValue())).append(" ");
renderName(namespaceDescriptor, builder);
return super.visitNamespaceDescriptor(namespaceDescriptor, builder);
}
compiler/testData/psi/Attributes.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: Attributes.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/Attributes_ERR.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: Attributes_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/BabySteps.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: BabySteps.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n')
compiler/testData/psi/BabySteps_ERR.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: BabySteps_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n')
compiler/testData/psi/FileStart_ERR.txt
+1 -1
View File
@@ -4,7 +4,7 @@ JetFile: FileStart_ERR.jet
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(DIV)('/')
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
compiler/testData/psi/Imports.txt
+2 -2
View File
@@ -1,6 +1,6 @@
JetFile: Imports.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -13,7 +13,7 @@ JetFile: Imports.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/Imports_ERR.txt
+4 -4
View File
@@ -1,6 +1,6 @@
JetFile: Imports_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -13,7 +13,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiErrorElement:Expecting '.'
<empty list>
PsiWhiteSpace(' ')
@@ -25,7 +25,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiErrorElement:Expecting qualified name
@@ -36,7 +36,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
compiler/testData/psi/NamespaceBlockFirst.txt
+1 -1
View File
@@ -2,7 +2,7 @@ JetFile: NamespaceBlockFirst.jet
NAMESPACE_HEADER
<empty list>
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
compiler/testData/psi/NamespaceModifiers.txt
+1 -1
View File
@@ -13,6 +13,6 @@ JetFile: NamespaceModifiers.jet
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('name')
compiler/testData/psi/RootNamespace.txt
+5 -5
View File
@@ -1,6 +1,6 @@
JetFile: RootNamespace.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -16,7 +16,7 @@ JetFile: RootNamespace.jet
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
@@ -48,7 +48,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -63,7 +63,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -97,7 +97,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/ShortAnnotations.txt
+1 -1
View File
@@ -49,7 +49,7 @@ JetFile: ShortAnnotations.jet
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('aa')
PsiWhiteSpace('\n\n')
compiler/testData/psi/SimpleModifiers.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: SimpleModifiers.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/SoftKeywords.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: SoftKeywords.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/TypeDef.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: TypeDef.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/When.txt
+1 -1
View File
@@ -598,7 +598,7 @@ JetFile: When.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
stdlib/ktSrc/JavaUtilMap.kt
+2 -2
View File
@@ -18,11 +18,11 @@ fun <K, V> JMap<K, V>.set(key : K, value : V) = this.put(key, value)
/** Returns the key of the entry */
val <K,V> JEntry<K,V>.key : K
get() = getKey()
get() = getKey().sure()
/** Returns the value of the entry */
val <K,V> JEntry<K,V>.value : V
get() = getValue()
get() = getValue().sure()
/** Returns the value for the given key or returns the result of the defaultValue function if there was no entry for the given key */
inline fun <K,V> java.util.Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V {
testlib/test/test/collections/TestAll.java
-2
View File
@@ -1,7 +1,5 @@
package test.collections;
import junit.framework.TestSuite;
/**
*/
public class TestAll {