Use correct key-arg splitting

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / key / KeyStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java
index d4ab2e686962619337ad94dce01fa26ce59450f0..27aa30050e60357ea414f7b5e285235c63dcc6bf 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java
@@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.key;
 
 import static com.google.common.base.Verify.verify;
 
+import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -22,6 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.KeyStatement;
+import org.opendaylight.yangtools.yang.parser.antlr.YangStatementLexer;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -31,14 +33,34 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 public final class KeyStatementSupport
         extends BaseStatementSupport<Set<QName>, KeyStatement, KeyEffectiveStatement> {
-    private static final Splitter LIST_KEY_SPLITTER = Splitter.on(' ').omitEmptyStrings().trimResults();
+    /**
+     * This is equivalent to {@link YangStatementLexer#SEP}'s definition. Currently equivalent to the non-repeating
+     * part of:
+     *
+     * <p>
+     * {@code SEP: [ \n\r\t]+ -> type(SEP);}.
+     */
+    private static final CharMatcher SEP = CharMatcher.anyOf(" \n\r\t").precomputed();
+
+    /**
+     * Splitter corresponding to {@code key-arg} ABNF as defined
+     * in <a href="https://tools.ietf.org/html/rfc6020#section-12">RFC6020, section 12</a>:
+     *
+     * <p>
+     * {@code key-arg             = node-identifier *(sep node-identifier)}
+     *
+     * <p>
+     * We also account for {@link #SEP} not handling repetition by ignoring empty strings.
+     */
+    private static final Splitter KEY_ARG_SPLITTER = Splitter.on(SEP).omitEmptyStrings();
+
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.KEY)
         .build();
     private static final KeyStatementSupport INSTANCE = new KeyStatementSupport();
 
     private KeyStatementSupport() {
-        super(YangStmtMapping.KEY);
+        super(YangStmtMapping.KEY, CopyPolicy.DECLARED_COPY);
     }
 
     public static KeyStatementSupport getInstance() {
@@ -49,15 +71,14 @@ public final class KeyStatementSupport
     public ImmutableSet<QName> parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
         final Builder<QName> builder = ImmutableSet.builder();
         int tokens = 0;
-        for (String keyToken : LIST_KEY_SPLITTER.split(value)) {
+        for (String keyToken : KEY_ARG_SPLITTER.split(value)) {
             builder.add(StmtContextUtils.parseNodeIdentifier(ctx, keyToken));
             tokens++;
         }
 
         // Throws NPE on nulls, retains first inserted value, cannot be modified
         final ImmutableSet<QName> ret = builder.build();
-        SourceException.throwIf(ret.size() != tokens, ctx.getStatementSourceReference(),
-                "Key argument '%s' contains duplicates", value);
+        SourceException.throwIf(ret.size() != tokens, ctx, "Key argument '%s' contains duplicates", value);
         return ret;
     }
 
@@ -66,7 +87,7 @@ public final class KeyStatementSupport
             final QNameModule targetModule) {
         final Builder<QName> builder = ImmutableSet.builder();
         boolean replaced = false;
-        for (final QName qname : ctx.coerceStatementArgument()) {
+        for (final QName qname : ctx.getArgument()) {
             if (!targetModule.equals(qname.getModule())) {
                 final QName newQname = qname.bindTo(targetModule).intern();
                 builder.add(newQname);
@@ -78,7 +99,7 @@ public final class KeyStatementSupport
 
         // This makes sure we reuse the collection when a grouping is
         // instantiated in the same module
-        return replaced ? builder.build() : ctx.getStatementArgument();
+        return replaced ? builder.build() : ctx.argument();
     }
 
     @Override
@@ -89,12 +110,12 @@ public final class KeyStatementSupport
     @Override
     protected KeyStatement createDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularKeyStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected KeyStatement createEmptyDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx) {
-        return new EmptyKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyKeyStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override