From 73ad5552c8f86fc89ef70a582ae354fce4581a45 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 10 Jan 2014 18:27:51 +0400 Subject: [PATCH] =?UTF-8?q?RootNamespaceExpression=20=E2=86=92=20RootPacka?= =?UTF-8?q?geExpression.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java | 2 +- .../src/org/jetbrains/jet/lang/diagnostics/Errors.java | 2 +- .../jetbrains/jet/lang/parsing/JetExpressionParsing.java | 2 +- ...spaceExpression.java => JetRootPackageExpression.java} | 8 ++++---- .../src/org/jetbrains/jet/lang/psi/JetVisitor.java | 2 +- .../src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java | 2 +- .../jet/lang/psi/JetVisitorVoidWithParameter.java | 8 ++++---- .../resolve/calls/autocasts/DataFlowValueFactory.java | 2 +- .../types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../testData/psi/{RootNamespace.kt => RootPackage.kt} | 0 .../testData/psi/{RootNamespace.txt => RootPackage.txt} | 6 +++--- .../jetbrains/jet/parsing/JetParsingTestGenerated.java | 6 +++--- .../src/org/jetbrains/k2js/translate/context/Namer.java | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/psi/{JetRootNamespaceExpression.java => JetRootPackageExpression.java} (78%) rename compiler/testData/psi/{RootNamespace.kt => RootPackage.kt} (100%) rename compiler/testData/psi/{RootNamespace.txt => RootPackage.txt} (98%) diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java index 4c6a5f1dd64..c841dfd70af 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java @@ -137,7 +137,7 @@ public interface JetNodeTypes { JetNodeType SAFE_ACCESS_EXPRESSION = new JetNodeType("SAFE_ACCESS_EXPRESSION", JetSafeQualifiedExpression.class); JetNodeType OBJECT_LITERAL = new JetNodeType("OBJECT_LITERAL", JetObjectLiteralExpression.class); - JetNodeType ROOT_NAMESPACE = new JetNodeType("ROOT_NAMESPACE", JetRootNamespaceExpression.class); + JetNodeType ROOT_PACKAGE = new JetNodeType("ROOT_PACKAGE", JetRootPackageExpression.class); JetNodeType WHEN = new JetNodeType("WHEN", JetWhenExpression.class); JetNodeType WHEN_ENTRY = new JetNodeType("WHEN_ENTRY", JetWhenEntry.class); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 3b9a60cd4c2..17d4106a297 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -566,7 +566,7 @@ public interface Errors { DiagnosticFactory0 ANONYMOUS_INITIALIZER_IN_TRAIT = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 NO_THIS = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 NAMESPACE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 NAMESPACE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 NO_CLASS_OBJECT = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_IS_NOT_AN_EXPRESSION = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_ON_LHS_OF_DOT = DiagnosticFactory1.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 6287d445dc3..9d1c6a6af70 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -542,7 +542,7 @@ public class JetExpressionParsing extends AbstractJetParsing { parseTupleExpression(); } else if (at(PACKAGE_KEYWORD)) { - parseOneTokenExpression(ROOT_NAMESPACE); + parseOneTokenExpression(ROOT_PACKAGE); } else if (at(THIS_KEYWORD)) { parseThisExpression(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java similarity index 78% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java rename to compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java index e3e5957cdc4..49da34b0c50 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java @@ -19,18 +19,18 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -public class JetRootNamespaceExpression extends JetExpressionImpl { - public JetRootNamespaceExpression(@NotNull ASTNode node) { +public class JetRootPackageExpression extends JetExpressionImpl { + public JetRootPackageExpression(@NotNull ASTNode node) { super(node); } @Override public void accept(@NotNull JetVisitorVoid visitor) { - visitor.visitRootNamespaceExpression(this); + visitor.visitRootPackageExpression(this); } @Override public R accept(@NotNull JetVisitor visitor, D data) { - return visitor.visitRootNamespaceExpression(this, data); + return visitor.visitRootPackageExpression(this, data); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java index 600e473c055..5f71eac090b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -266,7 +266,7 @@ public class JetVisitor extends PsiElementVisitor { return visitExpression(expression, data); } - public R visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, D data) { + public R visitRootPackageExpression(@NotNull JetRootPackageExpression expression, D data) { return visitExpression(expression, data); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java index 2e72478f2b0..7a6241d6403 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -264,7 +264,7 @@ public class JetVisitorVoid extends PsiElementVisitor { visitExpression(expression); } - public void visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression) { + public void visitRootPackageExpression(@NotNull JetRootPackageExpression expression) { visitExpression(expression); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java index 2bdb3e14275..e6a1048c0f4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java @@ -266,8 +266,8 @@ public class JetVisitorVoidWithParameter

extends JetVisitor { super.visitObjectLiteralExpression(expression, data); } - public void visitRootNamespaceExpressionVoid(@NotNull JetRootNamespaceExpression expression, P data) { - super.visitRootNamespaceExpression(expression, data); + public void visitRootPackageExpressionVoid(@NotNull JetRootPackageExpression expression, P data) { + super.visitRootPackageExpression(expression, data); } public void visitBlockExpressionVoid(@NotNull JetBlockExpression expression, P data) { @@ -772,8 +772,8 @@ public class JetVisitorVoidWithParameter

extends JetVisitor { } @Override - public final Void visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, P data) { - visitRootNamespaceExpressionVoid(expression, data); + public final Void visitRootPackageExpression(@NotNull JetRootPackageExpression expression, P data) { + visitRootPackageExpressionVoid(expression, data); return null; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java index 1f5bbeda7a7..858b90d2e4b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java @@ -155,7 +155,7 @@ public class DataFlowValueFactory { return getIdForThisReceiver(declarationDescriptor); } - else if (expression instanceof JetRootNamespaceExpression) { + else if (expression instanceof JetRootPackageExpression) { return createPackageInfo(JetModuleUtil.getRootPackageType(expression)); } return NO_IDENTIFIER_INFO; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 42c230d4792..00c1de0680d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -1170,7 +1170,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } @Override - public JetTypeInfo visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, ExpressionTypingContext context) { + public JetTypeInfo visitRootPackageExpression(@NotNull JetRootPackageExpression expression, ExpressionTypingContext context) { if (JetPsiUtil.isLHSOfDot(expression)) { return DataFlowUtils.checkType(JetModuleUtil.getRootPackageType(expression), expression, context, context.dataFlowInfo); } diff --git a/compiler/testData/psi/RootNamespace.kt b/compiler/testData/psi/RootPackage.kt similarity index 100% rename from compiler/testData/psi/RootNamespace.kt rename to compiler/testData/psi/RootPackage.kt diff --git a/compiler/testData/psi/RootNamespace.txt b/compiler/testData/psi/RootPackage.txt similarity index 98% rename from compiler/testData/psi/RootNamespace.txt rename to compiler/testData/psi/RootPackage.txt index 74ac8d22800..49e8322a696 100644 --- a/compiler/testData/psi/RootNamespace.txt +++ b/compiler/testData/psi/RootPackage.txt @@ -1,4 +1,4 @@ -JetFile: RootNamespace.kt +JetFile: RootPackage.kt PACKAGE_DIRECTIVE PsiElement(package)('package') PsiWhiteSpace(' ') @@ -46,7 +46,7 @@ JetFile: RootNamespace.kt DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION - ROOT_NAMESPACE + ROOT_PACKAGE PsiElement(package)('package') PsiElement(DOT)('.') REFERENCE_EXPRESSION @@ -61,7 +61,7 @@ JetFile: RootNamespace.kt DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION - ROOT_NAMESPACE + ROOT_PACKAGE PsiElement(package)('package') PsiElement(DOT)('.') REFERENCE_EXPRESSION diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java index b6aa9ffc11b..3cda834b809 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java @@ -337,9 +337,9 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { doParsingTest("compiler/testData/psi/QuotedIdentifiers.kt"); } - @TestMetadata("RootNamespace.kt") - public void testRootNamespace() throws Exception { - doParsingTest("compiler/testData/psi/RootNamespace.kt"); + @TestMetadata("RootPackage.kt") + public void testRootPackage() throws Exception { + doParsingTest("compiler/testData/psi/RootPackage.kt"); } @TestMetadata("SemicolonAfterIf.kt") diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java index 9d2c0f77326..7b75c0cb915 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java @@ -45,7 +45,7 @@ public final class Namer { private static final String GETTER_PREFIX = "get_"; private static final String BACKING_FIELD_PREFIX = "$"; private static final String SUPER_METHOD_NAME = "baseInitializer"; - private static final String ROOT_NAMESPACE = "_"; + private static final String ROOT_PACKAGE = "_"; private static final String RECEIVER_PARAMETER_NAME = "$receiver"; private static final String THROW_NPE_FUN_NAME = "throwNPE"; private static final String CLASS_OBJECT_GETTER = "object"; @@ -63,7 +63,7 @@ public final class Namer { @NotNull public static String getRootNamespaceName() { - return ROOT_NAMESPACE; + return ROOT_PACKAGE; } @NotNull