From bb507691534a26dc45cae73dafd363fc9d5c2c92 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 11 Apr 2016 19:49:38 +0100
Subject: Move Iterator to correct namespace

---
 .../java/org/zwobble/couscous/backends/csharp/CsharpBackend.java   | 2 +-
 src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java   | 2 +-
 src/main/resources/csharp/runtime/java/lang/Iterable.cs            | 2 +-
 src/main/resources/csharp/runtime/java/lang/Iterator.cs            | 7 -------
 src/main/resources/csharp/runtime/java/util/Arrays.cs              | 4 ++--
 src/main/resources/csharp/runtime/java/util/Iterator.cs            | 7 +++++++
 6 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 src/main/resources/csharp/runtime/java/lang/Iterator.cs
 create mode 100644 src/main/resources/csharp/runtime/java/util/Iterator.cs

(limited to 'src')

diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
index 312fd0d..7785ec5 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
@@ -22,7 +22,7 @@ public class CsharpBackend implements Backend {
         "java/util/Arrays.cs",
         // TODO: implement Iterable/Iterator in Java
         "java/lang/Iterable.cs",
-        "java/lang/Iterator.cs");
+        "java/util/Iterator.cs");
 
     private final Path directoryPath;
     private final String namespace;
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
index 1e373d8..1421e83 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
@@ -143,6 +143,6 @@ public class JavaTypes {
     }
 
     public static Type iterator(Type elementType) {
-        return parameterizedType(ScalarType.of("java.lang.Iterator"), list(elementType));
+        return parameterizedType(ScalarType.of("java.util.Iterator"), list(elementType));
     }
 }
diff --git a/src/main/resources/csharp/runtime/java/lang/Iterable.cs b/src/main/resources/csharp/runtime/java/lang/Iterable.cs
index 090b3e5..1565e2b 100644
--- a/src/main/resources/csharp/runtime/java/lang/Iterable.cs
+++ b/src/main/resources/csharp/runtime/java/lang/Iterable.cs
@@ -1,6 +1,6 @@
 namespace Couscous.java.lang {
     // TODO: implement in Java
     internal interface Iterable<T> {
-        Iterator<T> iterator();
+        java.util.Iterator<T> iterator();
     }
 }
diff --git a/src/main/resources/csharp/runtime/java/lang/Iterator.cs b/src/main/resources/csharp/runtime/java/lang/Iterator.cs
deleted file mode 100644
index 75d985f..0000000
--- a/src/main/resources/csharp/runtime/java/lang/Iterator.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Couscous.java.lang {
-    // TODO: implement in Java
-    internal interface Iterator<T> {
-        bool hasNext();
-        T next();
-    }
-}
diff --git a/src/main/resources/csharp/runtime/java/util/Arrays.cs b/src/main/resources/csharp/runtime/java/util/Arrays.cs
index 6833582..96b31d4 100644
--- a/src/main/resources/csharp/runtime/java/util/Arrays.cs
+++ b/src/main/resources/csharp/runtime/java/util/Arrays.cs
@@ -12,12 +12,12 @@ namespace Couscous.java.util {
             this.values = values;
         }
         
-        public java.lang.Iterator<T> iterator() {
+        public java.util.Iterator<T> iterator() {
             return new _ArrayIterator<T>(values);
         }
     }
     
-    internal class _ArrayIterator<T> : java.lang.Iterator<T> {
+    internal class _ArrayIterator<T> : java.util.Iterator<T> {
         private readonly T[] values;
         private int nextIndex;
         
diff --git a/src/main/resources/csharp/runtime/java/util/Iterator.cs b/src/main/resources/csharp/runtime/java/util/Iterator.cs
new file mode 100644
index 0000000..6b902cc
--- /dev/null
+++ b/src/main/resources/csharp/runtime/java/util/Iterator.cs
@@ -0,0 +1,7 @@
+namespace Couscous.java.util {
+    // TODO: implement in Java
+    internal interface Iterator<T> {
+        bool hasNext();
+        T next();
+    }
+}
-- 
cgit v1.2.3