From a319e6f9ec15b9e4d69ef3e5c6e177b26d4e2db1 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Mon, 31 Dec 2018 04:48:26 +0100 Subject: [PATCH] direct memory access and sprite fixes --- compiler/antlr/prog8.g4 | 8 +- compiler/examples/sprites.p8 | 107 +- compiler/examples/test.p8 | 28 +- compiler/src/prog8/ast/AST.kt | 55 +- compiler/src/prog8/ast/AstChecker.kt | 24 +- compiler/src/prog8/compiler/Compiler.kt | 39 +- .../src/prog8/compiler/intermediate/Opcode.kt | 6 +- .../src/prog8/compiler/target/c64/AsmGen.kt | 34 +- compiler/src/prog8/parser/prog8Lexer.java | 198 ++-- compiler/src/prog8/parser/prog8Parser.java | 955 +++++++++--------- compiler/src/prog8/stackvm/StackVm.kt | 10 + docs/source/programming.rst | 8 +- docs/source/syntaxreference.rst | 8 +- 13 files changed, 767 insertions(+), 713 deletions(-) diff --git a/compiler/antlr/prog8.g4 b/compiler/antlr/prog8.g4 index 4aa56f7f9..167d1b35d 100644 --- a/compiler/antlr/prog8.g4 +++ b/compiler/antlr/prog8.g4 @@ -126,9 +126,8 @@ assign_target: postincrdecr : assign_target operator = ('++' | '--') ; expression : - '(' expression ')' - | functioncall - | prefix = ('+'|'-'|'~') expression + functioncall + | prefix = ('+'|'-'|'~') expression | left = expression bop = '**' right = expression | left = expression bop = ('*' | '/' | '//' | '%' ) right = expression | left = expression bop = ('+' | '-' ) right = expression @@ -149,6 +148,7 @@ expression : | arrayindexed | directmemory | expression typecast + | '(' expression ')' ; @@ -159,7 +159,7 @@ arrayindexed : (identifier | scoped_identifier ) arrayspec ; -directmemory : '@' expression ; +directmemory : '@' '(' expression ')'; functioncall : diff --git a/compiler/examples/sprites.p8 b/compiler/examples/sprites.p8 index c9774bd53..28c5f37b6 100644 --- a/compiler/examples/sprites.p8 +++ b/compiler/examples/sprites.p8 @@ -3,27 +3,30 @@ ~ main { - ubyte[63] balloonsprite = [ %00000000, %01111111, %00000000, - %00000001, %11111111, %11000000, - %00000011, %11111111, %11100000, - %00000011, %11100011, %11100000, - %00000111, %11011100, %11110000, - %00000111, %11011101, %11110000, - %00000111, %11011100, %11110000, - %00000011, %11100011, %11100000, - %00000011, %11111111, %11100000, - %00000011, %11111111, %11100000, - %00000010, %11111111, %10100000, - %00000001, %01111111, %01000000, - %00000001, %00111110, %01000000, - %00000000, %10011100, %10000000, - %00000000, %10011100, %10000000, - %00000000, %01001001, %00000000, - %00000000, %01001001, %00000000, - %00000000, %00111110, %00000000, - %00000000, %00111110, %00000000, - %00000000, %00111110, %00000000, - %00000000, %00011100, %00000000 ] + const uword SP0X = $d000 + const uword SP0Y = $d001 + + ubyte[63] balloonsprite = [ %00000000,%01111111,%00000000, + %00000001,%11111111,%11000000, + %00000011,%11111111,%11100000, + %00000011,%11100011,%11100000, + %00000111,%11011100,%11110000, + %00000111,%11011101,%11110000, + %00000111,%11011100,%11110000, + %00000011,%11100011,%11100000, + %00000011,%11111111,%11100000, + %00000011,%11111111,%11100000, + %00000010,%11111111,%10100000, + %00000001,%01111111,%01000000, + %00000001,%00111110,%01000000, + %00000000,%10011100,%10000000, + %00000000,%10011100,%10000000, + %00000000,%01001001,%00000000, + %00000000,%01001001,%00000000, + %00000000,%00111110,%00000000, + %00000000,%00111110,%00000000, + %00000000,%00111110,%00000000, + %00000000,%00011100,%00000000 ] const uword sprite_data_address = 13*64 ; // safe area inside the tape buffer @@ -34,7 +37,7 @@ ; copy the ballon sprite data to the correct address and setup the sprite pointers ; @todo make a memcopy function for this, that calls c64utils.memcopy - for ubyte i in 0 to 62 { + for ubyte i in 0 to 63 { ;@(sprite_data_address+i) = @(balloonsprite+i) ; @todo nice error message @(sprite_data_address+i) = balloonsprite[i] } @@ -48,23 +51,10 @@ c64.SPRPTR6 = sprite_data_address//64 c64.SPRPTR7 = sprite_data_address//64 - c64.SP0X = 30+30*0 - c64.SP1X = 30+30*1 - c64.SP2X = 30+30*2 - c64.SP3X = 30+30*3 - c64.SP4X = 30+30*4 - c64.SP5X = 30+30*5 - c64.SP6X = 30+30*6 - c64.SP7X = 30+30*7 - - c64.SP0Y = 100+10*0 - c64.SP1Y = 100+10*1 - c64.SP2Y = 100+10*2 - c64.SP3Y = 100+10*3 - c64.SP4Y = 100+10*4 - c64.SP5Y = 100+10*5 - c64.SP6Y = 100+10*6 - c64.SP7Y = 100+10*7 + for ubyte i in 0 to 7 { + @(SP0X+i*2) = 50+25*i + @(SP0Y+i*2) = rnd() + } c64.SPENA = 255 ; enable all sprites } @@ -72,30 +62,25 @@ ~ irq { - +; @todo no longer auto-set this as irq handler. instead, add builtins functions activate_irqvec() / restore_irqvec() sub irq() { - c64.SP0Y-- - c64.SP1Y-- - c64.SP2Y-- - c64.SP3Y-- - c64.SP4Y-- - c64.SP5Y-- - c64.SP6Y-- - c64.SP7Y-- + ;return ; @todo return statements in the irqhandler should not do rts, but instead jmp c64.IRQDFRT + ; @todo also when including this return, the jmp c64.IRQDFRT at the end gets omitted.....:( + c64.EXTCOL++ + for ubyte i in 0 to 7 { + @(main.SP0Y+i+i)-- ; float up - -; const uword SP0X = $d000 -; for ubyte i in 0 to 7 { -; @(SP0X+i*2) = @(SP0X+i*2) + 1 ; @todo this doesn't read (or write?) the correct values.. -; ubyte r = rnd() -; if r>228 -; ; @(SP0X+i*2)++ ; @todo allow this -; @(SP0X+i*2) = @(SP0X+i*2)+1 -; else { -; if r<28 -; @(SP0X+i*2) = @(SP0X+i*2)-1 -; } -; } + ; horizontal wobble effect + ubyte r = rnd() + if r>208 + @(main.SP0X+i+i)++ + else { + ; @todo if-else if -else syntax without curly braces + if r<48 + @(main.SP0X+i+i)-- + } + } + c64.EXTCOL-- } } diff --git a/compiler/examples/test.p8 b/compiler/examples/test.p8 index 771e8fb38..54d8643fc 100644 --- a/compiler/examples/test.p8 +++ b/compiler/examples/test.p8 @@ -3,23 +3,15 @@ ~ main { sub start() { - - A+=5 - - ; @todo if-else if should compile ?: -; if A>100 -; Y=2 -; else if A>20 -; Y=3 - - -; @($d020) = 5 - @($d020)++ - @($d021)-- -; @($d020)=(@$d020)+5 - @($d020)+=5 -; @($d021)=(@$d021)-5 - @($d021)-=5 - + ubyte i=0 + A= @($d020) + A= @($d020+i) + @($d020) = 0 + @($d020+i) = 0 + @($d020+i) = 1 + @($d020+i) = 2 + @($d020) = @($d020+i) + 1 + @($d020+i) = @($d020+i) + 1 + c64scr.print_ub(X) } } diff --git a/compiler/src/prog8/ast/AST.kt b/compiler/src/prog8/ast/AST.kt index b802745a5..97c759efe 100644 --- a/compiler/src/prog8/ast/AST.kt +++ b/compiler/src/prog8/ast/AST.kt @@ -261,7 +261,7 @@ interface IAstProcessor { fun process(assignTarget: AssignTarget): AssignTarget { assignTarget.arrayindexed?.process(this) assignTarget.identifier?.process(this) - assignTarget.memAddressExpression = assignTarget.memAddressExpression?.process(this) + assignTarget.memoryAddress?.process(this) return assignTarget } @@ -275,9 +275,14 @@ interface IAstProcessor { return typecastExpression } - fun process(directmemoryExpression: DirectMemoryExpression): IExpression { - directmemoryExpression.addressExpression = directmemoryExpression.addressExpression.process(this) - return directmemoryExpression + fun process(memread: DirectMemoryRead): IExpression { + memread.addressExpression = memread.addressExpression.process(this) + return memread + } + + fun process(memwrite: DirectMemoryWrite): IExpression { + memwrite.addressExpression = memwrite.addressExpression.process(this) + return memwrite } } @@ -731,7 +736,7 @@ class VariableInitializationAssignment(target: AssignTarget, aug_op: String?, va data class AssignTarget(val register: Register?, val identifier: IdentifierReference?, val arrayindexed: ArrayIndexedExpression?, - var memAddressExpression: IExpression?, + var memoryAddress: DirectMemoryWrite?, override val position: Position) : Node { override lateinit var parent: Node @@ -739,7 +744,7 @@ data class AssignTarget(val register: Register?, this.parent = parent identifier?.linkParents(this) arrayindexed?.linkParents(this) - memAddressExpression?.linkParents(this) + memoryAddress?.linkParents(this) } fun process(processor: IAstProcessor) = processor.process(this) @@ -750,7 +755,8 @@ data class AssignTarget(val register: Register?, is RegisterExpr -> AssignTarget(expr.register, null, null, null, expr.position) is IdentifierReference -> AssignTarget(null, expr, null, null, expr.position) is ArrayIndexedExpression -> AssignTarget(null, null, expr, null, expr.position) - is DirectMemoryExpression -> AssignTarget(null, null, null, expr, expr.position) + is DirectMemoryRead -> AssignTarget(null, null, null, DirectMemoryWrite(expr.addressExpression, expr.position), expr.position) + is DirectMemoryWrite -> AssignTarget(null, null, null, expr, expr.position) else -> throw FatalAstException("invalid expression object $expr") } } @@ -771,7 +777,7 @@ data class AssignTarget(val register: Register?, return dt } - if(memAddressExpression!=null) + if(memoryAddress!=null) return DataType.UBYTE return null @@ -784,8 +790,9 @@ data class AssignTarget(val register: Register?, return identifier.nameInSource.last() if(arrayindexed!=null) return arrayindexed.identifier!!.nameInSource.last() - if(memAddressExpression is LiteralValue) - return (memAddressExpression as LiteralValue).asIntegerValue.toString() + val address = memoryAddress?.addressExpression + if(address is LiteralValue) + return address.asIntegerValue.toString() return "???" } } @@ -1027,7 +1034,7 @@ class TypecastExpression(var expression: IExpression, var type: DataType, overri } -class DirectMemoryExpression(var addressExpression: IExpression, override val position: Position) : IExpression { +class DirectMemoryRead(var addressExpression: IExpression, override val position: Position) : IExpression { override lateinit var parent: Node override fun linkParents(parent: Node) { @@ -1042,7 +1049,27 @@ class DirectMemoryExpression(var addressExpression: IExpression, override val po override fun constValue(namespace: INameScope, heap: HeapValues) = null override fun toString(): String { - return "DirectMemory($addressExpression)" + return "DirectMemoryRead($addressExpression)" + } +} + + +class DirectMemoryWrite(var addressExpression: IExpression, override val position: Position) : IExpression { + override lateinit var parent: Node + + override fun linkParents(parent: Node) { + this.parent = parent + this.addressExpression.linkParents(this) + } + + override fun process(processor: IAstProcessor) = processor.process(this) + override fun referencesIdentifier(name: String) = false + override fun resultingDatatype(namespace: INameScope, heap: HeapValues): DataType? = DataType.UBYTE + override fun isIterable(namespace: INameScope, heap: HeapValues) = false + override fun constValue(namespace: INameScope, heap: HeapValues) = null + + override fun toString(): String { + return "DirectMemoryWrite($addressExpression)" } } @@ -1978,7 +2005,7 @@ private fun prog8Parser.Assign_targetContext.toAst() : AssignTarget { register!=null -> AssignTarget(register, null, null, null, toPosition()) identifier!=null -> AssignTarget(null, identifier.toAst(), null, null, toPosition()) arrayindexed()!=null -> AssignTarget(null, null, arrayindexed().toAst(), null, toPosition()) - directmemory()!=null -> AssignTarget(null, null, null, directmemory().expression().toAst(), toPosition()) + directmemory()!=null -> AssignTarget(null, null, null, DirectMemoryWrite(directmemory().expression().toAst(), toPosition()), toPosition()) else -> AssignTarget(null, scoped_identifier()?.toAst(), null, null, toPosition()) } } @@ -2108,7 +2135,7 @@ private fun prog8Parser.ExpressionContext.toAst() : IExpression { return TypecastExpression(expression(0).toAst(), typecast().datatype().toAst(), toPosition()) if(directmemory()!=null) - return DirectMemoryExpression(directmemory().expression().toAst(), toPosition()) + return DirectMemoryRead(directmemory().expression().toAst(), toPosition()) throw FatalAstException(text) } diff --git a/compiler/src/prog8/ast/AstChecker.kt b/compiler/src/prog8/ast/AstChecker.kt index b7f7f14ba..12f4d0c0e 100644 --- a/compiler/src/prog8/ast/AstChecker.kt +++ b/compiler/src/prog8/ast/AstChecker.kt @@ -387,7 +387,7 @@ class AstChecker(private val namespace: INameScope, } private fun processAssignmentTarget(assignment: Assignment, target: AssignTarget): Assignment { - val memAddr = target.memAddressExpression?.constValue(namespace, heap)?.asIntegerValue + val memAddr = target.memoryAddress?.addressExpression?.constValue(namespace, heap)?.asIntegerValue if(memAddr!=null) { if(memAddr<0 || memAddr>=65536) checkResult.add(ExpressionError("address out of range", target.position)) @@ -435,16 +435,16 @@ class AstChecker(private val namespace: INameScope, target.register != null -> RegisterExpr(target.register, target.position) target.identifier != null -> target.identifier target.arrayindexed != null -> target.arrayindexed - target.memAddressExpression != null -> { - // @addr += 4 --> @addr = @addr +4 - // TODO: make it so that it follows the others - val memRead = DirectMemoryExpression(target.memAddressExpression!!, target.position) - val expression = BinaryExpression(memRead, assignment.aug_op.substringBeforeLast('='), assignment.value, assignment.position) - expression.linkParents(assignment.parent) - val assignment2 = Assignment(listOf(target), null, expression, assignment.position) - assignment2.linkParents(assignment.parent) - return assignment2 - } + target.memoryAddress != null -> target.memoryAddress!! +// // @addr += 4 --> @addr = @addr +4 +// // TODO: make it so that it follows the others +// val memRead = DirectMemoryRead(target.memoryAddress!!, target.position) +// val expression = BinaryExpression(memRead, assignment.aug_op.substringBeforeLast('='), assignment.value, assignment.position) +// expression.linkParents(assignment.parent) +// val assignment2 = Assignment(listOf(target), null, expression, assignment.position) +// assignment2.linkParents(assignment.parent) +// return assignment2 +// } else -> throw FatalAstException("strange assignment") } @@ -827,7 +827,7 @@ class AstChecker(private val namespace: INameScope, if(dt !in NumericDatatypes && dt !in ArrayDatatypes) checkResult.add(SyntaxError("can only increment or decrement a byte/float/word", postIncrDecr.position)) } - } else if(postIncrDecr.target.memAddressExpression != null) { + } else if(postIncrDecr.target.memoryAddress != null) { // a memory location can always be ++/-- } return super.process(postIncrDecr) diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt index f43dfbe86..80b38780c 100644 --- a/compiler/src/prog8/compiler/Compiler.kt +++ b/compiler/src/prog8/compiler/Compiler.kt @@ -580,7 +580,8 @@ private class StatementTranslator(private val prog: IntermediateProgram, is ArrayIndexedExpression -> translate(expr, false) is RangeExpr -> throw CompilerException("it's not possible to just have a range expression that has to be translated") is TypecastExpression -> translate(expr) - is DirectMemoryExpression -> translate(expr) + is DirectMemoryRead -> translate(expr) + is DirectMemoryWrite -> translate(expr) else -> { val lv = expr.constValue(namespace, heap) ?: throw CompilerException("constant expression required, not $expr") when(lv.type) { @@ -1273,15 +1274,19 @@ private class StatementTranslator(private val prog: IntermediateProgram, "--" -> prog.instr(opcodeDecArrayindexedVar(variable.datatype), callLabel = variable.scopedname) } } - stmt.target.memAddressExpression != null -> { - val address = stmt.target.memAddressExpression!!.constValue(namespace, heap)?.asIntegerValue + stmt.target.memoryAddress != null -> { + val address = stmt.target.memoryAddress?.addressExpression?.constValue(namespace, heap)?.asIntegerValue if(address!=null) { when(stmt.operator) { "++" -> prog.instr(Opcode.INC_MEMORY, Value(DataType.UWORD, address)) "--" -> prog.instr(Opcode.DEC_MEMORY, Value(DataType.UWORD, address)) } } else { - TODO("memory ++/-- ${stmt.target.memAddressExpression}") + translate(stmt.target.memoryAddress!!.addressExpression) + when(stmt.operator) { + "++" -> prog.instr(Opcode.POP_INC_MEMORY) + "--" -> prog.instr(Opcode.POP_DEC_MEMORY) + } } } else -> throw CompilerException("very strange postincrdecr ${stmt.target}") @@ -1368,7 +1373,7 @@ private class StatementTranslator(private val prog: IntermediateProgram, } assignTarget.register != null -> prog.instr(Opcode.PUSH_VAR_BYTE, callLabel = assignTarget.register.toString()) assignTarget.arrayindexed != null -> translate(assignTarget.arrayindexed, false) - assignTarget.memAddressExpression != null -> { + assignTarget.memoryAddress != null -> { TODO("translate aug assign on memory address $stmt") } } @@ -1496,14 +1501,13 @@ private class StatementTranslator(private val prog: IntermediateProgram, } assignTarget.register != null -> prog.instr(Opcode.POP_VAR_BYTE, callLabel = assignTarget.register.toString()) assignTarget.arrayindexed != null -> translate(assignTarget.arrayindexed, true) // write value to it - assignTarget.memAddressExpression != null -> { - val address = assignTarget.memAddressExpression?.constValue(namespace, heap)?.asIntegerValue + assignTarget.memoryAddress != null -> { + val address = assignTarget.memoryAddress?.addressExpression?.constValue(namespace, heap)?.asIntegerValue if(address!=null) { // const integer address given prog.instr(Opcode.POP_MEM_BYTE, arg=Value(DataType.UWORD, address)) } else { - translate(assignTarget.memAddressExpression!!) - prog.instr(Opcode.POP_MEMWRITE) + translate(assignTarget.memoryAddress!!) } } else -> throw CompilerException("corrupt assigntarget $assignTarget") @@ -2097,15 +2101,26 @@ private class StatementTranslator(private val prog: IntermediateProgram, } } - private fun translate(expr: DirectMemoryExpression) { + private fun translate(memread: DirectMemoryRead) { // for now, only a single memory location (ubyte) is read at a time. - val address = expr.addressExpression.constValue(namespace, heap)?.asIntegerValue + val address = memread.addressExpression.constValue(namespace, heap)?.asIntegerValue if(address!=null) { prog.instr(Opcode.PUSH_MEM_UB, arg = Value(DataType.UWORD, address)) } else { - translate(expr.addressExpression) + translate(memread.addressExpression) prog.instr(Opcode.PUSH_MEMREAD) } } + private fun translate(memwrite: DirectMemoryWrite) { + // for now, only a single memory location (ubyte) is written at a time. + val address = memwrite.addressExpression.constValue(namespace, heap)?.asIntegerValue + if(address!=null) { + prog.instr(Opcode.POP_MEM_BYTE, arg = Value(DataType.UWORD, address)) + } else { + translate(memwrite.addressExpression) + prog.instr(Opcode.POP_MEMWRITE) + } + } + } diff --git a/compiler/src/prog8/compiler/intermediate/Opcode.kt b/compiler/src/prog8/compiler/intermediate/Opcode.kt index 085f0341e..1e9a62eef 100644 --- a/compiler/src/prog8/compiler/intermediate/Opcode.kt +++ b/compiler/src/prog8/compiler/intermediate/Opcode.kt @@ -164,8 +164,10 @@ enum class Opcode { DEC_VAR_W, DEC_VAR_UW, DEC_VAR_F, - INC_MEMORY, - DEC_MEMORY, + INC_MEMORY, // increment direct address + DEC_MEMORY, // decrement direct address + POP_INC_MEMORY, // increment address from stack + POP_DEC_MEMORY, // decrement address from address // comparisons // @todo the comparisons push the result back on the stack. Optimize this to work with just processor flags? This does mean you can no longer use a logical boolean result as a byte 0/1 value ? diff --git a/compiler/src/prog8/compiler/target/c64/AsmGen.kt b/compiler/src/prog8/compiler/target/c64/AsmGen.kt index 75bb25314..1f7227465 100644 --- a/compiler/src/prog8/compiler/target/c64/AsmGen.kt +++ b/compiler/src/prog8/compiler/target/c64/AsmGen.kt @@ -496,11 +496,10 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram, Opcode.PUSH_MEMREAD -> { """ lda ${(ESTACK_LO+1).toHex()},x - sta ${C64Zeropage.SCRATCH_W1} + sta (+) +1 lda ${(ESTACK_HI+1).toHex()},x - sta ${C64Zeropage.SCRATCH_W1+1} - ldy #0 - lda (${C64Zeropage.SCRATCH_W1}),y + sta (+) +2 ++ lda 65535 ; modified sta ${(ESTACK_LO+1).toHex()},x """ } @@ -594,13 +593,12 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram, """ inx lda ${ESTACK_LO.toHex()},x - sta ${C64Zeropage.SCRATCH_W1} + sta (+) +1 lda ${ESTACK_HI.toHex()},x - sta ${C64Zeropage.SCRATCH_W1+1} + sta (+) +2 inx lda ${ESTACK_LO.toHex()},x - ldy #0 - sta (${C64Zeropage.SCRATCH_W1}),y ++ sta 65535 ; modified """ } @@ -637,6 +635,26 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram, jsr prog8_lib.inc_var_f """ } + Opcode.POP_INC_MEMORY -> { + """ + inx + lda ${ESTACK_LO.toHex()},x + sta (+) +1 + lda ${ESTACK_HI.toHex()},x + sta (+) +2 ++ inc 65535 ; modified + """ + } + Opcode.POP_DEC_MEMORY -> { + """ + inx + lda ${ESTACK_LO.toHex()},x + sta (+) +1 + lda ${ESTACK_HI.toHex()},x + sta (+) +2 ++ dec 65535 ; modified + """ + } Opcode.DEC_VAR_UB, Opcode.DEC_VAR_B -> { when (ins.callLabel) { "A" -> " sec | sbc #1" diff --git a/compiler/src/prog8/parser/prog8Lexer.java b/compiler/src/prog8/parser/prog8Lexer.java index 9b861481d..80f62ac4d 100644 --- a/compiler/src/prog8/parser/prog8Lexer.java +++ b/compiler/src/prog8/parser/prog8Lexer.java @@ -72,11 +72,11 @@ public class prog8Lexer extends Lexer { "'%asmbinary'", "'%option'", "','", "'='", "'const'", "'memory'", "'ubyte'", "'byte'", "'uword'", "'word'", "'float'", "'str'", "'str_p'", "'str_s'", "'str_ps'", "'['", "']'", "'+='", "'-='", "'/='", "'//='", "'*='", "'**='", - "'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'('", "')'", "'+'", - "'-'", "'**'", "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='", - "'=='", "'!='", "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'", - "'xor'", "'not'", "'as'", "'@'", "'return'", "'break'", "'continue'", - "'.'", "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", + "'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'+'", "'-'", "'**'", + "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='", "'=='", "'!='", + "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'", "'xor'", "'not'", + "'('", "')'", "'as'", "'@'", "'return'", "'break'", "'continue'", "'.'", + "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", "'Pv'", "'.w'", "'true'", "'false'", "'%asm'", "'sub'", "'->'", "'{'", "'}'", "'asmsub'", "'clobbers'", "'if'", "'else'", "'if_cs'", "'if_cc'", "'if_eq'", "'if_z'", "'if_ne'", "'if_nz'", "'if_pl'", "'if_pos'", "'if_mi'", @@ -235,19 +235,19 @@ public class prog8Lexer extends Lexer { "\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34"+ "\3\35\3\35\3\36\3\36\3\36\3\37\3\37\3\37\3 \3 \3 \3!\3!\3!\3!\3\"\3\""+ "\3\"\3#\3#\3#\3#\3$\3$\3$\3%\3%\3%\3&\3&\3&\3\'\3\'\3\'\3(\3(\3(\3)\3"+ - ")\3)\3*\3*\3+\3+\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\61\3\61\3\61\3"+ - "\62\3\62\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\67\3\67\3"+ - "\67\38\38\38\39\39\3:\3:\3;\3;\3<\3<\3<\3=\3=\3=\3=\3=\3>\3>\3>\3>\3?"+ - "\3?\3?\3@\3@\3@\3@\3A\3A\3A\3A\3B\3B\3B\3C\3C\3D\3D\3D\3D\3D\3D\3D\3E"+ - "\3E\3E\3E\3E\3E\3F\3F\3F\3F\3F\3F\3F\3F\3F\3G\3G\3H\3H\3I\3I\3J\3J\3K"+ - "\3K\3K\3L\3L\3L\3M\3M\3M\3N\3N\3N\3O\3O\3O\3P\3P\3P\3Q\3Q\3Q\3R\3R\3R"+ - "\3S\3S\3S\3S\3S\3T\3T\3T\3T\3T\3T\3U\3U\3U\3U\3U\3V\3V\3V\3V\3W\3W\3W"+ - "\3X\3X\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3[\3[\3[\3[\3\\\3\\\3"+ - "\\\3]\3]\3]\3]\3]\3^\3^\3^\3^\3^\3^\3_\3_\3_\3_\3_\3_\3`\3`\3`\3`\3`\3"+ - "`\3a\3a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3"+ - "d\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3h\3h\3"+ - "h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3k\3k\3k\3l\3l\3l\3l\3l\3l\3"+ - "m\3m\3m\3m\3m\3m\3m\3n\3n\3n\3n\3n\3n\3o\3o\7o\u02e9\no\fo\16o\u02ec\13"+ + ")\3)\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3.\3/\3/\3/\3\60\3\60\3\61\3\61\3\62"+ + "\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\67"+ + "\3\67\38\38\39\39\3:\3:\3:\3;\3;\3;\3;\3;\3<\3<\3<\3<\3=\3=\3=\3>\3>\3"+ + ">\3>\3?\3?\3?\3?\3@\3@\3A\3A\3B\3B\3B\3C\3C\3D\3D\3D\3D\3D\3D\3D\3E\3"+ + "E\3E\3E\3E\3E\3F\3F\3F\3F\3F\3F\3F\3F\3F\3G\3G\3H\3H\3I\3I\3J\3J\3K\3"+ + "K\3K\3L\3L\3L\3M\3M\3M\3N\3N\3N\3O\3O\3O\3P\3P\3P\3Q\3Q\3Q\3R\3R\3R\3"+ + "S\3S\3S\3S\3S\3T\3T\3T\3T\3T\3T\3U\3U\3U\3U\3U\3V\3V\3V\3V\3W\3W\3W\3"+ + "X\3X\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3[\3[\3[\3[\3\\\3\\\3\\"+ + "\3]\3]\3]\3]\3]\3^\3^\3^\3^\3^\3^\3_\3_\3_\3_\3_\3_\3`\3`\3`\3`\3`\3`"+ + "\3a\3a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3d"+ + "\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3h\3h\3h"+ + "\3h\3h\3h\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3k\3k\3k\3l\3l\3l\3l\3l\3l\3m"+ + "\3m\3m\3m\3m\3m\3m\3n\3n\3n\3n\3n\3n\3o\3o\7o\u02e9\no\fo\16o\u02ec\13"+ "o\3o\3o\3o\3o\3p\3p\7p\u02f4\np\fp\16p\u02f7\13p\3p\3p\3q\3q\3q\3q\3r"+ "\6r\u0300\nr\rr\16r\u0301\3s\3s\7s\u0306\ns\fs\16s\u0309\13s\3t\3t\3t"+ "\6t\u030e\nt\rt\16t\u030f\5t\u0312\nt\3u\3u\6u\u0316\nu\ru\16u\u0317\3"+ @@ -299,11 +299,11 @@ public class prog8Lexer extends Lexer { "\3\2\2\2=\u01b1\3\2\2\2?\u01b4\3\2\2\2A\u01b7\3\2\2\2C\u01bb\3\2\2\2E"+ "\u01be\3\2\2\2G\u01c2\3\2\2\2I\u01c5\3\2\2\2K\u01c8\3\2\2\2M\u01cb\3\2"+ "\2\2O\u01ce\3\2\2\2Q\u01d1\3\2\2\2S\u01d4\3\2\2\2U\u01d6\3\2\2\2W\u01d8"+ - "\3\2\2\2Y\u01da\3\2\2\2[\u01dc\3\2\2\2]\u01df\3\2\2\2_\u01e1\3\2\2\2a"+ - "\u01e3\3\2\2\2c\u01e6\3\2\2\2e\u01e8\3\2\2\2g\u01ea\3\2\2\2i\u01ec\3\2"+ - "\2\2k\u01ef\3\2\2\2m\u01f2\3\2\2\2o\u01f5\3\2\2\2q\u01f8\3\2\2\2s\u01fa"+ - "\3\2\2\2u\u01fc\3\2\2\2w\u01fe\3\2\2\2y\u0201\3\2\2\2{\u0206\3\2\2\2}"+ - "\u020a\3\2\2\2\177\u020d\3\2\2\2\u0081\u0211\3\2\2\2\u0083\u0215\3\2\2"+ + "\3\2\2\2Y\u01db\3\2\2\2[\u01dd\3\2\2\2]\u01df\3\2\2\2_\u01e2\3\2\2\2a"+ + "\u01e4\3\2\2\2c\u01e6\3\2\2\2e\u01e8\3\2\2\2g\u01eb\3\2\2\2i\u01ee\3\2"+ + "\2\2k\u01f1\3\2\2\2m\u01f4\3\2\2\2o\u01f6\3\2\2\2q\u01f8\3\2\2\2s\u01fa"+ + "\3\2\2\2u\u01fd\3\2\2\2w\u0202\3\2\2\2y\u0206\3\2\2\2{\u0209\3\2\2\2}"+ + "\u020d\3\2\2\2\177\u0211\3\2\2\2\u0081\u0213\3\2\2\2\u0083\u0215\3\2\2"+ "\2\u0085\u0218\3\2\2\2\u0087\u021a\3\2\2\2\u0089\u0221\3\2\2\2\u008b\u0227"+ "\3\2\2\2\u008d\u0230\3\2\2\2\u008f\u0232\3\2\2\2\u0091\u0234\3\2\2\2\u0093"+ "\u0236\3\2\2\2\u0095\u0238\3\2\2\2\u0097\u023b\3\2\2\2\u0099\u023e\3\2"+ @@ -377,82 +377,82 @@ public class prog8Lexer extends Lexer { "\7~\2\2\u01c6\u01c7\7?\2\2\u01c7J\3\2\2\2\u01c8\u01c9\7`\2\2\u01c9\u01ca"+ "\7?\2\2\u01caL\3\2\2\2\u01cb\u01cc\7\'\2\2\u01cc\u01cd\7?\2\2\u01cdN\3"+ "\2\2\2\u01ce\u01cf\7-\2\2\u01cf\u01d0\7-\2\2\u01d0P\3\2\2\2\u01d1\u01d2"+ - "\7/\2\2\u01d2\u01d3\7/\2\2\u01d3R\3\2\2\2\u01d4\u01d5\7*\2\2\u01d5T\3"+ - "\2\2\2\u01d6\u01d7\7+\2\2\u01d7V\3\2\2\2\u01d8\u01d9\7-\2\2\u01d9X\3\2"+ - "\2\2\u01da\u01db\7/\2\2\u01dbZ\3\2\2\2\u01dc\u01dd\7,\2\2\u01dd\u01de"+ - "\7,\2\2\u01de\\\3\2\2\2\u01df\u01e0\7,\2\2\u01e0^\3\2\2\2\u01e1\u01e2"+ - "\7\61\2\2\u01e2`\3\2\2\2\u01e3\u01e4\7\61\2\2\u01e4\u01e5\7\61\2\2\u01e5"+ - "b\3\2\2\2\u01e6\u01e7\7\'\2\2\u01e7d\3\2\2\2\u01e8\u01e9\7>\2\2\u01e9"+ - "f\3\2\2\2\u01ea\u01eb\7@\2\2\u01ebh\3\2\2\2\u01ec\u01ed\7>\2\2\u01ed\u01ee"+ - "\7?\2\2\u01eej\3\2\2\2\u01ef\u01f0\7@\2\2\u01f0\u01f1\7?\2\2\u01f1l\3"+ - "\2\2\2\u01f2\u01f3\7?\2\2\u01f3\u01f4\7?\2\2\u01f4n\3\2\2\2\u01f5\u01f6"+ - "\7#\2\2\u01f6\u01f7\7?\2\2\u01f7p\3\2\2\2\u01f8\u01f9\7(\2\2\u01f9r\3"+ - "\2\2\2\u01fa\u01fb\7`\2\2\u01fbt\3\2\2\2\u01fc\u01fd\7~\2\2\u01fdv\3\2"+ - "\2\2\u01fe\u01ff\7v\2\2\u01ff\u0200\7q\2\2\u0200x\3\2\2\2\u0201\u0202"+ - "\7u\2\2\u0202\u0203\7v\2\2\u0203\u0204\7g\2\2\u0204\u0205\7r\2\2\u0205"+ - "z\3\2\2\2\u0206\u0207\7c\2\2\u0207\u0208\7p\2\2\u0208\u0209\7f\2\2\u0209"+ - "|\3\2\2\2\u020a\u020b\7q\2\2\u020b\u020c\7t\2\2\u020c~\3\2\2\2\u020d\u020e"+ - "\7z\2\2\u020e\u020f\7q\2\2\u020f\u0210\7t\2\2\u0210\u0080\3\2\2\2\u0211"+ - "\u0212\7p\2\2\u0212\u0213\7q\2\2\u0213\u0214\7v\2\2\u0214\u0082\3\2\2"+ - "\2\u0215\u0216\7c\2\2\u0216\u0217\7u\2\2\u0217\u0084\3\2\2\2\u0218\u0219"+ - "\7B\2\2\u0219\u0086\3\2\2\2\u021a\u021b\7t\2\2\u021b\u021c\7g\2\2\u021c"+ - "\u021d\7v\2\2\u021d\u021e\7w\2\2\u021e\u021f\7t\2\2\u021f\u0220\7p\2\2"+ - "\u0220\u0088\3\2\2\2\u0221\u0222\7d\2\2\u0222\u0223\7t\2\2\u0223\u0224"+ - "\7g\2\2\u0224\u0225\7c\2\2\u0225\u0226\7m\2\2\u0226\u008a\3\2\2\2\u0227"+ - "\u0228\7e\2\2\u0228\u0229\7q\2\2\u0229\u022a\7p\2\2\u022a\u022b\7v\2\2"+ - "\u022b\u022c\7k\2\2\u022c\u022d\7p\2\2\u022d\u022e\7w\2\2\u022e\u022f"+ - "\7g\2\2\u022f\u008c\3\2\2\2\u0230\u0231\7\60\2\2\u0231\u008e\3\2\2\2\u0232"+ - "\u0233\7C\2\2\u0233\u0090\3\2\2\2\u0234\u0235\7Z\2\2\u0235\u0092\3\2\2"+ - "\2\u0236\u0237\7[\2\2\u0237\u0094\3\2\2\2\u0238\u0239\7C\2\2\u0239\u023a"+ - "\7Z\2\2\u023a\u0096\3\2\2\2\u023b\u023c\7C\2\2\u023c\u023d\7[\2\2\u023d"+ - "\u0098\3\2\2\2\u023e\u023f\7Z\2\2\u023f\u0240\7[\2\2\u0240\u009a\3\2\2"+ - "\2\u0241\u0242\7R\2\2\u0242\u0243\7e\2\2\u0243\u009c\3\2\2\2\u0244\u0245"+ - "\7R\2\2\u0245\u0246\7|\2\2\u0246\u009e\3\2\2\2\u0247\u0248\7R\2\2\u0248"+ - "\u0249\7p\2\2\u0249\u00a0\3\2\2\2\u024a\u024b\7R\2\2\u024b\u024c\7x\2"+ - "\2\u024c\u00a2\3\2\2\2\u024d\u024e\7\60\2\2\u024e\u024f\7y\2\2\u024f\u00a4"+ - "\3\2\2\2\u0250\u0251\7v\2\2\u0251\u0252\7t\2\2\u0252\u0253\7w\2\2\u0253"+ - "\u0254\7g\2\2\u0254\u00a6\3\2\2\2\u0255\u0256\7h\2\2\u0256\u0257\7c\2"+ - "\2\u0257\u0258\7n\2\2\u0258\u0259\7u\2\2\u0259\u025a\7g\2\2\u025a\u00a8"+ - "\3\2\2\2\u025b\u025c\7\'\2\2\u025c\u025d\7c\2\2\u025d\u025e\7u\2\2\u025e"+ - "\u025f\7o\2\2\u025f\u00aa\3\2\2\2\u0260\u0261\7u\2\2\u0261\u0262\7w\2"+ - "\2\u0262\u0263\7d\2\2\u0263\u00ac\3\2\2\2\u0264\u0265\7/\2\2\u0265\u0266"+ - "\7@\2\2\u0266\u00ae\3\2\2\2\u0267\u0268\7}\2\2\u0268\u00b0\3\2\2\2\u0269"+ - "\u026a\7\177\2\2\u026a\u00b2\3\2\2\2\u026b\u026c\7c\2\2\u026c\u026d\7"+ - "u\2\2\u026d\u026e\7o\2\2\u026e\u026f\7u\2\2\u026f\u0270\7w\2\2\u0270\u0271"+ - "\7d\2\2\u0271\u00b4\3\2\2\2\u0272\u0273\7e\2\2\u0273\u0274\7n\2\2\u0274"+ - "\u0275\7q\2\2\u0275\u0276\7d\2\2\u0276\u0277\7d\2\2\u0277\u0278\7g\2\2"+ - "\u0278\u0279\7t\2\2\u0279\u027a\7u\2\2\u027a\u00b6\3\2\2\2\u027b\u027c"+ - "\7k\2\2\u027c\u027d\7h\2\2\u027d\u00b8\3\2\2\2\u027e\u027f\7g\2\2\u027f"+ - "\u0280\7n\2\2\u0280\u0281\7u\2\2\u0281\u0282\7g\2\2\u0282\u00ba\3\2\2"+ - "\2\u0283\u0284\7k\2\2\u0284\u0285\7h\2\2\u0285\u0286\7a\2\2\u0286\u0287"+ - "\7e\2\2\u0287\u0288\7u\2\2\u0288\u00bc\3\2\2\2\u0289\u028a\7k\2\2\u028a"+ - "\u028b\7h\2\2\u028b\u028c\7a\2\2\u028c\u028d\7e\2\2\u028d\u028e\7e\2\2"+ - "\u028e\u00be\3\2\2\2\u028f\u0290\7k\2\2\u0290\u0291\7h\2\2\u0291\u0292"+ - "\7a\2\2\u0292\u0293\7g\2\2\u0293\u0294\7s\2\2\u0294\u00c0\3\2\2\2\u0295"+ - "\u0296\7k\2\2\u0296\u0297\7h\2\2\u0297\u0298\7a\2\2\u0298\u0299\7|\2\2"+ - "\u0299\u00c2\3\2\2\2\u029a\u029b\7k\2\2\u029b\u029c\7h\2\2\u029c\u029d"+ - "\7a\2\2\u029d\u029e\7p\2\2\u029e\u029f\7g\2\2\u029f\u00c4\3\2\2\2\u02a0"+ - "\u02a1\7k\2\2\u02a1\u02a2\7h\2\2\u02a2\u02a3\7a\2\2\u02a3\u02a4\7p\2\2"+ - "\u02a4\u02a5\7|\2\2\u02a5\u00c6\3\2\2\2\u02a6\u02a7\7k\2\2\u02a7\u02a8"+ - "\7h\2\2\u02a8\u02a9\7a\2\2\u02a9\u02aa\7r\2\2\u02aa\u02ab\7n\2\2\u02ab"+ - "\u00c8\3\2\2\2\u02ac\u02ad\7k\2\2\u02ad\u02ae\7h\2\2\u02ae\u02af\7a\2"+ - "\2\u02af\u02b0\7r\2\2\u02b0\u02b1\7q\2\2\u02b1\u02b2\7u\2\2\u02b2\u00ca"+ - "\3\2\2\2\u02b3\u02b4\7k\2\2\u02b4\u02b5\7h\2\2\u02b5\u02b6\7a\2\2\u02b6"+ - "\u02b7\7o\2\2\u02b7\u02b8\7k\2\2\u02b8\u00cc\3\2\2\2\u02b9\u02ba\7k\2"+ - "\2\u02ba\u02bb\7h\2\2\u02bb\u02bc\7a\2\2\u02bc\u02bd\7p\2\2\u02bd\u02be"+ - "\7g\2\2\u02be\u02bf\7i\2\2\u02bf\u00ce\3\2\2\2\u02c0\u02c1\7k\2\2\u02c1"+ - "\u02c2\7h\2\2\u02c2\u02c3\7a\2\2\u02c3\u02c4\7x\2\2\u02c4\u02c5\7u\2\2"+ - "\u02c5\u00d0\3\2\2\2\u02c6\u02c7\7k\2\2\u02c7\u02c8\7h\2\2\u02c8\u02c9"+ - "\7a\2\2\u02c9\u02ca\7x\2\2\u02ca\u02cb\7e\2\2\u02cb\u00d2\3\2\2\2\u02cc"+ - "\u02cd\7h\2\2\u02cd\u02ce\7q\2\2\u02ce\u02cf\7t\2\2\u02cf\u00d4\3\2\2"+ - "\2\u02d0\u02d1\7k\2\2\u02d1\u02d2\7p\2\2\u02d2\u00d6\3\2\2\2\u02d3\u02d4"+ - "\7y\2\2\u02d4\u02d5\7j\2\2\u02d5\u02d6\7k\2\2\u02d6\u02d7\7n\2\2\u02d7"+ - "\u02d8\7g\2\2\u02d8\u00d8\3\2\2\2\u02d9\u02da\7t\2\2\u02da\u02db\7g\2"+ - "\2\u02db\u02dc\7r\2\2\u02dc\u02dd\7g\2\2\u02dd\u02de\7c\2\2\u02de\u02df"+ - "\7v\2\2\u02df\u00da\3\2\2\2\u02e0\u02e1\7w\2\2\u02e1\u02e2\7p\2\2\u02e2"+ - "\u02e3\7v\2\2\u02e3\u02e4\7k\2\2\u02e4\u02e5\7n\2\2\u02e5\u00dc\3\2\2"+ - "\2\u02e6\u02ea\t\2\2\2\u02e7\u02e9\t\3\2\2\u02e8\u02e7\3\2\2\2\u02e9\u02ec"+ - "\3\2\2\2\u02ea\u02e8\3\2\2\2\u02ea\u02eb\3\2\2\2\u02eb\u02ed\3\2\2\2\u02ec"+ + "\7/\2\2\u01d2\u01d3\7/\2\2\u01d3R\3\2\2\2\u01d4\u01d5\7-\2\2\u01d5T\3"+ + "\2\2\2\u01d6\u01d7\7/\2\2\u01d7V\3\2\2\2\u01d8\u01d9\7,\2\2\u01d9\u01da"+ + "\7,\2\2\u01daX\3\2\2\2\u01db\u01dc\7,\2\2\u01dcZ\3\2\2\2\u01dd\u01de\7"+ + "\61\2\2\u01de\\\3\2\2\2\u01df\u01e0\7\61\2\2\u01e0\u01e1\7\61\2\2\u01e1"+ + "^\3\2\2\2\u01e2\u01e3\7\'\2\2\u01e3`\3\2\2\2\u01e4\u01e5\7>\2\2\u01e5"+ + "b\3\2\2\2\u01e6\u01e7\7@\2\2\u01e7d\3\2\2\2\u01e8\u01e9\7>\2\2\u01e9\u01ea"+ + "\7?\2\2\u01eaf\3\2\2\2\u01eb\u01ec\7@\2\2\u01ec\u01ed\7?\2\2\u01edh\3"+ + "\2\2\2\u01ee\u01ef\7?\2\2\u01ef\u01f0\7?\2\2\u01f0j\3\2\2\2\u01f1\u01f2"+ + "\7#\2\2\u01f2\u01f3\7?\2\2\u01f3l\3\2\2\2\u01f4\u01f5\7(\2\2\u01f5n\3"+ + "\2\2\2\u01f6\u01f7\7`\2\2\u01f7p\3\2\2\2\u01f8\u01f9\7~\2\2\u01f9r\3\2"+ + "\2\2\u01fa\u01fb\7v\2\2\u01fb\u01fc\7q\2\2\u01fct\3\2\2\2\u01fd\u01fe"+ + "\7u\2\2\u01fe\u01ff\7v\2\2\u01ff\u0200\7g\2\2\u0200\u0201\7r\2\2\u0201"+ + "v\3\2\2\2\u0202\u0203\7c\2\2\u0203\u0204\7p\2\2\u0204\u0205\7f\2\2\u0205"+ + "x\3\2\2\2\u0206\u0207\7q\2\2\u0207\u0208\7t\2\2\u0208z\3\2\2\2\u0209\u020a"+ + "\7z\2\2\u020a\u020b\7q\2\2\u020b\u020c\7t\2\2\u020c|\3\2\2\2\u020d\u020e"+ + "\7p\2\2\u020e\u020f\7q\2\2\u020f\u0210\7v\2\2\u0210~\3\2\2\2\u0211\u0212"+ + "\7*\2\2\u0212\u0080\3\2\2\2\u0213\u0214\7+\2\2\u0214\u0082\3\2\2\2\u0215"+ + "\u0216\7c\2\2\u0216\u0217\7u\2\2\u0217\u0084\3\2\2\2\u0218\u0219\7B\2"+ + "\2\u0219\u0086\3\2\2\2\u021a\u021b\7t\2\2\u021b\u021c\7g\2\2\u021c\u021d"+ + "\7v\2\2\u021d\u021e\7w\2\2\u021e\u021f\7t\2\2\u021f\u0220\7p\2\2\u0220"+ + "\u0088\3\2\2\2\u0221\u0222\7d\2\2\u0222\u0223\7t\2\2\u0223\u0224\7g\2"+ + "\2\u0224\u0225\7c\2\2\u0225\u0226\7m\2\2\u0226\u008a\3\2\2\2\u0227\u0228"+ + "\7e\2\2\u0228\u0229\7q\2\2\u0229\u022a\7p\2\2\u022a\u022b\7v\2\2\u022b"+ + "\u022c\7k\2\2\u022c\u022d\7p\2\2\u022d\u022e\7w\2\2\u022e\u022f\7g\2\2"+ + "\u022f\u008c\3\2\2\2\u0230\u0231\7\60\2\2\u0231\u008e\3\2\2\2\u0232\u0233"+ + "\7C\2\2\u0233\u0090\3\2\2\2\u0234\u0235\7Z\2\2\u0235\u0092\3\2\2\2\u0236"+ + "\u0237\7[\2\2\u0237\u0094\3\2\2\2\u0238\u0239\7C\2\2\u0239\u023a\7Z\2"+ + "\2\u023a\u0096\3\2\2\2\u023b\u023c\7C\2\2\u023c\u023d\7[\2\2\u023d\u0098"+ + "\3\2\2\2\u023e\u023f\7Z\2\2\u023f\u0240\7[\2\2\u0240\u009a\3\2\2\2\u0241"+ + "\u0242\7R\2\2\u0242\u0243\7e\2\2\u0243\u009c\3\2\2\2\u0244\u0245\7R\2"+ + "\2\u0245\u0246\7|\2\2\u0246\u009e\3\2\2\2\u0247\u0248\7R\2\2\u0248\u0249"+ + "\7p\2\2\u0249\u00a0\3\2\2\2\u024a\u024b\7R\2\2\u024b\u024c\7x\2\2\u024c"+ + "\u00a2\3\2\2\2\u024d\u024e\7\60\2\2\u024e\u024f\7y\2\2\u024f\u00a4\3\2"+ + "\2\2\u0250\u0251\7v\2\2\u0251\u0252\7t\2\2\u0252\u0253\7w\2\2\u0253\u0254"+ + "\7g\2\2\u0254\u00a6\3\2\2\2\u0255\u0256\7h\2\2\u0256\u0257\7c\2\2\u0257"+ + "\u0258\7n\2\2\u0258\u0259\7u\2\2\u0259\u025a\7g\2\2\u025a\u00a8\3\2\2"+ + "\2\u025b\u025c\7\'\2\2\u025c\u025d\7c\2\2\u025d\u025e\7u\2\2\u025e\u025f"+ + "\7o\2\2\u025f\u00aa\3\2\2\2\u0260\u0261\7u\2\2\u0261\u0262\7w\2\2\u0262"+ + "\u0263\7d\2\2\u0263\u00ac\3\2\2\2\u0264\u0265\7/\2\2\u0265\u0266\7@\2"+ + "\2\u0266\u00ae\3\2\2\2\u0267\u0268\7}\2\2\u0268\u00b0\3\2\2\2\u0269\u026a"+ + "\7\177\2\2\u026a\u00b2\3\2\2\2\u026b\u026c\7c\2\2\u026c\u026d\7u\2\2\u026d"+ + "\u026e\7o\2\2\u026e\u026f\7u\2\2\u026f\u0270\7w\2\2\u0270\u0271\7d\2\2"+ + "\u0271\u00b4\3\2\2\2\u0272\u0273\7e\2\2\u0273\u0274\7n\2\2\u0274\u0275"+ + "\7q\2\2\u0275\u0276\7d\2\2\u0276\u0277\7d\2\2\u0277\u0278\7g\2\2\u0278"+ + "\u0279\7t\2\2\u0279\u027a\7u\2\2\u027a\u00b6\3\2\2\2\u027b\u027c\7k\2"+ + "\2\u027c\u027d\7h\2\2\u027d\u00b8\3\2\2\2\u027e\u027f\7g\2\2\u027f\u0280"+ + "\7n\2\2\u0280\u0281\7u\2\2\u0281\u0282\7g\2\2\u0282\u00ba\3\2\2\2\u0283"+ + "\u0284\7k\2\2\u0284\u0285\7h\2\2\u0285\u0286\7a\2\2\u0286\u0287\7e\2\2"+ + "\u0287\u0288\7u\2\2\u0288\u00bc\3\2\2\2\u0289\u028a\7k\2\2\u028a\u028b"+ + "\7h\2\2\u028b\u028c\7a\2\2\u028c\u028d\7e\2\2\u028d\u028e\7e\2\2\u028e"+ + "\u00be\3\2\2\2\u028f\u0290\7k\2\2\u0290\u0291\7h\2\2\u0291\u0292\7a\2"+ + "\2\u0292\u0293\7g\2\2\u0293\u0294\7s\2\2\u0294\u00c0\3\2\2\2\u0295\u0296"+ + "\7k\2\2\u0296\u0297\7h\2\2\u0297\u0298\7a\2\2\u0298\u0299\7|\2\2\u0299"+ + "\u00c2\3\2\2\2\u029a\u029b\7k\2\2\u029b\u029c\7h\2\2\u029c\u029d\7a\2"+ + "\2\u029d\u029e\7p\2\2\u029e\u029f\7g\2\2\u029f\u00c4\3\2\2\2\u02a0\u02a1"+ + "\7k\2\2\u02a1\u02a2\7h\2\2\u02a2\u02a3\7a\2\2\u02a3\u02a4\7p\2\2\u02a4"+ + "\u02a5\7|\2\2\u02a5\u00c6\3\2\2\2\u02a6\u02a7\7k\2\2\u02a7\u02a8\7h\2"+ + "\2\u02a8\u02a9\7a\2\2\u02a9\u02aa\7r\2\2\u02aa\u02ab\7n\2\2\u02ab\u00c8"+ + "\3\2\2\2\u02ac\u02ad\7k\2\2\u02ad\u02ae\7h\2\2\u02ae\u02af\7a\2\2\u02af"+ + "\u02b0\7r\2\2\u02b0\u02b1\7q\2\2\u02b1\u02b2\7u\2\2\u02b2\u00ca\3\2\2"+ + "\2\u02b3\u02b4\7k\2\2\u02b4\u02b5\7h\2\2\u02b5\u02b6\7a\2\2\u02b6\u02b7"+ + "\7o\2\2\u02b7\u02b8\7k\2\2\u02b8\u00cc\3\2\2\2\u02b9\u02ba\7k\2\2\u02ba"+ + "\u02bb\7h\2\2\u02bb\u02bc\7a\2\2\u02bc\u02bd\7p\2\2\u02bd\u02be\7g\2\2"+ + "\u02be\u02bf\7i\2\2\u02bf\u00ce\3\2\2\2\u02c0\u02c1\7k\2\2\u02c1\u02c2"+ + "\7h\2\2\u02c2\u02c3\7a\2\2\u02c3\u02c4\7x\2\2\u02c4\u02c5\7u\2\2\u02c5"+ + "\u00d0\3\2\2\2\u02c6\u02c7\7k\2\2\u02c7\u02c8\7h\2\2\u02c8\u02c9\7a\2"+ + "\2\u02c9\u02ca\7x\2\2\u02ca\u02cb\7e\2\2\u02cb\u00d2\3\2\2\2\u02cc\u02cd"+ + "\7h\2\2\u02cd\u02ce\7q\2\2\u02ce\u02cf\7t\2\2\u02cf\u00d4\3\2\2\2\u02d0"+ + "\u02d1\7k\2\2\u02d1\u02d2\7p\2\2\u02d2\u00d6\3\2\2\2\u02d3\u02d4\7y\2"+ + "\2\u02d4\u02d5\7j\2\2\u02d5\u02d6\7k\2\2\u02d6\u02d7\7n\2\2\u02d7\u02d8"+ + "\7g\2\2\u02d8\u00d8\3\2\2\2\u02d9\u02da\7t\2\2\u02da\u02db\7g\2\2\u02db"+ + "\u02dc\7r\2\2\u02dc\u02dd\7g\2\2\u02dd\u02de\7c\2\2\u02de\u02df\7v\2\2"+ + "\u02df\u00da\3\2\2\2\u02e0\u02e1\7w\2\2\u02e1\u02e2\7p\2\2\u02e2\u02e3"+ + "\7v\2\2\u02e3\u02e4\7k\2\2\u02e4\u02e5\7n\2\2\u02e5\u00dc\3\2\2\2\u02e6"+ + "\u02ea\t\2\2\2\u02e7\u02e9\t\3\2\2\u02e8\u02e7\3\2\2\2\u02e9\u02ec\3\2"+ + "\2\2\u02ea\u02e8\3\2\2\2\u02ea\u02eb\3\2\2\2\u02eb\u02ed\3\2\2\2\u02ec"+ "\u02ea\3\2\2\2\u02ed\u02ee\5\u00dfp\2\u02ee\u02ef\3\2\2\2\u02ef\u02f0"+ "\bo\2\2\u02f0\u00de\3\2\2\2\u02f1\u02f5\7=\2\2\u02f2\u02f4\n\2\2\2\u02f3"+ "\u02f2\3\2\2\2\u02f4\u02f7\3\2\2\2\u02f5\u02f3\3\2\2\2\u02f5\u02f6\3\2"+ diff --git a/compiler/src/prog8/parser/prog8Parser.java b/compiler/src/prog8/parser/prog8Parser.java index 929d373e2..de2ebe4dc 100644 --- a/compiler/src/prog8/parser/prog8Parser.java +++ b/compiler/src/prog8/parser/prog8Parser.java @@ -80,11 +80,11 @@ public class prog8Parser extends Parser { "'%asmbinary'", "'%option'", "','", "'='", "'const'", "'memory'", "'ubyte'", "'byte'", "'uword'", "'word'", "'float'", "'str'", "'str_p'", "'str_s'", "'str_ps'", "'['", "']'", "'+='", "'-='", "'/='", "'//='", "'*='", "'**='", - "'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'('", "')'", "'+'", - "'-'", "'**'", "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='", - "'=='", "'!='", "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'", - "'xor'", "'not'", "'as'", "'@'", "'return'", "'break'", "'continue'", - "'.'", "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", + "'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'+'", "'-'", "'**'", + "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='", "'=='", "'!='", + "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'", "'xor'", "'not'", + "'('", "')'", "'as'", "'@'", "'return'", "'break'", "'continue'", "'.'", + "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", "'Pv'", "'.w'", "'true'", "'false'", "'%asm'", "'sub'", "'->'", "'{'", "'}'", "'asmsub'", "'clobbers'", "'if'", "'else'", "'if_cs'", "'if_cc'", "'if_eq'", "'if_z'", "'if_ne'", "'if_nz'", "'if_pl'", "'if_pos'", "'if_mi'", @@ -1348,15 +1348,15 @@ public class prog8Parser extends Parser { public ExpressionContext right; public ExpressionContext rangeto; public ExpressionContext rangestep; + public FunctioncallContext functioncall() { + return getRuleContext(FunctioncallContext.class,0); + } public List expression() { return getRuleContexts(ExpressionContext.class); } public ExpressionContext expression(int i) { return getRuleContext(ExpressionContext.class,i); } - public FunctioncallContext functioncall() { - return getRuleContext(FunctioncallContext.class,0); - } public LiteralvalueContext literalvalue() { return getRuleContext(LiteralvalueContext.class,0); } @@ -1406,25 +1406,15 @@ public class prog8Parser extends Parser { case 1: { setState(250); - match(T__40); - setState(251); - expression(0); - setState(252); - match(T__41); + functioncall(); } break; case 2: { - setState(254); - functioncall(); - } - break; - case 3: - { - setState(255); + setState(251); ((ExpressionContext)_localctx).prefix = _input.LT(1); _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__42) | (1L << T__43))) != 0)) ) { + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__40) | (1L << T__41))) != 0)) ) { ((ExpressionContext)_localctx).prefix = (Token)_errHandler.recoverInline(this); } else { @@ -1432,52 +1422,62 @@ public class prog8Parser extends Parser { _errHandler.reportMatch(this); consume(); } - setState(256); - expression(21); + setState(252); + expression(22); + } + break; + case 3: + { + setState(253); + ((ExpressionContext)_localctx).prefix = match(T__61); + setState(254); + expression(9); } break; case 4: { - setState(257); - ((ExpressionContext)_localctx).prefix = match(T__63); - setState(258); - expression(8); + setState(255); + literalvalue(); } break; case 5: { - setState(259); - literalvalue(); + setState(256); + register(); } break; case 6: { - setState(260); - register(); + setState(257); + identifier(); } break; case 7: { - setState(261); - identifier(); + setState(258); + scoped_identifier(); } break; case 8: { - setState(262); - scoped_identifier(); + setState(259); + arrayindexed(); } break; case 9: { - setState(263); - arrayindexed(); + setState(260); + directmemory(); } break; case 10: { - setState(264); - directmemory(); + setState(261); + match(T__62); + setState(262); + expression(0); + setState(263); + match(T__63); } break; } @@ -1500,11 +1500,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(267); - if (!(precpred(_ctx, 20))) throw new FailedPredicateException(this, "precpred(_ctx, 20)"); + if (!(precpred(_ctx, 21))) throw new FailedPredicateException(this, "precpred(_ctx, 21)"); setState(268); - ((ExpressionContext)_localctx).bop = match(T__44); + ((ExpressionContext)_localctx).bop = match(T__42); setState(269); - ((ExpressionContext)_localctx).right = expression(21); + ((ExpressionContext)_localctx).right = expression(22); } break; case 2: @@ -1514,11 +1514,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(270); - if (!(precpred(_ctx, 19))) throw new FailedPredicateException(this, "precpred(_ctx, 19)"); + if (!(precpred(_ctx, 20))) throw new FailedPredicateException(this, "precpred(_ctx, 20)"); setState(271); ((ExpressionContext)_localctx).bop = _input.LT(1); _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48))) != 0)) ) { + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46))) != 0)) ) { ((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this); } else { @@ -1527,7 +1527,7 @@ public class prog8Parser extends Parser { consume(); } setState(272); - ((ExpressionContext)_localctx).right = expression(20); + ((ExpressionContext)_localctx).right = expression(21); } break; case 3: @@ -1537,11 +1537,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(273); - if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)"); + if (!(precpred(_ctx, 19))) throw new FailedPredicateException(this, "precpred(_ctx, 19)"); setState(274); ((ExpressionContext)_localctx).bop = _input.LT(1); _la = _input.LA(1); - if ( !(_la==T__42 || _la==T__43) ) { + if ( !(_la==T__40 || _la==T__41) ) { ((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this); } else { @@ -1550,7 +1550,7 @@ public class prog8Parser extends Parser { consume(); } setState(275); - ((ExpressionContext)_localctx).right = expression(19); + ((ExpressionContext)_localctx).right = expression(20); } break; case 4: @@ -1560,11 +1560,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(276); - if (!(precpred(_ctx, 17))) throw new FailedPredicateException(this, "precpred(_ctx, 17)"); + if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)"); setState(277); ((ExpressionContext)_localctx).bop = _input.LT(1); _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52))) != 0)) ) { + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50))) != 0)) ) { ((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this); } else { @@ -1573,7 +1573,7 @@ public class prog8Parser extends Parser { consume(); } setState(278); - ((ExpressionContext)_localctx).right = expression(18); + ((ExpressionContext)_localctx).right = expression(19); } break; case 5: @@ -1583,11 +1583,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(279); - if (!(precpred(_ctx, 16))) throw new FailedPredicateException(this, "precpred(_ctx, 16)"); + if (!(precpred(_ctx, 17))) throw new FailedPredicateException(this, "precpred(_ctx, 17)"); setState(280); ((ExpressionContext)_localctx).bop = _input.LT(1); _la = _input.LA(1); - if ( !(_la==T__53 || _la==T__54) ) { + if ( !(_la==T__51 || _la==T__52) ) { ((ExpressionContext)_localctx).bop = (Token)_errHandler.recoverInline(this); } else { @@ -1596,7 +1596,7 @@ public class prog8Parser extends Parser { consume(); } setState(281); - ((ExpressionContext)_localctx).right = expression(17); + ((ExpressionContext)_localctx).right = expression(18); } break; case 6: @@ -1606,11 +1606,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(282); - if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)"); + if (!(precpred(_ctx, 16))) throw new FailedPredicateException(this, "precpred(_ctx, 16)"); setState(283); - ((ExpressionContext)_localctx).bop = match(T__55); + ((ExpressionContext)_localctx).bop = match(T__53); setState(284); - ((ExpressionContext)_localctx).right = expression(16); + ((ExpressionContext)_localctx).right = expression(17); } break; case 7: @@ -1620,11 +1620,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(285); - if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)"); + if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)"); setState(286); - ((ExpressionContext)_localctx).bop = match(T__56); + ((ExpressionContext)_localctx).bop = match(T__54); setState(287); - ((ExpressionContext)_localctx).right = expression(15); + ((ExpressionContext)_localctx).right = expression(16); } break; case 8: @@ -1634,11 +1634,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(288); - if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)"); + if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)"); setState(289); - ((ExpressionContext)_localctx).bop = match(T__57); + ((ExpressionContext)_localctx).bop = match(T__55); setState(290); - ((ExpressionContext)_localctx).right = expression(14); + ((ExpressionContext)_localctx).right = expression(15); } break; case 9: @@ -1648,11 +1648,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(291); - if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)"); + if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)"); setState(292); - ((ExpressionContext)_localctx).bop = match(T__60); + ((ExpressionContext)_localctx).bop = match(T__58); setState(293); - ((ExpressionContext)_localctx).right = expression(12); + ((ExpressionContext)_localctx).right = expression(13); } break; case 10: @@ -1662,11 +1662,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(294); - if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)"); + if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)"); setState(295); - ((ExpressionContext)_localctx).bop = match(T__61); + ((ExpressionContext)_localctx).bop = match(T__59); setState(296); - ((ExpressionContext)_localctx).right = expression(11); + ((ExpressionContext)_localctx).right = expression(12); } break; case 11: @@ -1676,11 +1676,11 @@ public class prog8Parser extends Parser { _localctx.left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(297); - if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)"); + if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)"); setState(298); - ((ExpressionContext)_localctx).bop = match(T__62); + ((ExpressionContext)_localctx).bop = match(T__60); setState(299); - ((ExpressionContext)_localctx).right = expression(10); + ((ExpressionContext)_localctx).right = expression(11); } break; case 12: @@ -1690,9 +1690,9 @@ public class prog8Parser extends Parser { _localctx.rangefrom = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(300); - if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)"); + if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)"); setState(301); - match(T__58); + match(T__56); setState(302); ((ExpressionContext)_localctx).rangeto = expression(0); setState(305); @@ -1701,7 +1701,7 @@ public class prog8Parser extends Parser { case 1: { setState(303); - match(T__59); + match(T__57); setState(304); ((ExpressionContext)_localctx).rangestep = expression(0); } @@ -1714,7 +1714,7 @@ public class prog8Parser extends Parser { _localctx = new ExpressionContext(_parentctx, _parentState); pushNewRecursionContext(_localctx, _startState, RULE_expression); setState(307); - if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); + if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); setState(308); typecast(); } @@ -1844,7 +1844,11 @@ public class prog8Parser extends Parser { setState(323); match(T__65); setState(324); + match(T__62); + setState(325); expression(0); + setState(326); + match(T__63); } } catch (RecognitionException re) { @@ -1881,36 +1885,36 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(328); + setState(330); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,19,_ctx) ) { case 1: { - setState(326); + setState(328); identifier(); } break; case 2: { - setState(327); + setState(329); scoped_identifier(); } break; } - setState(330); - match(T__40); setState(332); + match(T__62); + setState(334); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__26) | (1L << T__40) | (1L << T__42) | (1L << T__43))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (T__63 - 64)) | (1L << (T__65 - 64)) | (1L << (T__70 - 64)) | (1L << (T__71 - 64)) | (1L << (T__72 - 64)) | (1L << (T__81 - 64)) | (1L << (T__82 - 64)) | (1L << (NAME - 64)) | (1L << (DEC_INTEGER - 64)) | (1L << (HEX_INTEGER - 64)) | (1L << (BIN_INTEGER - 64)) | (1L << (FLOAT_NUMBER - 64)) | (1L << (STRING - 64)) | (1L << (SINGLECHAR - 64)))) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__26) | (1L << T__40) | (1L << T__41) | (1L << T__61) | (1L << T__62))) != 0) || ((((_la - 66)) & ~0x3f) == 0 && ((1L << (_la - 66)) & ((1L << (T__65 - 66)) | (1L << (T__70 - 66)) | (1L << (T__71 - 66)) | (1L << (T__72 - 66)) | (1L << (T__81 - 66)) | (1L << (T__82 - 66)) | (1L << (NAME - 66)) | (1L << (DEC_INTEGER - 66)) | (1L << (HEX_INTEGER - 66)) | (1L << (BIN_INTEGER - 66)) | (1L << (FLOAT_NUMBER - 66)) | (1L << (STRING - 66)) | (1L << (SINGLECHAR - 66)))) != 0)) { { - setState(331); + setState(333); expression_list(); } } - setState(334); - match(T__41); + setState(336); + match(T__63); } } catch (RecognitionException re) { @@ -1947,36 +1951,36 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(338); + setState(340); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) { case 1: { - setState(336); + setState(338); identifier(); } break; case 2: { - setState(337); + setState(339); scoped_identifier(); } break; } - setState(340); - match(T__40); setState(342); + match(T__62); + setState(344); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__26) | (1L << T__40) | (1L << T__42) | (1L << T__43))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (T__63 - 64)) | (1L << (T__65 - 64)) | (1L << (T__70 - 64)) | (1L << (T__71 - 64)) | (1L << (T__72 - 64)) | (1L << (T__81 - 64)) | (1L << (T__82 - 64)) | (1L << (NAME - 64)) | (1L << (DEC_INTEGER - 64)) | (1L << (HEX_INTEGER - 64)) | (1L << (BIN_INTEGER - 64)) | (1L << (FLOAT_NUMBER - 64)) | (1L << (STRING - 64)) | (1L << (SINGLECHAR - 64)))) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__26) | (1L << T__40) | (1L << T__41) | (1L << T__61) | (1L << T__62))) != 0) || ((((_la - 66)) & ~0x3f) == 0 && ((1L << (_la - 66)) & ((1L << (T__65 - 66)) | (1L << (T__70 - 66)) | (1L << (T__71 - 66)) | (1L << (T__72 - 66)) | (1L << (T__81 - 66)) | (1L << (T__82 - 66)) | (1L << (NAME - 66)) | (1L << (DEC_INTEGER - 66)) | (1L << (HEX_INTEGER - 66)) | (1L << (BIN_INTEGER - 66)) | (1L << (FLOAT_NUMBER - 66)) | (1L << (STRING - 66)) | (1L << (SINGLECHAR - 66)))) != 0)) { { - setState(341); + setState(343); expression_list(); } } - setState(344); - match(T__41); + setState(346); + match(T__63); } } catch (RecognitionException re) { @@ -2014,31 +2018,31 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(346); + setState(348); expression(0); - setState(354); + setState(356); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(347); - match(T__13); setState(349); + match(T__13); + setState(351); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(348); + setState(350); match(EOL); } } - setState(351); + setState(353); expression(0); } } - setState(356); + setState(358); _errHandler.sync(this); _la = _input.LA(1); } @@ -2071,14 +2075,14 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(357); - match(T__66); setState(359); + match(T__66); + setState(361); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { case 1: { - setState(358); + setState(360); expression_list(); } break; @@ -2109,7 +2113,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(361); + setState(363); match(T__67); } } @@ -2137,7 +2141,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(363); + setState(365); match(T__68); } } @@ -2166,7 +2170,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(365); + setState(367); match(NAME); } } @@ -2199,9 +2203,9 @@ public class prog8Parser extends Parser { int _alt; enterOuterAlt(_localctx, 1); { - setState(367); + setState(369); match(NAME); - setState(370); + setState(372); _errHandler.sync(this); _alt = 1; do { @@ -2209,9 +2213,9 @@ public class prog8Parser extends Parser { case 1: { { - setState(368); + setState(370); match(T__69); - setState(369); + setState(371); match(NAME); } } @@ -2219,7 +2223,7 @@ public class prog8Parser extends Parser { default: throw new NoViableAltException(this); } - setState(372); + setState(374); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,26,_ctx); } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ); @@ -2250,7 +2254,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(374); + setState(376); _la = _input.LA(1); if ( !(((((_la - 71)) & ~0x3f) == 0 && ((1L << (_la - 71)) & ((1L << (T__70 - 71)) | (1L << (T__71 - 71)) | (1L << (T__72 - 71)))) != 0)) ) { _errHandler.recoverInline(this); @@ -2287,7 +2291,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(376); + setState(378); _la = _input.LA(1); if ( !(((((_la - 71)) & ~0x3f) == 0 && ((1L << (_la - 71)) & ((1L << (T__70 - 71)) | (1L << (T__71 - 71)) | (1L << (T__72 - 71)) | (1L << (T__73 - 71)) | (1L << (T__74 - 71)) | (1L << (T__75 - 71)))) != 0)) ) { _errHandler.recoverInline(this); @@ -2324,7 +2328,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(378); + setState(380); _la = _input.LA(1); if ( !(((((_la - 77)) & ~0x3f) == 0 && ((1L << (_la - 77)) & ((1L << (T__76 - 77)) | (1L << (T__77 - 77)) | (1L << (T__78 - 77)) | (1L << (T__79 - 77)))) != 0)) ) { _errHandler.recoverInline(this); @@ -2368,7 +2372,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(380); + setState(382); ((IntegerliteralContext)_localctx).intpart = _input.LT(1); _la = _input.LA(1); if ( !(((((_la - 115)) & ~0x3f) == 0 && ((1L << (_la - 115)) & ((1L << (DEC_INTEGER - 115)) | (1L << (HEX_INTEGER - 115)) | (1L << (BIN_INTEGER - 115)))) != 0)) ) { @@ -2379,12 +2383,12 @@ public class prog8Parser extends Parser { _errHandler.reportMatch(this); consume(); } - setState(382); + setState(384); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) { case 1: { - setState(381); + setState(383); wordsuffix(); } break; @@ -2415,7 +2419,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(384); + setState(386); match(T__80); } } @@ -2444,7 +2448,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(386); + setState(388); _la = _input.LA(1); if ( !(_la==T__81 || _la==T__82) ) { _errHandler.recoverInline(this); @@ -2491,57 +2495,57 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(388); - match(T__26); setState(390); + match(T__26); + setState(392); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(389); + setState(391); match(EOL); } } - setState(392); + setState(394); expression(0); - setState(400); + setState(402); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(393); - match(T__13); setState(395); + match(T__13); + setState(397); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(394); + setState(396); match(EOL); } } - setState(397); + setState(399); expression(0); } } - setState(402); + setState(404); _errHandler.sync(this); _la = _input.LA(1); } - setState(404); + setState(406); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(403); + setState(405); match(EOL); } } - setState(406); + setState(408); match(T__27); } } @@ -2570,7 +2574,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(408); + setState(410); match(STRING); } } @@ -2599,7 +2603,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(410); + setState(412); match(SINGLECHAR); } } @@ -2628,7 +2632,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(412); + setState(414); match(FLOAT_NUMBER); } } @@ -2672,7 +2676,7 @@ public class prog8Parser extends Parser { LiteralvalueContext _localctx = new LiteralvalueContext(_ctx, getState()); enterRule(_localctx, 82, RULE_literalvalue); try { - setState(420); + setState(422); _errHandler.sync(this); switch (_input.LA(1)) { case DEC_INTEGER: @@ -2680,7 +2684,7 @@ public class prog8Parser extends Parser { case BIN_INTEGER: enterOuterAlt(_localctx, 1); { - setState(414); + setState(416); integerliteral(); } break; @@ -2688,35 +2692,35 @@ public class prog8Parser extends Parser { case T__82: enterOuterAlt(_localctx, 2); { - setState(415); + setState(417); booleanliteral(); } break; case T__26: enterOuterAlt(_localctx, 3); { - setState(416); + setState(418); arrayliteral(); } break; case STRING: enterOuterAlt(_localctx, 4); { - setState(417); + setState(419); stringliteral(); } break; case SINGLECHAR: enterOuterAlt(_localctx, 5); { - setState(418); + setState(420); charliteral(); } break; case FLOAT_NUMBER: enterOuterAlt(_localctx, 6); { - setState(419); + setState(421); floatliteral(); } break; @@ -2749,9 +2753,9 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(422); + setState(424); match(T__83); - setState(423); + setState(425); match(INLINEASMBLOCK); } } @@ -2793,38 +2797,38 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(425); - match(T__84); - setState(426); - identifier(); setState(427); - match(T__40); + match(T__84); + setState(428); + identifier(); setState(429); + match(T__62); + setState(431); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__17) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24) | (1L << T__25))) != 0)) { { - setState(428); + setState(430); sub_params(); } } - setState(431); - match(T__41); setState(433); + match(T__63); + setState(435); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__85) { { - setState(432); + setState(434); sub_return_part(); } } { - setState(435); + setState(437); statement_block(); - setState(436); + setState(438); match(EOL); } } @@ -2856,9 +2860,9 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(438); + setState(440); match(T__85); - setState(439); + setState(441); sub_returns(); } } @@ -2897,16 +2901,16 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(441); + setState(443); match(T__86); - setState(442); + setState(444); match(EOL); - setState(447); + setState(449); _errHandler.sync(this); _la = _input.LA(1); while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__2) | (1L << T__3) | (1L << T__4) | (1L << T__5) | (1L << T__6) | (1L << T__7) | (1L << T__8) | (1L << T__9) | (1L << T__10) | (1L << T__11) | (1L << T__12) | (1L << T__15) | (1L << T__16) | (1L << T__17) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24) | (1L << T__25))) != 0) || ((((_la - 66)) & ~0x3f) == 0 && ((1L << (_la - 66)) & ((1L << (T__65 - 66)) | (1L << (T__66 - 66)) | (1L << (T__67 - 66)) | (1L << (T__68 - 66)) | (1L << (T__70 - 66)) | (1L << (T__71 - 66)) | (1L << (T__72 - 66)) | (1L << (T__83 - 66)) | (1L << (T__84 - 66)) | (1L << (T__88 - 66)) | (1L << (T__90 - 66)) | (1L << (T__92 - 66)) | (1L << (T__93 - 66)) | (1L << (T__94 - 66)) | (1L << (T__95 - 66)) | (1L << (T__96 - 66)) | (1L << (T__97 - 66)) | (1L << (T__98 - 66)) | (1L << (T__99 - 66)) | (1L << (T__100 - 66)) | (1L << (T__101 - 66)) | (1L << (T__102 - 66)) | (1L << (T__103 - 66)) | (1L << (T__104 - 66)) | (1L << (T__106 - 66)) | (1L << (T__107 - 66)) | (1L << (EOL - 66)) | (1L << (NAME - 66)))) != 0)) { { - setState(445); + setState(447); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -2959,13 +2963,13 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(443); + setState(445); statement(); } break; case EOL: { - setState(444); + setState(446); match(EOL); } break; @@ -2973,11 +2977,11 @@ public class prog8Parser extends Parser { throw new NoViableAltException(this); } } - setState(449); + setState(451); _errHandler.sync(this); _la = _input.LA(1); } - setState(450); + setState(452); match(T__87); } } @@ -3016,31 +3020,31 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(452); + setState(454); vardecl(); - setState(460); + setState(462); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(453); - match(T__13); setState(455); + match(T__13); + setState(457); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(454); + setState(456); match(EOL); } } - setState(457); + setState(459); vardecl(); } } - setState(462); + setState(464); _errHandler.sync(this); _la = _input.LA(1); } @@ -3081,31 +3085,31 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(463); + setState(465); datatype(); - setState(471); + setState(473); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(464); - match(T__13); setState(466); + match(T__13); + setState(468); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(465); + setState(467); match(EOL); } } - setState(468); + setState(470); datatype(); } } - setState(473); + setState(475); _errHandler.sync(this); _la = _input.LA(1); } @@ -3154,70 +3158,70 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(474); - match(T__88); - setState(475); - identifier(); setState(476); - match(T__40); + match(T__88); + setState(477); + identifier(); setState(478); + match(T__62); + setState(480); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__17) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24) | (1L << T__25))) != 0)) { { - setState(477); + setState(479); asmsub_params(); } } - setState(480); - match(T__41); - setState(481); - match(T__85); setState(482); - match(T__89); + match(T__63); setState(483); - match(T__40); + match(T__85); + setState(484); + match(T__89); setState(485); + match(T__62); + setState(487); _errHandler.sync(this); _la = _input.LA(1); if (((((_la - 71)) & ~0x3f) == 0 && ((1L << (_la - 71)) & ((1L << (T__70 - 71)) | (1L << (T__71 - 71)) | (1L << (T__72 - 71)))) != 0)) { { - setState(484); + setState(486); clobber(); } } - setState(487); - match(T__41); - setState(488); - match(T__85); setState(489); - match(T__40); + match(T__63); + setState(490); + match(T__85); setState(491); + match(T__62); + setState(493); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__17) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24) | (1L << T__25))) != 0)) { { - setState(490); + setState(492); asmsub_returns(); } } - setState(493); - match(T__41); - setState(496); + setState(495); + match(T__63); + setState(498); _errHandler.sync(this); switch (_input.LA(1)) { case T__14: { - setState(494); + setState(496); asmsub_address(); } break; case T__86: { - setState(495); + setState(497); statement_block(); } break; @@ -3254,9 +3258,9 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(498); + setState(500); match(T__14); - setState(499); + setState(501); ((Asmsub_addressContext)_localctx).address = integerliteral(); } } @@ -3295,31 +3299,31 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(501); + setState(503); asmsub_param(); - setState(509); + setState(511); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(502); - match(T__13); setState(504); + match(T__13); + setState(506); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(503); + setState(505); match(EOL); } } - setState(506); + setState(508); asmsub_param(); } } - setState(511); + setState(513); _errHandler.sync(this); _la = _input.LA(1); } @@ -3358,11 +3362,11 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(512); + setState(514); vardecl(); - setState(513); + setState(515); match(T__65); - setState(516); + setState(518); _errHandler.sync(this); switch (_input.LA(1)) { case T__70: @@ -3372,7 +3376,7 @@ public class prog8Parser extends Parser { case T__74: case T__75: { - setState(514); + setState(516); registerorpair(); } break; @@ -3381,7 +3385,7 @@ public class prog8Parser extends Parser { case T__78: case T__79: { - setState(515); + setState(517); statusregister(); } break; @@ -3421,21 +3425,21 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(518); + setState(520); register(); - setState(523); + setState(525); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(519); + setState(521); match(T__13); - setState(520); + setState(522); register(); } } - setState(525); + setState(527); _errHandler.sync(this); _la = _input.LA(1); } @@ -3476,31 +3480,31 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(526); + setState(528); asmsub_return(); - setState(534); + setState(536); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__13) { { { - setState(527); - match(T__13); setState(529); + match(T__13); + setState(531); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(528); + setState(530); match(EOL); } } - setState(531); + setState(533); asmsub_return(); } } - setState(536); + setState(538); _errHandler.sync(this); _la = _input.LA(1); } @@ -3539,11 +3543,11 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(537); + setState(539); datatype(); - setState(538); + setState(540); match(T__65); - setState(541); + setState(543); _errHandler.sync(this); switch (_input.LA(1)) { case T__70: @@ -3553,7 +3557,7 @@ public class prog8Parser extends Parser { case T__74: case T__75: { - setState(539); + setState(541); registerorpair(); } break; @@ -3562,7 +3566,7 @@ public class prog8Parser extends Parser { case T__78: case T__79: { - setState(540); + setState(542); statusregister(); } break; @@ -3612,21 +3616,21 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(543); + setState(545); match(T__90); - setState(544); - expression(0); setState(546); + expression(0); + setState(548); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(545); + setState(547); match(EOL); } } - setState(550); + setState(552); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -3679,40 +3683,40 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(548); + setState(550); statement(); } break; case T__86: { - setState(549); + setState(551); statement_block(); } break; default: throw new NoViableAltException(this); } - setState(553); + setState(555); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,54,_ctx) ) { case 1: { - setState(552); + setState(554); match(EOL); } break; } - setState(556); + setState(558); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__91) { { - setState(555); + setState(557); else_part(); } } - setState(558); + setState(560); match(EOL); } } @@ -3748,19 +3752,19 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(560); - match(T__91); setState(562); + match(T__91); + setState(564); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(561); + setState(563); match(EOL); } } - setState(566); + setState(568); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -3813,13 +3817,13 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(564); + setState(566); statement(); } break; case T__86: { - setState(565); + setState(567); statement_block(); } break; @@ -3869,19 +3873,19 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(568); - branchcondition(); setState(570); + branchcondition(); + setState(572); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(569); + setState(571); match(EOL); } } - setState(574); + setState(576); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -3934,40 +3938,40 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(572); + setState(574); statement(); } break; case T__86: { - setState(573); + setState(575); statement_block(); } break; default: throw new NoViableAltException(this); } - setState(577); + setState(579); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,60,_ctx) ) { case 1: { - setState(576); + setState(578); match(EOL); } break; } - setState(580); + setState(582); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__91) { { - setState(579); + setState(581); else_part(); } } - setState(582); + setState(584); match(EOL); } } @@ -3996,7 +4000,7 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(584); + setState(586); _la = _input.LA(1); if ( !(((((_la - 93)) & ~0x3f) == 0 && ((1L << (_la - 93)) & ((1L << (T__92 - 93)) | (1L << (T__93 - 93)) | (1L << (T__94 - 93)) | (1L << (T__95 - 93)) | (1L << (T__96 - 93)) | (1L << (T__97 - 93)) | (1L << (T__98 - 93)) | (1L << (T__99 - 93)) | (1L << (T__100 - 93)) | (1L << (T__101 - 93)) | (1L << (T__102 - 93)) | (1L << (T__103 - 93)))) != 0)) ) { _errHandler.recoverInline(this); @@ -4049,53 +4053,53 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(586); - match(T__104); setState(588); + match(T__104); + setState(590); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__17) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24) | (1L << T__25))) != 0)) { { - setState(587); + setState(589); datatype(); } } - setState(592); + setState(594); _errHandler.sync(this); switch (_input.LA(1)) { case T__70: case T__71: case T__72: { - setState(590); + setState(592); register(); } break; case NAME: { - setState(591); + setState(593); identifier(); } break; default: throw new NoViableAltException(this); } - setState(594); + setState(596); match(T__105); - setState(595); - expression(0); setState(597); + expression(0); + setState(599); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(596); + setState(598); match(EOL); } } - setState(599); + setState(601); statement_block(); } } @@ -4134,21 +4138,21 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(601); + setState(603); match(T__106); - setState(602); - expression(0); setState(604); + expression(0); + setState(606); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(603); + setState(605); match(EOL); } } - setState(608); + setState(610); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -4201,13 +4205,13 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(606); + setState(608); statement(); } break; case T__86: { - setState(607); + setState(609); statement_block(); } break; @@ -4251,9 +4255,9 @@ public class prog8Parser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(610); + setState(612); match(T__107); - setState(613); + setState(615); _errHandler.sync(this); switch (_input.LA(1)) { case T__2: @@ -4306,32 +4310,32 @@ public class prog8Parser extends Parser { case T__107: case NAME: { - setState(611); + setState(613); statement(); } break; case T__86: { - setState(612); + setState(614); statement_block(); } break; default: throw new NoViableAltException(this); } - setState(616); + setState(618); _errHandler.sync(this); _la = _input.LA(1); if (_la==EOL) { { - setState(615); + setState(617); match(EOL); } } - setState(618); + setState(620); match(T__108); - setState(619); + setState(621); expression(0); } } @@ -4356,37 +4360,37 @@ public class prog8Parser extends Parser { private boolean expression_sempred(ExpressionContext _localctx, int predIndex) { switch (predIndex) { case 0: - return precpred(_ctx, 20); + return precpred(_ctx, 21); case 1: - return precpred(_ctx, 19); + return precpred(_ctx, 20); case 2: - return precpred(_ctx, 18); + return precpred(_ctx, 19); case 3: - return precpred(_ctx, 17); + return precpred(_ctx, 18); case 4: - return precpred(_ctx, 16); + return precpred(_ctx, 17); case 5: - return precpred(_ctx, 15); + return precpred(_ctx, 16); case 6: - return precpred(_ctx, 14); + return precpred(_ctx, 15); case 7: - return precpred(_ctx, 13); + return precpred(_ctx, 14); case 8: - return precpred(_ctx, 11); - case 9: - return precpred(_ctx, 10); - case 10: - return precpred(_ctx, 9); - case 11: return precpred(_ctx, 12); + case 9: + return precpred(_ctx, 11); + case 10: + return precpred(_ctx, 10); + case 11: + return precpred(_ctx, 13); case 12: - return precpred(_ctx, 1); + return precpred(_ctx, 2); } return true; } public static final String _serializedATN = - "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3{\u0270\4\2\t\2\4"+ + "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3{\u0272\4\2\t\2\4"+ "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+ "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ @@ -4409,46 +4413,46 @@ public class prog8Parser extends Parser { "\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+ "\3\25\3\25\3\25\3\25\3\25\5\25\u0134\n\25\3\25\3\25\7\25\u0138\n\25\f"+ "\25\16\25\u013b\13\25\3\26\3\26\3\26\3\27\3\27\5\27\u0142\n\27\3\27\3"+ - "\27\3\30\3\30\3\30\3\31\3\31\5\31\u014b\n\31\3\31\3\31\5\31\u014f\n\31"+ - "\3\31\3\31\3\32\3\32\5\32\u0155\n\32\3\32\3\32\5\32\u0159\n\32\3\32\3"+ - "\32\3\33\3\33\3\33\5\33\u0160\n\33\3\33\7\33\u0163\n\33\f\33\16\33\u0166"+ - "\13\33\3\34\3\34\5\34\u016a\n\34\3\35\3\35\3\36\3\36\3\37\3\37\3 \3 \3"+ - " \6 \u0175\n \r \16 \u0176\3!\3!\3\"\3\"\3#\3#\3$\3$\5$\u0181\n$\3%\3"+ - "%\3&\3&\3\'\3\'\5\'\u0189\n\'\3\'\3\'\3\'\5\'\u018e\n\'\3\'\7\'\u0191"+ - "\n\'\f\'\16\'\u0194\13\'\3\'\5\'\u0197\n\'\3\'\3\'\3(\3(\3)\3)\3*\3*\3"+ - "+\3+\3+\3+\3+\3+\5+\u01a7\n+\3,\3,\3,\3-\3-\3-\3-\5-\u01b0\n-\3-\3-\5"+ - "-\u01b4\n-\3-\3-\3-\3.\3.\3.\3/\3/\3/\3/\7/\u01c0\n/\f/\16/\u01c3\13/"+ - "\3/\3/\3\60\3\60\3\60\5\60\u01ca\n\60\3\60\7\60\u01cd\n\60\f\60\16\60"+ - "\u01d0\13\60\3\61\3\61\3\61\5\61\u01d5\n\61\3\61\7\61\u01d8\n\61\f\61"+ - "\16\61\u01db\13\61\3\62\3\62\3\62\3\62\5\62\u01e1\n\62\3\62\3\62\3\62"+ - "\3\62\3\62\5\62\u01e8\n\62\3\62\3\62\3\62\3\62\5\62\u01ee\n\62\3\62\3"+ - "\62\3\62\5\62\u01f3\n\62\3\63\3\63\3\63\3\64\3\64\3\64\5\64\u01fb\n\64"+ - "\3\64\7\64\u01fe\n\64\f\64\16\64\u0201\13\64\3\65\3\65\3\65\3\65\5\65"+ - "\u0207\n\65\3\66\3\66\3\66\7\66\u020c\n\66\f\66\16\66\u020f\13\66\3\67"+ - "\3\67\3\67\5\67\u0214\n\67\3\67\7\67\u0217\n\67\f\67\16\67\u021a\13\67"+ - "\38\38\38\38\58\u0220\n8\39\39\39\59\u0225\n9\39\39\59\u0229\n9\39\59"+ - "\u022c\n9\39\59\u022f\n9\39\39\3:\3:\5:\u0235\n:\3:\3:\5:\u0239\n:\3;"+ - "\3;\5;\u023d\n;\3;\3;\5;\u0241\n;\3;\5;\u0244\n;\3;\5;\u0247\n;\3;\3;"+ - "\3<\3<\3=\3=\5=\u024f\n=\3=\3=\5=\u0253\n=\3=\3=\3=\5=\u0258\n=\3=\3="+ - "\3>\3>\3>\5>\u025f\n>\3>\3>\5>\u0263\n>\3?\3?\3?\5?\u0268\n?\3?\5?\u026b"+ - "\n?\3?\3?\3?\3?\2\3(@\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,."+ - "\60\62\64\668:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|\2\21\3\2\6\17\3\2\24"+ - "\34\3\2\37(\3\2)*\4\2\3\3-.\3\2\60\63\3\2-.\3\2\64\67\3\289\3\2IK\3\2"+ - "IN\3\2OR\3\2uw\3\2TU\3\2_j\2\u02a6\2\u0082\3\2\2\2\4\u0089\3\2\2\2\6\u008b"+ - "\3\2\2\2\b\u00a9\3\2\2\2\n\u00ab\3\2\2\2\f\u00ae\3\2\2\2\16\u00b4\3\2"+ - "\2\2\20\u00c5\3\2\2\2\22\u00c7\3\2\2\2\24\u00cd\3\2\2\2\26\u00d5\3\2\2"+ - "\2\30\u00d8\3\2\2\2\32\u00db\3\2\2\2\34\u00dd\3\2\2\2\36\u00e1\3\2\2\2"+ - " \u00e5\3\2\2\2\"\u00ed\3\2\2\2$\u00f6\3\2\2\2&\u00f8\3\2\2\2(\u010b\3"+ - "\2\2\2*\u013c\3\2\2\2,\u0141\3\2\2\2.\u0145\3\2\2\2\60\u014a\3\2\2\2\62"+ - "\u0154\3\2\2\2\64\u015c\3\2\2\2\66\u0167\3\2\2\28\u016b\3\2\2\2:\u016d"+ - "\3\2\2\2<\u016f\3\2\2\2>\u0171\3\2\2\2@\u0178\3\2\2\2B\u017a\3\2\2\2D"+ - "\u017c\3\2\2\2F\u017e\3\2\2\2H\u0182\3\2\2\2J\u0184\3\2\2\2L\u0186\3\2"+ - "\2\2N\u019a\3\2\2\2P\u019c\3\2\2\2R\u019e\3\2\2\2T\u01a6\3\2\2\2V\u01a8"+ - "\3\2\2\2X\u01ab\3\2\2\2Z\u01b8\3\2\2\2\\\u01bb\3\2\2\2^\u01c6\3\2\2\2"+ - "`\u01d1\3\2\2\2b\u01dc\3\2\2\2d\u01f4\3\2\2\2f\u01f7\3\2\2\2h\u0202\3"+ - "\2\2\2j\u0208\3\2\2\2l\u0210\3\2\2\2n\u021b\3\2\2\2p\u0221\3\2\2\2r\u0232"+ - "\3\2\2\2t\u023a\3\2\2\2v\u024a\3\2\2\2x\u024c\3\2\2\2z\u025b\3\2\2\2|"+ - "\u0264\3\2\2\2~\u0081\5\4\3\2\177\u0081\7s\2\2\u0080~\3\2\2\2\u0080\177"+ + "\27\3\30\3\30\3\30\3\30\3\30\3\31\3\31\5\31\u014d\n\31\3\31\3\31\5\31"+ + "\u0151\n\31\3\31\3\31\3\32\3\32\5\32\u0157\n\32\3\32\3\32\5\32\u015b\n"+ + "\32\3\32\3\32\3\33\3\33\3\33\5\33\u0162\n\33\3\33\7\33\u0165\n\33\f\33"+ + "\16\33\u0168\13\33\3\34\3\34\5\34\u016c\n\34\3\35\3\35\3\36\3\36\3\37"+ + "\3\37\3 \3 \3 \6 \u0177\n \r \16 \u0178\3!\3!\3\"\3\"\3#\3#\3$\3$\5$\u0183"+ + "\n$\3%\3%\3&\3&\3\'\3\'\5\'\u018b\n\'\3\'\3\'\3\'\5\'\u0190\n\'\3\'\7"+ + "\'\u0193\n\'\f\'\16\'\u0196\13\'\3\'\5\'\u0199\n\'\3\'\3\'\3(\3(\3)\3"+ + ")\3*\3*\3+\3+\3+\3+\3+\3+\5+\u01a9\n+\3,\3,\3,\3-\3-\3-\3-\5-\u01b2\n"+ + "-\3-\3-\5-\u01b6\n-\3-\3-\3-\3.\3.\3.\3/\3/\3/\3/\7/\u01c2\n/\f/\16/\u01c5"+ + "\13/\3/\3/\3\60\3\60\3\60\5\60\u01cc\n\60\3\60\7\60\u01cf\n\60\f\60\16"+ + "\60\u01d2\13\60\3\61\3\61\3\61\5\61\u01d7\n\61\3\61\7\61\u01da\n\61\f"+ + "\61\16\61\u01dd\13\61\3\62\3\62\3\62\3\62\5\62\u01e3\n\62\3\62\3\62\3"+ + "\62\3\62\3\62\5\62\u01ea\n\62\3\62\3\62\3\62\3\62\5\62\u01f0\n\62\3\62"+ + "\3\62\3\62\5\62\u01f5\n\62\3\63\3\63\3\63\3\64\3\64\3\64\5\64\u01fd\n"+ + "\64\3\64\7\64\u0200\n\64\f\64\16\64\u0203\13\64\3\65\3\65\3\65\3\65\5"+ + "\65\u0209\n\65\3\66\3\66\3\66\7\66\u020e\n\66\f\66\16\66\u0211\13\66\3"+ + "\67\3\67\3\67\5\67\u0216\n\67\3\67\7\67\u0219\n\67\f\67\16\67\u021c\13"+ + "\67\38\38\38\38\58\u0222\n8\39\39\39\59\u0227\n9\39\39\59\u022b\n9\39"+ + "\59\u022e\n9\39\59\u0231\n9\39\39\3:\3:\5:\u0237\n:\3:\3:\5:\u023b\n:"+ + "\3;\3;\5;\u023f\n;\3;\3;\5;\u0243\n;\3;\5;\u0246\n;\3;\5;\u0249\n;\3;"+ + "\3;\3<\3<\3=\3=\5=\u0251\n=\3=\3=\5=\u0255\n=\3=\3=\3=\5=\u025a\n=\3="+ + "\3=\3>\3>\3>\5>\u0261\n>\3>\3>\5>\u0265\n>\3?\3?\3?\5?\u026a\n?\3?\5?"+ + "\u026d\n?\3?\3?\3?\3?\2\3(@\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \""+ + "$&(*,.\60\62\64\668:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|\2\21\3\2\6\17\3"+ + "\2\24\34\3\2\37(\3\2)*\4\2\3\3+,\3\2.\61\3\2+,\3\2\62\65\3\2\66\67\3\2"+ + "IK\3\2IN\3\2OR\3\2uw\3\2TU\3\2_j\2\u02a8\2\u0082\3\2\2\2\4\u0089\3\2\2"+ + "\2\6\u008b\3\2\2\2\b\u00a9\3\2\2\2\n\u00ab\3\2\2\2\f\u00ae\3\2\2\2\16"+ + "\u00b4\3\2\2\2\20\u00c5\3\2\2\2\22\u00c7\3\2\2\2\24\u00cd\3\2\2\2\26\u00d5"+ + "\3\2\2\2\30\u00d8\3\2\2\2\32\u00db\3\2\2\2\34\u00dd\3\2\2\2\36\u00e1\3"+ + "\2\2\2 \u00e5\3\2\2\2\"\u00ed\3\2\2\2$\u00f6\3\2\2\2&\u00f8\3\2\2\2(\u010b"+ + "\3\2\2\2*\u013c\3\2\2\2,\u0141\3\2\2\2.\u0145\3\2\2\2\60\u014c\3\2\2\2"+ + "\62\u0156\3\2\2\2\64\u015e\3\2\2\2\66\u0169\3\2\2\28\u016d\3\2\2\2:\u016f"+ + "\3\2\2\2<\u0171\3\2\2\2>\u0173\3\2\2\2@\u017a\3\2\2\2B\u017c\3\2\2\2D"+ + "\u017e\3\2\2\2F\u0180\3\2\2\2H\u0184\3\2\2\2J\u0186\3\2\2\2L\u0188\3\2"+ + "\2\2N\u019c\3\2\2\2P\u019e\3\2\2\2R\u01a0\3\2\2\2T\u01a8\3\2\2\2V\u01aa"+ + "\3\2\2\2X\u01ad\3\2\2\2Z\u01ba\3\2\2\2\\\u01bd\3\2\2\2^\u01c8\3\2\2\2"+ + "`\u01d3\3\2\2\2b\u01de\3\2\2\2d\u01f6\3\2\2\2f\u01f9\3\2\2\2h\u0204\3"+ + "\2\2\2j\u020a\3\2\2\2l\u0212\3\2\2\2n\u021d\3\2\2\2p\u0223\3\2\2\2r\u0234"+ + "\3\2\2\2t\u023c\3\2\2\2v\u024c\3\2\2\2x\u024e\3\2\2\2z\u025d\3\2\2\2|"+ + "\u0266\3\2\2\2~\u0081\5\4\3\2\177\u0081\7s\2\2\u0080~\3\2\2\2\u0080\177"+ "\3\2\2\2\u0081\u0084\3\2\2\2\u0082\u0080\3\2\2\2\u0082\u0083\3\2\2\2\u0083"+ "\u0085\3\2\2\2\u0084\u0082\3\2\2\2\u0085\u0086\7\2\2\3\u0086\3\3\2\2\2"+ "\u0087\u008a\5\16\b\2\u0088\u008a\5\6\4\2\u0089\u0087\3\2\2\2\u0089\u0088"+ @@ -4493,135 +4497,136 @@ public class prog8Parser extends Parser { "\2\u00f3\u00f7\5> \2\u00f4\u00f7\5,\27\2\u00f5\u00f7\5.\30\2\u00f6\u00f1"+ "\3\2\2\2\u00f6\u00f2\3\2\2\2\u00f6\u00f3\3\2\2\2\u00f6\u00f4\3\2\2\2\u00f6"+ "\u00f5\3\2\2\2\u00f7%\3\2\2\2\u00f8\u00f9\5$\23\2\u00f9\u00fa\t\5\2\2"+ - "\u00fa\'\3\2\2\2\u00fb\u00fc\b\25\1\2\u00fc\u00fd\7+\2\2\u00fd\u00fe\5"+ - "(\25\2\u00fe\u00ff\7,\2\2\u00ff\u010c\3\2\2\2\u0100\u010c\5\60\31\2\u0101"+ - "\u0102\t\6\2\2\u0102\u010c\5(\25\27\u0103\u0104\7B\2\2\u0104\u010c\5("+ - "\25\n\u0105\u010c\5T+\2\u0106\u010c\5@!\2\u0107\u010c\5<\37\2\u0108\u010c"+ - "\5> \2\u0109\u010c\5,\27\2\u010a\u010c\5.\30\2\u010b\u00fb\3\2\2\2\u010b"+ - "\u0100\3\2\2\2\u010b\u0101\3\2\2\2\u010b\u0103\3\2\2\2\u010b\u0105\3\2"+ - "\2\2\u010b\u0106\3\2\2\2\u010b\u0107\3\2\2\2\u010b\u0108\3\2\2\2\u010b"+ - "\u0109\3\2\2\2\u010b\u010a\3\2\2\2\u010c\u0139\3\2\2\2\u010d\u010e\f\26"+ - "\2\2\u010e\u010f\7/\2\2\u010f\u0138\5(\25\27\u0110\u0111\f\25\2\2\u0111"+ - "\u0112\t\7\2\2\u0112\u0138\5(\25\26\u0113\u0114\f\24\2\2\u0114\u0115\t"+ - "\b\2\2\u0115\u0138\5(\25\25\u0116\u0117\f\23\2\2\u0117\u0118\t\t\2\2\u0118"+ - "\u0138\5(\25\24\u0119\u011a\f\22\2\2\u011a\u011b\t\n\2\2\u011b\u0138\5"+ - "(\25\23\u011c\u011d\f\21\2\2\u011d\u011e\7:\2\2\u011e\u0138\5(\25\22\u011f"+ - "\u0120\f\20\2\2\u0120\u0121\7;\2\2\u0121\u0138\5(\25\21\u0122\u0123\f"+ - "\17\2\2\u0123\u0124\7<\2\2\u0124\u0138\5(\25\20\u0125\u0126\f\r\2\2\u0126"+ - "\u0127\7?\2\2\u0127\u0138\5(\25\16\u0128\u0129\f\f\2\2\u0129\u012a\7@"+ - "\2\2\u012a\u0138\5(\25\r\u012b\u012c\f\13\2\2\u012c\u012d\7A\2\2\u012d"+ - "\u0138\5(\25\f\u012e\u012f\f\16\2\2\u012f\u0130\7=\2\2\u0130\u0133\5("+ - "\25\2\u0131\u0132\7>\2\2\u0132\u0134\5(\25\2\u0133\u0131\3\2\2\2\u0133"+ - "\u0134\3\2\2\2\u0134\u0138\3\2\2\2\u0135\u0136\f\3\2\2\u0136\u0138\5*"+ - "\26\2\u0137\u010d\3\2\2\2\u0137\u0110\3\2\2\2\u0137\u0113\3\2\2\2\u0137"+ - "\u0116\3\2\2\2\u0137\u0119\3\2\2\2\u0137\u011c\3\2\2\2\u0137\u011f\3\2"+ - "\2\2\u0137\u0122\3\2\2\2\u0137\u0125\3\2\2\2\u0137\u0128\3\2\2\2\u0137"+ - "\u012b\3\2\2\2\u0137\u012e\3\2\2\2\u0137\u0135\3\2\2\2\u0138\u013b\3\2"+ - "\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a)\3\2\2\2\u013b\u0139"+ - "\3\2\2\2\u013c\u013d\7C\2\2\u013d\u013e\5\32\16\2\u013e+\3\2\2\2\u013f"+ - "\u0142\5<\37\2\u0140\u0142\5> \2\u0141\u013f\3\2\2\2\u0141\u0140\3\2\2"+ - "\2\u0142\u0143\3\2\2\2\u0143\u0144\5\34\17\2\u0144-\3\2\2\2\u0145\u0146"+ - "\7D\2\2\u0146\u0147\5(\25\2\u0147/\3\2\2\2\u0148\u014b\5<\37\2\u0149\u014b"+ - "\5> \2\u014a\u0148\3\2\2\2\u014a\u0149\3\2\2\2\u014b\u014c\3\2\2\2\u014c"+ - "\u014e\7+\2\2\u014d\u014f\5\64\33\2\u014e\u014d\3\2\2\2\u014e\u014f\3"+ - "\2\2\2\u014f\u0150\3\2\2\2\u0150\u0151\7,\2\2\u0151\61\3\2\2\2\u0152\u0155"+ - "\5<\37\2\u0153\u0155\5> \2\u0154\u0152\3\2\2\2\u0154\u0153\3\2\2\2\u0155"+ - "\u0156\3\2\2\2\u0156\u0158\7+\2\2\u0157\u0159\5\64\33\2\u0158\u0157\3"+ - "\2\2\2\u0158\u0159\3\2\2\2\u0159\u015a\3\2\2\2\u015a\u015b\7,\2\2\u015b"+ - "\63\3\2\2\2\u015c\u0164\5(\25\2\u015d\u015f\7\20\2\2\u015e\u0160\7s\2"+ - "\2\u015f\u015e\3\2\2\2\u015f\u0160\3\2\2\2\u0160\u0161\3\2\2\2\u0161\u0163"+ - "\5(\25\2\u0162\u015d\3\2\2\2\u0163\u0166\3\2\2\2\u0164\u0162\3\2\2\2\u0164"+ - "\u0165\3\2\2\2\u0165\65\3\2\2\2\u0166\u0164\3\2\2\2\u0167\u0169\7E\2\2"+ - "\u0168\u016a\5\64\33\2\u0169\u0168\3\2\2\2\u0169\u016a\3\2\2\2\u016a\67"+ - "\3\2\2\2\u016b\u016c\7F\2\2\u016c9\3\2\2\2\u016d\u016e\7G\2\2\u016e;\3"+ - "\2\2\2\u016f\u0170\7t\2\2\u0170=\3\2\2\2\u0171\u0174\7t\2\2\u0172\u0173"+ - "\7H\2\2\u0173\u0175\7t\2\2\u0174\u0172\3\2\2\2\u0175\u0176\3\2\2\2\u0176"+ - "\u0174\3\2\2\2\u0176\u0177\3\2\2\2\u0177?\3\2\2\2\u0178\u0179\t\13\2\2"+ - "\u0179A\3\2\2\2\u017a\u017b\t\f\2\2\u017bC\3\2\2\2\u017c\u017d\t\r\2\2"+ - "\u017dE\3\2\2\2\u017e\u0180\t\16\2\2\u017f\u0181\5H%\2\u0180\u017f\3\2"+ - "\2\2\u0180\u0181\3\2\2\2\u0181G\3\2\2\2\u0182\u0183\7S\2\2\u0183I\3\2"+ - "\2\2\u0184\u0185\t\17\2\2\u0185K\3\2\2\2\u0186\u0188\7\35\2\2\u0187\u0189"+ - "\7s\2\2\u0188\u0187\3\2\2\2\u0188\u0189\3\2\2\2\u0189\u018a\3\2\2\2\u018a"+ - "\u0192\5(\25\2\u018b\u018d\7\20\2\2\u018c\u018e\7s\2\2\u018d\u018c\3\2"+ - "\2\2\u018d\u018e\3\2\2\2\u018e\u018f\3\2\2\2\u018f\u0191\5(\25\2\u0190"+ - "\u018b\3\2\2\2\u0191\u0194\3\2\2\2\u0192\u0190\3\2\2\2\u0192\u0193\3\2"+ - "\2\2\u0193\u0196\3\2\2\2\u0194\u0192\3\2\2\2\u0195\u0197\7s\2\2\u0196"+ - "\u0195\3\2\2\2\u0196\u0197\3\2\2\2\u0197\u0198\3\2\2\2\u0198\u0199\7\36"+ - "\2\2\u0199M\3\2\2\2\u019a\u019b\7y\2\2\u019bO\3\2\2\2\u019c\u019d\7{\2"+ - "\2\u019dQ\3\2\2\2\u019e\u019f\7x\2\2\u019fS\3\2\2\2\u01a0\u01a7\5F$\2"+ - "\u01a1\u01a7\5J&\2\u01a2\u01a7\5L\'\2\u01a3\u01a7\5N(\2\u01a4\u01a7\5"+ - "P)\2\u01a5\u01a7\5R*\2\u01a6\u01a0\3\2\2\2\u01a6\u01a1\3\2\2\2\u01a6\u01a2"+ - "\3\2\2\2\u01a6\u01a3\3\2\2\2\u01a6\u01a4\3\2\2\2\u01a6\u01a5\3\2\2\2\u01a7"+ - "U\3\2\2\2\u01a8\u01a9\7V\2\2\u01a9\u01aa\7z\2\2\u01aaW\3\2\2\2\u01ab\u01ac"+ - "\7W\2\2\u01ac\u01ad\5<\37\2\u01ad\u01af\7+\2\2\u01ae\u01b0\5^\60\2\u01af"+ - "\u01ae\3\2\2\2\u01af\u01b0\3\2\2\2\u01b0\u01b1\3\2\2\2\u01b1\u01b3\7,"+ - "\2\2\u01b2\u01b4\5Z.\2\u01b3\u01b2\3\2\2\2\u01b3\u01b4\3\2\2\2\u01b4\u01b5"+ - "\3\2\2\2\u01b5\u01b6\5\\/\2\u01b6\u01b7\7s\2\2\u01b7Y\3\2\2\2\u01b8\u01b9"+ - "\7X\2\2\u01b9\u01ba\5`\61\2\u01ba[\3\2\2\2\u01bb\u01bc\7Y\2\2\u01bc\u01c1"+ - "\7s\2\2\u01bd\u01c0\5\b\5\2\u01be\u01c0\7s\2\2\u01bf\u01bd\3\2\2\2\u01bf"+ - "\u01be\3\2\2\2\u01c0\u01c3\3\2\2\2\u01c1\u01bf\3\2\2\2\u01c1\u01c2\3\2"+ - "\2\2\u01c2\u01c4\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c4\u01c5\7Z\2\2\u01c5"+ - "]\3\2\2\2\u01c6\u01ce\5\22\n\2\u01c7\u01c9\7\20\2\2\u01c8\u01ca\7s\2\2"+ - "\u01c9\u01c8\3\2\2\2\u01c9\u01ca\3\2\2\2\u01ca\u01cb\3\2\2\2\u01cb\u01cd"+ - "\5\22\n\2\u01cc\u01c7\3\2\2\2\u01cd\u01d0\3\2\2\2\u01ce\u01cc\3\2\2\2"+ - "\u01ce\u01cf\3\2\2\2\u01cf_\3\2\2\2\u01d0\u01ce\3\2\2\2\u01d1\u01d9\5"+ - "\32\16\2\u01d2\u01d4\7\20\2\2\u01d3\u01d5\7s\2\2\u01d4\u01d3\3\2\2\2\u01d4"+ - "\u01d5\3\2\2\2\u01d5\u01d6\3\2\2\2\u01d6\u01d8\5\32\16\2\u01d7\u01d2\3"+ - "\2\2\2\u01d8\u01db\3\2\2\2\u01d9\u01d7\3\2\2\2\u01d9\u01da\3\2\2\2\u01da"+ - "a\3\2\2\2\u01db\u01d9\3\2\2\2\u01dc\u01dd\7[\2\2\u01dd\u01de\5<\37\2\u01de"+ - "\u01e0\7+\2\2\u01df\u01e1\5f\64\2\u01e0\u01df\3\2\2\2\u01e0\u01e1\3\2"+ - "\2\2\u01e1\u01e2\3\2\2\2\u01e2\u01e3\7,\2\2\u01e3\u01e4\7X\2\2\u01e4\u01e5"+ - "\7\\\2\2\u01e5\u01e7\7+\2\2\u01e6\u01e8\5j\66\2\u01e7\u01e6\3\2\2\2\u01e7"+ - "\u01e8\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9\u01ea\7,\2\2\u01ea\u01eb\7X\2"+ - "\2\u01eb\u01ed\7+\2\2\u01ec\u01ee\5l\67\2\u01ed\u01ec\3\2\2\2\u01ed\u01ee"+ - "\3\2\2\2\u01ee\u01ef\3\2\2\2\u01ef\u01f2\7,\2\2\u01f0\u01f3\5d\63\2\u01f1"+ - "\u01f3\5\\/\2\u01f2\u01f0\3\2\2\2\u01f2\u01f1\3\2\2\2\u01f3c\3\2\2\2\u01f4"+ - "\u01f5\7\21\2\2\u01f5\u01f6\5F$\2\u01f6e\3\2\2\2\u01f7\u01ff\5h\65\2\u01f8"+ - "\u01fa\7\20\2\2\u01f9\u01fb\7s\2\2\u01fa\u01f9\3\2\2\2\u01fa\u01fb\3\2"+ - "\2\2\u01fb\u01fc\3\2\2\2\u01fc\u01fe\5h\65\2\u01fd\u01f8\3\2\2\2\u01fe"+ - "\u0201\3\2\2\2\u01ff\u01fd\3\2\2\2\u01ff\u0200\3\2\2\2\u0200g\3\2\2\2"+ - "\u0201\u01ff\3\2\2\2\u0202\u0203\5\22\n\2\u0203\u0206\7D\2\2\u0204\u0207"+ - "\5B\"\2\u0205\u0207\5D#\2\u0206\u0204\3\2\2\2\u0206\u0205\3\2\2\2\u0207"+ - "i\3\2\2\2\u0208\u020d\5@!\2\u0209\u020a\7\20\2\2\u020a\u020c\5@!\2\u020b"+ - "\u0209\3\2\2\2\u020c\u020f\3\2\2\2\u020d\u020b\3\2\2\2\u020d\u020e\3\2"+ - "\2\2\u020ek\3\2\2\2\u020f\u020d\3\2\2\2\u0210\u0218\5n8\2\u0211\u0213"+ - "\7\20\2\2\u0212\u0214\7s\2\2\u0213\u0212\3\2\2\2\u0213\u0214\3\2\2\2\u0214"+ - "\u0215\3\2\2\2\u0215\u0217\5n8\2\u0216\u0211\3\2\2\2\u0217\u021a\3\2\2"+ - "\2\u0218\u0216\3\2\2\2\u0218\u0219\3\2\2\2\u0219m\3\2\2\2\u021a\u0218"+ - "\3\2\2\2\u021b\u021c\5\32\16\2\u021c\u021f\7D\2\2\u021d\u0220\5B\"\2\u021e"+ - "\u0220\5D#\2\u021f\u021d\3\2\2\2\u021f\u021e\3\2\2\2\u0220o\3\2\2\2\u0221"+ - "\u0222\7]\2\2\u0222\u0224\5(\25\2\u0223\u0225\7s\2\2\u0224\u0223\3\2\2"+ - "\2\u0224\u0225\3\2\2\2\u0225\u0228\3\2\2\2\u0226\u0229\5\b\5\2\u0227\u0229"+ - "\5\\/\2\u0228\u0226\3\2\2\2\u0228\u0227\3\2\2\2\u0229\u022b\3\2\2\2\u022a"+ - "\u022c\7s\2\2\u022b\u022a\3\2\2\2\u022b\u022c\3\2\2\2\u022c\u022e\3\2"+ - "\2\2\u022d\u022f\5r:\2\u022e\u022d\3\2\2\2\u022e\u022f\3\2\2\2\u022f\u0230"+ - "\3\2\2\2\u0230\u0231\7s\2\2\u0231q\3\2\2\2\u0232\u0234\7^\2\2\u0233\u0235"+ - "\7s\2\2\u0234\u0233\3\2\2\2\u0234\u0235\3\2\2\2\u0235\u0238\3\2\2\2\u0236"+ - "\u0239\5\b\5\2\u0237\u0239\5\\/\2\u0238\u0236\3\2\2\2\u0238\u0237\3\2"+ - "\2\2\u0239s\3\2\2\2\u023a\u023c\5v<\2\u023b\u023d\7s\2\2\u023c\u023b\3"+ - "\2\2\2\u023c\u023d\3\2\2\2\u023d\u0240\3\2\2\2\u023e\u0241\5\b\5\2\u023f"+ - "\u0241\5\\/\2\u0240\u023e\3\2\2\2\u0240\u023f\3\2\2\2\u0241\u0243\3\2"+ - "\2\2\u0242\u0244\7s\2\2\u0243\u0242\3\2\2\2\u0243\u0244\3\2\2\2\u0244"+ - "\u0246\3\2\2\2\u0245\u0247\5r:\2\u0246\u0245\3\2\2\2\u0246\u0247\3\2\2"+ - "\2\u0247\u0248\3\2\2\2\u0248\u0249\7s\2\2\u0249u\3\2\2\2\u024a\u024b\t"+ - "\20\2\2\u024bw\3\2\2\2\u024c\u024e\7k\2\2\u024d\u024f\5\32\16\2\u024e"+ - "\u024d\3\2\2\2\u024e\u024f\3\2\2\2\u024f\u0252\3\2\2\2\u0250\u0253\5@"+ - "!\2\u0251\u0253\5<\37\2\u0252\u0250\3\2\2\2\u0252\u0251\3\2\2\2\u0253"+ - "\u0254\3\2\2\2\u0254\u0255\7l\2\2\u0255\u0257\5(\25\2\u0256\u0258\7s\2"+ - "\2\u0257\u0256\3\2\2\2\u0257\u0258\3\2\2\2\u0258\u0259\3\2\2\2\u0259\u025a"+ - "\5\\/\2\u025ay\3\2\2\2\u025b\u025c\7m\2\2\u025c\u025e\5(\25\2\u025d\u025f"+ - "\7s\2\2\u025e\u025d\3\2\2\2\u025e\u025f\3\2\2\2\u025f\u0262\3\2\2\2\u0260"+ - "\u0263\5\b\5\2\u0261\u0263\5\\/\2\u0262\u0260\3\2\2\2\u0262\u0261\3\2"+ - "\2\2\u0263{\3\2\2\2\u0264\u0267\7n\2\2\u0265\u0268\5\b\5\2\u0266\u0268"+ - "\5\\/\2\u0267\u0265\3\2\2\2\u0267\u0266\3\2\2\2\u0268\u026a\3\2\2\2\u0269"+ - "\u026b\7s\2\2\u026a\u0269\3\2\2\2\u026a\u026b\3\2\2\2\u026b\u026c\3\2"+ - "\2\2\u026c\u026d\7o\2\2\u026d\u026e\5(\25\2\u026e}\3\2\2\2G\u0080\u0082"+ + "\u00fa\'\3\2\2\2\u00fb\u00fc\b\25\1\2\u00fc\u010c\5\60\31\2\u00fd\u00fe"+ + "\t\6\2\2\u00fe\u010c\5(\25\30\u00ff\u0100\7@\2\2\u0100\u010c\5(\25\13"+ + "\u0101\u010c\5T+\2\u0102\u010c\5@!\2\u0103\u010c\5<\37\2\u0104\u010c\5"+ + "> \2\u0105\u010c\5,\27\2\u0106\u010c\5.\30\2\u0107\u0108\7A\2\2\u0108"+ + "\u0109\5(\25\2\u0109\u010a\7B\2\2\u010a\u010c\3\2\2\2\u010b\u00fb\3\2"+ + "\2\2\u010b\u00fd\3\2\2\2\u010b\u00ff\3\2\2\2\u010b\u0101\3\2\2\2\u010b"+ + "\u0102\3\2\2\2\u010b\u0103\3\2\2\2\u010b\u0104\3\2\2\2\u010b\u0105\3\2"+ + "\2\2\u010b\u0106\3\2\2\2\u010b\u0107\3\2\2\2\u010c\u0139\3\2\2\2\u010d"+ + "\u010e\f\27\2\2\u010e\u010f\7-\2\2\u010f\u0138\5(\25\30\u0110\u0111\f"+ + "\26\2\2\u0111\u0112\t\7\2\2\u0112\u0138\5(\25\27\u0113\u0114\f\25\2\2"+ + "\u0114\u0115\t\b\2\2\u0115\u0138\5(\25\26\u0116\u0117\f\24\2\2\u0117\u0118"+ + "\t\t\2\2\u0118\u0138\5(\25\25\u0119\u011a\f\23\2\2\u011a\u011b\t\n\2\2"+ + "\u011b\u0138\5(\25\24\u011c\u011d\f\22\2\2\u011d\u011e\78\2\2\u011e\u0138"+ + "\5(\25\23\u011f\u0120\f\21\2\2\u0120\u0121\79\2\2\u0121\u0138\5(\25\22"+ + "\u0122\u0123\f\20\2\2\u0123\u0124\7:\2\2\u0124\u0138\5(\25\21\u0125\u0126"+ + "\f\16\2\2\u0126\u0127\7=\2\2\u0127\u0138\5(\25\17\u0128\u0129\f\r\2\2"+ + "\u0129\u012a\7>\2\2\u012a\u0138\5(\25\16\u012b\u012c\f\f\2\2\u012c\u012d"+ + "\7?\2\2\u012d\u0138\5(\25\r\u012e\u012f\f\17\2\2\u012f\u0130\7;\2\2\u0130"+ + "\u0133\5(\25\2\u0131\u0132\7<\2\2\u0132\u0134\5(\25\2\u0133\u0131\3\2"+ + "\2\2\u0133\u0134\3\2\2\2\u0134\u0138\3\2\2\2\u0135\u0136\f\4\2\2\u0136"+ + "\u0138\5*\26\2\u0137\u010d\3\2\2\2\u0137\u0110\3\2\2\2\u0137\u0113\3\2"+ + "\2\2\u0137\u0116\3\2\2\2\u0137\u0119\3\2\2\2\u0137\u011c\3\2\2\2\u0137"+ + "\u011f\3\2\2\2\u0137\u0122\3\2\2\2\u0137\u0125\3\2\2\2\u0137\u0128\3\2"+ + "\2\2\u0137\u012b\3\2\2\2\u0137\u012e\3\2\2\2\u0137\u0135\3\2\2\2\u0138"+ + "\u013b\3\2\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a)\3\2\2\2"+ + "\u013b\u0139\3\2\2\2\u013c\u013d\7C\2\2\u013d\u013e\5\32\16\2\u013e+\3"+ + "\2\2\2\u013f\u0142\5<\37\2\u0140\u0142\5> \2\u0141\u013f\3\2\2\2\u0141"+ + "\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0144\5\34\17\2\u0144-\3\2\2"+ + "\2\u0145\u0146\7D\2\2\u0146\u0147\7A\2\2\u0147\u0148\5(\25\2\u0148\u0149"+ + "\7B\2\2\u0149/\3\2\2\2\u014a\u014d\5<\37\2\u014b\u014d\5> \2\u014c\u014a"+ + "\3\2\2\2\u014c\u014b\3\2\2\2\u014d\u014e\3\2\2\2\u014e\u0150\7A\2\2\u014f"+ + "\u0151\5\64\33\2\u0150\u014f\3\2\2\2\u0150\u0151\3\2\2\2\u0151\u0152\3"+ + "\2\2\2\u0152\u0153\7B\2\2\u0153\61\3\2\2\2\u0154\u0157\5<\37\2\u0155\u0157"+ + "\5> \2\u0156\u0154\3\2\2\2\u0156\u0155\3\2\2\2\u0157\u0158\3\2\2\2\u0158"+ + "\u015a\7A\2\2\u0159\u015b\5\64\33\2\u015a\u0159\3\2\2\2\u015a\u015b\3"+ + "\2\2\2\u015b\u015c\3\2\2\2\u015c\u015d\7B\2\2\u015d\63\3\2\2\2\u015e\u0166"+ + "\5(\25\2\u015f\u0161\7\20\2\2\u0160\u0162\7s\2\2\u0161\u0160\3\2\2\2\u0161"+ + "\u0162\3\2\2\2\u0162\u0163\3\2\2\2\u0163\u0165\5(\25\2\u0164\u015f\3\2"+ + "\2\2\u0165\u0168\3\2\2\2\u0166\u0164\3\2\2\2\u0166\u0167\3\2\2\2\u0167"+ + "\65\3\2\2\2\u0168\u0166\3\2\2\2\u0169\u016b\7E\2\2\u016a\u016c\5\64\33"+ + "\2\u016b\u016a\3\2\2\2\u016b\u016c\3\2\2\2\u016c\67\3\2\2\2\u016d\u016e"+ + "\7F\2\2\u016e9\3\2\2\2\u016f\u0170\7G\2\2\u0170;\3\2\2\2\u0171\u0172\7"+ + "t\2\2\u0172=\3\2\2\2\u0173\u0176\7t\2\2\u0174\u0175\7H\2\2\u0175\u0177"+ + "\7t\2\2\u0176\u0174\3\2\2\2\u0177\u0178\3\2\2\2\u0178\u0176\3\2\2\2\u0178"+ + "\u0179\3\2\2\2\u0179?\3\2\2\2\u017a\u017b\t\13\2\2\u017bA\3\2\2\2\u017c"+ + "\u017d\t\f\2\2\u017dC\3\2\2\2\u017e\u017f\t\r\2\2\u017fE\3\2\2\2\u0180"+ + "\u0182\t\16\2\2\u0181\u0183\5H%\2\u0182\u0181\3\2\2\2\u0182\u0183\3\2"+ + "\2\2\u0183G\3\2\2\2\u0184\u0185\7S\2\2\u0185I\3\2\2\2\u0186\u0187\t\17"+ + "\2\2\u0187K\3\2\2\2\u0188\u018a\7\35\2\2\u0189\u018b\7s\2\2\u018a\u0189"+ + "\3\2\2\2\u018a\u018b\3\2\2\2\u018b\u018c\3\2\2\2\u018c\u0194\5(\25\2\u018d"+ + "\u018f\7\20\2\2\u018e\u0190\7s\2\2\u018f\u018e\3\2\2\2\u018f\u0190\3\2"+ + "\2\2\u0190\u0191\3\2\2\2\u0191\u0193\5(\25\2\u0192\u018d\3\2\2\2\u0193"+ + "\u0196\3\2\2\2\u0194\u0192\3\2\2\2\u0194\u0195\3\2\2\2\u0195\u0198\3\2"+ + "\2\2\u0196\u0194\3\2\2\2\u0197\u0199\7s\2\2\u0198\u0197\3\2\2\2\u0198"+ + "\u0199\3\2\2\2\u0199\u019a\3\2\2\2\u019a\u019b\7\36\2\2\u019bM\3\2\2\2"+ + "\u019c\u019d\7y\2\2\u019dO\3\2\2\2\u019e\u019f\7{\2\2\u019fQ\3\2\2\2\u01a0"+ + "\u01a1\7x\2\2\u01a1S\3\2\2\2\u01a2\u01a9\5F$\2\u01a3\u01a9\5J&\2\u01a4"+ + "\u01a9\5L\'\2\u01a5\u01a9\5N(\2\u01a6\u01a9\5P)\2\u01a7\u01a9\5R*\2\u01a8"+ + "\u01a2\3\2\2\2\u01a8\u01a3\3\2\2\2\u01a8\u01a4\3\2\2\2\u01a8\u01a5\3\2"+ + "\2\2\u01a8\u01a6\3\2\2\2\u01a8\u01a7\3\2\2\2\u01a9U\3\2\2\2\u01aa\u01ab"+ + "\7V\2\2\u01ab\u01ac\7z\2\2\u01acW\3\2\2\2\u01ad\u01ae\7W\2\2\u01ae\u01af"+ + "\5<\37\2\u01af\u01b1\7A\2\2\u01b0\u01b2\5^\60\2\u01b1\u01b0\3\2\2\2\u01b1"+ + "\u01b2\3\2\2\2\u01b2\u01b3\3\2\2\2\u01b3\u01b5\7B\2\2\u01b4\u01b6\5Z."+ + "\2\u01b5\u01b4\3\2\2\2\u01b5\u01b6\3\2\2\2\u01b6\u01b7\3\2\2\2\u01b7\u01b8"+ + "\5\\/\2\u01b8\u01b9\7s\2\2\u01b9Y\3\2\2\2\u01ba\u01bb\7X\2\2\u01bb\u01bc"+ + "\5`\61\2\u01bc[\3\2\2\2\u01bd\u01be\7Y\2\2\u01be\u01c3\7s\2\2\u01bf\u01c2"+ + "\5\b\5\2\u01c0\u01c2\7s\2\2\u01c1\u01bf\3\2\2\2\u01c1\u01c0\3\2\2\2\u01c2"+ + "\u01c5\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c3\u01c4\3\2\2\2\u01c4\u01c6\3\2"+ + "\2\2\u01c5\u01c3\3\2\2\2\u01c6\u01c7\7Z\2\2\u01c7]\3\2\2\2\u01c8\u01d0"+ + "\5\22\n\2\u01c9\u01cb\7\20\2\2\u01ca\u01cc\7s\2\2\u01cb\u01ca\3\2\2\2"+ + "\u01cb\u01cc\3\2\2\2\u01cc\u01cd\3\2\2\2\u01cd\u01cf\5\22\n\2\u01ce\u01c9"+ + "\3\2\2\2\u01cf\u01d2\3\2\2\2\u01d0\u01ce\3\2\2\2\u01d0\u01d1\3\2\2\2\u01d1"+ + "_\3\2\2\2\u01d2\u01d0\3\2\2\2\u01d3\u01db\5\32\16\2\u01d4\u01d6\7\20\2"+ + "\2\u01d5\u01d7\7s\2\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7\u01d8"+ + "\3\2\2\2\u01d8\u01da\5\32\16\2\u01d9\u01d4\3\2\2\2\u01da\u01dd\3\2\2\2"+ + "\u01db\u01d9\3\2\2\2\u01db\u01dc\3\2\2\2\u01dca\3\2\2\2\u01dd\u01db\3"+ + "\2\2\2\u01de\u01df\7[\2\2\u01df\u01e0\5<\37\2\u01e0\u01e2\7A\2\2\u01e1"+ + "\u01e3\5f\64\2\u01e2\u01e1\3\2\2\2\u01e2\u01e3\3\2\2\2\u01e3\u01e4\3\2"+ + "\2\2\u01e4\u01e5\7B\2\2\u01e5\u01e6\7X\2\2\u01e6\u01e7\7\\\2\2\u01e7\u01e9"+ + "\7A\2\2\u01e8\u01ea\5j\66\2\u01e9\u01e8\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea"+ + "\u01eb\3\2\2\2\u01eb\u01ec\7B\2\2\u01ec\u01ed\7X\2\2\u01ed\u01ef\7A\2"+ + "\2\u01ee\u01f0\5l\67\2\u01ef\u01ee\3\2\2\2\u01ef\u01f0\3\2\2\2\u01f0\u01f1"+ + "\3\2\2\2\u01f1\u01f4\7B\2\2\u01f2\u01f5\5d\63\2\u01f3\u01f5\5\\/\2\u01f4"+ + "\u01f2\3\2\2\2\u01f4\u01f3\3\2\2\2\u01f5c\3\2\2\2\u01f6\u01f7\7\21\2\2"+ + "\u01f7\u01f8\5F$\2\u01f8e\3\2\2\2\u01f9\u0201\5h\65\2\u01fa\u01fc\7\20"+ + "\2\2\u01fb\u01fd\7s\2\2\u01fc\u01fb\3\2\2\2\u01fc\u01fd\3\2\2\2\u01fd"+ + "\u01fe\3\2\2\2\u01fe\u0200\5h\65\2\u01ff\u01fa\3\2\2\2\u0200\u0203\3\2"+ + "\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2\2\2\u0202g\3\2\2\2\u0203\u0201"+ + "\3\2\2\2\u0204\u0205\5\22\n\2\u0205\u0208\7D\2\2\u0206\u0209\5B\"\2\u0207"+ + "\u0209\5D#\2\u0208\u0206\3\2\2\2\u0208\u0207\3\2\2\2\u0209i\3\2\2\2\u020a"+ + "\u020f\5@!\2\u020b\u020c\7\20\2\2\u020c\u020e\5@!\2\u020d\u020b\3\2\2"+ + "\2\u020e\u0211\3\2\2\2\u020f\u020d\3\2\2\2\u020f\u0210\3\2\2\2\u0210k"+ + "\3\2\2\2\u0211\u020f\3\2\2\2\u0212\u021a\5n8\2\u0213\u0215\7\20\2\2\u0214"+ + "\u0216\7s\2\2\u0215\u0214\3\2\2\2\u0215\u0216\3\2\2\2\u0216\u0217\3\2"+ + "\2\2\u0217\u0219\5n8\2\u0218\u0213\3\2\2\2\u0219\u021c\3\2\2\2\u021a\u0218"+ + "\3\2\2\2\u021a\u021b\3\2\2\2\u021bm\3\2\2\2\u021c\u021a\3\2\2\2\u021d"+ + "\u021e\5\32\16\2\u021e\u0221\7D\2\2\u021f\u0222\5B\"\2\u0220\u0222\5D"+ + "#\2\u0221\u021f\3\2\2\2\u0221\u0220\3\2\2\2\u0222o\3\2\2\2\u0223\u0224"+ + "\7]\2\2\u0224\u0226\5(\25\2\u0225\u0227\7s\2\2\u0226\u0225\3\2\2\2\u0226"+ + "\u0227\3\2\2\2\u0227\u022a\3\2\2\2\u0228\u022b\5\b\5\2\u0229\u022b\5\\"+ + "/\2\u022a\u0228\3\2\2\2\u022a\u0229\3\2\2\2\u022b\u022d\3\2\2\2\u022c"+ + "\u022e\7s\2\2\u022d\u022c\3\2\2\2\u022d\u022e\3\2\2\2\u022e\u0230\3\2"+ + "\2\2\u022f\u0231\5r:\2\u0230\u022f\3\2\2\2\u0230\u0231\3\2\2\2\u0231\u0232"+ + "\3\2\2\2\u0232\u0233\7s\2\2\u0233q\3\2\2\2\u0234\u0236\7^\2\2\u0235\u0237"+ + "\7s\2\2\u0236\u0235\3\2\2\2\u0236\u0237\3\2\2\2\u0237\u023a\3\2\2\2\u0238"+ + "\u023b\5\b\5\2\u0239\u023b\5\\/\2\u023a\u0238\3\2\2\2\u023a\u0239\3\2"+ + "\2\2\u023bs\3\2\2\2\u023c\u023e\5v<\2\u023d\u023f\7s\2\2\u023e\u023d\3"+ + "\2\2\2\u023e\u023f\3\2\2\2\u023f\u0242\3\2\2\2\u0240\u0243\5\b\5\2\u0241"+ + "\u0243\5\\/\2\u0242\u0240\3\2\2\2\u0242\u0241\3\2\2\2\u0243\u0245\3\2"+ + "\2\2\u0244\u0246\7s\2\2\u0245\u0244\3\2\2\2\u0245\u0246\3\2\2\2\u0246"+ + "\u0248\3\2\2\2\u0247\u0249\5r:\2\u0248\u0247\3\2\2\2\u0248\u0249\3\2\2"+ + "\2\u0249\u024a\3\2\2\2\u024a\u024b\7s\2\2\u024bu\3\2\2\2\u024c\u024d\t"+ + "\20\2\2\u024dw\3\2\2\2\u024e\u0250\7k\2\2\u024f\u0251\5\32\16\2\u0250"+ + "\u024f\3\2\2\2\u0250\u0251\3\2\2\2\u0251\u0254\3\2\2\2\u0252\u0255\5@"+ + "!\2\u0253\u0255\5<\37\2\u0254\u0252\3\2\2\2\u0254\u0253\3\2\2\2\u0255"+ + "\u0256\3\2\2\2\u0256\u0257\7l\2\2\u0257\u0259\5(\25\2\u0258\u025a\7s\2"+ + "\2\u0259\u0258\3\2\2\2\u0259\u025a\3\2\2\2\u025a\u025b\3\2\2\2\u025b\u025c"+ + "\5\\/\2\u025cy\3\2\2\2\u025d\u025e\7m\2\2\u025e\u0260\5(\25\2\u025f\u0261"+ + "\7s\2\2\u0260\u025f\3\2\2\2\u0260\u0261\3\2\2\2\u0261\u0264\3\2\2\2\u0262"+ + "\u0265\5\b\5\2\u0263\u0265\5\\/\2\u0264\u0262\3\2\2\2\u0264\u0263\3\2"+ + "\2\2\u0265{\3\2\2\2\u0266\u0269\7n\2\2\u0267\u026a\5\b\5\2\u0268\u026a"+ + "\5\\/\2\u0269\u0267\3\2\2\2\u0269\u0268\3\2\2\2\u026a\u026c\3\2\2\2\u026b"+ + "\u026d\7s\2\2\u026c\u026b\3\2\2\2\u026c\u026d\3\2\2\2\u026d\u026e\3\2"+ + "\2\2\u026e\u026f\7o\2\2\u026f\u0270\5(\25\2\u0270}\3\2\2\2G\u0080\u0082"+ "\u0089\u008e\u00a9\u00b2\u00b6\u00bd\u00c0\u00c5\u00c9\u00cf\u00ea\u00f6"+ - "\u010b\u0133\u0137\u0139\u0141\u014a\u014e\u0154\u0158\u015f\u0164\u0169"+ - "\u0176\u0180\u0188\u018d\u0192\u0196\u01a6\u01af\u01b3\u01bf\u01c1\u01c9"+ - "\u01ce\u01d4\u01d9\u01e0\u01e7\u01ed\u01f2\u01fa\u01ff\u0206\u020d\u0213"+ - "\u0218\u021f\u0224\u0228\u022b\u022e\u0234\u0238\u023c\u0240\u0243\u0246"+ - "\u024e\u0252\u0257\u025e\u0262\u0267\u026a"; + "\u010b\u0133\u0137\u0139\u0141\u014c\u0150\u0156\u015a\u0161\u0166\u016b"+ + "\u0178\u0182\u018a\u018f\u0194\u0198\u01a8\u01b1\u01b5\u01c1\u01c3\u01cb"+ + "\u01d0\u01d6\u01db\u01e2\u01e9\u01ef\u01f4\u01fc\u0201\u0208\u020f\u0215"+ + "\u021a\u0221\u0226\u022a\u022d\u0230\u0236\u023a\u023e\u0242\u0245\u0248"+ + "\u0250\u0254\u0259\u0260\u0264\u0269\u026c"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/compiler/src/prog8/stackvm/StackVm.kt b/compiler/src/prog8/stackvm/StackVm.kt index 6e0144d6b..7154ee503 100644 --- a/compiler/src/prog8/stackvm/StackVm.kt +++ b/compiler/src/prog8/stackvm/StackVm.kt @@ -325,6 +325,16 @@ class StackVm(private var traceOutputFile: String?) { checkDt(value, DataType.UBYTE) TODO("pop_memwrite $value to $address") } + Opcode.POP_INC_MEMORY -> { + val address = evalstack.pop() + checkDt(address, DataType.UWORD) + TODO("pop_inc_memory $address") + } + Opcode.POP_DEC_MEMORY -> { + val address = evalstack.pop() + checkDt(address, DataType.UWORD) + TODO("pop_dec_memory $address") + } Opcode.ADD_UB -> { val (top, second) = evalstack.pop2() checkDt(top, DataType.UBYTE) diff --git a/docs/source/programming.rst b/docs/source/programming.rst index 3808dadc1..9cd69af20 100644 --- a/docs/source/programming.rst +++ b/docs/source/programming.rst @@ -421,11 +421,11 @@ Normally memory locations are accessed by a *memory mapped* name, such as ``c64. as the memory mapped address $d021. If you want to access a memory location directly (by using the address itself), without defining -a memory mapped location, you can do so by prefixing the address with ``@``:: +a memory mapped location, you can do so by enclosing the address in ``@(...)``:: - A = @$d020 ; set the A register to the current c64 screen border color ("peek(53280)") - @$d020 = 0 ; set the c64 screen border to black ("poke 53280,0") - @(vic+$20) = 6 ; you can also use expressions to 'calculate' the address + A = @($d020) ; set the A register to the current c64 screen border color ("peek(53280)") + @($d020) = 0 ; set the c64 screen border to black ("poke 53280,0") + @(vic+$20) = 6 ; you can also use expressions to 'calculate' the address Expressions diff --git a/docs/source/syntaxreference.rst b/docs/source/syntaxreference.rst index 0c6e7b93f..7c3174b92 100644 --- a/docs/source/syntaxreference.rst +++ b/docs/source/syntaxreference.rst @@ -300,11 +300,11 @@ should be the *memory address* where the value is located:: Direct access to memory locations ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Instead of defining a memory mapped name for a specific memory location, you can also -directly access the memory. Prefix a numeric expression or literal by ``@`` to do that:: +directly access the memory. Enclose a numeric expression or literal with ``@(...)`` to do that:: - A = @$d020 ; set the A register to the current c64 screen border color ("peek(53280)") - @$d020 = 0 ; set the c64 screen border to black ("poke 53280,0") - @(vic+$20) = 6 ; a dynamic expression to 'calculate' the address + A = @($d020) ; set the A register to the current c64 screen border color ("peek(53280)") + @($d020) = 0 ; set the c64 screen border to black ("poke 53280,0") + @(vic+$20) = 6 ; a dynamic expression to 'calculate' the address Constants