From cfc77126eaf387f953660171019c09d8f59131c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Sch=C3=B6ning?=
 <tschoening@users.noreply.github.com>
Date: Sun, 1 Apr 2018 12:04:13 +0200
Subject: [PATCH] Removing PR #134 for now, because things are more complicated
 for KS and its support for other languages and use-cases than I expected. I
 was able to rewrite my KS for now because of the usage of FMPP, so don't rely
 in this fix anymore. this way I'm more back in line with master again.

---
 .../main/scala/io/kaitai/struct/languages/JavaCompiler.scala    | 2 +-
 .../main/scala/io/kaitai/struct/languages/RubyCompiler.scala    | 1 -
 .../scala/io/kaitai/struct/translators/RubyTranslator.scala     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
index c3274aa6b..9db929b04 100644
--- a/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
+++ b/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
@@ -389,7 +389,7 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
     out.puts(s"${privateMemberName(id)} = new ${kaitaiType2JavaType(ArrayType(dataType))}();")
     out.puts("{")
     out.inc
-    out.puts(s"${kaitaiType2JavaType(dataType)} ${translator.doName(Identifier.ITERATOR)} = null;")
+    out.puts(s"${kaitaiType2JavaType(dataType)} ${translator.doName("_")};")
     out.puts("int i = 0;")
     out.puts("do {")
     out.inc
diff --git a/shared/src/main/scala/io/kaitai/struct/languages/RubyCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/RubyCompiler.scala
index 8ef63265b..9138981e1 100644
--- a/shared/src/main/scala/io/kaitai/struct/languages/RubyCompiler.scala
+++ b/shared/src/main/scala/io/kaitai/struct/languages/RubyCompiler.scala
@@ -308,7 +308,6 @@ class RubyCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
     if (needRaw)
       out.puts(s"${privateMemberName(RawIdentifier(id))} = []")
     out.puts(s"${privateMemberName(id)} = []")
-    out.puts(s"${translator.doName(Identifier.ITERATOR)} = nil")
     out.puts("i = 0")
     out.puts("begin")
     out.inc
diff --git a/shared/src/main/scala/io/kaitai/struct/translators/RubyTranslator.scala b/shared/src/main/scala/io/kaitai/struct/translators/RubyTranslator.scala
index 21fa3dd13..52975cee5 100644
--- a/shared/src/main/scala/io/kaitai/struct/translators/RubyTranslator.scala
+++ b/shared/src/main/scala/io/kaitai/struct/translators/RubyTranslator.scala
@@ -29,7 +29,6 @@ class RubyTranslator(provider: TypeProvider) extends BaseTranslator(provider) {
 
   override def doName(s: String) = {
     s match {
-      case Identifier.ITERATOR => "_it"
       case Identifier.INDEX => "i" // FIXME: probably would clash with attribute named "i"
       case _ => s
     }