From dbe3c6ad7ead5fef7d6dde68c9c53bebe3593fe6 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 1 Mar 2016 21:24:45 +0000
Subject: Get static nested classes working on interpreter

---
 .../org/zwobble/couscous/frontends/java/JavaReader.java    |  7 +++++++
 .../java/org/zwobble/couscous/tests/CompilerTests.java     | 12 ++++++++++++
 .../java/org/zwobble/couscous/tests/JavaToPythonTests.java |  7 +++++++
 .../couscous/tests/backends/csharp/JavaToCsharpTests.java  |  7 +++++++
 .../static-nested-class/com/example/StaticNestedClass.java | 14 ++++++++++++++
 5 files changed, 47 insertions(+)
 create mode 100644 src/test/resources/java/static-nested-class/com/example/StaticNestedClass.java

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 ec6b556..b867dc2 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -68,6 +68,10 @@ public class JavaReader {
 
     private TypeNode readCompilationUnit(CompilationUnit ast) {
         TypeDeclaration type = (TypeDeclaration)ast.types().get(0);
+        return readTypeDeclaration(type);
+    }
+
+    private TypeNode readTypeDeclaration(TypeDeclaration type) {
         TypeName name = typeOf(type.resolveBinding());
         Scope scope = Scope.create().enterClass(name);
         TypeDeclarationBody body = readTypeDeclarationBody(scope, name, type.bodyDeclarations());
@@ -254,6 +258,9 @@ public class JavaReader {
 
             Casts.tryCast(FieldDeclaration.class, declaration)
                 .ifPresent(field -> readField(body, scope, type, field));
+
+            Casts.tryCast(TypeDeclaration.class, declaration)
+                .ifPresent(typeDeclaration -> classes.add(readTypeDeclaration(typeDeclaration)));
         }
         return body.build();
     }
diff --git a/src/test/java/org/zwobble/couscous/tests/CompilerTests.java b/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
index e2800ce..285a51f 100644
--- a/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
@@ -86,6 +86,18 @@ public abstract class CompilerTests {
                 IntegerValue.REF));
     }
 
+    @Test
+    public void staticNestedClasses() throws Exception {
+        assertEquals(
+            value(42),
+            execTestProgram(
+                "static-nested-class",
+                TypeName.of("com.example.StaticNestedClass"),
+                "value",
+                list(),
+                IntegerValue.REF));
+    }
+
     @Test
     public void canImplementUserDefinedInterface() throws Exception {
         assertEquals(
diff --git a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
index 6b9f6ed..35040b1 100644
--- a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
@@ -1,5 +1,7 @@
 package org.zwobble.couscous.tests;
 
+import org.junit.Ignore;
+import org.junit.Test;
 import org.zwobble.couscous.CouscousCompiler;
 import org.zwobble.couscous.ast.TypeName;
 import org.zwobble.couscous.backends.python.PythonBackend;
@@ -16,6 +18,11 @@ import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaToPythonTests extends CompilerTests {
+    @Test
+    @Ignore
+    public void staticNestedClasses() throws Exception {
+    }
+
     protected PrimitiveValue execProgram(
             Path directory,
             TypeName type,
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
index cc00511..a44d2fe 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
@@ -1,5 +1,7 @@
 package org.zwobble.couscous.tests.backends.csharp;
 
+import org.junit.Ignore;
+import org.junit.Test;
 import org.zwobble.couscous.CouscousCompiler;
 import org.zwobble.couscous.ast.TypeName;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
@@ -16,6 +18,11 @@ import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaToCsharpTests extends CompilerTests {
+    @Test
+    @Ignore
+    public void staticNestedClasses() throws Exception {
+    }
+    
     protected PrimitiveValue execProgram(
         Path directory,
         TypeName type,
diff --git a/src/test/resources/java/static-nested-class/com/example/StaticNestedClass.java b/src/test/resources/java/static-nested-class/com/example/StaticNestedClass.java
new file mode 100644
index 0000000..0ef0b36
--- /dev/null
+++ b/src/test/resources/java/static-nested-class/com/example/StaticNestedClass.java
@@ -0,0 +1,14 @@
+package com.example;
+
+public class StaticNestedClass {
+    public static int value() {
+        IntSupplier supplier = new IntSupplier();
+        return supplier.get();
+    }
+    
+    private static class IntSupplier {
+        public int get() {
+            return 42;
+        }
+    }
+}
-- 
cgit v1.2.3