From 0e98e8252a823eb025c24857c9c47fb917f4c220 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 10 Apr 2016 20:19:48 +0100
Subject: Read values in enum

---
 .../java/org/zwobble/couscous/ast/EnumNode.java    | 32 ++++++++++++++--------
 .../couscous/frontends/java/JavaReader.java        |  4 ++-
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/zwobble/couscous/ast/EnumNode.java b/src/main/java/org/zwobble/couscous/ast/EnumNode.java
index 9e7a0b7..162d2a0 100644
--- a/src/main/java/org/zwobble/couscous/ast/EnumNode.java
+++ b/src/main/java/org/zwobble/couscous/ast/EnumNode.java
@@ -12,14 +12,16 @@ import static org.zwobble.couscous.util.ExtraLists.list;
 import static org.zwobble.couscous.util.ExtraSets.set;
 
 public class EnumNode implements TypeNode {
-    public static EnumNode declareEnum(ScalarType name) {
-        return new EnumNode(name);
+    public static EnumNode declareEnum(ScalarType name, List<String> values) {
+        return new EnumNode(name, values);
     }
 
     private final ScalarType name;
+    private final List<String> values;
 
-    public EnumNode(ScalarType name) {
+    public EnumNode(ScalarType name, List<String> values) {
         this.name = name;
+        this.values = values;
     }
 
     @Override
@@ -27,6 +29,10 @@ public class EnumNode implements TypeNode {
         return name;
     }
 
+    public List<String> getValues() {
+        return values;
+    }
+
     @Override
     public List<FormalTypeParameterNode> getTypeParameters() {
         return list();
@@ -44,21 +50,22 @@ public class EnumNode implements TypeNode {
 
     @Override
     public TypeNode transform(NodeTransformer transformer) {
-        return new EnumNode(transformer.transform(name));
+        return new EnumNode(transformer.transform(name), values);
+    }
+
+    @Override
+    public <T> T accept(NodeMapper<T> visitor) {
+        return visitor.visit(this);
     }
 
     @Override
     public String toString() {
         return "EnumNode(" +
             "name=" + name +
+            ", values=" + values +
             ')';
     }
 
-    @Override
-    public <T> T accept(NodeMapper<T> visitor) {
-        return visitor.visit(this);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -66,12 +73,15 @@ public class EnumNode implements TypeNode {
 
         EnumNode enumNode = (EnumNode) o;
 
-        return name.equals(enumNode.name);
+        if (!name.equals(enumNode.name)) return false;
+        return values.equals(enumNode.values);
 
     }
 
     @Override
     public int hashCode() {
-        return name.hashCode();
+        int result = name.hashCode();
+        result = 31 * result + values.hashCode();
+        return result;
     }
 }
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 a83be40..fe7646b 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -104,7 +104,9 @@ public class JavaReader {
 
     private TypeNode readEnumDeclaration(EnumDeclaration type) {
         ScalarType name = (ScalarType) typeOf(type.resolveBinding());
-        return new EnumNode(name);
+        @SuppressWarnings("unchecked")
+        List<EnumConstantDeclaration> values = type.enumConstants();
+        return new EnumNode(name, eagerMap(values, declaration -> declaration.getName().getIdentifier()));
     }
 
     private TypeNode readTypeDeclaration(TypeDeclaration type) {
-- 
cgit v1.2.3