Bug 4079: Unable to compile pattern defined in module

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / PatternStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java
index 0d35ec52d63711453d0600a3a592f13c71476fee..56f562410c1c83d6b338d3ca58487187413b8aa8 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -18,15 +18,27 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.PatternConstraintEffectiveImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.PatternEffectiveStatementImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PatternStatementImpl extends AbstractDeclaredStatement<PatternConstraint> implements PatternStatement {
-
-    protected PatternStatementImpl(StmtContext<PatternConstraint, PatternStatement, ?> context) {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+            .PATTERN)
+            .add(Rfc6020Mapping.DESCRIPTION, 0, 1)
+            .add(Rfc6020Mapping.ERROR_APP_TAG, 0, 1)
+            .add(Rfc6020Mapping.ERROR_MESSAGE, 0, 1)
+            .add(Rfc6020Mapping.REFERENCE, 0, 1)
+            .build();
+    private static final Logger LOG = LoggerFactory.getLogger(PatternStatementImpl.class);
+
+    protected PatternStatementImpl(final StmtContext<PatternConstraint, PatternStatement, ?> context) {
         super(context);
     }
 
@@ -39,32 +51,36 @@ public class PatternStatementImpl extends AbstractDeclaredStatement<PatternConst
         }
 
         @Override
-        public PatternConstraint parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
-
-            final StringBuilder wrapPatternBuilder = new StringBuilder(value.length() + 2);
-            wrapPatternBuilder.append('^');
-            wrapPatternBuilder.append(value);
-            wrapPatternBuilder.append('$');
-            final String pattern = wrapPatternBuilder.toString();
+        public PatternConstraint parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
+            final String pattern = "^" + Utils.fixUnicodeScriptPattern(value) + '$';
 
             try {
                 Pattern.compile(pattern);
-                return new PatternConstraintEffectiveImpl(pattern, Optional.of(""), Optional.of(""));
             } catch (PatternSyntaxException e) {
+                LOG.debug("Pattern \"{}\" failed to compile at {}", pattern, ctx.getStatementSourceReference(), e);
                 return null;
             }
+
+            return new PatternConstraintEffectiveImpl(pattern, Optional.<String>absent(), Optional.<String>absent());
         }
 
         @Override
-        public PatternStatement createDeclared(StmtContext<PatternConstraint, PatternStatement, ?> ctx) {
+        public PatternStatement createDeclared(final StmtContext<PatternConstraint, PatternStatement, ?> ctx) {
             return new PatternStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<PatternConstraint, PatternStatement> createEffective(
-                StmtContext<PatternConstraint, PatternStatement, EffectiveStatement<PatternConstraint, PatternStatement>> ctx) {
+                final StmtContext<PatternConstraint, PatternStatement, EffectiveStatement<PatternConstraint, PatternStatement>> ctx) {
             return new PatternEffectiveStatementImpl(ctx);
         }
+
+        @Override
+        public void onFullDefinitionDeclared(StmtContext.Mutable<PatternConstraint, PatternStatement,
+                EffectiveStatement<PatternConstraint, PatternStatement>> stmt) throws SourceException {
+            super.onFullDefinitionDeclared(stmt);
+            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        }
     }
 
     @Override