New Java parser (cleanup)

This commit is contained in:
Roman Shevchenko
2010-08-01 17:40:45 +04:00
parent 9cfb7ac4f8
commit f4a6176736
2 changed files with 5 additions and 5 deletions
@@ -52,10 +52,10 @@ public class FileParser {
continue;
}
final PsiBuilder.Marker decl = DeclarationParser.parse(builder, DeclarationParser.Context.FILE);
if (decl != null) {
final PsiBuilder.Marker declaration = DeclarationParser.parse(builder, DeclarationParser.Context.FILE);
if (declaration != null) {
if (invalidElements != null) {
invalidElements.errorBefore(JavaErrorMessages.message("expected.class.or.interface"), decl);
invalidElements.errorBefore(JavaErrorMessages.message("expected.class.or.interface"), declaration);
invalidElements = null;
}
continue;
@@ -34,12 +34,12 @@ public class JavaParser implements PsiParser {
@NotNull
public ASTNode parse(final IElementType rootType, final PsiBuilder builder) {
final PsiBuilder.Marker root = builder.mark();
setLanguageLevel(builder, myLanguageLevel);
final PsiBuilder.Marker root = builder.mark();
FileParser.parse(builder);
root.done(rootType);
return builder.getTreeBuilt();
}
}