From 2d24979f47af2027de780fc956fa37829edafe40 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 13 Feb 2016 14:36:16 +0000 Subject: Read instance initializers --- src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/frontends') diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java index b66fe0d..483ea24 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java @@ -240,7 +240,9 @@ public class JavaReader { Casts.tryCast(Initializer.class, declaration) // TODO: handle instance initializer - .ifPresent(initializer -> body.addStaticInitializer(readStatement(scope, initializer.getBody()))); + .ifPresent(initializer -> body.addInitializer( + Modifier.isStatic(initializer.getModifiers()), + readStatement(scope, initializer.getBody()))); Casts.tryCast(FieldDeclaration.class, declaration) .ifPresent(field -> readField(body, scope, type, field)); @@ -258,7 +260,7 @@ public class JavaReader { if (fragment.getInitializer() != null) { ExpressionNode value = readExpression(scope, type, fragment.getInitializer()); String name = fragment.getName().getIdentifier(); - builder.addStaticInitializer(assignStatement(fieldAccess(declaringType, name, type), value)); + builder.addInitializer(assignStatement(fieldAccess(declaringType, name, type), value)); } }); -- cgit v1.2.3