BUG-5222: Reuse substatements across phases

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
index c59d1d94f0ebcaadb9c99e91028887d282a6d931..9b6bda04299aa19355d54b9c4df833525ede1544 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
@@ -18,10 +19,9 @@ final class StatementContextWriter implements StatementWriter {
     private final ModelProcessingPhase phase;
     private final SourceSpecificContext ctx;
 
-    private StatementContextBase<?, ?, ?> parent;
-    private ContextBuilder<?, ?, ?> current;
+    private StatementContextBase<?, ?, ?> current;
 
-    public StatementContextWriter(final SourceSpecificContext ctx, final ModelProcessingPhase phase) {
+    StatementContextWriter(final SourceSpecificContext ctx, final ModelProcessingPhase phase) {
         this.ctx = Preconditions.checkNotNull(ctx);
         this.phase = Preconditions.checkNotNull(phase);
     }
@@ -29,16 +29,14 @@ final class StatementContextWriter implements StatementWriter {
     @Override
     public void startStatement(final int childId, @Nonnull final QName name, final String argument,
             @Nonnull final StatementSourceReference ref) {
-        deferredCreate();
-        current = ctx.createDeclaredChild(parent, childId, name, argument, ref);
+        current = Verify.verifyNotNull(ctx.createDeclaredChild(current, childId, name, argument, ref));
     }
 
     @Override
     public void endStatement(@Nonnull final StatementSourceReference ref) {
-        deferredCreate();
-        Preconditions.checkState(parent != null);
-        parent.endDeclared(ref,phase);
-        parent = parent.getParentContext();
+        Preconditions.checkState(current != null);
+        current.endDeclared(ref, phase);
+        current = current.getParentContext();
     }
 
     @Nonnull
@@ -46,11 +44,4 @@ final class StatementContextWriter implements StatementWriter {
     public ModelProcessingPhase getPhase() {
         return phase;
     }
-
-    private void deferredCreate() {
-        if (current != null) {
-            parent = current.build();
-            current = null;
-        }
-    }
 }