formatting

Author: raydac

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

@@ -479,14 +479,15 @@ private PrologTerm readBlock(final Koi7CharOpMap endOperators) {
                     if (readAtom == null) {
                       if (onlyCharCode == '{') {
                         emptyCurly = true;
-                      } else
-                      throw new PrologParserException("Illegal start of term",
-                          readAtomContainer.getLine(), readAtomContainer.getPos());
+                      } else {
+                        throw new PrologParserException("Illegal start of term",
+                            readAtomContainer.getLine(), readAtomContainer.getPos());
+                      }
                     }
 
                     if (emptyCurly) {
                       readAtom = new PrologStruct(Op.VIRTUAL_OPERATOR_CURLY_BLOCK, EMPTY_TERM_ARRAY, readAtomContainer.getLine(), readAtomContainer.getPos());
-                    }else {
+                    } else {
                       readAtom.setLine(readAtomContainer.getLine());
                       readAtom.setPos(readAtomContainer.getPos());
                       readAtom = new PrologStruct(onlyCharCode == '{' ? Op.VIRTUAL_OPERATOR_CURLY_BLOCK : Op.VIRTUAL_OPERATOR_BLOCK, new PrologTerm[] {readAtom}, readAtomContainer.getLine(), readAtomContainer.getPos());

src/main/java/com/igormaznitsa/prologparser/tokenizer/TreeItem.java

@@ -255,7 +255,7 @@ public PrologTerm convertToTermAndRelease() {
           }
 
           if (this.leftBranch == null) {
-            if (this.rightBranch.getType() == TermType.STRUCT && this.rightBranch.savedTerm.isBlock() && !((PrologStruct)this.rightBranch.savedTerm).isEmpty()) {
+            if (this.rightBranch.getType() == TermType.STRUCT && this.rightBranch.savedTerm.isBlock() && !((PrologStruct) this.rightBranch.savedTerm).isEmpty()) {
               final PrologTerm rightTerm = this.rightBranch.convertToTermAndRelease();
               Op operator = (Op) wrapper.getWrappedTerm();
               final PrologTerm blockContent = ((PrologStruct) rightTerm).getTermAt(0);
@@ -280,7 +280,7 @@ public PrologTerm convertToTermAndRelease() {
                   } else {
                     operator = this.parser.getContext().findOpForName(this.parser, operator.getTermText()).findForArity(1);
                     return operator == null ? new PrologStruct(new PrologAtom(wrapper.getTermText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos())
-                            : new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
+                        : new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
                   }
                 }
               }

src/test/java/com/igormaznitsa/prologparser/IntegrationTest.java

@@ -1,37 +1,5 @@
 package com.igormaznitsa.prologparser;
 
-import static com.igormaznitsa.prologparser.DefaultParserContext.of;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_BLOCK_COMMENTS;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_CURLY_BRACKETS;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_NONE;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_VAR_AS_FUNCTOR;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_ZERO_QUOTATION_CHARCODE;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_ZERO_STRUCT;
-import static com.igormaznitsa.prologparser.terms.OpContainer.make;
-import static com.igormaznitsa.prologparser.terms.Quotation.BACK_TICK;
-import static com.igormaznitsa.prologparser.terms.Quotation.DOUBLE;
-import static com.igormaznitsa.prologparser.terms.Quotation.NONE;
-import static com.igormaznitsa.prologparser.terms.Quotation.SINGLE;
-import static com.igormaznitsa.prologparser.terms.TermType.ATOM;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.FX;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.FY;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.XF;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.XFX;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.XFY;
-import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.YFX;
-import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import com.igormaznitsa.prologparser.exceptions.PrologParserException;
 import com.igormaznitsa.prologparser.terms.OpContainer;
 import com.igormaznitsa.prologparser.terms.PrologAtom;
@@ -66,6 +34,16 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static com.igormaznitsa.prologparser.DefaultParserContext.of;
+import static com.igormaznitsa.prologparser.ParserContext.*;
+import static com.igormaznitsa.prologparser.terms.OpContainer.make;
+import static com.igormaznitsa.prologparser.terms.Quotation.*;
+import static com.igormaznitsa.prologparser.terms.TermType.ATOM;
+import static com.igormaznitsa.prologparser.tokenizer.OpAssoc.*;
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
 public class IntegrationTest {
 
   private static PrologParser parseCpl(final String str) {