From c39810233274b0973fe0fcbfedb3ced8c9f685b6 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 16 Aug 2021 13:06:53 -0400 Subject: [PATCH] [msl-out]: avoid inner structure for run-time array sizes --- src/back/msl/writer.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index 92b7ef640a..cd50217c8e 100644 --- a/src/back/msl/writer.rs +++ b/src/back/msl/writer.rs @@ -801,12 +801,15 @@ impl Writer { crate::TypeInner::ValuePointer { .. } | crate::TypeInner::Vector { .. } => { write!(self.out, ".{}", back::COMPONENTS[index as usize])?; } - crate::TypeInner::Matrix { .. } => { - write!(self.out, "[{}]", index)?; - } - crate::TypeInner::Array { .. } => { + crate::TypeInner::Array { + size: crate::ArraySize::Constant(_), + .. + } => { write!(self.out, ".{}[{}]", WRAPPED_ARRAY_FIELD, index)?; } + crate::TypeInner::Array { .. } | crate::TypeInner::Matrix { .. } => { + write!(self.out, "[{}]", index)?; + } _ => { // unexpected indexing, should fail validation }