JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected ASTPrinter for RecordPattern

Browse Source
This commit is contained in:
luca9913 2023-07-15 22:05:34 +02:00
parent e8140b3160
commit 6119bc92ed
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
View File

@ -386,13 +386,15 @@ public class SyntaxTreeGenerator {
} }
List<RefType> permittedSubtypes = new ArrayList<>(); List<RefType> permittedSubtypes = new ArrayList<>();
// Ist Bit für 'sealed'-Modifier gesetzt // Ist Bit für 'sealed'-Modifier gesetzt
if ((modifiers & 4096) != 0 && !Objects.isNull(ctx.PERMITS())) { if ((modifiers & 4096) != 0) {
if (!Objects.isNull(ctx.PERMITS())) {
// permitted subtypes sind letzte typeList (siehe Grammatikregel 'classDeclaration') // permitted subtypes sind letzte typeList (siehe Grammatikregel 'classDeclaration')
permittedSubtypes.addAll(convert(ctx.typeList(ctx.typeList().size() - 1), generics)); permittedSubtypes.addAll(convert(ctx.typeList(ctx.typeList().size() - 1), generics));
} else { } else {
// falls sealed modifier ohne 'permits'-List oder umgekehrt // falls sealed modifier ohne 'permits'-List oder umgekehrt
throw new NotImplementedException("Invalid sealed class declaration"); throw new NotImplementedException("Invalid sealed class declaration");
} }
}
return new ClassOrInterface(modifiers, name, fields, Optional.empty(), methods, new ArrayList<>(), genericParams, superClass, true, extendedInterfaces, permittedSubtypes, ctx.getStart()); return new ClassOrInterface(modifiers, name, fields, Optional.empty(), methods, new ArrayList<>(), genericParams, superClass, true, extendedInterfaces, permittedSubtypes, ctx.getStart());
} }

6
src/main/java/de/dhbwstuttgart/syntaxtree/statement/RecordPattern.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import de.dhbwstuttgart.syntaxtree.StatementVisitor;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
public class RecordPattern extends Pattern { public class RecordPattern extends Pattern {
@ -28,4 +29,9 @@ public class RecordPattern extends Pattern {
this.subPattern.add(newPattern); this.subPattern.add(newPattern);
} }
@Override
public void accept(StatementVisitor visitor) {
visitor.visit(this);
}
} }

15
src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
View File

@ -7,6 +7,7 @@ import de.dhbwstuttgart.syntaxtree.type.*;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
public class OutputGenerator implements ASTVisitor { public class OutputGenerator implements ASTVisitor {
private static final String TAB = " "; private static final String TAB = " ";
@ -457,10 +458,18 @@ public class OutputGenerator implements ASTVisitor {
@Override @Override
public void visit(RecordPattern aRecordPattern) { public void visit(RecordPattern aRecordPattern) {
aRecordPattern.getType().accept(this); aRecordPattern.getType().accept(this);
for (Pattern subPattern : aRecordPattern.getSubPattern()) { out.append("(");
subPattern.accept(this); List<Pattern> subPatterns = aRecordPattern.getSubPattern();
int i;
for (i = 0; i < subPatterns.size() - 1; i++) {
subPatterns.get(i).accept(this);
out.append(", ");
} }
out.append(aRecordPattern.getName()); subPatterns.get(i).accept(this);
String name;
if ((name = aRecordPattern.getName()) != null)
out.append(name);
out.append(")");
} }
@Override @Override

10
src/test/java/syntaxtreegenerator/TestNewFeatures.java
View File

@ -107,13 +107,3 @@ public class TestNewFeatures {
} }
} }
} }
class JavFilter implements FileFilter {
@Override
public boolean accept(File pathname) {
if (pathname.getName().contains(".jav"))
return true;
return false;
}
}