refactoring

Author: raydac

src/main/java/com/igormaznitsa/prologparser/AstItem.java

@@ -32,7 +32,6 @@
 import com.igormaznitsa.prologparser.tokenizer.OpAssoc;
 import com.igormaznitsa.prologparser.tokenizer.TermWrapper;
 import com.igormaznitsa.prologparser.utils.SoftObjectPool;
-
 import java.util.ArrayList;
 
 final class AstItem {
@@ -135,27 +134,19 @@ public TermType getType() {
 
   public AstItem findRoot() {
     AstItem result = this;
-    while (!Thread.currentThread().isInterrupted()) {
-      final AstItem theParent = result.parentItem;
-      if (theParent == null) {
-        break;
-      } else {
-        result = theParent;
-      }
+    AstItem theParent;
+    while ((theParent = result.parentItem) != null) {
+      result = theParent;
     }
     return result;
   }
 
   public AstItem findFirstNodeWithSuchOrLowerPrecedence(final int precedence) {
     AstItem result = this;
 
-    while (!Thread.currentThread().isInterrupted()) {
-      final AstItem itsParent = result.parentItem;
-      if (itsParent == null || result.getPrecedence() >= precedence) {
-        break;
-      } else {
-        result = itsParent;
-      }
+    AstItem itsParent;
+    while ((itsParent = result.parentItem) != null && result.getPrecedence() < precedence) {
+      result = itsParent;
     }
 
     return result;
@@ -271,17 +262,17 @@ public PrologTerm convertToTermAndRelease() {
                 if (operator.getArity() == terms.length) {
                   return new PrologStruct(operator, terms, wrapper.getLine(), wrapper.getPos());
                 } else {
-                    final Op appropriateOperator = this.parser.getContext().findOpForName(this.parser, operator.getText()).findForArity(terms.length);
-                    
-                    if (appropriateOperator == null) {
-                        if (operator.getArity() == 1) {
-                            return new PrologStruct(operator, new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos());
-                        } else {
-                            return new PrologStruct(new PrologAtom(wrapper.getText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), terms, wrapper.getLine(), wrapper.getPos());
-                        }
+                  final Op appropriateOperator = this.parser.getContext().findOpForName(this.parser, operator.getText()).findForArity(terms.length);
+
+                  if (appropriateOperator == null) {
+                    if (operator.getArity() == 1) {
+                      return new PrologStruct(operator, new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos());
                     } else {
-                        return new PrologStruct(appropriateOperator, terms, wrapper.getLine(), wrapper.getPos());
+                      return new PrologStruct(new PrologAtom(wrapper.getText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), terms, wrapper.getLine(), wrapper.getPos());
                     }
+                  } else {
+                    return new PrologStruct(appropriateOperator, terms, wrapper.getLine(), wrapper.getPos());
+                  }
                 }
 
               } else {
@@ -347,8 +338,8 @@ public PrologTerm convertToTermAndRelease() {
             final PrologTerm thatTerm = thisStruct.getTermAt(0);
 
             if (thatTerm.getType() == TermType.STRUCT && (thatTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK || thatTerm.getFunctor() == Op.VIRTUAL_OPERATOR_CURLY_BLOCK)) {
-                // rolling normal blocks
-                result = thatTerm.isBlock() && (this.isBlock()&& (this.parentItem == null || (this.parentItem != null && this.parentItem.isBlock()))) ? thatTerm : thisStruct;
+              // rolling normal blocks
+              result = thatTerm.isBlock() && (this.isBlock() && (this.parentItem == null || (this.parentItem != null && this.parentItem.isBlock()))) ? thatTerm : thisStruct;
             } else {
               result = thisStruct;
             }

src/main/java/com/igormaznitsa/prologparser/PrologParser.java

@@ -20,6 +20,8 @@
  */
 package com.igormaznitsa.prologparser;
 
+import static com.igormaznitsa.prologparser.DefaultParserContext.of;
+import static com.igormaznitsa.prologparser.ParserContext.*;
 import com.igormaznitsa.prologparser.exceptions.CriticalUnexpectedError;
 import com.igormaznitsa.prologparser.exceptions.PrologParserException;
 import com.igormaznitsa.prologparser.terms.OpContainer;
@@ -29,15 +31,16 @@
 import com.igormaznitsa.prologparser.terms.PrologTerm;
 import com.igormaznitsa.prologparser.terms.Quotation;
 import com.igormaznitsa.prologparser.terms.TermType;
+import static com.igormaznitsa.prologparser.terms.TermType.SPEC_TERM_OPERATOR_CONTAINER;
 import com.igormaznitsa.prologparser.tokenizer.Op;
 import com.igormaznitsa.prologparser.tokenizer.OpAssoc;
 import com.igormaznitsa.prologparser.tokenizer.TermWrapper;
 import com.igormaznitsa.prologparser.tokenizer.Tokenizer;
 import com.igormaznitsa.prologparser.tokenizer.TokenizerResult;
 import com.igormaznitsa.prologparser.utils.AssertUtils;
 import com.igormaznitsa.prologparser.utils.Koi7CharOpMap;
+import static com.igormaznitsa.prologparser.utils.Koi7CharOpMap.ofOps;
 import com.igormaznitsa.prologparser.utils.SoftObjectPool;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Reader;
@@ -50,11 +53,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import static com.igormaznitsa.prologparser.DefaultParserContext.of;
-import static com.igormaznitsa.prologparser.ParserContext.*;
-import static com.igormaznitsa.prologparser.terms.TermType.SPEC_TERM_OPERATOR_CONTAINER;
-import static com.igormaznitsa.prologparser.utils.Koi7CharOpMap.ofOps;
-
 /**
  * Abstract base Prolog parser.
  */
@@ -137,7 +135,7 @@ public final AstItem get() {
   public Tokenizer getInternalTokenizer() {
     return this.tokenizer;
   }
-  
+
   public static Op findBaseMetaOperator(final String text, final OpAssoc type) {
     if (text.length() != 1) {
       return null;
@@ -224,7 +222,7 @@ private PrologStruct readStruct(final PrologTerm functor) {
     try {
       PrologStruct result;
       boolean active = true;
-      while (active && !Thread.currentThread().isInterrupted()) {
+      while (active) {
         final PrologTerm block = readBlock(OPERATORS_INSIDE_STRUCT);
 
         if (block == null) {
@@ -274,7 +272,7 @@ private PrologTerm readList(final TokenizerResult openingBracket) {
 
     boolean doRead = true;
 
-    while (doRead && !Thread.currentThread().isInterrupted()) {
+    while (doRead) {
       final PrologTerm block = readBlock(OPERATORS_INSIDE_LIST);
 
       final TokenizerResult nextAtom = this.tokenizer.readNextToken();