From 0a1a596bb9ce286c85c3d45b823aa14d98085b62 Mon Sep 17 00:00:00 2001 From: Victorious3 Date: Tue, 31 May 2022 14:02:39 +0200 Subject: [PATCH] Add Field transform --- .../target/generate/ASTToTargetAST.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java b/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java index da917783..595ac922 100644 --- a/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java +++ b/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java @@ -35,7 +35,7 @@ public class ASTToTargetAST { return new TargetClass(input.getModifiers(),input.getClassName().toString(), sigma.get(input.getSuperClass()), input.getSuperInterfaces().stream().map(it -> sigma.get(it)).collect(Collectors.toList()), targetConstructors, - input.getFieldDecl().stream().map(it -> convert(it)).collect(Collectors.toList()), + input.getFieldDecl().stream().map(it -> convert(input, it)).collect(Collectors.toList()), input.getMethods().stream().map(it -> convert(input, it)).collect(Collectors.toList())); } @@ -47,7 +47,8 @@ public class ASTToTargetAST { new TargetRefType(owner.getClassName().getClassName()), input.name, params, convert(input.getReturnType()), - convert(input.block)); + convert(input.block) + ); } protected TargetBlock convert(Block block) { @@ -60,8 +61,13 @@ public class ASTToTargetAST { return converter.result; } - private TargetField convert(Field input) { - return null; + private TargetField convert(ClassOrInterface owner, Field input) { + return new TargetField( + input.modifier, + new TargetRefType(owner.getClassName().getClassName()), + convert(input.getType()), + input.getName() + ); } protected TargetType convert(RefTypeOrTPHOrWildcardOrGeneric input) {