YangStatementParser is not used directly, only its inner class
is needed. Since it is already imported, shorten references
and clean up code.
Change-Id: Ia2298bdf20860bc936ba29234f6568adbe7462c0
Signed-off-by: Robert Varga <rovarga@cisco.com>
import java.util.Objects;
import java.util.Set;
import org.antlr.v4.runtime.ParserRuleContext;
import java.util.Objects;
import java.util.Set;
import org.antlr.v4.runtime.ParserRuleContext;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser;
import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext;
import org.opendaylight.yangtools.concepts.SemVer;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext;
import org.opendaylight.yangtools.concepts.SemVer;
import org.opendaylight.yangtools.yang.common.QName;
public static YangModelDependencyInfo fromAST(final String name,
final ParserRuleContext tree) throws YangSyntaxErrorException {
public static YangModelDependencyInfo fromAST(final String name,
final ParserRuleContext tree) throws YangSyntaxErrorException {
- if (tree instanceof YangStatementParser.StatementContext) {
- final YangStatementParser.StatementContext rootStatement = (YangStatementParser.StatementContext) tree;
+ if (tree instanceof StatementContext) {
+ final StatementContext rootStatement = (StatementContext) tree;
return parseAST(rootStatement);
}
throw new YangSyntaxErrorException(name, 0, 0, "Unknown YANG text type");
}
return parseAST(rootStatement);
}
throw new YangSyntaxErrorException(name, 0, 0, "Unknown YANG text type");
}
- private static YangModelDependencyInfo parseAST(
- final YangStatementParser.StatementContext rootStatement) {
+ private static YangModelDependencyInfo parseAST(final StatementContext rootStatement) {
if (rootStatement
.keyword()
.getText()
if (rootStatement
.keyword()
.getText()
return parseAST(yangAST);
}
return parseAST(yangAST);
}
- private static YangModelDependencyInfo parseModuleContext(
- final YangStatementParser.StatementContext module) {
+ private static YangModelDependencyInfo parseModuleContext(final StatementContext module) {
final String name = Utils.stringFromStringContext(module.argument());
final String latestRevision = getLatestRevision(module);
final Optional<SemVer> semVer = Optional.fromNullable(getSemanticVersion(module));
final String name = Utils.stringFromStringContext(module.argument());
final String latestRevision = getLatestRevision(module);
final Optional<SemVer> semVer = Optional.fromNullable(getSemanticVersion(module));
return new ModuleDependencyInfo(name, latestRevision, imports, includes, semVer);
}
return new ModuleDependencyInfo(name, latestRevision, imports, includes, semVer);
}
- private static ImmutableSet<ModuleImport> parseImports(
- final YangStatementParser.StatementContext module) {
+ private static ImmutableSet<ModuleImport> parseImports(final StatementContext module) {
final Set<ModuleImport> result = new HashSet<>();
final List<StatementContext> subStatements = module.statement();
for (final StatementContext subStatementContext : subStatements) {
final Set<ModuleImport> result = new HashSet<>();
final List<StatementContext> subStatements = module.statement();
for (final StatementContext subStatementContext : subStatements) {
return SemVer.valueOf(semVerString);
}
return SemVer.valueOf(semVerString);
}
- private static ImmutableSet<ModuleImport> parseIncludes(
- final YangStatementParser.StatementContext module) {
+ private static ImmutableSet<ModuleImport> parseIncludes(final StatementContext module) {
final Set<ModuleImport> result = new HashSet<>();
final List<StatementContext> subStatements = module.statement();
for (final StatementContext subStatementContext : subStatements) {
final Set<ModuleImport> result = new HashSet<>();
final List<StatementContext> subStatements = module.statement();
for (final StatementContext subStatementContext : subStatements) {
return revisionDateStr;
}
return revisionDateStr;
}
- public static String getLatestRevision(
- final YangStatementParser.StatementContext module) {
+ public static String getLatestRevision(final StatementContext module) {
final List<StatementContext> subStatements = module.statement();
String latestRevision = null;
for (final StatementContext subStatementContext : subStatements) {
final List<StatementContext> subStatements = module.statement();
String latestRevision = null;
for (final StatementContext subStatementContext : subStatements) {
- private static YangModelDependencyInfo parseSubmoduleContext(
- final YangStatementParser.StatementContext submodule) {
+ private static YangModelDependencyInfo parseSubmoduleContext(final StatementContext submodule) {
final String name = Utils.stringFromStringContext(submodule.argument());
final String belongsTo = parseBelongsTo(submodule);
final String name = Utils.stringFromStringContext(submodule.argument());
final String belongsTo = parseBelongsTo(submodule);