From 6e44f575843c8f30c01673ecb4cac57ff1326f4e Mon Sep 17 00:00:00 2001 From: MaxGraey Date: Sun, 7 Aug 2022 13:04:03 +0300 Subject: [PATCH 1/2] [bindings] add size types for path path lowering in StaticArray --- src/bindings/js.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bindings/js.ts b/src/bindings/js.ts index d13a5faf0b..27abfebad9 100644 --- a/src/bindings/js.ts +++ b/src/bindings/js.ts @@ -1094,28 +1094,28 @@ export class JSBuilder extends ExportsWalker { sb.push(name); if (clazz.extends(this.program.staticArrayPrototype)) { // optional last argument for __lowerStaticArray - let valueType = clazz.getArrayValueType(); - if (valueType.isNumericValue) { + let type = clazz.getArrayValueType(); + if (type.isNumericValue) { sb.push(", "); - if (valueType == Type.u8 || valueType == Type.bool) { + if (type == Type.u8 || type == Type.bool) { sb.push("Uint8Array"); - } else if (valueType == Type.i8) { + } else if (type == Type.i8) { sb.push("Int8Array"); - } else if (valueType == Type.u16) { + } else if (type == Type.u16) { sb.push("Uint16Array"); - } else if (valueType == Type.i16) { + } else if (type == Type.i16) { sb.push("Int16Array"); - } else if (valueType == Type.u32) { + } else if (type == Type.u32 || type == Type.usize32) { sb.push("Uint32Array"); - } else if (valueType == Type.i32) { + } else if (type == Type.i32 || type == Type.isize32) { sb.push("Int32Array"); - } else if (valueType == Type.u64) { + } else if (type == Type.u64 || type == Type.usize64) { sb.push("BigUint64Array"); - } else if (valueType == Type.i64) { + } else if (type == Type.i64 || type == Type.isize64) { sb.push("BigInt64Array"); - } else if (valueType == Type.f32) { + } else if (type == Type.f32) { sb.push("Float32Array"); - } else if (valueType == Type.f64) { + } else if (type == Type.f64) { sb.push("Float64Array"); } else { // unreachable From c88a3345c711a71c56db291788d20034ef2a45ab Mon Sep 17 00:00:00 2001 From: MaxGraey Date: Sun, 7 Aug 2022 13:10:33 +0300 Subject: [PATCH 2/2] avoid shadowing --- src/bindings/js.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bindings/js.ts b/src/bindings/js.ts index 27abfebad9..814b334171 100644 --- a/src/bindings/js.ts +++ b/src/bindings/js.ts @@ -1094,28 +1094,28 @@ export class JSBuilder extends ExportsWalker { sb.push(name); if (clazz.extends(this.program.staticArrayPrototype)) { // optional last argument for __lowerStaticArray - let type = clazz.getArrayValueType(); - if (type.isNumericValue) { + let valueType = clazz.getArrayValueType(); + if (valueType.isNumericValue) { sb.push(", "); - if (type == Type.u8 || type == Type.bool) { + if (valueType == Type.u8 || valueType == Type.bool) { sb.push("Uint8Array"); - } else if (type == Type.i8) { + } else if (valueType == Type.i8) { sb.push("Int8Array"); - } else if (type == Type.u16) { + } else if (valueType == Type.u16) { sb.push("Uint16Array"); - } else if (type == Type.i16) { + } else if (valueType == Type.i16) { sb.push("Int16Array"); - } else if (type == Type.u32 || type == Type.usize32) { + } else if (valueType == Type.u32 || valueType == Type.usize32) { sb.push("Uint32Array"); - } else if (type == Type.i32 || type == Type.isize32) { + } else if (valueType == Type.i32 || valueType == Type.isize32) { sb.push("Int32Array"); - } else if (type == Type.u64 || type == Type.usize64) { + } else if (valueType == Type.u64 || valueType == Type.usize64) { sb.push("BigUint64Array"); - } else if (type == Type.i64 || type == Type.isize64) { + } else if (valueType == Type.i64 || valueType == Type.isize64) { sb.push("BigInt64Array"); - } else if (type == Type.f32) { + } else if (valueType == Type.f32) { sb.push("Float32Array"); - } else if (type == Type.f64) { + } else if (valueType == Type.f64) { sb.push("Float64Array"); } else { // unreachable