Skip to content

Commit 977b33c

Browse files
raydacraydac
committed
reformatting
1 parent 832412e commit 977b33c

24 files changed

+581
-297
lines changed

‎src/main/java/com/igormaznitsa/prologparser/terms/OpContainer.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,14 @@ public Op findSimilar(final boolean hasLeftArg, final boolean hasRightArg) {
258258
result = this.opFZ;
259259
}
260260
}
261-
} else {
262-
if (hasRightArg) {
263-
if (this.opFZ != null) {
264-
result = this.opFZ;
265-
} else {
266-
result = this.opZF;
267-
}
261+
} else if (hasRightArg) {
262+
if (this.opFZ != null) {
263+
result = this.opFZ;
268264
} else {
269-
result = null;
265+
result = this.opZF;
270266
}
267+
} else {
268+
result = null;
271269
}
272270
return result;
273271
}
@@ -282,24 +280,27 @@ public Op findForType(final OpAssoc type) {
282280
Op result = null;
283281
switch (type) {
284282
case FY:
285-
case FX:
283+
case FX: {
286284
if (this.opFZ != null) {
287285
result = this.opFZ;
288286
}
289-
break;
287+
}
288+
break;
290289
case XF:
291-
case YF:
290+
case YF: {
292291
if (this.opZF != null) {
293292
result = this.opZF;
294293
}
295-
break;
294+
}
295+
break;
296296
case XFX:
297297
case YFX:
298-
case XFY:
298+
case XFY: {
299299
if (this.opZFZ != null) {
300300
result = this.opZFZ;
301301
}
302-
break;
302+
}
303+
break;
303304
default:
304305
throw new CriticalUnexpectedError();
305306
}

‎src/test/java/com/igormaznitsa/prologparser/AbstractIntegrationTest.java‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,27 @@
1616

1717
package com.igormaznitsa.prologparser;
1818

19+
import static com.igormaznitsa.prologparser.DefaultParserContext.of;
20+
import static com.igormaznitsa.prologparser.ParserContext.FLAG_BLOCK_COMMENTS;
21+
import static com.igormaznitsa.prologparser.ParserContext.FLAG_CURLY_BRACKETS;
22+
import static com.igormaznitsa.prologparser.ParserContext.FLAG_DOT2_AS_LIST;
23+
import static com.igormaznitsa.prologparser.ParserContext.FLAG_ZERO_QUOTATION_CHARCODE;
24+
import static com.igormaznitsa.prologparser.terms.TermType.ATOM;
25+
import static java.util.Objects.requireNonNull;
26+
import static org.junit.jupiter.api.Assertions.assertEquals;
27+
import static org.junit.jupiter.api.Assertions.assertFalse;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
import static org.junit.jupiter.api.Assertions.fail;
30+
import static org.mockito.Mockito.mock;
31+
import static org.mockito.Mockito.when;
32+
1933
import com.igormaznitsa.prologparser.terms.OpContainer;
2034
import com.igormaznitsa.prologparser.terms.PrologInt;
2135
import com.igormaznitsa.prologparser.terms.PrologStruct;
2236
import com.igormaznitsa.prologparser.terms.PrologTerm;
2337
import com.igormaznitsa.prologparser.terms.TermType;
2438
import com.igormaznitsa.prologparser.tokenizer.Op;
2539
import com.igormaznitsa.prologparser.tokenizer.OpAssoc;
26-
2740
import java.io.IOException;
2841
import java.io.InputStreamReader;
2942
import java.io.Reader;
@@ -33,27 +46,23 @@
3346
import java.util.List;
3447
import java.util.Map;
3548

36-
import static com.igormaznitsa.prologparser.DefaultParserContext.of;
37-
import static com.igormaznitsa.prologparser.ParserContext.*;
38-
import static com.igormaznitsa.prologparser.terms.TermType.ATOM;
39-
import static java.util.Objects.requireNonNull;
40-
import static org.junit.jupiter.api.Assertions.*;
41-
import static org.mockito.Mockito.mock;
42-
import static org.mockito.Mockito.when;
43-
4449
abstract class AbstractIntegrationTest {
4550
public PrologParser parseCpl(final String str) {
46-
return new GenericPrologParser(new StringReader(str), DefaultParserContext.of(FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS, Op.SWI, Op.SWI_CPL));
51+
return new GenericPrologParser(new StringReader(str), DefaultParserContext.of(
52+
FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS, Op.SWI,
53+
Op.SWI_CPL));
4754
}
4855

4956
public PrologParser parseIso(final String str) {
50-
return new GenericPrologParser(new StringReader(str), DefaultParserContext.of(FLAG_ZERO_QUOTATION_CHARCODE | FLAG_DOT2_AS_LIST, Op.ISO));
57+
return new GenericPrologParser(new StringReader(str),
58+
DefaultParserContext.of(FLAG_ZERO_QUOTATION_CHARCODE | FLAG_DOT2_AS_LIST, Op.ISO));
5159
}
5260

5361
public PrologParser parseEd(final String str) {
5462
final ParserContext parserContext = mock(ParserContext.class);
5563
when(parserContext.getMaxTokenizerBufferLength()).thenReturn(1024);
56-
when(parserContext.getFlags()).thenReturn(FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS);
64+
when(parserContext.getFlags()).thenReturn(
65+
FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS);
5766
return parseEd(str, parserContext);
5867
}
5968

@@ -70,20 +79,25 @@ public PrologParser parseEd(final String str, final ParserContext context) {
7079

7180
public PrologParser parseEd(final Reader reader, final ParserContext context) {
7281
return new GenericPrologParser(reader, ParserContextChain.of(
73-
DefaultParserContext.of(FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS, Op.SWI), context));
82+
DefaultParserContext.of(
83+
FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS, Op.SWI),
84+
context));
7485
}
7586

7687
public PrologParser parseGen(final String str, final ParserContext context) {
7788
final ParserContext parserContext = mock(ParserContext.class);
7889
when(parserContext.getMaxTokenizerBufferLength()).thenReturn(1024);
79-
when(parserContext.getFlags()).thenReturn(ParserContext.FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS);
80-
return new GenericPrologParser(new StringReader(str), ParserContextChain.of(context, parserContext));
90+
when(parserContext.getFlags()).thenReturn(
91+
ParserContext.FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE | FLAG_CURLY_BRACKETS);
92+
return new GenericPrologParser(new StringReader(str),
93+
ParserContextChain.of(context, parserContext));
8194
}
8295

8396
public GenericPrologParser parseGen(final String str) {
8497
final ParserContext parserContext = mock(ParserContext.class);
8598
when(parserContext.getMaxTokenizerBufferLength()).thenReturn(1024);
86-
when(parserContext.getFlags()).thenReturn(ParserContext.FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE);
99+
when(parserContext.getFlags()).thenReturn(
100+
ParserContext.FLAG_BLOCK_COMMENTS | FLAG_ZERO_QUOTATION_CHARCODE);
87101
return new GenericPrologParser(new StringReader(str), parserContext);
88102
}
89103

@@ -92,8 +106,11 @@ public void assertReadTerms(final int expected, final String resource, final Lis
92106
}
93107

94108
public void assertReadTerms(final int expected, final String resource, final Op... ops) {
95-
final ParserContext defaultContext = of(ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_ZERO_QUOTATION_CHARCODE | ParserContext.FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR, ops);
96-
try (Reader reader = new InputStreamReader(requireNonNull(getClass().getResourceAsStream(resource)), StandardCharsets.UTF_8)) {
109+
final ParserContext defaultContext =
110+
of(ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_ZERO_QUOTATION_CHARCODE |
111+
ParserContext.FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR, ops);
112+
try (Reader reader = new InputStreamReader(
113+
requireNonNull(getClass().getResourceAsStream(resource)), StandardCharsets.UTF_8)) {
97114
final PrologParser parser = parseEd(reader, defaultContext);
98115
assertEquals(expected, parser.stream().count());
99116
} catch (IOException ex) {
@@ -102,20 +119,24 @@ public void assertReadTerms(final int expected, final String resource, final Op.
102119
}
103120

104121
public ParserContext makeSictusContext(final Op... ops) {
105-
return of(ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_CURLY_BRACKETS, Op.ISO, Op.SICTUS_SPECIFIC, Arrays.asList(ops));
122+
return of(ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_CURLY_BRACKETS, Op.ISO,
123+
Op.SICTUS_SPECIFIC, Arrays.asList(ops));
106124
}
107125

108126
public void assertReadSictusTerms(final int expected, final String resource, final Op... ops) {
109127
final ParserContext defaultContext = makeSictusContext(ops);
110-
try (Reader reader = new InputStreamReader(requireNonNull(getClass().getResourceAsStream("bench/" + resource)), StandardCharsets.UTF_8)) {
128+
try (Reader reader = new InputStreamReader(
129+
requireNonNull(getClass().getResourceAsStream("bench/" + resource)),
130+
StandardCharsets.UTF_8)) {
111131
final PrologParser parser = new GenericPrologParser(reader, defaultContext);
112132
assertEquals(expected, parser.stream().count());
113133
} catch (IOException ex) {
114134
fail("IOException", ex);
115135
}
116136
}
117137

118-
public void assertOperatorAsFunctor(final String goal, final String opText, final OpAssoc assoc, final int arity, final String expectedText) {
138+
public void assertOperatorAsFunctor(final String goal, final String opText, final OpAssoc assoc,
139+
final int arity, final String expectedText) {
119140
try (final PrologParser parser = parseEd(goal)) {
120141
assertTrue(parser.hasNext());
121142
final PrologTerm term = parser.next();

‎src/test/java/com/igormaznitsa/prologparser/BigDataTest.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,35 @@
1616

1717
package com.igormaznitsa.prologparser;
1818

19+
import static com.igormaznitsa.prologparser.ParserContext.FLAG_NONE;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.fail;
23+
1924
import com.igormaznitsa.prologparser.terms.PrologInt;
2025
import com.igormaznitsa.prologparser.terms.PrologList;
2126
import com.igormaznitsa.prologparser.terms.PrologStruct;
2227
import com.igormaznitsa.prologparser.tokenizer.Op;
2328
import java.io.IOException;
24-
import org.junit.jupiter.api.Test;
25-
2629
import java.io.InputStreamReader;
27-
28-
import static com.igormaznitsa.prologparser.ParserContext.FLAG_NONE;
29-
import static org.junit.jupiter.api.Assertions.assertEquals;
30-
import static org.junit.jupiter.api.Assertions.assertTrue;
31-
import static org.junit.jupiter.api.Assertions.fail;
30+
import org.junit.jupiter.api.Test;
3231

3332
class BigDataTest extends AbstractIntegrationTest {
3433

3534
@Test
3635
public void testBigSource_ClausesSplitted() {
3736
final int CLAUSES = 1000;
38-
assertEquals(CLAUSES, new GenericPrologParser(new InputStreamReader(new PrologSourceKoi7Generator(CLAUSES, true)), DefaultParserContext.of(FLAG_NONE, Op.SWI)).stream().count());
37+
assertEquals(CLAUSES,
38+
new GenericPrologParser(new InputStreamReader(new PrologSourceKoi7Generator(CLAUSES, true)),
39+
DefaultParserContext.of(FLAG_NONE, Op.SWI)).stream().count());
3940
}
4041

4142
@Test
4243
public void testBigSource_ClausesNotSplitted() {
4344
final int CLAUSES = 1000;
44-
assertEquals(CLAUSES, new GenericPrologParser(new InputStreamReader(new PrologSourceKoi7Generator(CLAUSES, false)), DefaultParserContext.of(FLAG_NONE, Op.SWI)).stream().count());
45+
assertEquals(CLAUSES, new GenericPrologParser(
46+
new InputStreamReader(new PrologSourceKoi7Generator(CLAUSES, false)),
47+
DefaultParserContext.of(FLAG_NONE, Op.SWI)).stream().count());
4548
}
4649

4750

@@ -62,7 +65,7 @@ void testVeryLongStructure() {
6265
}
6366
buffer.append(").");
6467

65-
try(final PrologParser parser = parseEd(buffer.toString())) {
68+
try (final PrologParser parser = parseEd(buffer.toString())) {
6669
PrologStruct struct = (PrologStruct) parser.next();
6770
assertEquals(ELEMENTS, struct.getArity());
6871
assertEquals("test", struct.getFunctor().getText());

0 commit comments

Comments
 (0)