parse imports in scripts

This commit is contained in:
Stepan Koltsov
2012-06-13 22:32:36 +04:00
parent 669d7c704c
commit 4d06660243
3 changed files with 52 additions and 4 deletions
@@ -107,6 +107,9 @@ public class JetParsing extends AbstractJetParsing {
void parseScript() {
PsiBuilder.Marker fileMarker = mark();
PsiBuilder.Marker scriptMarker = mark();
parseImportDirectives();
PsiBuilder.Marker blockMarker = mark();
myExpressionParsing.parseStatements();
@@ -167,10 +170,7 @@ public class JetParsing extends AbstractJetParsing {
}
namespaceHeader.done(NAMESPACE_HEADER);
// TODO: Duplicate with parsing imports in parseToplevelDeclarations
while (at(IMPORT_KEYWORD)) {
parseImportDirective();
}
parseImportDirectives();
}
/* SimpleName{"."} */
@@ -248,6 +248,13 @@ public class JetParsing extends AbstractJetParsing {
importDirective.done(IMPORT_DIRECTIVE);
}
private void parseImportDirectives() {
// TODO: Duplicate with parsing imports in parseToplevelDeclarations
while (at(IMPORT_KEYWORD)) {
parseImportDirective();
}
}
private void handleUselessRename() {
if (at(AS_KEYWORD)) {
PsiBuilder.Marker as = mark();