Skip to content

Commit 65f9275

Browse files
TwoOfTwelveTwoOfTwelve
committed
Revert "Adjusted token generation and tests"
This reverts commit a7ac9d6.
1 parent a7ac9d6 commit 65f9275

4 files changed

Lines changed: 21 additions & 33 deletions

File tree

‎languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.sun.source.tree.IdentifierTree;
3131
import com.sun.source.tree.IfTree;
3232
import com.sun.source.tree.ImportTree;
33-
import com.sun.source.tree.InstanceOfTree;
3433
import com.sun.source.tree.LineMap;
3534
import com.sun.source.tree.MemberSelectTree;
3635
import com.sun.source.tree.MethodInvocationTree;
@@ -476,31 +475,13 @@ public Void visitVariable(VariableTree node, Void unused) {
476475
semantics = CodeSemantics.createKeep();
477476
}
478477
addToken(JavaTokenType.J_VARDEF, start, end, semantics);
479-
480-
if (node.getInitializer() != null) {
481-
long initPos = start + node.toString().indexOf('=');
482-
addToken(JavaTokenType.J_ASSIGN, initPos, initPos + 1, semantics);
483-
}
484478
// manually add variable to semantics since identifier isn't visited
485479
variableRegistry.setNextVariableAccessType(VariableAccessType.WRITE);
486480
variableRegistry.registerVariableAccess(name, !inLocalScope);
487481
}
488482
return super.visitVariable(node, null);
489483
}
490484

491-
@Override
492-
public Void visitInstanceOf(InstanceOfTree node, Void unused) {
493-
super.visitInstanceOf(node, unused);
494-
495-
if (node.getPattern() != null && node.getPattern().getKind() == Tree.Kind.BINDING_PATTERN) {
496-
long start = positions.getStartPosition(ast, node.getPattern());
497-
long end = positions.getEndPosition(ast, node.getPattern());
498-
addToken(JavaTokenType.J_ASSIGN, start, end, new CodeSemantics());
499-
}
500-
501-
return null;
502-
}
503-
504485
@Override
505486
public Void visitConditionalExpression(ConditionalExpressionTree node, Void unused) {
506487
long start = positions.getStartPosition(ast, node);

‎languages/java/src/test/java/de/jplag/java/JavaLanguageTest.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,28 @@ protected void collectTestData(TestDataCollector collector) {
5454
J_IF_END, J_METHOD_END, J_CLASS_END);
5555

5656
collector.testFile("Verbose.java", "Compact.java").testSourceCoverage().testTokenSequence(J_PACKAGE, J_IMPORT, J_CLASS_BEGIN, J_METHOD_BEGIN,
57-
J_VARDEF, J_VARDEF, J_IF_BEGIN, J_APPLY, J_RETURN, J_IF_END, J_VARDEF, J_ASSIGN, J_LOOP_BEGIN, J_VARDEF, J_ASSIGN, J_APPLY, J_ASSIGN,
58-
J_IF_BEGIN, J_APPLY, J_APPLY, J_ASSIGN, J_IF_END, J_LOOP_END, J_IF_BEGIN, J_APPLY, J_ASSIGN, J_IF_END, J_IF_BEGIN, J_APPLY, J_APPLY,
59-
J_ASSIGN, J_IF_END, J_RETURN, J_METHOD_END, J_CLASS_END);
57+
J_VARDEF, J_VARDEF, J_IF_BEGIN, J_APPLY, J_RETURN, J_IF_END, J_VARDEF, J_LOOP_BEGIN, J_VARDEF, J_APPLY, J_ASSIGN, J_IF_BEGIN, J_APPLY,
58+
J_APPLY, J_ASSIGN, J_IF_END, J_LOOP_END, J_IF_BEGIN, J_APPLY, J_ASSIGN, J_IF_END, J_IF_BEGIN, J_APPLY, J_APPLY, J_ASSIGN, J_IF_END,
59+
J_RETURN, J_METHOD_END, J_CLASS_END);
6060

6161
// Test difference between try block and try-with-resource block.
6262
collector.testFile("Try.java", "TryWithResource.java").testSourceCoverage().testTokenSequence(J_PACKAGE, J_IMPORT, J_IMPORT, J_IMPORT,
63-
J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_APPLY, J_NEWCLASS, J_METHOD_END, J_METHOD_BEGIN, J_VARDEF, J_VARDEF, J_ASSIGN, J_TRY_BEGIN,
64-
J_VARDEF, J_ASSIGN, J_ASSIGN, J_NEWCLASS, J_NEWCLASS, J_LOOP_BEGIN, J_APPLY, J_APPLY, J_APPLY, J_LOOP_END, J_CATCH_BEGIN, J_VARDEF,
65-
J_APPLY, J_CATCH_END, J_FINALLY_BEGIN, J_IF_BEGIN, J_APPLY, J_IF_END, J_FINALLY_END, J_TRY_END, J_METHOD_END, J_CLASS_END);
63+
J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_APPLY, J_NEWCLASS, J_METHOD_END, J_METHOD_BEGIN, J_VARDEF, J_VARDEF, J_TRY_BEGIN, J_VARDEF,
64+
J_ASSIGN, J_NEWCLASS, J_NEWCLASS, J_LOOP_BEGIN, J_APPLY, J_APPLY, J_APPLY, J_LOOP_END, J_CATCH_BEGIN, J_VARDEF, J_APPLY, J_CATCH_END,
65+
J_FINALLY_BEGIN, J_IF_BEGIN, J_APPLY, J_IF_END, J_FINALLY_END, J_TRY_END, J_METHOD_END, J_CLASS_END);
6666

6767
collector.testFile("CLI.java").testSourceCoverage().testContainedTokens(J_TRY_END, J_IMPORT, J_VARDEF, J_LOOP_BEGIN, J_ARRAY_INIT_BEGIN,
6868
J_IF_BEGIN, J_CATCH_END, J_COND, J_ARRAY_INIT_END, J_METHOD_BEGIN, J_TRY_BEGIN, J_CLASS_END, J_RETURN, J_ASSIGN, J_METHOD_END,
6969
J_IF_END, J_CLASS_BEGIN, J_NEWARRAY, J_PACKAGE, J_APPLY, J_LOOP_END, J_THROW, J_NEWCLASS, J_CATCH_BEGIN);
7070

7171
collector.testFile("PatternMatching.java", "PatternMatchingManual.java").testSourceCoverage().testTokenSequence(J_CLASS_BEGIN, J_RECORD_BEGIN,
72-
J_VARDEF, J_RECORD_END, J_METHOD_BEGIN, J_VARDEF, J_ASSIGN, J_NEWCLASS, J_IF_BEGIN, J_VARDEF, J_ASSIGN, J_IF_END, J_METHOD_END,
73-
J_CLASS_END);
72+
J_VARDEF, J_RECORD_END, J_METHOD_BEGIN, J_VARDEF, J_NEWCLASS, J_IF_BEGIN, J_VARDEF, J_IF_END, J_METHOD_END, J_CLASS_END);
7473

75-
collector.testFile("StringConcat.java").testSourceCoverage().testTokenSequence(J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_ASSIGN, J_VARDEF,
76-
J_ASSIGN, J_VARDEF, J_ASSIGN, J_APPLY, J_METHOD_END, J_CLASS_END);
74+
collector.testFile("StringConcat.java", "StringTemplate.java").testSourceCoverage().testTokenSequence(J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF,
75+
J_VARDEF, J_VARDEF, J_APPLY, J_METHOD_END, J_CLASS_END);
7776

78-
collector.testFile("AnonymousVariables.java").testTokenSequence(J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_IF_BEGIN, J_ASSIGN, J_IF_END,
79-
J_METHOD_END, J_CLASS_END);
77+
collector.testFile("AnonymousVariables.java").testTokenSequence(J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_IF_BEGIN, J_IF_END, J_METHOD_END,
78+
J_CLASS_END);
8079

8180
collector.testFile("ClassWithoutModifier.java").testSourceCoverage().testTokenSequence(J_PACKAGE, J_IMPORT, J_IMPORT, J_IMPORT, J_CLASS_BEGIN,
8281
J_CLASS_END, J_CLASS_BEGIN, J_CLASS_END);
@@ -94,6 +93,6 @@ protected void configureIgnoredLines(TestSourceIgnoredLinesCollector collector)
9493

9594
@Override
9695
protected List<TokenType> getIgnoredTokensForMonotoneTokenOrder() {
97-
return List.of(JavaTokenType.J_ANNO, J_APPLY);
96+
return List.of(JavaTokenType.J_ANNO);
9897
}
9998
}

‎languages/java/src/test/resources/de/jplag/java/StringTemplate.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
public class StringTemplate {
2+
void test() {
3+
int param1 = 1;
4+
String param2 = "test";
5+
6+
String result = STR."prefix \{param1} infix + \{param2.length()} suffix";
7+
}
8+
}

‎languages/java/src/test/resources/de/jplag/java/Try.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static void main(String[] args) {
1212
public void load(String path) {
1313
Scanner scanner = null;
1414
try {
15-
Scanner other = null; // This is just here to keep the tokens similar.
15+
Scanner other; // This is just here to keep the tokens similar.
1616
scanner = new Scanner(new File(path));
1717
while (scanner.hasNext()) {
1818
System.out.println(scanner.nextLine());

0 commit comments

Comments
 (0)