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

SyntaxTreeGenerator.setPackageName() is now used properly.

Browse Source
This commit is contained in:
Jakob Herrmann 2017-02-07 22:12:40 +01:00
parent 8d0f24f2f8
commit 50a618ee4b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/dhbwstuttgart/parser/RunParser.java
View File

@ -27,7 +27,7 @@ public class RunParser{
SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry()); SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry());
SourceFile f = generator.convert((Java8Parser.CompilationUnitContext) tree); SourceFile f = generator.convert((Java8Parser.CompilationUnitContext) tree);
String pkgName = f.getPkgName(); String pkgName = f.getPkgName();
System.out.println(pkgName); System.out.println("package: " + pkgName);
System.out.println("classes:"); System.out.println("classes:");
for(ClassOrInterface c : f.KlassenVektor){ for(ClassOrInterface c : f.KlassenVektor){
for(Modifier mod : c.getModifiers().getModifierList()){ for(Modifier mod : c.getModifiers().getModifierList()){

10
src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
View File

@ -34,11 +34,12 @@ public class SyntaxTreeGenerator{
} }
public void getNames(Java8Parser.CompilationUnitContext ctx){ public void getNames(Java8Parser.CompilationUnitContext ctx){
if(this.pkgName == "") this.setPackageName(ctx);
String nameString = ""; String nameString = "";
for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){ for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
if(typeDecl.interfaceDeclaration() != null){ if(typeDecl.interfaceDeclaration() != null){
if(typeDecl.interfaceDeclaration().normalInterfaceDeclaration() != null){ if(typeDecl.interfaceDeclaration().normalInterfaceDeclaration() != null){
if(this.pkgName != null){ if(this.pkgName != ""){
nameString = this.pkgName + "." + typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString(); nameString = this.pkgName + "." + typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
} }
else{ else{
@ -116,9 +117,9 @@ public class SyntaxTreeGenerator{
private List<Field> convertFields(Java8Parser.ClassBodyContext classBodyContext) { private List<Field> convertFields(Java8Parser.ClassBodyContext classBodyContext) {
List<Field> ret = new ArrayList<>(); List<Field> ret = new ArrayList<>();
for(Java8Parser.ClassBodyDeclarationContext classMember : classBodyContext.classBodyDeclaration()){ for(Java8Parser.ClassBodyDeclarationContext classMember : classBodyContext.classBodyDeclaration()){
if(classMember.classMemberDeclaration()!= null){ if(classMember.classMemberDeclaration() != null){
Java8Parser.ClassMemberDeclarationContext classMemberDeclarationContext = classMember.classMemberDeclaration(); Java8Parser.ClassMemberDeclarationContext classMemberDeclarationContext = classMember.classMemberDeclaration();
if(classMemberDeclarationContext.fieldDeclaration()!=null){ if(classMemberDeclarationContext.fieldDeclaration() != null){
ret.addAll(convert(classMember.classMemberDeclaration().fieldDeclaration())); ret.addAll(convert(classMember.classMemberDeclaration().fieldDeclaration()));
}else if(classMemberDeclarationContext.methodDeclaration()!= null){ }else if(classMemberDeclarationContext.methodDeclaration()!= null){
ret.add(convert(classMemberDeclarationContext.methodDeclaration())); ret.add(convert(classMemberDeclarationContext.methodDeclaration()));
@ -134,8 +135,9 @@ public class SyntaxTreeGenerator{
RefType retType; RefType retType;
if(header.result() != null){ if(header.result() != null){
if(header.result().unannType() != null) if(header.result().unannType() != null){
retType = convert(header.result().unannType()); retType = convert(header.result().unannType());
}
else retType = new de.dhbwstuttgart.syntaxtree.type.Void(header.result().getStart()); else retType = new de.dhbwstuttgart.syntaxtree.type.Void(header.result().getStart());
}else{ }else{
retType = TypePlaceholder.fresh(header.getStart()); retType = TypePlaceholder.fresh(header.getStart());