Unify processing of array types in TypeDetector

Both ArrayTypeInStream and CalcArrayType the only existing successors of the sealed class TypeDetector so we can do that simplification
kaitai-io · Jul 13, 2023 · 1ddc2c5 · 1ddc2c5
1 parent 88aa2ec
commit 1ddc2c5
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/shared/src/main/scala/io/kaitai/struct/translators/TypeDetector.scala b/shared/src/main/scala/io/kaitai/struct/translators/TypeDetector.scala
@@ -101,20 +101,10 @@ class TypeDetector(provider: TypeProvider) {
         }
       case Ast.expr.Subscript(container: Ast.expr, idx: Ast.expr) =>
         detectType(container) match {
-          case ArrayTypeInStream(elType: DataType) =>
+          case arr: ArrayType =>
             detectType(idx) match {
-              case _: IntType => elType.asNonOwning(
-                elType match {
-                  case ct: ComplexDataType => ct.isOwning
-                  case _ => false
-                }
-              )
-              case idxType => throw new TypeMismatchError(s"unable to index an array using $idxType")
-            }
-          case CalcArrayType(elType: DataType, _) =>
-            detectType(idx) match {
-              case _: IntType => elType.asNonOwning(
-                elType match {
+              case _: IntType => arr.elType.asNonOwning(
+                arr.elType match {
                   case ct: ComplexDataType => ct.isOwning
                   case _ => false
                 }