improved curly block processing added tests

Author: raydac

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()) {
+            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);
@@ -272,12 +272,16 @@ public PrologTerm convertToTermAndRelease() {
                       : new PrologStruct(operator, terms, wrapper.getLine(), wrapper.getPos());
                 }
               } else {
-                if (operator.getArity() == 1) {
-                  return new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
+                if (rightTerm.isCurlyBlock()) {
+                  return new PrologStruct(operator, new PrologTerm[] {rightTerm}, wrapper.getLine(), wrapper.getPos());
                 } 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());
+                  if (operator.getArity() == 1) {
+                    return new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
+                  } 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());
+                  }
                 }
               }
             }

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

@@ -1,5 +1,37 @@
 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;
@@ -34,16 +66,6 @@
 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) {
@@ -1197,6 +1219,18 @@ public void testStandardTermOrder() {
    */
   @Test
   public void testConformity() {
+    assertThrows(PrologParserException.class, () -> parseEd("{:- :- c} = {:-(:-,c)}.").next());
+    assertThrows(PrologParserException.class, () -> parseEd("{1} = {}(1).").next());
+
+    assertEquals("writeq({- = xf1})", parseEd("writeq({- =xf1}).").next().toString());
+    assertEquals("X = {,}", parseEd("X ={,}.").next().toString());
+    assertEquals("{- = -1} = {(- =) - 1}", parseEd("{- = - 1}={(-(=)) - 1}.").next().toString());
+    assertEquals("{- - c} = {- - c}", parseEd("{- - c}={-(-(c))}.").next().toString());
+
+    assertEquals("writeq([+ {a}, + []])", parseEd("writeq([+{a},+[]]).").next().toString());
+    assertEquals("writeq(- {a})", parseEd("writeq(-{a}).").next().toString());
+    assertEquals("writeq(- {})", parseEd("writeq(-{}).").next().toString());
+
     assertEquals("writeq([a, b|','])", parseEd("writeq([a,b|',']).").next().toString());
     assertEquals("X = 1", parseEd("X = 2'1.").next().toString());
     assertEquals("writeq(- - 1)", parseEd("writeq(-(-(1))).").next().toString());