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

refactor qualifier generation logic

Browse Source
This commit is contained in:
Pavel Talanov
2012-02-12 18:55:20 +04:00
parent 9e3001215b
commit ec6b006bbb
1 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
+49 -21
View File
@@ -66,6 +66,8 @@ public class StaticContext {
private final Generator<NamingScope> scopes = new ScopeGenerator(); private final Generator<NamingScope> scopes = new ScopeGenerator();
@NotNull @NotNull
private final Generator<JsNameRef> qualifiers = new QualifierGenerator(); private final Generator<JsNameRef> qualifiers = new QualifierGenerator();
@NotNull
private final Generator<Boolean> qualifierIsNull = new QualifierIsNullGenerator();
//TODO: too many parameters in constructor //TODO: too many parameters in constructor
@@ -124,23 +126,6 @@ public class StaticContext {
return namingScope; return namingScope;
} }
@Nullable
public JsNameRef getQualifierForDescriptor(@NotNull DeclarationDescriptor descriptor) {
//TODO: refactor
if (descriptor instanceof PropertyDescriptor) {
return null;
}
if (isVariableAsFunction(descriptor)) {
return null;
}
//TODO: hack!
if (AnnotationsUtils.isNativeObject(descriptor)) {
return null;
}
return qualifiers.get(descriptor.getOriginal());
}
@NotNull @NotNull
public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) { public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) {
@@ -150,7 +135,7 @@ public class StaticContext {
} }
private class NameGenerator extends Generator<JsName> { private final class NameGenerator extends Generator<JsName> {
public NameGenerator() { public NameGenerator() {
Rule<JsName> aliasOverridesNames = new Rule<JsName>() { Rule<JsName> aliasOverridesNames = new Rule<JsName>() {
@Override @Override
@@ -306,7 +291,7 @@ public class StaticContext {
} }
private class ScopeGenerator extends Generator<NamingScope> { private final class ScopeGenerator extends Generator<NamingScope> {
public ScopeGenerator() { public ScopeGenerator() {
Rule<NamingScope> generateNewScopesForNamespaceDescriptors = new Rule<NamingScope>() { Rule<NamingScope> generateNewScopesForNamespaceDescriptors = new Rule<NamingScope>() {
@@ -328,11 +313,17 @@ public class StaticContext {
addRule(generateNewScopesForNamespaceDescriptors); addRule(generateNewScopesForNamespaceDescriptors);
addRule(generateInnerScopesForMembers); addRule(generateInnerScopesForMembers);
} }
} }
@Nullable
public JsNameRef getQualifierForDescriptor(@NotNull DeclarationDescriptor descriptor) {
if (qualifierIsNull.get(descriptor) != null) {
return null;
}
return qualifiers.get(descriptor.getOriginal());
}
private class QualifierGenerator extends Generator<JsNameRef> { private final class QualifierGenerator extends Generator<JsNameRef> {
public QualifierGenerator() { public QualifierGenerator() {
Rule<JsNameRef> namespacesHaveNoQualifiers = new Rule<JsNameRef>() { Rule<JsNameRef> namespacesHaveNoQualifiers = new Rule<JsNameRef>() {
@Override @Override
@@ -395,4 +386,41 @@ public class StaticContext {
addRule(namespaceLevelDeclarationsHaveEnclosingNamespacesNamesAsQualifier); addRule(namespaceLevelDeclarationsHaveEnclosingNamespacesNamesAsQualifier);
} }
} }
private class QualifierIsNullGenerator extends Generator<Boolean> {
private QualifierIsNullGenerator() {
Rule<Boolean> propertiesHaveNoQualifiers = new Rule<Boolean>() {
@Override
public Boolean apply(@NotNull DeclarationDescriptor descriptor) {
if (!(descriptor instanceof PropertyDescriptor)) {
return null;
}
return true;
}
};
Rule<Boolean> variableAsFunctionsHaveNoQualifiers = new Rule<Boolean>() {
@Override
public Boolean apply(@NotNull DeclarationDescriptor descriptor) {
if (!isVariableAsFunction(descriptor)) {
return null;
}
return true;
}
};
//TODO: hack!
Rule<Boolean> nativeObjectsHaveNoQualifiers = new Rule<Boolean>() {
@Override
public Boolean apply(@NotNull DeclarationDescriptor descriptor) {
if (!AnnotationsUtils.isNativeObject(descriptor)) {
return null;
}
return true;
}
};
addRule(propertiesHaveNoQualifiers);
addRule(variableAsFunctionsHaveNoQualifiers);
addRule(nativeObjectsHaveNoQualifiers);
}
}
} }