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

TypeInsert ausbessern

Browse Source
This commit is contained in:
JanUlrich 2017-08-25 03:39:54 +02:00
parent 397ac3cd58
commit ff59b585bd
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
View File

@ -63,7 +63,8 @@ public abstract class AbstractASTWalker implements ASTVisitor{
private void visitMethod(Method method){ private void visitMethod(Method method){
method.getType().accept(this); method.getType().accept(this);
method.getParameterList().accept(this); method.getParameterList().accept(this);
method.block.accept(this); if(method.block != null)
method.block.accept(this);
} }
@Override @Override

3
src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
View File

@ -84,7 +84,8 @@ public class OutputGenerator implements ASTVisitor {
method.getType().accept(this); method.getType().accept(this);
out.append(" " + method.getName()); out.append(" " + method.getName());
method.getParameterList().accept(this); method.getParameterList().accept(this);
method.block.accept(this); if(method.block != null)
method.block.accept(this);
out.append("\n"); out.append("\n");
} }

2
src/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
View File

@ -62,6 +62,8 @@ public class TypeInsertFactory {
additionalInserts.add(((TypePlaceholder) type)); additionalInserts.add(((TypePlaceholder) type));
}else if(type instanceof GenericRefType){ }else if(type instanceof GenericRefType){
insertPoint = new TypeInsertPoint(offset, ((GenericRefType) type).getName().toString()); insertPoint = new TypeInsertPoint(offset, ((GenericRefType) type).getName().toString());
}else if(type instanceof RefType){
insertPoint = new TypeInsertPoint(offset, ((RefType) type).getName().toString());
}else throw new NotImplementedException(); }else throw new NotImplementedException();
} }

16
test/typeinference/JavaTXCompilerTest.java
View File

@ -33,15 +33,15 @@ public class JavaTXCompilerTest extends JavaTXCompiler {
@Test @Test
public void test() throws IOException, java.lang.ClassNotFoundException { public void test() throws IOException, java.lang.ClassNotFoundException {
//filesToTest.add(new File(rootDirectory+"Faculty.jav")); filesToTest.add(new File(rootDirectory+"Faculty.jav"));
filesToTest.add(new File(rootDirectory+"mathStruc.jav")); filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
//filesToTest.add(new File(rootDirectory+"Lambda.jav")); filesToTest.add(new File(rootDirectory+"Lambda.jav"));
//filesToTest.add(new File(rootDirectory+"Lambda2.jav")); filesToTest.add(new File(rootDirectory+"Lambda2.jav"));
//filesToTest.add(new File(rootDirectory+"Lambda3.jav")); filesToTest.add(new File(rootDirectory+"Lambda3.jav"));
//filesToTest.add(new File(rootDirectory+"Vector.jav")); filesToTest.add(new File(rootDirectory+"Vector.jav"));
//filesToTest.add(new File(rootDirectory+"Generics.jav")); filesToTest.add(new File(rootDirectory+"Generics.jav"));
//filesToTest.add(new File(rootDirectory+"MethodsEasy.jav")); filesToTest.add(new File(rootDirectory+"MethodsEasy.jav"));
//filesToTest.add(new File(rootDirectory+"Matrix.jav")); filesToTest.add(new File(rootDirectory+"Matrix.jav"));
for(File f : filesToTest){ for(File f : filesToTest){
SourceFile sf = this.parse(f); SourceFile sf = this.parse(f);
System.out.println(ASTTypePrinter.print(this.sourceFiles.get(sourceFiles.size()-1))); System.out.println(ASTTypePrinter.print(this.sourceFiles.get(sourceFiles.size()-1)));