From c14dfa155df9fb90c01b365b3ef7c882925f3734 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 Jan 2023 20:21:08 +0100 Subject: [PATCH] Fix InstanceIdentifierParser's lexer We have a day-0 bug here: we are using xpathLexer instead of instanceIdentifierLexer. JIRA: YANGTOOLS-1361 Change-Id: Ic4c074577c8a6fce9fbc22ef5da8e54b5df75faa Signed-off-by: Ruslan Kashapov Signed-off-by: Robert Varga (cherry picked from commit 8175666c67304af22cda102db8a183784b659799) --- .../yangtools/yang/xpath/impl/InstanceIdentifierParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/InstanceIdentifierParser.java b/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/InstanceIdentifierParser.java index c3654f0b78..ab149ad662 100644 --- a/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/InstanceIdentifierParser.java +++ b/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/InstanceIdentifierParser.java @@ -22,6 +22,7 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTree; import org.opendaylight.yangtools.yang.common.UnresolvedQName; import org.opendaylight.yangtools.yang.common.YangNamespaceContext; +import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierLexer; import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser; import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.EqQuotedStringContext; import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.InstanceIdentifierContext; @@ -34,7 +35,6 @@ import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.Path import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.PosContext; import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.PredicateContext; import org.opendaylight.yangtools.yang.xpath.antlr.instanceIdentifierParser.QuotedStringContext; -import org.opendaylight.yangtools.yang.xpath.antlr.xpathLexer; import org.opendaylight.yangtools.yang.xpath.api.YangBinaryOperator; import org.opendaylight.yangtools.yang.xpath.api.YangExpr; import org.opendaylight.yangtools.yang.xpath.api.YangLiteralExpr; @@ -92,7 +92,7 @@ abstract class InstanceIdentifierParser { } final Absolute interpretAsInstanceIdentifier(final YangLiteralExpr expr) throws XPathExpressionException { - final xpathLexer lexer = new xpathLexer(CharStreams.fromString(expr.getLiteral())); + final instanceIdentifierLexer lexer = new instanceIdentifierLexer(CharStreams.fromString(expr.getLiteral())); final instanceIdentifierParser parser = new instanceIdentifierParser(new CommonTokenStream(lexer)); final CapturingErrorListener listener = new CapturingErrorListener(); lexer.removeErrorListeners(); -- 2.36.6