Remove lombok from VariableDeclaration

2 files changed, 75 insertions, 6 deletions

diff --git a/src/main/java/org/zwobble/couscous/ast/VariableDeclaration.java b/src/main/java/org/zwobble/couscous/ast/VariableDeclaration.java
index 84c0d43..713f3a6 100644
--- a/src/main/java/org/zwobble/couscous/ast/VariableDeclaration.java
+++ b/src/main/java/org/zwobble/couscous/ast/VariableDeclaration.java
@@ -1,10 +1,72 @@
 package org.zwobble.couscous.ast;
 
-import lombok.Value;
-
-@Value(staticConstructor="var")
 public class VariableDeclaration {
-    String id;
-    String name;
-    TypeName type;
+    public static VariableDeclaration var(String id, String name, TypeName type) {
+        return new VariableDeclaration(id, name, type);
+    }
+    
+    private final String id;
+    private final String name;
+    private final TypeName type;
+    
+    private VariableDeclaration(String id, String name, TypeName type) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+    }
+    
+    public String getId() {
+        return id;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public TypeName getType() {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return "VariableDeclaration(id=" + id + ", name=" + name + ", type="
+               + type + ")";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        VariableDeclaration other = (VariableDeclaration) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (type == null) {
+            if (other.type != null)
+                return false;
+        } else if (!type.equals(other.type))
+            return false;
+        return true;
+    }
 }
diff --git a/src/main/java/org/zwobble/couscous/util/ExtraArrays.java b/src/main/java/org/zwobble/couscous/util/ExtraArrays.java
index c4ebc57..457b77b 100644
--- a/src/main/java/org/zwobble/couscous/util/ExtraArrays.java
+++ b/src/main/java/org/zwobble/couscous/util/ExtraArrays.java
@@ -1,11 +1,18 @@
 package org.zwobble.couscous.util;
 
 import java.util.Arrays;
+import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 public class ExtraArrays {
+    public static <T, R> Stream<R> mapWithIndex(T[] array, BiFunction<Integer, T, R> function) {
+        return IntStream.range(0, array.length)
+            .mapToObj(index -> function.apply(index,  array[index]));
+    }
+    
     public static <T, R> Stream<R> map(T[] array, Function<T, R> function) {
         return stream(array).map(function);
     }