Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-11-03 04:17:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into structs

Browse Source 
# Conflicts:
#	compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
#	parser/src/main/antlr/Prog8ANTLR.g4
This commit is contained in:
Irmen de Jong
2025-05-15 21:29:08 +02:00
parent 86eef7039f f5fc4e345c
commit 11456496bd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
View File

@@ -408,7 +408,7 @@ private fun Assign_targetContext.toAst() : AssignTarget {
AssignTarget(null, arrayindexed, null, null, false, position = toPosition()) AssignTarget(null, arrayindexed, null, null, false, position = toPosition())
} }
is VoidTargetContext -> { is VoidTargetContext -> {
AssignTarget(null, null, null, null, true, position = voidtarget().toPosition()) AssignTarget(null, null, null, null, true, position = this.toPosition())
} }
is PointerDereferenceTargetContext -> { is PointerDereferenceTargetContext -> {
val deref = this.pointerdereference().toAst() val deref = this.pointerdereference().toAst()

3
parser/src/main/antlr/Prog8ANTLR.g4
View File

@@ -188,10 +188,9 @@ assign_target:
| directmemory #MemoryTarget | directmemory #MemoryTarget
| pointerdereference #PointerDereferenceTarget | pointerdereference #PointerDereferenceTarget
| pointerindexedderef #PointerIndexedDerefTarget | pointerindexedderef #PointerIndexedDerefTarget
| voidtarget #VoidTarget | VOID #VoidTarget
; ;
voidtarget : VOID ;
multi_assign_target: multi_assign_target:
assign_target (',' assign_target)+ ; assign_target (',' assign_target)+ ;