6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-01-06 00:33:42 +00:00
Code Issues Projects Releases Wiki Activity

Fixed problem with size calculation of arrays inside structs. Closes #458

Browse Source
This commit is contained in:
jespergravgaard 2020-05-30 01:07:45 +02:00
parent c33d140628
commit a99256645a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/dk/camelot64/kickc/model/types/SymbolTypeStruct.java
View File

@ -63,10 +63,11 @@ public class SymbolTypeStruct implements SymbolType {
public static int getMemberSizeBytes(SymbolType memberType, ConstantValue arraySize, ProgramScope programScope) { public static int getMemberSizeBytes(SymbolType memberType, ConstantValue arraySize, ProgramScope programScope) {
if(arraySize!=null) { if(arraySize!=null) {
final SymbolType elementType = ((SymbolTypePointer) memberType).getElementType();
if(programScope != null) { if(programScope != null) {
ConstantLiteral sizeLiteral = arraySize.calculateLiteral(programScope); ConstantLiteral sizeLiteral = arraySize.calculateLiteral(programScope);
if(sizeLiteral instanceof ConstantInteger) { if(sizeLiteral instanceof ConstantInteger) {
return memberType.getSizeBytes() * ((ConstantInteger) sizeLiteral).getInteger().intValue(); return elementType.getSizeBytes() * ((ConstantInteger) sizeLiteral).getInteger().intValue();
} }
} else { } else {
return 5; // Add a token size return 5; // Add a token size