Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-09-27 11:56:10 +00:00
Code Issues Projects Releases Wiki Activity

fix compiler crash for some struct/array initialization assignment literals containing not just numbers

Browse Source
This commit is contained in:
Irmen de Jong 2021-04-10 00:28:32 +02:00
parent 2b7b925090
commit b1ef09675b
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/src/prog8/compiler/astprocessing/StatementReorderer.kt
View File

@ -224,7 +224,7 @@ internal class StatementReorderer(val program: Program, val errors: IErrorReport
if(targetType.istype(DataType.STRUCT) && (valueType.istype(DataType.STRUCT) || valueType.typeOrElse(DataType.STRUCT) in ArrayDatatypes )) {
if (assignment.value is ArrayLiteralValue) {
errors.err("cannot assign non-const array value, use separate assignment per field", assignment.position)
errors.err("cannot assign array literal here, use separate assignment per field", assignment.position)
} else {
return copyStructValue(assignment)
}
@ -232,7 +232,7 @@ internal class StatementReorderer(val program: Program, val errors: IErrorReport
if(targetType.typeOrElse(DataType.STRUCT) in ArrayDatatypes && valueType.typeOrElse(DataType.STRUCT) in ArrayDatatypes ) {
if (assignment.value is ArrayLiteralValue) {
errors.err("cannot assign non-const array value, use separate assignment per element", assignment.position)
errors.err("cannot assign array literal here, use separate assignment per element", assignment.position)
} else {
return copyArrayValue(assignment)
}

9
compilerAst/src/prog8/ast/statements/AstStatements.kt
View File

@ -256,7 +256,14 @@ open class VarDecl(val type: VarDeclType,
fun flattenStructMembers(): MutableList<Statement> {
val result = struct!!.statements.mapIndexed { index, statement ->
val member = statement as VarDecl
val initvalue = if(value!=null) (value as ArrayLiteralValue).value[index] else null
val initvalueOrig = if(value!=null) (value as ArrayLiteralValue).value[index] else null
val initvalue = when(initvalueOrig) {
is AddressOf -> initvalueOrig.copy()
is ArrayIndexedExpression -> initvalueOrig.copy()
is DirectMemoryRead -> initvalueOrig.copy()
is IdentifierReference -> initvalueOrig.copy()
else -> initvalueOrig
}
VarDecl(
VarDeclType.VAR,
member.datatype,

28
examples/test.p8
View File

@ -3,12 +3,28 @@
main {
sub start() {
txt.print("✓✓✓✓✓")
txt.nl()
txt.print("WWWWW")
txt.nl()
txt.print("●●●●●")
txt.nl()
const ubyte world_width=100
struct Color {
ubyte red
ubyte green
ubyte blue
}
Color rgb = [255,world_width,0] ; note that struct initializer value is same as an array
;rgb = [255,world_width,0] ; note that struct initializer value is same as an array
;rgb = [255,world_width/2,0] ; note that struct initializer value is same as an array
; struct Entity {
; ubyte active
; ubyte x
; ubyte y
; byte direction
; }
;
; Entity pede
; pede = [1, 1, 0, -1]
}
}