Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong iterator handling for user types in repeat-until. #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wrong iterator handling for user types in repeat-until. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("_")};")
out.puts(s"${kaitaiType2JavaType(dataType)} ${translator.doName(Identifier.ITERATOR)} = null;")
out.puts("int i = 0;")
out.puts("do {")
out.inc
Expand Down
1 change: 1 addition & 0 deletions shared/src/main/scala/io/kaitai/struct/languages/RubyCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ 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
Expand Down
1 change: 1 addition & 0 deletions shared/src/main/scala/io/kaitai/struct/translators/RubyTranslator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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
}
Expand Down