refactoring

Author: raydac

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

@@ -482,10 +482,7 @@ private PrologTerm readBlock(final Koi7CharOpMap endOperators) {
           }
           break;
           default: {
-            if (readAtom.getTermType() == TermType.VAR && (this.parserFlags & FLAG_VAR_AS_FUNCTOR) == 0) {
-              // do nothing
-            } else {
-
+            if (readAtom.getTermType() != TermType.VAR || (this.parserFlags & FLAG_VAR_AS_FUNCTOR) != 0) {
               TokenizerResult nextToken = this.tokenizer.readNextToken();
 
               if (nextToken == null) {

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

@@ -1186,7 +1186,6 @@ public void testConformity() {
     assertThrows(PrologParserException.class, () -> parseEd("/**/ write_canonical(fy yf).").next());
     assertThrows(PrologParserException.class, () -> parseEd("/**/ write_canonical(f f).").next());
     assertThrows(PrologParserException.class, () -> parseEd("writeq(0'f').", DefaultParserContext.of(FLAG_BLOCK_COMMENTS, Op.make(100, XF, "f"))).next());
-
     assertThrows(PrologParserException.class, () -> parseEd("/**/ X = 1.e.", DefaultParserContext.of(FLAG_BLOCK_COMMENTS, Op.make(100, XF, "f"))).next());
     assertThrows(PrologParserException.class, () -> parseEd("/**/ writeq(1 .2).").next());
     assertThrows(PrologParserException.class, () -> parseEd("is 0'mod'1.").next());
@@ -1219,6 +1218,7 @@ public void testConformity() {
     assertThrows(NoSuchElementException.class, () -> parseEd(".").next());
     assertThrows(PrologParserException.class, () -> parseEd("writeq('\t'). % horiz. tab ").next());
     assertThrows(PrologParserException.class, () -> parseEd("writeq('\n').").next());
+    assertThrows(PrologParserException.class, () -> parseEd("Finis ().").next());
 
     assertEquals("writeq('*/')", parseEd("writeq('*/').").next().toString());
     assertEquals("writeq('/**')", parseEd("writeq('/**').").next().toString());
@@ -1233,7 +1233,6 @@ public void testConformity() {
     assertEquals("writeq(((':-') :- (':-')))", parseEd("writeq(((:-):-(:-))).").next().toString());
     assertEquals("writeq((*) = (*))", parseEd("writeq((*)=(*)).").next().toString());
     assertEquals("writeq([':-', '-'])", parseEd("writeq([:-,-]).").next().toString());
-    assertThrows(PrologParserException.class, () -> parseEd("Finis ().").next());
     assertEquals("writeq('\\b\\r\\f\\t\\n')", parseEd("writeq('\\b\\r\\f\\t\\n').").next().toString());
     assertEquals("writeq('^`')", parseEd("writeq('^`').").next().toString());
   }