Skip to content

Commit 8b4a5a3

Browse files
raydacraydac
committed
reformatting, replaced custom non null to java api non null
1 parent 4b0bd7b commit 8b4a5a3

28 files changed

+689
-680
lines changed

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* specific language governing permissions and limitations
1919
* under the License.
2020
*/
21+
2122
package com.igormaznitsa.prologparser;
2223

2324
import com.igormaznitsa.prologparser.exceptions.CriticalUnexpectedError;
@@ -31,23 +32,23 @@
3132
import com.igormaznitsa.prologparser.tokenizer.Op;
3233
import com.igormaznitsa.prologparser.tokenizer.OpAssoc;
3334
import com.igormaznitsa.prologparser.tokenizer.TermWrapper;
35+
3436
import java.util.ArrayList;
3537

3638
final class AstItem {
3739

40+
private final PrologTerm savedTerm;
3841
private AstItem leftItem;
3942
private AstItem rightItem;
4043
private AstItem parentItem;
41-
private final PrologTerm savedTerm;
4244

4345
AstItem(final PrologTerm term, final int line, final int pos) {
4446
if (term == null) {
4547
this.savedTerm = null;
4648
} else {
4749
final TermType termType = term.getType();
4850
if (termType == TermType.OPERATOR) {
49-
final TermWrapper termWrapper = new TermWrapper(term);
50-
this.savedTerm = termWrapper;
51+
this.savedTerm = new TermWrapper(term);
5152
} else {
5253
this.savedTerm = term;
5354
}
@@ -190,13 +191,13 @@ private boolean isPrecedenceOk() {
190191

191192
private boolean isAnyBlock() {
192193
return this.savedTerm.getType() == TermType.STRUCT
193-
&& (this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK
194-
|| this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_CURLY_BLOCK);
194+
&& (this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK
195+
|| this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_CURLY_BLOCK);
195196
}
196197

197198
private boolean isBlock() {
198199
return this.savedTerm.getType() == TermType.STRUCT
199-
&& this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK;
200+
&& this.savedTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK;
200201
}
201202

202203
private boolean isOperator() {
@@ -236,7 +237,7 @@ PrologTerm convertToTermAndRelease(final PrologParser parser) {
236237

237238
if (appropriateOperator == null) {
238239
if (operator.getArity() == 1) {
239-
return new PrologStruct(operator, new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos());
240+
return new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
240241
} else {
241242
return new PrologStruct(new PrologAtom(wrapper.getText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), terms, wrapper.getLine(), wrapper.getPos());
242243
}
@@ -247,20 +248,20 @@ PrologTerm convertToTermAndRelease(final PrologParser parser) {
247248

248249
} else {
249250
if (rightTerm.isCurlyBlock()) {
250-
return new PrologStruct(operator, new PrologTerm[]{rightTerm}, wrapper.getLine(), wrapper.getPos());
251+
return new PrologStruct(operator, new PrologTerm[] {rightTerm}, wrapper.getLine(), wrapper.getPos());
251252
} else {
252253
if (operator.getArity() == 1) {
253-
return new PrologStruct(operator, new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos());
254+
return new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
254255
} else {
255256
operator = parser.getContext().findOpForName(parser, operator.getText()).findForArity(1);
256-
return operator == null ? new PrologStruct(new PrologAtom(wrapper.getText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos())
257-
: new PrologStruct(operator, new PrologTerm[]{blockContent}, wrapper.getLine(), wrapper.getPos());
257+
return operator == null ? new PrologStruct(new PrologAtom(wrapper.getText(), Quotation.SINGLE, wrapper.getLine(), wrapper.getPos()), new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos())
258+
: new PrologStruct(operator, new PrologTerm[] {blockContent}, wrapper.getLine(), wrapper.getPos());
258259
}
259260
}
260261
}
261262
}
262263
} else if (this.isAnyBlock() && this.leftItem.isAnyBlock()) {
263-
return new PrologStruct(wrapper.getWrappedTerm(), new PrologTerm[]{this.leftItem.convertToTermAndRelease(parser)}, wrapper.getLine(), wrapper.getPos());
264+
return new PrologStruct(wrapper.getWrappedTerm(), new PrologTerm[] {this.leftItem.convertToTermAndRelease(parser)}, wrapper.getLine(), wrapper.getPos());
264265
}
265266

266267
if (!isOperandsOk()) {
@@ -273,7 +274,7 @@ PrologTerm convertToTermAndRelease(final PrologParser parser) {
273274
if (!isPrecedenceOk()) {
274275
if (this.rightItem != null && this.rightItem.isOperator() && this.rightItem.getOpAssoc().isPrefix()) {
275276
left = this.leftItem == null ? null : this.leftItem.convertToTermAndRelease(parser);
276-
right = new PrologStruct(Op.VIRTUAL_OPERATOR_BLOCK, new PrologTerm[]{this.rightItem.convertToTermAndRelease(parser)});
277+
right = new PrologStruct(Op.VIRTUAL_OPERATOR_BLOCK, new PrologTerm[] {this.rightItem.convertToTermAndRelease(parser)});
277278
} else {
278279
throw new PrologParserException("Operator precedence clash or missing operator: [" + wrapper.getText() + ']', wrapper.getLine(), wrapper.getPos());
279280
}
@@ -293,23 +294,23 @@ PrologTerm convertToTermAndRelease(final PrologParser parser) {
293294

294295
final PrologStruct operatorStruct;
295296
if (left == null) {
296-
operatorStruct = new PrologStruct(wrapper.getWrappedTerm(), new PrologTerm[]{right}, wrapper.getLine(), wrapper.getPos());
297+
operatorStruct = new PrologStruct(wrapper.getWrappedTerm(), new PrologTerm[] {right}, wrapper.getLine(), wrapper.getPos());
297298
} else {
298-
operatorStruct = new PrologStruct(wrapper.getWrappedTerm(), right == null ? new PrologTerm[]{left} : new PrologTerm[]{left, right}, wrapper.getLine(), wrapper.getPos());
299+
operatorStruct = new PrologStruct(wrapper.getWrappedTerm(), right == null ? new PrologTerm[] {left} : new PrologTerm[] {left, right}, wrapper.getLine(), wrapper.getPos());
299300
}
300301
result = operatorStruct;
301302
}
302303
break;
303304
case STRUCT: {
304305
final PrologStruct thisStruct = (PrologStruct) this.savedTerm;
305306
if ((thisStruct.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK || thisStruct.getFunctor() == Op.VIRTUAL_OPERATOR_CURLY_BLOCK)
306-
&& thisStruct.getArity() == 1) {
307+
&& thisStruct.getArity() == 1) {
307308

308309
final PrologTerm thatTerm = thisStruct.getTermAt(0);
309310

310311
if (thatTerm.getType() == TermType.STRUCT && (thatTerm.getFunctor() == Op.VIRTUAL_OPERATOR_BLOCK || thatTerm.getFunctor() == Op.VIRTUAL_OPERATOR_CURLY_BLOCK)) {
311312
// rolling normal blocks
312-
result = thatTerm.isBlock() && (this.isBlock() && (this.parentItem == null || (this.parentItem != null && this.parentItem.isBlock()))) ? thatTerm : thisStruct;
313+
result = thatTerm.isBlock() && this.isBlock() && (this.parentItem == null || this.parentItem.isBlock()) ? thatTerm : thisStruct;
313314
} else {
314315
result = thisStruct;
315316
}

‎src/main/java/com/igormaznitsa/prologparser/DefaultParserContext.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* specific language governing permissions and limitations
1919
* under the License.
2020
*/
21+
2122
package com.igormaznitsa.prologparser;
2223

2324
import com.igormaznitsa.prologparser.terms.OpContainer;
@@ -85,18 +86,18 @@ public final DefaultParserContext addOps(final List<Op>... operators) {
8586

8687
public DefaultParserContext addOps(final Op... operators) {
8788
Stream.of(operators)
88-
.filter(Objects::nonNull)
89-
.flatMap(Op::streamOp)
90-
.forEach(x -> {
91-
fillPrefixes(x.getText());
92-
OpContainer container = this.opContainers.get(x.getText());
93-
if (container == null) {
94-
container = OpContainer.make(x);
95-
this.opContainers.put(x.getText(), container);
96-
} else {
97-
container.add(x);
98-
}
99-
});
89+
.filter(Objects::nonNull)
90+
.flatMap(Op::streamOp)
91+
.forEach(x -> {
92+
fillPrefixes(x.getText());
93+
OpContainer container = this.opContainers.get(x.getText());
94+
if (container == null) {
95+
container = OpContainer.make(x);
96+
this.opContainers.put(x.getText(), container);
97+
} else {
98+
container.add(x);
99+
}
100+
});
100101
return this;
101102
}
102103

‎src/main/java/com/igormaznitsa/prologparser/ParserContext.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
import com.igormaznitsa.prologparser.terms.OpContainer;
2525

26-
import java.util.Map;
27-
2826
/**
2927
* Context which provides flags and operator storage for a prolog parser.
3028
*

‎src/main/java/com/igormaznitsa/prologparser/ParserContextChain.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
package com.igormaznitsa.prologparser;
2323

2424
import com.igormaznitsa.prologparser.terms.OpContainer;
25-
import com.igormaznitsa.prologparser.utils.AssertUtils;
2625

27-
import java.util.Map;
2826
import java.util.Objects;
29-
import java.util.stream.Collectors;
3027
import java.util.stream.Stream;
3128

3229
import static java.util.Arrays.stream;
30+
import static java.util.Objects.requireNonNull;
3331

3432
/**
3533
* Auxiliary class allows to make chain of prolog contexts.
@@ -50,7 +48,7 @@ public ParserContextChain(final ParserContext... contexts) {
5048
public static ParserContext of(final ParserContext... contexts) {
5149
final ParserContext result;
5250
if (contexts.length == 1) {
53-
result = AssertUtils.assertNotNull(contexts[0]);
51+
result = requireNonNull(contexts[0]);
5452
} else {
5553
result = new ParserContextChain(contexts);
5654
}

0 commit comments

Comments
 (0)