Move implicitDeclaredFlag

[yangtools.git] / parser / yang-parser-reactor / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / reactor / AbstractResumedStatement.java

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
index 1358f284ffe477610b07b80791922d3aa02e7200..e085978af3ba34ee5d52b967e913f42c0e3e8422 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
@@ -39,6 +39,7 @@ abstract class AbstractResumedStatement<A, D extends DeclaredStatement<A>, E ext
 
     private StatementMap substatements = StatementMap.empty();
     private @Nullable D declaredInstance;
+    private boolean implicitDeclared;
 
     // Copy constructor
     AbstractResumedStatement(final AbstractResumedStatement<A, D, E> original) {
@@ -80,7 +81,7 @@ abstract class AbstractResumedStatement<A, D extends DeclaredStatement<A>, E ext
     @SuppressWarnings({ "rawtypes", "unchecked" })
     private @NonNull Stream<DeclaredStatement<?>> substatementsAsDeclared() {
         final Stream<AbstractResumedStatement<?, ?, ?>> stream;
-        if (getImplicitDeclaredFlag()) {
+        if (implicitDeclared) {
             stream = substatements.stream().map(AbstractResumedStatement::unmaskUndeclared);
         } else {
             stream = (Stream) substatements.stream();
@@ -155,7 +156,7 @@ abstract class AbstractResumedStatement<A, D extends DeclaredStatement<A>, E ext
         final SubstatementContext<X, Y, Z> ret;
         final var implicitParent = definition().getImplicitParentFor(this, def.getPublicView());
         if (implicitParent.isPresent()) {
-            setImplicitDeclaredFlag();
+            implicitDeclared = true;
             final var parent = createUndeclared(offset, implicitParent.orElseThrow(), ref, argument);
             ret = new SubstatementContext<>(parent, def, ref, argument);
             parent.addEffectiveSubstatement(ret);