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

Java: a more precise check for when switch statements can be used. #247

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

Java: a more precise check for when switch statements can be used. #247

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
38 changes: 34 additions & 4 deletions 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 @@ -545,10 +545,39 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
}
}

// Java switch statements can accept byte, short, char, int, enums and Strings.
override def switchRequiresIfs(onType: DataType): Boolean = onType match {
case _: IntType | _: EnumType | _: StrType => false
case _ => true
}
case Int1Type(false) => false
case IntMultiType(false, Width2, _) => false

case Int1Type(true) => false // byte
case IntMultiType(true, Width2, _) => false // short
case IntMultiType(true, Width4, _) => false // int
case IntMultiType(true, Width8, _) => true // long

case FloatMultiType(Width4, _) => true
case FloatMultiType(Width8, _) => true

case BitsType(_, _) => true

case _: BooleanType => true
case CalcIntType => false
case CalcFloatType => true

case _: StrType => false
case _: BytesType => true

case AnyType => true
case KaitaiStreamType | OwnedKaitaiStreamType => true
case KaitaiStructType | CalcKaitaiStructType => true

case t: UserType => true
case EnumType(name, _) => false

case ArrayTypeInStream(_) | CalcArrayType(_) => true

case _ => true
}

//<editor-fold desc="switching: true version">

Expand All @@ -567,8 +596,9 @@ class JavaCompiler(typeProvider: ClassTypeProvider, config: RuntimeConfig)
// If switch is over a enum, only literal enum values are supported,
// and they must be written as "MEMBER", not "SomeEnum.MEMBER".
value2Const(enumByLabel.label.name)
case _ =>
case _ => {
expression(condition)
}
}

out.puts(s"case $condStr: {")
Expand Down