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

Cast moved to the call-site

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-27 14:01:35 +04:00
parent 7191763c17
commit 19e5e322fe
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
+2 -3
View File
@@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetScript; import org.jetbrains.jet.lang.psi.JetScript;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl;
@@ -99,7 +98,7 @@ public class ScriptHeaderResolver {
return new ValueParameterDescriptorImpl(script, null, index, Annotations.EMPTY, scriptParameter.getName(), type, false, null); return new ValueParameterDescriptorImpl(script, null, index, Annotations.EMPTY, scriptParameter.getName(), type, false, null);
} }
public void processScriptHierarchy(@NotNull TopDownAnalysisContext c, @NotNull JetScript script, @NotNull JetScope outerScope) { public void processScriptHierarchy(@NotNull TopDownAnalysisContext c, @NotNull JetScript script, @NotNull WritableScope outerScope) {
JetFile file = (JetFile) script.getContainingFile(); JetFile file = (JetFile) script.getContainingFile();
FqName fqName = file.getPackageFqName(); FqName fqName = file.getPackageFqName();
PackageFragmentDescriptor ns = packageFragmentProvider.getOrCreateFragment(fqName); PackageFragmentDescriptor ns = packageFragmentProvider.getOrCreateFragment(fqName);
@@ -123,7 +122,7 @@ public class ScriptHeaderResolver {
trace.record(BindingContext.SCRIPT, script, scriptDescriptor); trace.record(BindingContext.SCRIPT, script, scriptDescriptor);
((WritableScope)outerScope).addClassifierDescriptor(scriptDescriptor.getClassDescriptor()); outerScope.addClassifierDescriptor(scriptDescriptor.getClassDescriptor());
} }
public void resolveScriptDeclarations(@NotNull TopDownAnalysisContext c) { public void resolveScriptDeclarations(@NotNull TopDownAnalysisContext c) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+5 -1
View File
@@ -187,7 +187,11 @@ public class TopDownAnalyzer {
if (file.isScript()) { if (file.isScript()) {
JetScript script = file.getScript(); JetScript script = file.getScript();
assert script != null; assert script != null;
scriptHeaderResolver.processScriptHierarchy(c, script, resolveSession.getScopeProvider().getFileScope(file)); scriptHeaderResolver.processScriptHierarchy(
c,
script,
(WritableScope) resolveSession.getScopeProvider().getFileScope(file)
);
} }
else { else {
JetPackageDirective packageDirective = file.getPackageDirective(); JetPackageDirective packageDirective = file.getPackageDirective();