Use switch internal to decodeFixedVec (#4945)
This commit is contained in:
@@ -105,9 +105,11 @@ function _decodeStruct (value: TypeDef, type: string, _: string, count: number):
|
|||||||
? new Map(Object.entries(parsed._alias))
|
? new Map(Object.entries(parsed._alias))
|
||||||
: undefined;
|
: undefined;
|
||||||
value.fallbackType = parsed._fallback;
|
value.fallbackType = parsed._fallback;
|
||||||
value.sub = keys.filter((name) => !KNOWN_INTERNALS.includes(name)).map((name): TypeDef =>
|
value.sub = keys
|
||||||
getTypeDef(getTypeString(parsed[name]), { name }, count)
|
.filter((name) => !KNOWN_INTERNALS.includes(name))
|
||||||
);
|
.map((name) =>
|
||||||
|
getTypeDef(getTypeString(parsed[name]), { name }, count)
|
||||||
|
);
|
||||||
|
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
@@ -120,12 +122,26 @@ function _decodeFixedVec (value: TypeDef, type: string, _: string, count: number
|
|||||||
let inner = 0;
|
let inner = 0;
|
||||||
|
|
||||||
for (let i = 1; (i < max) && (index === -1); i++) {
|
for (let i = 1; (i < max) && (index === -1); i++) {
|
||||||
if (type[i] === ';' && inner === 0) {
|
switch (type[i]) {
|
||||||
index = i;
|
case ';': {
|
||||||
} else if (['[', '(', '<'].includes(type[i])) {
|
if (inner === 0) {
|
||||||
inner++;
|
index = i;
|
||||||
} else if ([']', ')', '>'].includes(type[i])) {
|
}
|
||||||
inner--;
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case '[':
|
||||||
|
case '(':
|
||||||
|
case '<':
|
||||||
|
inner++;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ']':
|
||||||
|
case ')':
|
||||||
|
case '>':
|
||||||
|
inner--;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user