diff --git a/compiler/antlr/prog8.g4 b/compiler/antlr/prog8.g4
index 764b0bceb..137e4eb2c 100644
--- a/compiler/antlr/prog8.g4
+++ b/compiler/antlr/prog8.g4
@@ -120,6 +120,7 @@ assign_target:
| identifier
| scoped_identifier
| arrayindexed
+ | directmemory
;
postincrdecr : assign_target operator = ('++' | '--') ;
@@ -146,6 +147,7 @@ expression :
| identifier
| scoped_identifier
| arrayindexed
+ | directmemory
| expression typecast
;
@@ -157,6 +159,8 @@ arrayindexed :
(identifier | scoped_identifier ) arrayspec
;
+directmemory : '@' expression ;
+
functioncall :
(identifier | scoped_identifier) '(' expression_list? ')'
diff --git a/compiler/examples/sprites.p8 b/compiler/examples/sprites.p8
new file mode 100644
index 000000000..76f64c72f
--- /dev/null
+++ b/compiler/examples/sprites.p8
@@ -0,0 +1,21 @@
+%import c64lib
+%import c64utils
+
+~ main {
+
+ sub start() {
+
+ c64.STROUT("balloon sprites!\n")
+
+ const uword SP0X = $d000 ; @todo "address-of" operator '&' so we can write &c64.SP0X
+ const uword SP0Y = $d001 ; @todo "address-of" operator '&' so we can write &c64.SP0Y
+
+ for ubyte i in 0 to 7 {
+ @(SP0X+i*2) = 30+i*30
+ @(SP0Y+i*2) = 100+i*10
+ }
+
+ c64.SPENA = 255 ; enable all sprites
+ }
+
+}
diff --git a/compiler/examples/test.p8 b/compiler/examples/test.p8
index f1152c634..61fc390a6 100644
--- a/compiler/examples/test.p8
+++ b/compiler/examples/test.p8
@@ -1,95 +1,17 @@
%import c64utils
-%option enable_floats
~ main {
- float[10] xcoor = [1,2,3,4,5,6,7,8,9.9,11.11 ]
- float[10] ycoor = [11,22,33,44,55,66,77,88,99.9,111.11 ]
- float[10] zcoor = [111,222,333,444,555,666,777,888,999.9,1001.11 ]
-
sub start() {
- c64scr.print("\nxcoor:\n")
- for float f1 in xcoor {
- c64flt.print_f(f1)
- c64.CHROUT(',')
- }
- c64.CHROUT('\n')
- c64scr.print("ycoor:\n")
- for float f2 in ycoor {
- c64flt.print_f(f2)
- c64.CHROUT(',')
- }
- c64.CHROUT('\n')
- c64scr.print("zcoor:\n")
- for float f3 in zcoor {
- c64flt.print_f(f3)
- c64.CHROUT(',')
- }
- c64.CHROUT('\n')
+ uword vic = $d000
+ const uword cvic = $d000
- c64.CHROUT('X')
- c64scr.print_ub(X)
- c64.CHROUT('\n')
- float avgfx = avg(xcoor)
- float avgfy = avg(ycoor)
- float avgfz = avg(zcoor)
- c64.CHROUT('X')
- c64scr.print_ub(X)
- c64.CHROUT('\n')
+ @(cvic+$20) = 7
+ @(cvic+$21) = @(cvic+$20)
- c64scr.print("avgfx=")
- c64flt.print_f(avgfx)
- c64.CHROUT('\n')
- c64scr.print("avgfy=")
- c64flt.print_f(avgfy)
- c64.CHROUT('\n')
- c64scr.print("avgfz=")
- c64flt.print_f(avgfz)
- c64.CHROUT('\n')
-
-separated2:
- c64scr.print("\nseparated i=2\n")
- c64scr.print(" x[2]=")
- ubyte ii=2
- c64flt.print_f(xcoor[ii])
-
- c64scr.print(" y[2]=")
- c64flt.print_f(ycoor[ii])
- c64scr.print(" z[2]=")
- c64flt.print_f(zcoor[ii])
-
-separated3:
- c64scr.print("\nseparated i=3\n")
- ii=3
- c64scr.print(" x[3]=")
- c64flt.print_f(xcoor[ii])
- c64scr.print(" y[3]=")
- c64flt.print_f(ycoor[ii])
- c64scr.print(" z[3]=")
- c64flt.print_f(zcoor[ii])
-
-
- c64.CHROUT('\n')
- c64.CHROUT('X')
- c64scr.print_ub(X)
- c64.CHROUT('\n')
- avgfx = avg(xcoor)
- avgfy = avg(ycoor)
- avgfz = avg(zcoor)
- c64.CHROUT('X')
- c64scr.print_ub(X)
- c64.CHROUT('\n')
-
- c64scr.print("avgfx=")
- c64flt.print_f(avgfx)
- c64.CHROUT('\n')
- c64scr.print("avgfy=")
- c64flt.print_f(avgfy)
- c64.CHROUT('\n')
- c64scr.print("avgfz=")
- c64flt.print_f(avgfz)
- c64.CHROUT('\n')
+ @(vic+$20) = 5
+ @(vic+$21) = @(vic+$20)
}
}
diff --git a/compiler/src/prog8/ast/AST.kt b/compiler/src/prog8/ast/AST.kt
index e3ad82f85..b802745a5 100644
--- a/compiler/src/prog8/ast/AST.kt
+++ b/compiler/src/prog8/ast/AST.kt
@@ -261,6 +261,7 @@ interface IAstProcessor {
fun process(assignTarget: AssignTarget): AssignTarget {
assignTarget.arrayindexed?.process(this)
assignTarget.identifier?.process(this)
+ assignTarget.memAddressExpression = assignTarget.memAddressExpression?.process(this)
return assignTarget
}
@@ -273,6 +274,11 @@ interface IAstProcessor {
typecastExpression.expression = typecastExpression.expression.process(this)
return typecastExpression
}
+
+ fun process(directmemoryExpression: DirectMemoryExpression): IExpression {
+ directmemoryExpression.addressExpression = directmemoryExpression.addressExpression.process(this)
+ return directmemoryExpression
+ }
}
@@ -725,6 +731,7 @@ class VariableInitializationAssignment(target: AssignTarget, aug_op: String?, va
data class AssignTarget(val register: Register?,
val identifier: IdentifierReference?,
val arrayindexed: ArrayIndexedExpression?,
+ var memAddressExpression: IExpression?,
override val position: Position) : Node {
override lateinit var parent: Node
@@ -732,6 +739,7 @@ data class AssignTarget(val register: Register?,
this.parent = parent
identifier?.linkParents(this)
arrayindexed?.linkParents(this)
+ memAddressExpression?.linkParents(this)
}
fun process(processor: IAstProcessor) = processor.process(this)
@@ -739,9 +747,10 @@ data class AssignTarget(val register: Register?,
companion object {
fun fromExpr(expr: IExpression): AssignTarget {
return when (expr) {
- is RegisterExpr -> AssignTarget(expr.register, null, null, expr.position)
- is IdentifierReference -> AssignTarget(null, expr, null, expr.position)
- is ArrayIndexedExpression -> AssignTarget(null, null, expr, expr.position)
+ 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)
else -> throw FatalAstException("invalid expression object $expr")
}
}
@@ -761,6 +770,10 @@ data class AssignTarget(val register: Register?,
if(dt!=null)
return dt
}
+
+ if(memAddressExpression!=null)
+ return DataType.UBYTE
+
return null
}
@@ -771,6 +784,8 @@ 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()
return "???"
}
}
@@ -1012,6 +1027,24 @@ class TypecastExpression(var expression: IExpression, var type: DataType, overri
}
+class DirectMemoryExpression(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 "DirectMemory($addressExpression)"
+ }
+}
private data class NumericLiteral(val number: Number, val datatype: DataType)
@@ -1942,14 +1975,14 @@ private fun prog8Parser.Assign_targetContext.toAst() : AssignTarget {
val register = register()?.toAst()
val identifier = identifier()
return when {
- register!=null -> AssignTarget(register, null, null, toPosition())
- identifier!=null -> AssignTarget(null, identifier.toAst(), null, toPosition())
- arrayindexed()!=null -> AssignTarget(null, null, arrayindexed().toAst(), toPosition())
- else -> AssignTarget(null, scoped_identifier()?.toAst(), null, toPosition())
+ 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())
+ else -> AssignTarget(null, scoped_identifier()?.toAst(), null, null, toPosition())
}
}
-
private fun prog8Parser.RegisterContext.toAst() = Register.valueOf(text.toUpperCase())
private fun prog8Parser.DatatypeContext.toAst() = DataType.valueOf(text.toUpperCase())
@@ -2074,6 +2107,9 @@ private fun prog8Parser.ExpressionContext.toAst() : IExpression {
if(typecast()!=null)
return TypecastExpression(expression(0).toAst(), typecast().datatype().toAst(), toPosition())
+ if(directmemory()!=null)
+ return DirectMemoryExpression(directmemory().expression().toAst(), toPosition())
+
throw FatalAstException(text)
}
diff --git a/compiler/src/prog8/ast/AstChecker.kt b/compiler/src/prog8/ast/AstChecker.kt
index 8133d9a84..24ded452e 100644
--- a/compiler/src/prog8/ast/AstChecker.kt
+++ b/compiler/src/prog8/ast/AstChecker.kt
@@ -387,6 +387,13 @@ class AstChecker(private val namespace: INameScope,
}
private fun processAssignmentTarget(assignment: Assignment, target: AssignTarget): Assignment {
+ val memAddr = target.memAddressExpression?.constValue(namespace, heap)?.asIntegerValue
+ if(memAddr!=null) {
+ if(memAddr<0 || memAddr>=65536)
+ checkResult.add(ExpressionError("address out of range", target.position))
+ return assignment
+ }
+
if(target.identifier!=null) {
val targetName = target.identifier.nameInSource
val targetSymbol = namespace.lookup(targetName, assignment)
diff --git a/compiler/src/prog8/ast/StmtReorderer.kt b/compiler/src/prog8/ast/StmtReorderer.kt
index c06c921e7..85427464c 100644
--- a/compiler/src/prog8/ast/StmtReorderer.kt
+++ b/compiler/src/prog8/ast/StmtReorderer.kt
@@ -121,7 +121,7 @@ class StatementReorderer(private val namespace: INameScope, private val heap: He
else
declvalue
return VariableInitializationAssignment(
- AssignTarget(null, IdentifierReference(decl.scopedname.split("."), decl.position), null, decl.position),
+ AssignTarget(null, IdentifierReference(decl.scopedname.split("."), decl.position), null, null, decl.position),
null,
value,
decl.position
diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt
index 09a88bf5b..5413f07e1 100644
--- a/compiler/src/prog8/compiler/Compiler.kt
+++ b/compiler/src/prog8/compiler/Compiler.kt
@@ -580,6 +580,7 @@ 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)
else -> {
val lv = expr.constValue(namespace, heap) ?: throw CompilerException("constant expression required, not $expr")
when(lv.type) {
@@ -876,7 +877,7 @@ private class StatementTranslator(private val prog: IntermediateProgram,
} else {
when (arg.second.registerOrPair!!) {
A -> {
- val assign = Assignment(listOf(AssignTarget(Register.A, null, null, callPosition)), null, arg.first, callPosition)
+ val assign = Assignment(listOf(AssignTarget(Register.A, null, null, null, callPosition)), null, arg.first, callPosition)
assign.linkParents(arguments[0].parent)
translate(assign)
}
@@ -885,12 +886,12 @@ private class StatementTranslator(private val prog: IntermediateProgram,
prog.instr(Opcode.RSAVEX)
restoreX = true
}
- val assign = Assignment(listOf(AssignTarget(Register.X, null, null, callPosition)), null, arg.first, callPosition)
+ val assign = Assignment(listOf(AssignTarget(Register.X, null, null, null, callPosition)), null, arg.first, callPosition)
assign.linkParents(arguments[0].parent)
translate(assign)
}
Y -> {
- val assign = Assignment(listOf(AssignTarget(Register.Y, null, null, callPosition)), null, arg.first, callPosition)
+ val assign = Assignment(listOf(AssignTarget(Register.Y, null, null, null, callPosition)), null, arg.first, callPosition)
assign.linkParents(arguments[0].parent)
translate(assign)
}
@@ -906,8 +907,8 @@ private class StatementTranslator(private val prog: IntermediateProgram,
DataType.UBYTE -> {
valueA=arg.first
valueX=LiteralValue.optimalInteger(0, callPosition)
- val assignA = Assignment(listOf(AssignTarget(Register.A, null, null, callPosition)), null, valueA, callPosition)
- val assignX = Assignment(listOf(AssignTarget(Register.X, null, null, callPosition)), null, valueX, callPosition)
+ val assignA = Assignment(listOf(AssignTarget(Register.A, null, null, null, callPosition)), null, valueA, callPosition)
+ val assignX = Assignment(listOf(AssignTarget(Register.X, null, null, null, callPosition)), null, valueX, callPosition)
assignA.linkParents(arguments[0].parent)
assignX.linkParents(arguments[0].parent)
translate(assignA)
@@ -932,8 +933,8 @@ private class StatementTranslator(private val prog: IntermediateProgram,
DataType.UBYTE -> {
valueA=arg.first
valueY=LiteralValue.optimalInteger(0, callPosition)
- val assignA = Assignment(listOf(AssignTarget(Register.A, null, null, callPosition)), null, valueA, callPosition)
- val assignY = Assignment(listOf(AssignTarget(Register.Y, null, null, callPosition)), null, valueY, callPosition)
+ val assignA = Assignment(listOf(AssignTarget(Register.A, null, null, null, callPosition)), null, valueA, callPosition)
+ val assignY = Assignment(listOf(AssignTarget(Register.Y, null, null, null, callPosition)), null, valueY, callPosition)
assignA.linkParents(arguments[0].parent)
assignY.linkParents(arguments[0].parent)
translate(assignA)
@@ -962,8 +963,8 @@ private class StatementTranslator(private val prog: IntermediateProgram,
DataType.UBYTE -> {
valueX=arg.first
valueY=LiteralValue.optimalInteger(0, callPosition)
- val assignX = Assignment(listOf(AssignTarget(Register.X, null, null, callPosition)), null, valueX, callPosition)
- val assignY = Assignment(listOf(AssignTarget(Register.Y, null, null, callPosition)), null, valueY, callPosition)
+ val assignX = Assignment(listOf(AssignTarget(Register.X, null, null, null, callPosition)), null, valueX, callPosition)
+ val assignY = Assignment(listOf(AssignTarget(Register.Y, null, null, null, callPosition)), null, valueY, callPosition)
assignX.linkParents(arguments[0].parent)
assignY.linkParents(arguments[0].parent)
translate(assignX)
@@ -1481,6 +1482,17 @@ 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
+ 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)
+ }
+ }
+ else -> throw CompilerException("corrupt assigntarget $assignTarget")
}
}
@@ -1710,9 +1722,9 @@ private class StatementTranslator(private val prog: IntermediateProgram,
// loop starts here
prog.label(loopLabel)
val assignTarget = if(loop.loopRegister!=null)
- AssignTarget(loop.loopRegister, null, null, loop.position)
+ AssignTarget(loop.loopRegister, null, null, null, loop.position)
else
- AssignTarget(null, loop.loopVar!!.copy(), null, loop.position)
+ AssignTarget(null, loop.loopVar!!.copy(), null, null, loop.position)
val arrayspec = ArraySpec(IdentifierReference(listOf(ForLoop.iteratorLoopcounterVarname), loop.position), loop.position)
val assignLv = Assignment(
listOf(assignTarget), null,
@@ -1843,9 +1855,9 @@ private class StatementTranslator(private val prog: IntermediateProgram,
*/
fun makeAssignmentTarget(): AssignTarget {
return if(varname!=null)
- AssignTarget(null, IdentifierReference(varname, range.position), null, range.position)
+ AssignTarget(null, IdentifierReference(varname, range.position), null, null, range.position)
else
- AssignTarget(register, null, null, range.position)
+ AssignTarget(register, null, null, null, range.position)
}
val startAssignment = Assignment(listOf(makeAssignmentTarget()), null, range.from, range.position)
@@ -2071,4 +2083,15 @@ private class StatementTranslator(private val prog: IntermediateProgram,
}
}
+ private fun translate(expr: DirectMemoryExpression) {
+ // for now, only a single memory location (ubyte) is read at a time.
+ val address = expr.addressExpression.constValue(namespace, heap)?.asIntegerValue
+ if(address!=null) {
+ prog.instr(Opcode.PUSH_MEM_UB, arg = Value(DataType.UWORD, address))
+ } else {
+ translate(expr.addressExpression)
+ prog.instr(Opcode.PUSH_MEMREAD)
+ }
+ }
+
}
diff --git a/compiler/src/prog8/compiler/intermediate/Opcode.kt b/compiler/src/prog8/compiler/intermediate/Opcode.kt
index 1c889cc8c..6387fb628 100644
--- a/compiler/src/prog8/compiler/intermediate/Opcode.kt
+++ b/compiler/src/prog8/compiler/intermediate/Opcode.kt
@@ -11,6 +11,7 @@ enum class Opcode {
PUSH_MEM_W, // push word value from memory to stack
PUSH_MEM_UW, // push unsigned word value from memory to stack
PUSH_MEM_FLOAT, // push float value from memory to stack
+ PUSH_MEMREAD, // push memory value from address that's on the stack
PUSH_VAR_BYTE, // push byte variable (ubyte, byte)
PUSH_VAR_WORD, // push word variable (uword, word)
PUSH_VAR_FLOAT, // push float variable
@@ -27,6 +28,7 @@ enum class Opcode {
POP_MEM_BYTE, // pop (u)byte value into destination memory address
POP_MEM_WORD, // pop (u)word value into destination memory address
POP_MEM_FLOAT, // pop float value into destination memory address
+ POP_MEMWRITE, // pop address and byte stack and write the byte to the memory address
POP_VAR_BYTE, // pop (u)byte value into variable
POP_VAR_WORD, // pop (u)word value into variable
POP_VAR_FLOAT, // pop float value into variable
diff --git a/compiler/src/prog8/compiler/target/c64/AsmGen.kt b/compiler/src/prog8/compiler/target/c64/AsmGen.kt
index 3ebcd71e5..4e1cf3f52 100644
--- a/compiler/src/prog8/compiler/target/c64/AsmGen.kt
+++ b/compiler/src/prog8/compiler/target/c64/AsmGen.kt
@@ -493,6 +493,17 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
Opcode.PUSH_MEM_FLOAT -> {
" lda #<${hexVal(ins)} | ldy #>${hexVal(ins)}| jsr prog8_lib.push_float"
}
+ Opcode.PUSH_MEMREAD -> {
+ """
+ lda ${(ESTACK_LO+1).toHex()},x
+ sta ${C64Zeropage.SCRATCH_W1}
+ lda ${(ESTACK_HI+1).toHex()},x
+ sta ${C64Zeropage.SCRATCH_W1+1}
+ ldy #0
+ lda (${C64Zeropage.SCRATCH_W1}),y
+ sta ${(ESTACK_LO+1).toHex()},x
+ """
+ }
Opcode.PUSH_REGAY_WORD -> {
" sta ${ESTACK_LO.toHex()},x | tya | sta ${ESTACK_HI.toHex()},x | dex "
@@ -579,6 +590,20 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
Opcode.POP_MEM_FLOAT -> {
" lda ${hexVal(ins)} | ldy ${hexValPlusOne(ins)} | jsr prog8_lib.pop_float"
}
+ Opcode.POP_MEMWRITE -> {
+ """
+ inx
+ lda ${ESTACK_LO.toHex()},x
+ sta ${C64Zeropage.SCRATCH_W1}
+ lda ${ESTACK_HI.toHex()},x
+ sta ${C64Zeropage.SCRATCH_W1+1}
+ inx
+ lda ${ESTACK_LO.toHex()},x
+ ldy #0
+ sta (${C64Zeropage.SCRATCH_W1}),y
+ """
+ }
+
Opcode.POP_VAR_BYTE -> {
when (ins.callLabel) {
"X" -> throw CompilerException("makes no sense to pop X, it's used as a stack pointer itself")
@@ -702,8 +727,8 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
Opcode.CAST_F_TO_B -> " jsr prog8_lib.stack_float2w"
Opcode.CAST_F_TO_UW -> " jsr prog8_lib.stack_float2uw"
Opcode.CAST_F_TO_W -> " jsr prog8_lib.stack_float2w"
- Opcode.CAST_UB_TO_UW, Opcode.CAST_UB_TO_W -> " lda #0 | sta ${ESTACK_HI+1},x" // clear the msb
- Opcode.CAST_B_TO_UW, Opcode.CAST_B_TO_W -> " ${signExtendA("${ESTACK_HI+1},x")}" // sign extend the lsb @todo missing an lda???
+ Opcode.CAST_UB_TO_UW, Opcode.CAST_UB_TO_W -> " lda #0 | sta ${(ESTACK_HI+1).toHex()},x" // clear the msb
+ Opcode.CAST_B_TO_UW, Opcode.CAST_B_TO_W -> " lda ${(ESTACK_LO+1)},x | ${signExtendA("${(ESTACK_HI+1).toHex()},x")}" // sign extend the lsb
Opcode.MSB -> " lda ${(ESTACK_HI+1).toHex()},x | sta ${(ESTACK_LO+1).toHex()},x"
Opcode.ADD_UB, Opcode.ADD_B -> {
diff --git a/compiler/src/prog8/optimizing/StatementOptimizer.kt b/compiler/src/prog8/optimizing/StatementOptimizer.kt
index 588de8e9f..00cccc8ce 100644
--- a/compiler/src/prog8/optimizing/StatementOptimizer.kt
+++ b/compiler/src/prog8/optimizing/StatementOptimizer.kt
@@ -93,7 +93,7 @@ class StatementOptimizer(private val namespace: INameScope, private val heap: He
if(range.size(heap)==1) {
// for loop over a (constant) range of just a single value-- optimize the loop away
// loopvar/reg = range value , follow by block
- val assignment = Assignment(listOf(AssignTarget(forLoop.loopRegister, forLoop.loopVar, null, forLoop.position)), null, range.from, forLoop.position)
+ val assignment = Assignment(listOf(AssignTarget(forLoop.loopRegister, forLoop.loopVar, null, null, forLoop.position)), null, range.from, forLoop.position)
forLoop.body.statements.add(0, assignment)
optimizationsDone++
return forLoop.body
diff --git a/compiler/src/prog8/parser/prog8Lexer.java b/compiler/src/prog8/parser/prog8Lexer.java
index b198288ad..9b861481d 100644
--- a/compiler/src/prog8/parser/prog8Lexer.java
+++ b/compiler/src/prog8/parser/prog8Lexer.java
@@ -1,4 +1,4 @@
-// Generated from ../antlr/prog8.g4 by ANTLR 4.7.2
+// Generated from /home/irmen/Projects/prog8/compiler/antlr/prog8.g4 by ANTLR 4.7.2
package prog8.parser;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
@@ -75,13 +75,13 @@ public class prog8Lexer extends Lexer {
"'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'('", "')'", "'+'",
"'-'", "'**'", "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='",
"'=='", "'!='", "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'",
- "'xor'", "'not'", "'as'", "'return'", "'break'", "'continue'", "'.'",
- "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'",
+ "'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'", "'if_neg'", "'if_vs'", "'if_vc'", "'for'", "'in'", "'while'",
- "'repeat'", "'until'"
+ "'}'", "'asmsub'", "'clobbers'", "'if'", "'else'", "'if_cs'", "'if_cc'",
+ "'if_eq'", "'if_z'", "'if_ne'", "'if_nz'", "'if_pl'", "'if_pos'", "'if_mi'",
+ "'if_neg'", "'if_vs'", "'if_vc'", "'for'", "'in'", "'while'", "'repeat'",
+ "'until'"
};
}
private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -238,11 +238,11 @@ public class prog8Lexer extends Lexer {
")\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\3C\3C\3C\3C\3C\3D\3D\3D"+
- "\3D\3D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3F\3F\3G\3G\3H\3H\3I\3I\3J\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\3R\3R\3S\3S\3S\3S\3S\3S\3T\3T\3T\3T\3T\3U\3U\3U\3U\3V\3V\3V\3W\3W"+
- "\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\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"+
@@ -304,13 +304,13 @@ public class prog8Lexer extends Lexer {
"\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"+
- "\2\u0085\u0218\3\2\2\2\u0087\u021f\3\2\2\2\u0089\u0225\3\2\2\2\u008b\u022e"+
+ "\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\u0239\3\2\2\2\u0097\u023c\3\2\2\2\u0099\u023f\3\2"+
- "\2\2\u009b\u0242\3\2\2\2\u009d\u0245\3\2\2\2\u009f\u0248\3\2\2\2\u00a1"+
- "\u024b\3\2\2\2\u00a3\u024e\3\2\2\2\u00a5\u0253\3\2\2\2\u00a7\u0259\3\2"+
- "\2\2\u00a9\u025e\3\2\2\2\u00ab\u0262\3\2\2\2\u00ad\u0265\3\2\2\2\u00af"+
- "\u0267\3\2\2\2\u00b1\u0269\3\2\2\2\u00b3\u0270\3\2\2\2\u00b5\u0279\3\2"+
+ "\u0236\3\2\2\2\u0095\u0238\3\2\2\2\u0097\u023b\3\2\2\2\u0099\u023e\3\2"+
+ "\2\2\u009b\u0241\3\2\2\2\u009d\u0244\3\2\2\2\u009f\u0247\3\2\2\2\u00a1"+
+ "\u024a\3\2\2\2\u00a3\u024d\3\2\2\2\u00a5\u0250\3\2\2\2\u00a7\u0255\3\2"+
+ "\2\2\u00a9\u025b\3\2\2\2\u00ab\u0260\3\2\2\2\u00ad\u0264\3\2\2\2\u00af"+
+ "\u0267\3\2\2\2\u00b1\u0269\3\2\2\2\u00b3\u026b\3\2\2\2\u00b5\u0272\3\2"+
"\2\2\u00b7\u027b\3\2\2\2\u00b9\u027e\3\2\2\2\u00bb\u0283\3\2\2\2\u00bd"+
"\u0289\3\2\2\2\u00bf\u028f\3\2\2\2\u00c1\u0295\3\2\2\2\u00c3\u029a\3\2"+
"\2\2\u00c5\u02a0\3\2\2\2\u00c7\u02a6\3\2\2\2\u00c9\u02ac\3\2\2\2\u00cb"+
@@ -395,68 +395,68 @@ public class prog8Lexer extends Lexer {
"\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"+
- "\7t\2\2\u0219\u021a\7g\2\2\u021a\u021b\7v\2\2\u021b\u021c\7w\2\2\u021c"+
- "\u021d\7t\2\2\u021d\u021e\7p\2\2\u021e\u0086\3\2\2\2\u021f\u0220\7d\2"+
- "\2\u0220\u0221\7t\2\2\u0221\u0222\7g\2\2\u0222\u0223\7c\2\2\u0223\u0224"+
- "\7m\2\2\u0224\u0088\3\2\2\2\u0225\u0226\7e\2\2\u0226\u0227\7q\2\2\u0227"+
- "\u0228\7p\2\2\u0228\u0229\7v\2\2\u0229\u022a\7k\2\2\u022a\u022b\7p\2\2"+
- "\u022b\u022c\7w\2\2\u022c\u022d\7g\2\2\u022d\u008a\3\2\2\2\u022e\u022f"+
- "\7\60\2\2\u022f\u008c\3\2\2\2\u0230\u0231\7C\2\2\u0231\u008e\3\2\2\2\u0232"+
- "\u0233\7Z\2\2\u0233\u0090\3\2\2\2\u0234\u0235\7[\2\2\u0235\u0092\3\2\2"+
- "\2\u0236\u0237\7C\2\2\u0237\u0238\7Z\2\2\u0238\u0094\3\2\2\2\u0239\u023a"+
- "\7C\2\2\u023a\u023b\7[\2\2\u023b\u0096\3\2\2\2\u023c\u023d\7Z\2\2\u023d"+
- "\u023e\7[\2\2\u023e\u0098\3\2\2\2\u023f\u0240\7R\2\2\u0240\u0241\7e\2"+
- "\2\u0241\u009a\3\2\2\2\u0242\u0243\7R\2\2\u0243\u0244\7|\2\2\u0244\u009c"+
- "\3\2\2\2\u0245\u0246\7R\2\2\u0246\u0247\7p\2\2\u0247\u009e\3\2\2\2\u0248"+
- "\u0249\7R\2\2\u0249\u024a\7x\2\2\u024a\u00a0\3\2\2\2\u024b\u024c\7\60"+
- "\2\2\u024c\u024d\7y\2\2\u024d\u00a2\3\2\2\2\u024e\u024f\7v\2\2\u024f\u0250"+
- "\7t\2\2\u0250\u0251\7w\2\2\u0251\u0252\7g\2\2\u0252\u00a4\3\2\2\2\u0253"+
- "\u0254\7h\2\2\u0254\u0255\7c\2\2\u0255\u0256\7n\2\2\u0256\u0257\7u\2\2"+
- "\u0257\u0258\7g\2\2\u0258\u00a6\3\2\2\2\u0259\u025a\7\'\2\2\u025a\u025b"+
- "\7c\2\2\u025b\u025c\7u\2\2\u025c\u025d\7o\2\2\u025d\u00a8\3\2\2\2\u025e"+
- "\u025f\7u\2\2\u025f\u0260\7w\2\2\u0260\u0261\7d\2\2\u0261\u00aa\3\2\2"+
- "\2\u0262\u0263\7/\2\2\u0263\u0264\7@\2\2\u0264\u00ac\3\2\2\2\u0265\u0266"+
- "\7}\2\2\u0266\u00ae\3\2\2\2\u0267\u0268\7\177\2\2\u0268\u00b0\3\2\2\2"+
- "\u0269\u026a\7c\2\2\u026a\u026b\7u\2\2\u026b\u026c\7o\2\2\u026c\u026d"+
- "\7u\2\2\u026d\u026e\7w\2\2\u026e\u026f\7d\2\2\u026f\u00b2\3\2\2\2\u0270"+
- "\u0271\7e\2\2\u0271\u0272\7n\2\2\u0272\u0273\7q\2\2\u0273\u0274\7d\2\2"+
- "\u0274\u0275\7d\2\2\u0275\u0276\7g\2\2\u0276\u0277\7t\2\2\u0277\u0278"+
- "\7u\2\2\u0278\u00b4\3\2\2\2\u0279\u027a\7B\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\2\2\u02f6\u02f8\3\2\2\2\u02f7\u02f5\3\2\2\2\u02f8\u02f9\bp\2\2\u02f9"+
+ "\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"+
+ "\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"+
+ "\2\2\u02f6\u02f8\3\2\2\2\u02f7\u02f5\3\2\2\2\u02f8\u02f9\bp\2\2\u02f9"+
"\u00e0\3\2\2\2\u02fa\u02fb\t\3\2\2\u02fb\u02fc\3\2\2\2\u02fc\u02fd\bq"+
"\3\2\u02fd\u00e2\3\2\2\2\u02fe\u0300\t\2\2\2\u02ff\u02fe\3\2\2\2\u0300"+
"\u0301\3\2\2\2\u0301\u02ff\3\2\2\2\u0301\u0302\3\2\2\2\u0302\u00e4\3\2"+
diff --git a/compiler/src/prog8/parser/prog8Parser.java b/compiler/src/prog8/parser/prog8Parser.java
index 3395cdef5..929d373e2 100644
--- a/compiler/src/prog8/parser/prog8Parser.java
+++ b/compiler/src/prog8/parser/prog8Parser.java
@@ -1,4 +1,4 @@
-// Generated from ../antlr/prog8.g4 by ANTLR 4.7.2
+// Generated from /home/irmen/Projects/prog8/compiler/antlr/prog8.g4 by ANTLR 4.7.2
package prog8.parser;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
@@ -41,33 +41,34 @@ public class prog8Parser extends Parser {
RULE_vardecl = 8, RULE_varinitializer = 9, RULE_constdecl = 10, RULE_memoryvardecl = 11,
RULE_datatype = 12, RULE_arrayspec = 13, RULE_assignment = 14, RULE_assign_targets = 15,
RULE_augassignment = 16, RULE_assign_target = 17, RULE_postincrdecr = 18,
- RULE_expression = 19, RULE_typecast = 20, RULE_arrayindexed = 21, RULE_functioncall = 22,
- RULE_functioncall_stmt = 23, RULE_expression_list = 24, RULE_returnstmt = 25,
- RULE_breakstmt = 26, RULE_continuestmt = 27, RULE_identifier = 28, RULE_scoped_identifier = 29,
- RULE_register = 30, RULE_registerorpair = 31, RULE_statusregister = 32,
- RULE_integerliteral = 33, RULE_wordsuffix = 34, RULE_booleanliteral = 35,
- RULE_arrayliteral = 36, RULE_stringliteral = 37, RULE_charliteral = 38,
- RULE_floatliteral = 39, RULE_literalvalue = 40, RULE_inlineasm = 41, RULE_subroutine = 42,
- RULE_sub_return_part = 43, RULE_statement_block = 44, RULE_sub_params = 45,
- RULE_sub_returns = 46, RULE_asmsubroutine = 47, RULE_asmsub_address = 48,
- RULE_asmsub_params = 49, RULE_asmsub_param = 50, RULE_clobber = 51, RULE_asmsub_returns = 52,
- RULE_asmsub_return = 53, RULE_if_stmt = 54, RULE_else_part = 55, RULE_branch_stmt = 56,
- RULE_branchcondition = 57, RULE_forloop = 58, RULE_whileloop = 59, RULE_repeatloop = 60;
+ RULE_expression = 19, RULE_typecast = 20, RULE_arrayindexed = 21, RULE_directmemory = 22,
+ RULE_functioncall = 23, RULE_functioncall_stmt = 24, RULE_expression_list = 25,
+ RULE_returnstmt = 26, RULE_breakstmt = 27, RULE_continuestmt = 28, RULE_identifier = 29,
+ RULE_scoped_identifier = 30, RULE_register = 31, RULE_registerorpair = 32,
+ RULE_statusregister = 33, RULE_integerliteral = 34, RULE_wordsuffix = 35,
+ RULE_booleanliteral = 36, RULE_arrayliteral = 37, RULE_stringliteral = 38,
+ RULE_charliteral = 39, RULE_floatliteral = 40, RULE_literalvalue = 41,
+ RULE_inlineasm = 42, RULE_subroutine = 43, RULE_sub_return_part = 44,
+ RULE_statement_block = 45, RULE_sub_params = 46, RULE_sub_returns = 47,
+ RULE_asmsubroutine = 48, RULE_asmsub_address = 49, RULE_asmsub_params = 50,
+ RULE_asmsub_param = 51, RULE_clobber = 52, RULE_asmsub_returns = 53, RULE_asmsub_return = 54,
+ RULE_if_stmt = 55, RULE_else_part = 56, RULE_branch_stmt = 57, RULE_branchcondition = 58,
+ RULE_forloop = 59, RULE_whileloop = 60, RULE_repeatloop = 61;
private static String[] makeRuleNames() {
return new String[] {
"module", "modulestatement", "block", "statement", "labeldef", "unconditionaljump",
"directive", "directivearg", "vardecl", "varinitializer", "constdecl",
"memoryvardecl", "datatype", "arrayspec", "assignment", "assign_targets",
"augassignment", "assign_target", "postincrdecr", "expression", "typecast",
- "arrayindexed", "functioncall", "functioncall_stmt", "expression_list",
- "returnstmt", "breakstmt", "continuestmt", "identifier", "scoped_identifier",
- "register", "registerorpair", "statusregister", "integerliteral", "wordsuffix",
- "booleanliteral", "arrayliteral", "stringliteral", "charliteral", "floatliteral",
- "literalvalue", "inlineasm", "subroutine", "sub_return_part", "statement_block",
- "sub_params", "sub_returns", "asmsubroutine", "asmsub_address", "asmsub_params",
- "asmsub_param", "clobber", "asmsub_returns", "asmsub_return", "if_stmt",
- "else_part", "branch_stmt", "branchcondition", "forloop", "whileloop",
- "repeatloop"
+ "arrayindexed", "directmemory", "functioncall", "functioncall_stmt",
+ "expression_list", "returnstmt", "breakstmt", "continuestmt", "identifier",
+ "scoped_identifier", "register", "registerorpair", "statusregister",
+ "integerliteral", "wordsuffix", "booleanliteral", "arrayliteral", "stringliteral",
+ "charliteral", "floatliteral", "literalvalue", "inlineasm", "subroutine",
+ "sub_return_part", "statement_block", "sub_params", "sub_returns", "asmsubroutine",
+ "asmsub_address", "asmsub_params", "asmsub_param", "clobber", "asmsub_returns",
+ "asmsub_return", "if_stmt", "else_part", "branch_stmt", "branchcondition",
+ "forloop", "whileloop", "repeatloop"
};
}
public static final String[] ruleNames = makeRuleNames();
@@ -82,13 +83,13 @@ public class prog8Parser extends Parser {
"'&='", "'|='", "'^='", "'%='", "'++'", "'--'", "'('", "')'", "'+'",
"'-'", "'**'", "'*'", "'/'", "'//'", "'%'", "'<'", "'>'", "'<='", "'>='",
"'=='", "'!='", "'&'", "'^'", "'|'", "'to'", "'step'", "'and'", "'or'",
- "'xor'", "'not'", "'as'", "'return'", "'break'", "'continue'", "'.'",
- "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'",
+ "'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'", "'if_neg'", "'if_vs'", "'if_vc'", "'for'", "'in'", "'while'",
- "'repeat'", "'until'"
+ "'}'", "'asmsub'", "'clobbers'", "'if'", "'else'", "'if_cs'", "'if_cc'",
+ "'if_eq'", "'if_z'", "'if_ne'", "'if_nz'", "'if_pl'", "'if_pos'", "'if_mi'",
+ "'if_neg'", "'if_vs'", "'if_vc'", "'for'", "'in'", "'while'", "'repeat'",
+ "'until'"
};
}
private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -184,12 +185,12 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(126);
+ setState(128);
_errHandler.sync(this);
_la = _input.LA(1);
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (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))) != 0) || _la==EOL) {
{
- setState(124);
+ setState(126);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__0:
@@ -204,13 +205,13 @@ public class prog8Parser extends Parser {
case T__11:
case T__12:
{
- setState(122);
+ setState(124);
modulestatement();
}
break;
case EOL:
{
- setState(123);
+ setState(125);
match(EOL);
}
break;
@@ -218,11 +219,11 @@ public class prog8Parser extends Parser {
throw new NoViableAltException(this);
}
}
- setState(128);
+ setState(130);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(129);
+ setState(131);
match(EOF);
}
}
@@ -254,7 +255,7 @@ public class prog8Parser extends Parser {
ModulestatementContext _localctx = new ModulestatementContext(_ctx, getState());
enterRule(_localctx, 2, RULE_modulestatement);
try {
- setState(133);
+ setState(135);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__3:
@@ -269,14 +270,14 @@ public class prog8Parser extends Parser {
case T__12:
enterOuterAlt(_localctx, 1);
{
- setState(131);
+ setState(133);
directive();
}
break;
case T__0:
enterOuterAlt(_localctx, 2);
{
- setState(132);
+ setState(134);
block();
}
break;
@@ -319,23 +320,23 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(135);
+ setState(137);
match(T__0);
- setState(136);
- identifier();
setState(138);
+ identifier();
+ setState(140);
_errHandler.sync(this);
_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)) {
{
- setState(137);
+ setState(139);
integerliteral();
}
}
- setState(140);
+ setState(142);
statement_block();
- setState(141);
+ setState(143);
match(EOL);
}
}
@@ -427,160 +428,160 @@ public class prog8Parser extends Parser {
StatementContext _localctx = new StatementContext(_ctx, getState());
enterRule(_localctx, 6, RULE_statement);
try {
- setState(165);
+ setState(167);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(143);
+ setState(145);
directive();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(144);
+ setState(146);
varinitializer();
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(145);
+ setState(147);
vardecl();
}
break;
case 4:
enterOuterAlt(_localctx, 4);
{
- setState(146);
+ setState(148);
constdecl();
}
break;
case 5:
enterOuterAlt(_localctx, 5);
{
- setState(147);
+ setState(149);
memoryvardecl();
}
break;
case 6:
enterOuterAlt(_localctx, 6);
{
- setState(148);
+ setState(150);
assignment();
}
break;
case 7:
enterOuterAlt(_localctx, 7);
{
- setState(149);
+ setState(151);
augassignment();
}
break;
case 8:
enterOuterAlt(_localctx, 8);
{
- setState(150);
+ setState(152);
unconditionaljump();
}
break;
case 9:
enterOuterAlt(_localctx, 9);
{
- setState(151);
+ setState(153);
postincrdecr();
}
break;
case 10:
enterOuterAlt(_localctx, 10);
{
- setState(152);
+ setState(154);
functioncall_stmt();
}
break;
case 11:
enterOuterAlt(_localctx, 11);
{
- setState(153);
+ setState(155);
if_stmt();
}
break;
case 12:
enterOuterAlt(_localctx, 12);
{
- setState(154);
+ setState(156);
branch_stmt();
}
break;
case 13:
enterOuterAlt(_localctx, 13);
{
- setState(155);
+ setState(157);
subroutine();
}
break;
case 14:
enterOuterAlt(_localctx, 14);
{
- setState(156);
+ setState(158);
asmsubroutine();
}
break;
case 15:
enterOuterAlt(_localctx, 15);
{
- setState(157);
+ setState(159);
inlineasm();
}
break;
case 16:
enterOuterAlt(_localctx, 16);
{
- setState(158);
+ setState(160);
returnstmt();
}
break;
case 17:
enterOuterAlt(_localctx, 17);
{
- setState(159);
+ setState(161);
forloop();
}
break;
case 18:
enterOuterAlt(_localctx, 18);
{
- setState(160);
+ setState(162);
whileloop();
}
break;
case 19:
enterOuterAlt(_localctx, 19);
{
- setState(161);
+ setState(163);
repeatloop();
}
break;
case 20:
enterOuterAlt(_localctx, 20);
{
- setState(162);
+ setState(164);
breakstmt();
}
break;
case 21:
enterOuterAlt(_localctx, 21);
{
- setState(163);
+ setState(165);
continuestmt();
}
break;
case 22:
enterOuterAlt(_localctx, 22);
{
- setState(164);
+ setState(166);
labeldef();
}
break;
@@ -613,9 +614,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(167);
+ setState(169);
identifier();
- setState(168);
+ setState(170);
match(T__1);
}
}
@@ -652,26 +653,26 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(170);
+ setState(172);
match(T__2);
- setState(174);
+ setState(176);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
case 1:
{
- setState(171);
+ setState(173);
integerliteral();
}
break;
case 2:
{
- setState(172);
+ setState(174);
identifier();
}
break;
case 3:
{
- setState(173);
+ setState(175);
scoped_identifier();
}
break;
@@ -710,7 +711,7 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(176);
+ setState(178);
((DirectiveContext)_localctx).directivename = _input.LT(1);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((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))) != 0)) ) {
@@ -721,17 +722,17 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(188);
+ setState(190);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,8,_ctx) ) {
case 1:
{
- setState(178);
+ setState(180);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,6,_ctx) ) {
case 1:
{
- setState(177);
+ setState(179);
directivearg();
}
break;
@@ -740,21 +741,21 @@ public class prog8Parser extends Parser {
break;
case 2:
{
- setState(180);
+ setState(182);
directivearg();
- setState(185);
+ setState(187);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(181);
+ setState(183);
match(T__13);
- setState(182);
+ setState(184);
directivearg();
}
}
- setState(187);
+ setState(189);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -794,20 +795,20 @@ public class prog8Parser extends Parser {
DirectiveargContext _localctx = new DirectiveargContext(_ctx, getState());
enterRule(_localctx, 14, RULE_directivearg);
try {
- setState(193);
+ setState(195);
_errHandler.sync(this);
switch (_input.LA(1)) {
case STRING:
enterOuterAlt(_localctx, 1);
{
- setState(190);
+ setState(192);
stringliteral();
}
break;
case NAME:
enterOuterAlt(_localctx, 2);
{
- setState(191);
+ setState(193);
identifier();
}
break;
@@ -816,7 +817,7 @@ public class prog8Parser extends Parser {
case BIN_INTEGER:
enterOuterAlt(_localctx, 3);
{
- setState(192);
+ setState(194);
integerliteral();
}
break;
@@ -858,19 +859,19 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(195);
- datatype();
setState(197);
+ datatype();
+ setState(199);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==T__26) {
{
- setState(196);
+ setState(198);
arrayspec();
}
}
- setState(199);
+ setState(201);
identifier();
}
}
@@ -911,23 +912,23 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(201);
- datatype();
setState(203);
+ datatype();
+ setState(205);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==T__26) {
{
- setState(202);
+ setState(204);
arrayspec();
}
}
- setState(205);
- identifier();
- setState(206);
- match(T__14);
setState(207);
+ identifier();
+ setState(208);
+ match(T__14);
+ setState(209);
expression(0);
}
}
@@ -958,9 +959,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(209);
+ setState(211);
match(T__15);
- setState(210);
+ setState(212);
varinitializer();
}
}
@@ -991,9 +992,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(212);
+ setState(214);
match(T__16);
- setState(213);
+ setState(215);
varinitializer();
}
}
@@ -1022,7 +1023,7 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(215);
+ setState(217);
_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)) ) {
_errHandler.recoverInline(this);
@@ -1061,11 +1062,11 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(217);
- match(T__26);
- setState(218);
- expression(0);
setState(219);
+ match(T__26);
+ setState(220);
+ expression(0);
+ setState(221);
match(T__27);
}
}
@@ -1099,11 +1100,11 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(221);
- assign_targets();
- setState(222);
- match(T__14);
setState(223);
+ assign_targets();
+ setState(224);
+ match(T__14);
+ setState(225);
expression(0);
}
}
@@ -1138,21 +1139,21 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(225);
+ setState(227);
assign_target();
- setState(230);
+ setState(232);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(226);
+ setState(228);
match(T__13);
- setState(227);
+ setState(229);
assign_target();
}
}
- setState(232);
+ setState(234);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -1190,9 +1191,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(233);
+ setState(235);
assign_target();
- setState(234);
+ setState(236);
((AugassignmentContext)_localctx).operator = _input.LT(1);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__28) | (1L << T__29) | (1L << T__30) | (1L << T__31) | (1L << T__32) | (1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36) | (1L << T__37))) != 0)) ) {
@@ -1203,7 +1204,7 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(235);
+ setState(237);
expression(0);
}
}
@@ -1231,6 +1232,9 @@ public class prog8Parser extends Parser {
public ArrayindexedContext arrayindexed() {
return getRuleContext(ArrayindexedContext.class,0);
}
+ public DirectmemoryContext directmemory() {
+ return getRuleContext(DirectmemoryContext.class,0);
+ }
public Assign_targetContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@@ -1241,37 +1245,44 @@ public class prog8Parser extends Parser {
Assign_targetContext _localctx = new Assign_targetContext(_ctx, getState());
enterRule(_localctx, 34, RULE_assign_target);
try {
- setState(241);
+ setState(244);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(237);
+ setState(239);
register();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(238);
+ setState(240);
identifier();
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(239);
+ setState(241);
scoped_identifier();
}
break;
case 4:
enterOuterAlt(_localctx, 4);
{
- setState(240);
+ setState(242);
arrayindexed();
}
break;
+ case 5:
+ enterOuterAlt(_localctx, 5);
+ {
+ setState(243);
+ directmemory();
+ }
+ break;
}
}
catch (RecognitionException re) {
@@ -1303,9 +1314,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(243);
+ setState(246);
assign_target();
- setState(244);
+ setState(247);
((PostincrdecrContext)_localctx).operator = _input.LT(1);
_la = _input.LA(1);
if ( !(_la==T__38 || _la==T__39) ) {
@@ -1361,6 +1372,9 @@ public class prog8Parser extends Parser {
public ArrayindexedContext arrayindexed() {
return getRuleContext(ArrayindexedContext.class,0);
}
+ public DirectmemoryContext directmemory() {
+ return getRuleContext(DirectmemoryContext.class,0);
+ }
public TypecastContext typecast() {
return getRuleContext(TypecastContext.class,0);
}
@@ -1386,28 +1400,28 @@ public class prog8Parser extends Parser {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(261);
+ setState(265);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
case 1:
{
- setState(247);
+ setState(250);
match(T__40);
- setState(248);
+ setState(251);
expression(0);
- setState(249);
+ setState(252);
match(T__41);
}
break;
case 2:
{
- setState(251);
+ setState(254);
functioncall();
}
break;
case 3:
{
- setState(252);
+ setState(255);
((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)) ) {
@@ -1418,51 +1432,57 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(253);
- expression(20);
+ setState(256);
+ expression(21);
}
break;
case 4:
{
- setState(254);
+ setState(257);
((ExpressionContext)_localctx).prefix = match(T__63);
- setState(255);
- expression(7);
+ setState(258);
+ expression(8);
}
break;
case 5:
{
- setState(256);
+ setState(259);
literalvalue();
}
break;
case 6:
{
- setState(257);
+ setState(260);
register();
}
break;
case 7:
{
- setState(258);
+ setState(261);
identifier();
}
break;
case 8:
{
- setState(259);
+ setState(262);
scoped_identifier();
}
break;
case 9:
{
- setState(260);
+ setState(263);
arrayindexed();
}
break;
+ case 10:
+ {
+ setState(264);
+ directmemory();
+ }
+ break;
}
_ctx.stop = _input.LT(-1);
- setState(307);
+ setState(311);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
@@ -1470,7 +1490,7 @@ public class prog8Parser extends Parser {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(305);
+ setState(309);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
case 1:
@@ -1479,12 +1499,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(263);
- if (!(precpred(_ctx, 19))) throw new FailedPredicateException(this, "precpred(_ctx, 19)");
- setState(264);
+ setState(267);
+ if (!(precpred(_ctx, 20))) throw new FailedPredicateException(this, "precpred(_ctx, 20)");
+ setState(268);
((ExpressionContext)_localctx).bop = match(T__44);
- setState(265);
- ((ExpressionContext)_localctx).right = expression(20);
+ setState(269);
+ ((ExpressionContext)_localctx).right = expression(21);
}
break;
case 2:
@@ -1493,9 +1513,9 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(266);
- if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)");
- setState(267);
+ setState(270);
+ if (!(precpred(_ctx, 19))) throw new FailedPredicateException(this, "precpred(_ctx, 19)");
+ 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)) ) {
@@ -1506,8 +1526,8 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(268);
- ((ExpressionContext)_localctx).right = expression(19);
+ setState(272);
+ ((ExpressionContext)_localctx).right = expression(20);
}
break;
case 3:
@@ -1516,9 +1536,9 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(269);
- if (!(precpred(_ctx, 17))) throw new FailedPredicateException(this, "precpred(_ctx, 17)");
- setState(270);
+ setState(273);
+ if (!(precpred(_ctx, 18))) throw new FailedPredicateException(this, "precpred(_ctx, 18)");
+ setState(274);
((ExpressionContext)_localctx).bop = _input.LT(1);
_la = _input.LA(1);
if ( !(_la==T__42 || _la==T__43) ) {
@@ -1529,8 +1549,8 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(271);
- ((ExpressionContext)_localctx).right = expression(18);
+ setState(275);
+ ((ExpressionContext)_localctx).right = expression(19);
}
break;
case 4:
@@ -1539,9 +1559,9 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(272);
- if (!(precpred(_ctx, 16))) throw new FailedPredicateException(this, "precpred(_ctx, 16)");
- setState(273);
+ setState(276);
+ if (!(precpred(_ctx, 17))) throw new FailedPredicateException(this, "precpred(_ctx, 17)");
+ 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)) ) {
@@ -1552,8 +1572,8 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(274);
- ((ExpressionContext)_localctx).right = expression(17);
+ setState(278);
+ ((ExpressionContext)_localctx).right = expression(18);
}
break;
case 5:
@@ -1562,9 +1582,9 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(275);
- if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)");
- setState(276);
+ setState(279);
+ if (!(precpred(_ctx, 16))) throw new FailedPredicateException(this, "precpred(_ctx, 16)");
+ setState(280);
((ExpressionContext)_localctx).bop = _input.LT(1);
_la = _input.LA(1);
if ( !(_la==T__53 || _la==T__54) ) {
@@ -1575,8 +1595,8 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(277);
- ((ExpressionContext)_localctx).right = expression(16);
+ setState(281);
+ ((ExpressionContext)_localctx).right = expression(17);
}
break;
case 6:
@@ -1585,12 +1605,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(278);
- if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
- setState(279);
+ setState(282);
+ if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)");
+ setState(283);
((ExpressionContext)_localctx).bop = match(T__55);
- setState(280);
- ((ExpressionContext)_localctx).right = expression(15);
+ setState(284);
+ ((ExpressionContext)_localctx).right = expression(16);
}
break;
case 7:
@@ -1599,12 +1619,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(281);
- if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
- setState(282);
+ setState(285);
+ if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)");
+ setState(286);
((ExpressionContext)_localctx).bop = match(T__56);
- setState(283);
- ((ExpressionContext)_localctx).right = expression(14);
+ setState(287);
+ ((ExpressionContext)_localctx).right = expression(15);
}
break;
case 8:
@@ -1613,12 +1633,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(284);
- if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
- setState(285);
+ setState(288);
+ if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
+ setState(289);
((ExpressionContext)_localctx).bop = match(T__57);
- setState(286);
- ((ExpressionContext)_localctx).right = expression(13);
+ setState(290);
+ ((ExpressionContext)_localctx).right = expression(14);
}
break;
case 9:
@@ -1627,12 +1647,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(287);
- if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
- setState(288);
+ setState(291);
+ if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
+ setState(292);
((ExpressionContext)_localctx).bop = match(T__60);
- setState(289);
- ((ExpressionContext)_localctx).right = expression(11);
+ setState(293);
+ ((ExpressionContext)_localctx).right = expression(12);
}
break;
case 10:
@@ -1641,12 +1661,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(290);
- if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
- setState(291);
+ setState(294);
+ if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
+ setState(295);
((ExpressionContext)_localctx).bop = match(T__61);
- setState(292);
- ((ExpressionContext)_localctx).right = expression(10);
+ setState(296);
+ ((ExpressionContext)_localctx).right = expression(11);
}
break;
case 11:
@@ -1655,12 +1675,12 @@ public class prog8Parser extends Parser {
_localctx.left = _prevctx;
_localctx.left = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(293);
- if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
- setState(294);
+ setState(297);
+ if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
+ setState(298);
((ExpressionContext)_localctx).bop = match(T__62);
- setState(295);
- ((ExpressionContext)_localctx).right = expression(9);
+ setState(299);
+ ((ExpressionContext)_localctx).right = expression(10);
}
break;
case 12:
@@ -1669,20 +1689,20 @@ public class prog8Parser extends Parser {
_localctx.rangefrom = _prevctx;
_localctx.rangefrom = _prevctx;
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(296);
- if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
- setState(297);
- match(T__58);
- setState(298);
- ((ExpressionContext)_localctx).rangeto = expression(0);
+ setState(300);
+ if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
setState(301);
+ match(T__58);
+ setState(302);
+ ((ExpressionContext)_localctx).rangeto = expression(0);
+ setState(305);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
case 1:
{
- setState(299);
+ setState(303);
match(T__59);
- setState(300);
+ setState(304);
((ExpressionContext)_localctx).rangestep = expression(0);
}
break;
@@ -1693,16 +1713,16 @@ public class prog8Parser extends Parser {
{
_localctx = new ExpressionContext(_parentctx, _parentState);
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(303);
+ setState(307);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(304);
+ setState(308);
typecast();
}
break;
}
}
}
- setState(309);
+ setState(313);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
}
@@ -1735,9 +1755,9 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(310);
+ setState(314);
match(T__64);
- setState(311);
+ setState(315);
datatype();
}
}
@@ -1774,23 +1794,23 @@ public class prog8Parser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(315);
+ setState(319);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
case 1:
{
- setState(313);
+ setState(317);
identifier();
}
break;
case 2:
{
- setState(314);
+ setState(318);
scoped_identifier();
}
break;
}
- setState(317);
+ setState(321);
arrayspec();
}
}
@@ -1805,6 +1825,39 @@ public class prog8Parser extends Parser {
return _localctx;
}
+ public static class DirectmemoryContext extends ParserRuleContext {
+ public ExpressionContext expression() {
+ return getRuleContext(ExpressionContext.class,0);
+ }
+ public DirectmemoryContext(ParserRuleContext parent, int invokingState) {
+ super(parent, invokingState);
+ }
+ @Override public int getRuleIndex() { return RULE_directmemory; }
+ }
+
+ public final DirectmemoryContext directmemory() throws RecognitionException {
+ DirectmemoryContext _localctx = new DirectmemoryContext(_ctx, getState());
+ enterRule(_localctx, 44, RULE_directmemory);
+ try {
+ enterOuterAlt(_localctx, 1);
+ {
+ setState(323);
+ match(T__65);
+ setState(324);
+ expression(0);
+ }
+ }
+ catch (RecognitionException re) {
+ _localctx.exception = re;
+ _errHandler.reportError(this, re);
+ _errHandler.recover(this, re);
+ }
+ finally {
+ exitRule();
+ }
+ return _localctx;
+ }
+
public static class FunctioncallContext extends ParserRuleContext {
public IdentifierContext identifier() {
return getRuleContext(IdentifierContext.class,0);
@@ -1823,40 +1876,40 @@ public class prog8Parser extends Parser {
public final FunctioncallContext functioncall() throws RecognitionException {
FunctioncallContext _localctx = new FunctioncallContext(_ctx, getState());
- enterRule(_localctx, 44, RULE_functioncall);
+ enterRule(_localctx, 46, RULE_functioncall);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(321);
+ setState(328);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,19,_ctx) ) {
case 1:
{
- setState(319);
+ setState(326);
identifier();
}
break;
case 2:
{
- setState(320);
+ setState(327);
scoped_identifier();
}
break;
}
- setState(323);
+ setState(330);
match(T__40);
- setState(325);
+ setState(332);
_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__69 - 64)) | (1L << (T__70 - 64)) | (1L << (T__71 - 64)) | (1L << (T__80 - 64)) | (1L << (T__81 - 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__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)) {
{
- setState(324);
+ setState(331);
expression_list();
}
}
- setState(327);
+ setState(334);
match(T__41);
}
}
@@ -1889,40 +1942,40 @@ public class prog8Parser extends Parser {
public final Functioncall_stmtContext functioncall_stmt() throws RecognitionException {
Functioncall_stmtContext _localctx = new Functioncall_stmtContext(_ctx, getState());
- enterRule(_localctx, 46, RULE_functioncall_stmt);
+ enterRule(_localctx, 48, RULE_functioncall_stmt);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(331);
+ setState(338);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
case 1:
{
- setState(329);
+ setState(336);
identifier();
}
break;
case 2:
{
- setState(330);
+ setState(337);
scoped_identifier();
}
break;
}
- setState(333);
+ setState(340);
match(T__40);
- setState(335);
+ setState(342);
_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__69 - 64)) | (1L << (T__70 - 64)) | (1L << (T__71 - 64)) | (1L << (T__80 - 64)) | (1L << (T__81 - 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__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)) {
{
- setState(334);
+ setState(341);
expression_list();
}
}
- setState(337);
+ setState(344);
match(T__41);
}
}
@@ -1956,36 +2009,36 @@ public class prog8Parser extends Parser {
public final Expression_listContext expression_list() throws RecognitionException {
Expression_listContext _localctx = new Expression_listContext(_ctx, getState());
- enterRule(_localctx, 48, RULE_expression_list);
+ enterRule(_localctx, 50, RULE_expression_list);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(339);
+ setState(346);
expression(0);
- setState(347);
+ setState(354);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(340);
+ setState(347);
match(T__13);
- setState(342);
+ setState(349);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(341);
+ setState(348);
match(EOL);
}
}
- setState(344);
+ setState(351);
expression(0);
}
}
- setState(349);
+ setState(356);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -2014,18 +2067,18 @@ public class prog8Parser extends Parser {
public final ReturnstmtContext returnstmt() throws RecognitionException {
ReturnstmtContext _localctx = new ReturnstmtContext(_ctx, getState());
- enterRule(_localctx, 50, RULE_returnstmt);
+ enterRule(_localctx, 52, RULE_returnstmt);
try {
enterOuterAlt(_localctx, 1);
{
- setState(350);
- match(T__65);
- setState(352);
+ setState(357);
+ match(T__66);
+ setState(359);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
case 1:
{
- setState(351);
+ setState(358);
expression_list();
}
break;
@@ -2052,12 +2105,12 @@ public class prog8Parser extends Parser {
public final BreakstmtContext breakstmt() throws RecognitionException {
BreakstmtContext _localctx = new BreakstmtContext(_ctx, getState());
- enterRule(_localctx, 52, RULE_breakstmt);
+ enterRule(_localctx, 54, RULE_breakstmt);
try {
enterOuterAlt(_localctx, 1);
{
- setState(354);
- match(T__66);
+ setState(361);
+ match(T__67);
}
}
catch (RecognitionException re) {
@@ -2080,12 +2133,12 @@ public class prog8Parser extends Parser {
public final ContinuestmtContext continuestmt() throws RecognitionException {
ContinuestmtContext _localctx = new ContinuestmtContext(_ctx, getState());
- enterRule(_localctx, 54, RULE_continuestmt);
+ enterRule(_localctx, 56, RULE_continuestmt);
try {
enterOuterAlt(_localctx, 1);
{
- setState(356);
- match(T__67);
+ setState(363);
+ match(T__68);
}
}
catch (RecognitionException re) {
@@ -2109,11 +2162,11 @@ public class prog8Parser extends Parser {
public final IdentifierContext identifier() throws RecognitionException {
IdentifierContext _localctx = new IdentifierContext(_ctx, getState());
- enterRule(_localctx, 56, RULE_identifier);
+ enterRule(_localctx, 58, RULE_identifier);
try {
enterOuterAlt(_localctx, 1);
{
- setState(358);
+ setState(365);
match(NAME);
}
}
@@ -2141,14 +2194,14 @@ public class prog8Parser extends Parser {
public final Scoped_identifierContext scoped_identifier() throws RecognitionException {
Scoped_identifierContext _localctx = new Scoped_identifierContext(_ctx, getState());
- enterRule(_localctx, 58, RULE_scoped_identifier);
+ enterRule(_localctx, 60, RULE_scoped_identifier);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(360);
+ setState(367);
match(NAME);
- setState(363);
+ setState(370);
_errHandler.sync(this);
_alt = 1;
do {
@@ -2156,9 +2209,9 @@ public class prog8Parser extends Parser {
case 1:
{
{
- setState(361);
- match(T__68);
- setState(362);
+ setState(368);
+ match(T__69);
+ setState(369);
match(NAME);
}
}
@@ -2166,7 +2219,7 @@ public class prog8Parser extends Parser {
default:
throw new NoViableAltException(this);
}
- setState(365);
+ setState(372);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,26,_ctx);
} while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
@@ -2192,14 +2245,14 @@ public class prog8Parser extends Parser {
public final RegisterContext register() throws RecognitionException {
RegisterContext _localctx = new RegisterContext(_ctx, getState());
- enterRule(_localctx, 60, RULE_register);
+ enterRule(_localctx, 62, RULE_register);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(367);
+ setState(374);
_la = _input.LA(1);
- if ( !(((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (T__69 - 70)) | (1L << (T__70 - 70)) | (1L << (T__71 - 70)))) != 0)) ) {
+ if ( !(((((_la - 71)) & ~0x3f) == 0 && ((1L << (_la - 71)) & ((1L << (T__70 - 71)) | (1L << (T__71 - 71)) | (1L << (T__72 - 71)))) != 0)) ) {
_errHandler.recoverInline(this);
}
else {
@@ -2229,14 +2282,14 @@ public class prog8Parser extends Parser {
public final RegisterorpairContext registerorpair() throws RecognitionException {
RegisterorpairContext _localctx = new RegisterorpairContext(_ctx, getState());
- enterRule(_localctx, 62, RULE_registerorpair);
+ enterRule(_localctx, 64, RULE_registerorpair);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(369);
+ setState(376);
_la = _input.LA(1);
- if ( !(((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (T__69 - 70)) | (1L << (T__70 - 70)) | (1L << (T__71 - 70)) | (1L << (T__72 - 70)) | (1L << (T__73 - 70)) | (1L << (T__74 - 70)))) != 0)) ) {
+ 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);
}
else {
@@ -2266,14 +2319,14 @@ public class prog8Parser extends Parser {
public final StatusregisterContext statusregister() throws RecognitionException {
StatusregisterContext _localctx = new StatusregisterContext(_ctx, getState());
- enterRule(_localctx, 64, RULE_statusregister);
+ enterRule(_localctx, 66, RULE_statusregister);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(371);
+ setState(378);
_la = _input.LA(1);
- if ( !(((((_la - 76)) & ~0x3f) == 0 && ((1L << (_la - 76)) & ((1L << (T__75 - 76)) | (1L << (T__76 - 76)) | (1L << (T__77 - 76)) | (1L << (T__78 - 76)))) != 0)) ) {
+ 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);
}
else {
@@ -2310,12 +2363,12 @@ public class prog8Parser extends Parser {
public final IntegerliteralContext integerliteral() throws RecognitionException {
IntegerliteralContext _localctx = new IntegerliteralContext(_ctx, getState());
- enterRule(_localctx, 66, RULE_integerliteral);
+ enterRule(_localctx, 68, RULE_integerliteral);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(373);
+ setState(380);
((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)) ) {
@@ -2326,12 +2379,12 @@ public class prog8Parser extends Parser {
_errHandler.reportMatch(this);
consume();
}
- setState(375);
+ setState(382);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
case 1:
{
- setState(374);
+ setState(381);
wordsuffix();
}
break;
@@ -2358,12 +2411,12 @@ public class prog8Parser extends Parser {
public final WordsuffixContext wordsuffix() throws RecognitionException {
WordsuffixContext _localctx = new WordsuffixContext(_ctx, getState());
- enterRule(_localctx, 68, RULE_wordsuffix);
+ enterRule(_localctx, 70, RULE_wordsuffix);
try {
enterOuterAlt(_localctx, 1);
{
- setState(377);
- match(T__79);
+ setState(384);
+ match(T__80);
}
}
catch (RecognitionException re) {
@@ -2386,14 +2439,14 @@ public class prog8Parser extends Parser {
public final BooleanliteralContext booleanliteral() throws RecognitionException {
BooleanliteralContext _localctx = new BooleanliteralContext(_ctx, getState());
- enterRule(_localctx, 70, RULE_booleanliteral);
+ enterRule(_localctx, 72, RULE_booleanliteral);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(379);
+ setState(386);
_la = _input.LA(1);
- if ( !(_la==T__80 || _la==T__81) ) {
+ if ( !(_la==T__81 || _la==T__82) ) {
_errHandler.recoverInline(this);
}
else {
@@ -2433,62 +2486,62 @@ public class prog8Parser extends Parser {
public final ArrayliteralContext arrayliteral() throws RecognitionException {
ArrayliteralContext _localctx = new ArrayliteralContext(_ctx, getState());
- enterRule(_localctx, 72, RULE_arrayliteral);
+ enterRule(_localctx, 74, RULE_arrayliteral);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(381);
+ setState(388);
match(T__26);
- setState(383);
+ setState(390);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(382);
+ setState(389);
match(EOL);
}
}
- setState(385);
+ setState(392);
expression(0);
- setState(393);
+ setState(400);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(386);
+ setState(393);
match(T__13);
- setState(388);
+ setState(395);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(387);
+ setState(394);
match(EOL);
}
}
- setState(390);
+ setState(397);
expression(0);
}
}
- setState(395);
+ setState(402);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(397);
+ setState(404);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(396);
+ setState(403);
match(EOL);
}
}
- setState(399);
+ setState(406);
match(T__27);
}
}
@@ -2513,11 +2566,11 @@ public class prog8Parser extends Parser {
public final StringliteralContext stringliteral() throws RecognitionException {
StringliteralContext _localctx = new StringliteralContext(_ctx, getState());
- enterRule(_localctx, 74, RULE_stringliteral);
+ enterRule(_localctx, 76, RULE_stringliteral);
try {
enterOuterAlt(_localctx, 1);
{
- setState(401);
+ setState(408);
match(STRING);
}
}
@@ -2542,11 +2595,11 @@ public class prog8Parser extends Parser {
public final CharliteralContext charliteral() throws RecognitionException {
CharliteralContext _localctx = new CharliteralContext(_ctx, getState());
- enterRule(_localctx, 76, RULE_charliteral);
+ enterRule(_localctx, 78, RULE_charliteral);
try {
enterOuterAlt(_localctx, 1);
{
- setState(403);
+ setState(410);
match(SINGLECHAR);
}
}
@@ -2571,11 +2624,11 @@ public class prog8Parser extends Parser {
public final FloatliteralContext floatliteral() throws RecognitionException {
FloatliteralContext _localctx = new FloatliteralContext(_ctx, getState());
- enterRule(_localctx, 78, RULE_floatliteral);
+ enterRule(_localctx, 80, RULE_floatliteral);
try {
enterOuterAlt(_localctx, 1);
{
- setState(405);
+ setState(412);
match(FLOAT_NUMBER);
}
}
@@ -2617,9 +2670,9 @@ public class prog8Parser extends Parser {
public final LiteralvalueContext literalvalue() throws RecognitionException {
LiteralvalueContext _localctx = new LiteralvalueContext(_ctx, getState());
- enterRule(_localctx, 80, RULE_literalvalue);
+ enterRule(_localctx, 82, RULE_literalvalue);
try {
- setState(413);
+ setState(420);
_errHandler.sync(this);
switch (_input.LA(1)) {
case DEC_INTEGER:
@@ -2627,43 +2680,43 @@ public class prog8Parser extends Parser {
case BIN_INTEGER:
enterOuterAlt(_localctx, 1);
{
- setState(407);
+ setState(414);
integerliteral();
}
break;
- case T__80:
case T__81:
+ case T__82:
enterOuterAlt(_localctx, 2);
{
- setState(408);
+ setState(415);
booleanliteral();
}
break;
case T__26:
enterOuterAlt(_localctx, 3);
{
- setState(409);
+ setState(416);
arrayliteral();
}
break;
case STRING:
enterOuterAlt(_localctx, 4);
{
- setState(410);
+ setState(417);
stringliteral();
}
break;
case SINGLECHAR:
enterOuterAlt(_localctx, 5);
{
- setState(411);
+ setState(418);
charliteral();
}
break;
case FLOAT_NUMBER:
enterOuterAlt(_localctx, 6);
{
- setState(412);
+ setState(419);
floatliteral();
}
break;
@@ -2692,13 +2745,13 @@ public class prog8Parser extends Parser {
public final InlineasmContext inlineasm() throws RecognitionException {
InlineasmContext _localctx = new InlineasmContext(_ctx, getState());
- enterRule(_localctx, 82, RULE_inlineasm);
+ enterRule(_localctx, 84, RULE_inlineasm);
try {
enterOuterAlt(_localctx, 1);
{
- setState(415);
- match(T__82);
- setState(416);
+ setState(422);
+ match(T__83);
+ setState(423);
match(INLINEASMBLOCK);
}
}
@@ -2735,43 +2788,43 @@ public class prog8Parser extends Parser {
public final SubroutineContext subroutine() throws RecognitionException {
SubroutineContext _localctx = new SubroutineContext(_ctx, getState());
- enterRule(_localctx, 84, RULE_subroutine);
+ enterRule(_localctx, 86, RULE_subroutine);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(418);
- match(T__83);
- setState(419);
+ setState(425);
+ match(T__84);
+ setState(426);
identifier();
- setState(420);
+ setState(427);
match(T__40);
- setState(422);
+ setState(429);
_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(421);
+ setState(428);
sub_params();
}
}
- setState(424);
+ setState(431);
match(T__41);
- setState(426);
+ setState(433);
_errHandler.sync(this);
_la = _input.LA(1);
- if (_la==T__84) {
+ if (_la==T__85) {
{
- setState(425);
+ setState(432);
sub_return_part();
}
}
{
- setState(428);
+ setState(435);
statement_block();
- setState(429);
+ setState(436);
match(EOL);
}
}
@@ -2799,13 +2852,13 @@ public class prog8Parser extends Parser {
public final Sub_return_partContext sub_return_part() throws RecognitionException {
Sub_return_partContext _localctx = new Sub_return_partContext(_ctx, getState());
- enterRule(_localctx, 86, RULE_sub_return_part);
+ enterRule(_localctx, 88, RULE_sub_return_part);
try {
enterOuterAlt(_localctx, 1);
{
- setState(431);
- match(T__84);
- setState(432);
+ setState(438);
+ match(T__85);
+ setState(439);
sub_returns();
}
}
@@ -2839,21 +2892,21 @@ public class prog8Parser extends Parser {
public final Statement_blockContext statement_block() throws RecognitionException {
Statement_blockContext _localctx = new Statement_blockContext(_ctx, getState());
- enterRule(_localctx, 88, RULE_statement_block);
+ enterRule(_localctx, 90, RULE_statement_block);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(434);
- match(T__85);
- setState(435);
+ setState(441);
+ match(T__86);
+ setState(442);
match(EOL);
- setState(440);
+ setState(447);
_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__69 - 66)) | (1L << (T__70 - 66)) | (1L << (T__71 - 66)) | (1L << (T__82 - 66)) | (1L << (T__83 - 66)) | (1L << (T__87 - 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)) {
+ 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(438);
+ setState(445);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -2881,12 +2934,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -2905,13 +2959,13 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(436);
+ setState(443);
statement();
}
break;
case EOL:
{
- setState(437);
+ setState(444);
match(EOL);
}
break;
@@ -2919,12 +2973,12 @@ public class prog8Parser extends Parser {
throw new NoViableAltException(this);
}
}
- setState(442);
+ setState(449);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(443);
- match(T__86);
+ setState(450);
+ match(T__87);
}
}
catch (RecognitionException re) {
@@ -2957,36 +3011,36 @@ public class prog8Parser extends Parser {
public final Sub_paramsContext sub_params() throws RecognitionException {
Sub_paramsContext _localctx = new Sub_paramsContext(_ctx, getState());
- enterRule(_localctx, 90, RULE_sub_params);
+ enterRule(_localctx, 92, RULE_sub_params);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(445);
+ setState(452);
vardecl();
- setState(453);
+ setState(460);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(446);
+ setState(453);
match(T__13);
- setState(448);
+ setState(455);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(447);
+ setState(454);
match(EOL);
}
}
- setState(450);
+ setState(457);
vardecl();
}
}
- setState(455);
+ setState(462);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -3022,36 +3076,36 @@ public class prog8Parser extends Parser {
public final Sub_returnsContext sub_returns() throws RecognitionException {
Sub_returnsContext _localctx = new Sub_returnsContext(_ctx, getState());
- enterRule(_localctx, 92, RULE_sub_returns);
+ enterRule(_localctx, 94, RULE_sub_returns);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(456);
+ setState(463);
datatype();
- setState(464);
+ setState(471);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(457);
+ setState(464);
match(T__13);
- setState(459);
+ setState(466);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(458);
+ setState(465);
match(EOL);
}
}
- setState(461);
+ setState(468);
datatype();
}
}
- setState(466);
+ setState(473);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -3095,75 +3149,75 @@ public class prog8Parser extends Parser {
public final AsmsubroutineContext asmsubroutine() throws RecognitionException {
AsmsubroutineContext _localctx = new AsmsubroutineContext(_ctx, getState());
- enterRule(_localctx, 94, RULE_asmsubroutine);
+ enterRule(_localctx, 96, RULE_asmsubroutine);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(467);
- match(T__87);
- setState(468);
- identifier();
- setState(469);
- match(T__40);
- setState(471);
- _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(470);
- asmsub_params();
- }
- }
-
- setState(473);
- match(T__41);
setState(474);
- match(T__84);
- setState(475);
match(T__88);
+ setState(475);
+ identifier();
setState(476);
match(T__40);
setState(478);
_errHandler.sync(this);
_la = _input.LA(1);
- if (((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (T__69 - 70)) | (1L << (T__70 - 70)) | (1L << (T__71 - 70)))) != 0)) {
+ 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);
- clobber();
+ asmsub_params();
}
}
setState(480);
match(T__41);
setState(481);
- match(T__84);
+ match(T__85);
setState(482);
+ match(T__89);
+ setState(483);
match(T__40);
- setState(484);
+ setState(485);
+ _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);
+ clobber();
+ }
+ }
+
+ setState(487);
+ match(T__41);
+ setState(488);
+ match(T__85);
+ setState(489);
+ match(T__40);
+ setState(491);
_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(483);
+ setState(490);
asmsub_returns();
}
}
- setState(486);
+ setState(493);
match(T__41);
- setState(489);
+ setState(496);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__14:
{
- setState(487);
+ setState(494);
asmsub_address();
}
break;
- case T__85:
+ case T__86:
{
- setState(488);
+ setState(495);
statement_block();
}
break;
@@ -3196,13 +3250,13 @@ public class prog8Parser extends Parser {
public final Asmsub_addressContext asmsub_address() throws RecognitionException {
Asmsub_addressContext _localctx = new Asmsub_addressContext(_ctx, getState());
- enterRule(_localctx, 96, RULE_asmsub_address);
+ enterRule(_localctx, 98, RULE_asmsub_address);
try {
enterOuterAlt(_localctx, 1);
{
- setState(491);
+ setState(498);
match(T__14);
- setState(492);
+ setState(499);
((Asmsub_addressContext)_localctx).address = integerliteral();
}
}
@@ -3236,36 +3290,36 @@ public class prog8Parser extends Parser {
public final Asmsub_paramsContext asmsub_params() throws RecognitionException {
Asmsub_paramsContext _localctx = new Asmsub_paramsContext(_ctx, getState());
- enterRule(_localctx, 98, RULE_asmsub_params);
+ enterRule(_localctx, 100, RULE_asmsub_params);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(494);
+ setState(501);
asmsub_param();
- setState(502);
+ setState(509);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(495);
+ setState(502);
match(T__13);
- setState(497);
+ setState(504);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(496);
+ setState(503);
match(EOL);
}
}
- setState(499);
+ setState(506);
asmsub_param();
}
}
- setState(504);
+ setState(511);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -3300,34 +3354,34 @@ public class prog8Parser extends Parser {
public final Asmsub_paramContext asmsub_param() throws RecognitionException {
Asmsub_paramContext _localctx = new Asmsub_paramContext(_ctx, getState());
- enterRule(_localctx, 100, RULE_asmsub_param);
+ enterRule(_localctx, 102, RULE_asmsub_param);
try {
enterOuterAlt(_localctx, 1);
{
- setState(505);
+ setState(512);
vardecl();
- setState(506);
- match(T__89);
- setState(509);
+ setState(513);
+ match(T__65);
+ setState(516);
_errHandler.sync(this);
switch (_input.LA(1)) {
- case T__69:
case T__70:
case T__71:
case T__72:
case T__73:
case T__74:
+ case T__75:
{
- setState(507);
+ setState(514);
registerorpair();
}
break;
- case T__75:
case T__76:
case T__77:
case T__78:
+ case T__79:
{
- setState(508);
+ setState(515);
statusregister();
}
break;
@@ -3362,26 +3416,26 @@ public class prog8Parser extends Parser {
public final ClobberContext clobber() throws RecognitionException {
ClobberContext _localctx = new ClobberContext(_ctx, getState());
- enterRule(_localctx, 102, RULE_clobber);
+ enterRule(_localctx, 104, RULE_clobber);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(511);
+ setState(518);
register();
- setState(516);
+ setState(523);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(512);
+ setState(519);
match(T__13);
- setState(513);
+ setState(520);
register();
}
}
- setState(518);
+ setState(525);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -3417,36 +3471,36 @@ public class prog8Parser extends Parser {
public final Asmsub_returnsContext asmsub_returns() throws RecognitionException {
Asmsub_returnsContext _localctx = new Asmsub_returnsContext(_ctx, getState());
- enterRule(_localctx, 104, RULE_asmsub_returns);
+ enterRule(_localctx, 106, RULE_asmsub_returns);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(519);
+ setState(526);
asmsub_return();
- setState(527);
+ setState(534);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__13) {
{
{
- setState(520);
+ setState(527);
match(T__13);
- setState(522);
+ setState(529);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(521);
+ setState(528);
match(EOL);
}
}
- setState(524);
+ setState(531);
asmsub_return();
}
}
- setState(529);
+ setState(536);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -3481,34 +3535,34 @@ public class prog8Parser extends Parser {
public final Asmsub_returnContext asmsub_return() throws RecognitionException {
Asmsub_returnContext _localctx = new Asmsub_returnContext(_ctx, getState());
- enterRule(_localctx, 106, RULE_asmsub_return);
+ enterRule(_localctx, 108, RULE_asmsub_return);
try {
enterOuterAlt(_localctx, 1);
{
- setState(530);
+ setState(537);
datatype();
- setState(531);
- match(T__89);
- setState(534);
+ setState(538);
+ match(T__65);
+ setState(541);
_errHandler.sync(this);
switch (_input.LA(1)) {
- case T__69:
case T__70:
case T__71:
case T__72:
case T__73:
case T__74:
+ case T__75:
{
- setState(532);
+ setState(539);
registerorpair();
}
break;
- case T__75:
case T__76:
case T__77:
case T__78:
+ case T__79:
{
- setState(533);
+ setState(540);
statusregister();
}
break;
@@ -3553,26 +3607,26 @@ public class prog8Parser extends Parser {
public final If_stmtContext if_stmt() throws RecognitionException {
If_stmtContext _localctx = new If_stmtContext(_ctx, getState());
- enterRule(_localctx, 108, RULE_if_stmt);
+ enterRule(_localctx, 110, RULE_if_stmt);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(536);
+ setState(543);
match(T__90);
- setState(537);
+ setState(544);
expression(0);
- setState(539);
+ setState(546);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(538);
+ setState(545);
match(EOL);
}
}
- setState(543);
+ setState(550);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -3600,12 +3654,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -3624,40 +3679,40 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(541);
+ setState(548);
statement();
}
break;
- case T__85:
+ case T__86:
{
- setState(542);
+ setState(549);
statement_block();
}
break;
default:
throw new NoViableAltException(this);
}
- setState(546);
+ setState(553);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,54,_ctx) ) {
case 1:
{
- setState(545);
+ setState(552);
match(EOL);
}
break;
}
- setState(549);
+ setState(556);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==T__91) {
{
- setState(548);
+ setState(555);
else_part();
}
}
- setState(551);
+ setState(558);
match(EOL);
}
}
@@ -3688,24 +3743,24 @@ public class prog8Parser extends Parser {
public final Else_partContext else_part() throws RecognitionException {
Else_partContext _localctx = new Else_partContext(_ctx, getState());
- enterRule(_localctx, 110, RULE_else_part);
+ enterRule(_localctx, 112, RULE_else_part);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(553);
+ setState(560);
match(T__91);
- setState(555);
+ setState(562);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(554);
+ setState(561);
match(EOL);
}
}
- setState(559);
+ setState(566);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -3733,12 +3788,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -3757,13 +3813,13 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(557);
+ setState(564);
statement();
}
break;
- case T__85:
+ case T__86:
{
- setState(558);
+ setState(565);
statement_block();
}
break;
@@ -3808,24 +3864,24 @@ public class prog8Parser extends Parser {
public final Branch_stmtContext branch_stmt() throws RecognitionException {
Branch_stmtContext _localctx = new Branch_stmtContext(_ctx, getState());
- enterRule(_localctx, 112, RULE_branch_stmt);
+ enterRule(_localctx, 114, RULE_branch_stmt);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(561);
+ setState(568);
branchcondition();
- setState(563);
+ setState(570);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(562);
+ setState(569);
match(EOL);
}
}
- setState(567);
+ setState(574);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -3853,12 +3909,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -3877,40 +3934,40 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(565);
+ setState(572);
statement();
}
break;
- case T__85:
+ case T__86:
{
- setState(566);
+ setState(573);
statement_block();
}
break;
default:
throw new NoViableAltException(this);
}
- setState(570);
+ setState(577);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,60,_ctx) ) {
case 1:
{
- setState(569);
+ setState(576);
match(EOL);
}
break;
}
- setState(573);
+ setState(580);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==T__91) {
{
- setState(572);
+ setState(579);
else_part();
}
}
- setState(575);
+ setState(582);
match(EOL);
}
}
@@ -3934,12 +3991,12 @@ public class prog8Parser extends Parser {
public final BranchconditionContext branchcondition() throws RecognitionException {
BranchconditionContext _localctx = new BranchconditionContext(_ctx, getState());
- enterRule(_localctx, 114, RULE_branchcondition);
+ enterRule(_localctx, 116, RULE_branchcondition);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(577);
+ setState(584);
_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);
@@ -3987,58 +4044,58 @@ public class prog8Parser extends Parser {
public final ForloopContext forloop() throws RecognitionException {
ForloopContext _localctx = new ForloopContext(_ctx, getState());
- enterRule(_localctx, 116, RULE_forloop);
+ enterRule(_localctx, 118, RULE_forloop);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(579);
+ setState(586);
match(T__104);
- setState(581);
+ setState(588);
_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(580);
+ setState(587);
datatype();
}
}
- setState(585);
+ setState(592);
_errHandler.sync(this);
switch (_input.LA(1)) {
- case T__69:
case T__70:
case T__71:
+ case T__72:
{
- setState(583);
+ setState(590);
register();
}
break;
case NAME:
{
- setState(584);
+ setState(591);
identifier();
}
break;
default:
throw new NoViableAltException(this);
}
- setState(587);
+ setState(594);
match(T__105);
- setState(588);
+ setState(595);
expression(0);
- setState(590);
+ setState(597);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(589);
+ setState(596);
match(EOL);
}
}
- setState(592);
+ setState(599);
statement_block();
}
}
@@ -4072,26 +4129,26 @@ public class prog8Parser extends Parser {
public final WhileloopContext whileloop() throws RecognitionException {
WhileloopContext _localctx = new WhileloopContext(_ctx, getState());
- enterRule(_localctx, 118, RULE_whileloop);
+ enterRule(_localctx, 120, RULE_whileloop);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(594);
+ setState(601);
match(T__106);
- setState(595);
+ setState(602);
expression(0);
- setState(597);
+ setState(604);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(596);
+ setState(603);
match(EOL);
}
}
- setState(601);
+ setState(608);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -4119,12 +4176,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -4143,13 +4201,13 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(599);
+ setState(606);
statement();
}
break;
- case T__85:
+ case T__86:
{
- setState(600);
+ setState(607);
statement_block();
}
break;
@@ -4188,14 +4246,14 @@ public class prog8Parser extends Parser {
public final RepeatloopContext repeatloop() throws RecognitionException {
RepeatloopContext _localctx = new RepeatloopContext(_ctx, getState());
- enterRule(_localctx, 120, RULE_repeatloop);
+ enterRule(_localctx, 122, RULE_repeatloop);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(603);
+ setState(610);
match(T__107);
- setState(606);
+ setState(613);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__2:
@@ -4223,12 +4281,13 @@ public class prog8Parser extends Parser {
case T__65:
case T__66:
case T__67:
- case T__69:
+ case T__68:
case T__70:
case T__71:
- case T__82:
+ case T__72:
case T__83:
- case T__87:
+ case T__84:
+ case T__88:
case T__90:
case T__92:
case T__93:
@@ -4247,32 +4306,32 @@ public class prog8Parser extends Parser {
case T__107:
case NAME:
{
- setState(604);
+ setState(611);
statement();
}
break;
- case T__85:
+ case T__86:
{
- setState(605);
+ setState(612);
statement_block();
}
break;
default:
throw new NoViableAltException(this);
}
- setState(609);
+ setState(616);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==EOL) {
{
- setState(608);
+ setState(615);
match(EOL);
}
}
- setState(611);
+ setState(618);
match(T__108);
- setState(612);
+ setState(619);
expression(0);
}
}
@@ -4297,29 +4356,29 @@ public class prog8Parser extends Parser {
private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
switch (predIndex) {
case 0:
- return precpred(_ctx, 19);
+ return precpred(_ctx, 20);
case 1:
- return precpred(_ctx, 18);
+ return precpred(_ctx, 19);
case 2:
- return precpred(_ctx, 17);
+ return precpred(_ctx, 18);
case 3:
- return precpred(_ctx, 16);
+ return precpred(_ctx, 17);
case 4:
- return precpred(_ctx, 15);
+ return precpred(_ctx, 16);
case 5:
- return precpred(_ctx, 14);
+ return precpred(_ctx, 15);
case 6:
- return precpred(_ctx, 13);
+ return precpred(_ctx, 14);
case 7:
- return precpred(_ctx, 12);
+ return precpred(_ctx, 13);
case 8:
- return precpred(_ctx, 10);
- case 9:
- return precpred(_ctx, 9);
- case 10:
- return precpred(_ctx, 8);
- case 11:
return precpred(_ctx, 11);
+ case 9:
+ return precpred(_ctx, 10);
+ case 10:
+ return precpred(_ctx, 9);
+ case 11:
+ return precpred(_ctx, 12);
case 12:
return precpred(_ctx, 1);
}
@@ -4327,7 +4386,7 @@ public class prog8Parser extends Parser {
}
public static final String _serializedATN =
- "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3{\u0269\4\2\t\2\4"+
+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3{\u0270\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"+
@@ -4335,232 +4394,234 @@ public class prog8Parser extends Parser {
"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
- "\4>\t>\3\2\3\2\7\2\177\n\2\f\2\16\2\u0082\13\2\3\2\3\2\3\3\3\3\5\3\u0088"+
- "\n\3\3\4\3\4\3\4\5\4\u008d\n\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5"+
- "\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\5\5\u00a8"+
- "\n\5\3\6\3\6\3\6\3\7\3\7\3\7\3\7\5\7\u00b1\n\7\3\b\3\b\5\b\u00b5\n\b\3"+
- "\b\3\b\3\b\7\b\u00ba\n\b\f\b\16\b\u00bd\13\b\5\b\u00bf\n\b\3\t\3\t\3\t"+
- "\5\t\u00c4\n\t\3\n\3\n\5\n\u00c8\n\n\3\n\3\n\3\13\3\13\5\13\u00ce\n\13"+
- "\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\17\3\17\3\17"+
- "\3\17\3\20\3\20\3\20\3\20\3\21\3\21\3\21\7\21\u00e7\n\21\f\21\16\21\u00ea"+
- "\13\21\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\5\23\u00f4\n\23\3\24\3"+
- "\24\3\24\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\u0108\n\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
+ "\4>\t>\4?\t?\3\2\3\2\7\2\u0081\n\2\f\2\16\2\u0084\13\2\3\2\3\2\3\3\3\3"+
+ "\5\3\u008a\n\3\3\4\3\4\3\4\5\4\u008f\n\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3"+
+ "\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5"+
+ "\5\5\u00aa\n\5\3\6\3\6\3\6\3\7\3\7\3\7\3\7\5\7\u00b3\n\7\3\b\3\b\5\b\u00b7"+
+ "\n\b\3\b\3\b\3\b\7\b\u00bc\n\b\f\b\16\b\u00bf\13\b\5\b\u00c1\n\b\3\t\3"+
+ "\t\3\t\5\t\u00c6\n\t\3\n\3\n\5\n\u00ca\n\n\3\n\3\n\3\13\3\13\5\13\u00d0"+
+ "\n\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\17\3\17"+
+ "\3\17\3\17\3\20\3\20\3\20\3\20\3\21\3\21\3\21\7\21\u00e9\n\21\f\21\16"+
+ "\21\u00ec\13\21\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\5\23\u00f7"+
+ "\n\23\3\24\3\24\3\24\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\u010c\n\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\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\u0130\n\25\3\25\3\25\7\25\u0134\n\25\f\25\16\25\u0137"+
- "\13\25\3\26\3\26\3\26\3\27\3\27\5\27\u013e\n\27\3\27\3\27\3\30\3\30\5"+
- "\30\u0144\n\30\3\30\3\30\5\30\u0148\n\30\3\30\3\30\3\31\3\31\5\31\u014e"+
- "\n\31\3\31\3\31\5\31\u0152\n\31\3\31\3\31\3\32\3\32\3\32\5\32\u0159\n"+
- "\32\3\32\7\32\u015c\n\32\f\32\16\32\u015f\13\32\3\33\3\33\5\33\u0163\n"+
- "\33\3\34\3\34\3\35\3\35\3\36\3\36\3\37\3\37\3\37\6\37\u016e\n\37\r\37"+
- "\16\37\u016f\3 \3 \3!\3!\3\"\3\"\3#\3#\5#\u017a\n#\3$\3$\3%\3%\3&\3&\5"+
- "&\u0182\n&\3&\3&\3&\5&\u0187\n&\3&\7&\u018a\n&\f&\16&\u018d\13&\3&\5&"+
- "\u0190\n&\3&\3&\3\'\3\'\3(\3(\3)\3)\3*\3*\3*\3*\3*\3*\5*\u01a0\n*\3+\3"+
- "+\3+\3,\3,\3,\3,\5,\u01a9\n,\3,\3,\5,\u01ad\n,\3,\3,\3,\3-\3-\3-\3.\3"+
- ".\3.\3.\7.\u01b9\n.\f.\16.\u01bc\13.\3.\3.\3/\3/\3/\5/\u01c3\n/\3/\7/"+
- "\u01c6\n/\f/\16/\u01c9\13/\3\60\3\60\3\60\5\60\u01ce\n\60\3\60\7\60\u01d1"+
- "\n\60\f\60\16\60\u01d4\13\60\3\61\3\61\3\61\3\61\5\61\u01da\n\61\3\61"+
- "\3\61\3\61\3\61\3\61\5\61\u01e1\n\61\3\61\3\61\3\61\3\61\5\61\u01e7\n"+
- "\61\3\61\3\61\3\61\5\61\u01ec\n\61\3\62\3\62\3\62\3\63\3\63\3\63\5\63"+
- "\u01f4\n\63\3\63\7\63\u01f7\n\63\f\63\16\63\u01fa\13\63\3\64\3\64\3\64"+
- "\3\64\5\64\u0200\n\64\3\65\3\65\3\65\7\65\u0205\n\65\f\65\16\65\u0208"+
- "\13\65\3\66\3\66\3\66\5\66\u020d\n\66\3\66\7\66\u0210\n\66\f\66\16\66"+
- "\u0213\13\66\3\67\3\67\3\67\3\67\5\67\u0219\n\67\38\38\38\58\u021e\n8"+
- "\38\38\58\u0222\n8\38\58\u0225\n8\38\58\u0228\n8\38\38\39\39\59\u022e"+
- "\n9\39\39\59\u0232\n9\3:\3:\5:\u0236\n:\3:\3:\5:\u023a\n:\3:\5:\u023d"+
- "\n:\3:\5:\u0240\n:\3:\3:\3;\3;\3<\3<\5<\u0248\n<\3<\3<\5<\u024c\n<\3<"+
- "\3<\3<\5<\u0251\n<\3<\3<\3=\3=\3=\5=\u0258\n=\3=\3=\5=\u025c\n=\3>\3>"+
- "\3>\5>\u0261\n>\3>\5>\u0264\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\\^`bdfhjlnp"+
- "rtvxz\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\2HJ\3\2HM\3\2NQ\3\2uw\3\2ST\3\2_j\2\u029e\2\u0080\3"+
- "\2\2\2\4\u0087\3\2\2\2\6\u0089\3\2\2\2\b\u00a7\3\2\2\2\n\u00a9\3\2\2\2"+
- "\f\u00ac\3\2\2\2\16\u00b2\3\2\2\2\20\u00c3\3\2\2\2\22\u00c5\3\2\2\2\24"+
- "\u00cb\3\2\2\2\26\u00d3\3\2\2\2\30\u00d6\3\2\2\2\32\u00d9\3\2\2\2\34\u00db"+
- "\3\2\2\2\36\u00df\3\2\2\2 \u00e3\3\2\2\2\"\u00eb\3\2\2\2$\u00f3\3\2\2"+
- "\2&\u00f5\3\2\2\2(\u0107\3\2\2\2*\u0138\3\2\2\2,\u013d\3\2\2\2.\u0143"+
- "\3\2\2\2\60\u014d\3\2\2\2\62\u0155\3\2\2\2\64\u0160\3\2\2\2\66\u0164\3"+
- "\2\2\28\u0166\3\2\2\2:\u0168\3\2\2\2<\u016a\3\2\2\2>\u0171\3\2\2\2@\u0173"+
- "\3\2\2\2B\u0175\3\2\2\2D\u0177\3\2\2\2F\u017b\3\2\2\2H\u017d\3\2\2\2J"+
- "\u017f\3\2\2\2L\u0193\3\2\2\2N\u0195\3\2\2\2P\u0197\3\2\2\2R\u019f\3\2"+
- "\2\2T\u01a1\3\2\2\2V\u01a4\3\2\2\2X\u01b1\3\2\2\2Z\u01b4\3\2\2\2\\\u01bf"+
- "\3\2\2\2^\u01ca\3\2\2\2`\u01d5\3\2\2\2b\u01ed\3\2\2\2d\u01f0\3\2\2\2f"+
- "\u01fb\3\2\2\2h\u0201\3\2\2\2j\u0209\3\2\2\2l\u0214\3\2\2\2n\u021a\3\2"+
- "\2\2p\u022b\3\2\2\2r\u0233\3\2\2\2t\u0243\3\2\2\2v\u0245\3\2\2\2x\u0254"+
- "\3\2\2\2z\u025d\3\2\2\2|\177\5\4\3\2}\177\7s\2\2~|\3\2\2\2~}\3\2\2\2\177"+
- "\u0082\3\2\2\2\u0080~\3\2\2\2\u0080\u0081\3\2\2\2\u0081\u0083\3\2\2\2"+
- "\u0082\u0080\3\2\2\2\u0083\u0084\7\2\2\3\u0084\3\3\2\2\2\u0085\u0088\5"+
- "\16\b\2\u0086\u0088\5\6\4\2\u0087\u0085\3\2\2\2\u0087\u0086\3\2\2\2\u0088"+
- "\5\3\2\2\2\u0089\u008a\7\3\2\2\u008a\u008c\5:\36\2\u008b\u008d\5D#\2\u008c"+
- "\u008b\3\2\2\2\u008c\u008d\3\2\2\2\u008d\u008e\3\2\2\2\u008e\u008f\5Z"+
- ".\2\u008f\u0090\7s\2\2\u0090\7\3\2\2\2\u0091\u00a8\5\16\b\2\u0092\u00a8"+
- "\5\24\13\2\u0093\u00a8\5\22\n\2\u0094\u00a8\5\26\f\2\u0095\u00a8\5\30"+
- "\r\2\u0096\u00a8\5\36\20\2\u0097\u00a8\5\"\22\2\u0098\u00a8\5\f\7\2\u0099"+
- "\u00a8\5&\24\2\u009a\u00a8\5\60\31\2\u009b\u00a8\5n8\2\u009c\u00a8\5r"+
- ":\2\u009d\u00a8\5V,\2\u009e\u00a8\5`\61\2\u009f\u00a8\5T+\2\u00a0\u00a8"+
- "\5\64\33\2\u00a1\u00a8\5v<\2\u00a2\u00a8\5x=\2\u00a3\u00a8\5z>\2\u00a4"+
- "\u00a8\5\66\34\2\u00a5\u00a8\58\35\2\u00a6\u00a8\5\n\6\2\u00a7\u0091\3"+
- "\2\2\2\u00a7\u0092\3\2\2\2\u00a7\u0093\3\2\2\2\u00a7\u0094\3\2\2\2\u00a7"+
- "\u0095\3\2\2\2\u00a7\u0096\3\2\2\2\u00a7\u0097\3\2\2\2\u00a7\u0098\3\2"+
- "\2\2\u00a7\u0099\3\2\2\2\u00a7\u009a\3\2\2\2\u00a7\u009b\3\2\2\2\u00a7"+
- "\u009c\3\2\2\2\u00a7\u009d\3\2\2\2\u00a7\u009e\3\2\2\2\u00a7\u009f\3\2"+
- "\2\2\u00a7\u00a0\3\2\2\2\u00a7\u00a1\3\2\2\2\u00a7\u00a2\3\2\2\2\u00a7"+
- "\u00a3\3\2\2\2\u00a7\u00a4\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a6\3\2"+
- "\2\2\u00a8\t\3\2\2\2\u00a9\u00aa\5:\36\2\u00aa\u00ab\7\4\2\2\u00ab\13"+
- "\3\2\2\2\u00ac\u00b0\7\5\2\2\u00ad\u00b1\5D#\2\u00ae\u00b1\5:\36\2\u00af"+
- "\u00b1\5<\37\2\u00b0\u00ad\3\2\2\2\u00b0\u00ae\3\2\2\2\u00b0\u00af\3\2"+
- "\2\2\u00b1\r\3\2\2\2\u00b2\u00be\t\2\2\2\u00b3\u00b5\5\20\t\2\u00b4\u00b3"+
- "\3\2\2\2\u00b4\u00b5\3\2\2\2\u00b5\u00bf\3\2\2\2\u00b6\u00bb\5\20\t\2"+
- "\u00b7\u00b8\7\20\2\2\u00b8\u00ba\5\20\t\2\u00b9\u00b7\3\2\2\2\u00ba\u00bd"+
- "\3\2\2\2\u00bb\u00b9\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\u00bf\3\2\2\2\u00bd"+
- "\u00bb\3\2\2\2\u00be\u00b4\3\2\2\2\u00be\u00b6\3\2\2\2\u00bf\17\3\2\2"+
- "\2\u00c0\u00c4\5L\'\2\u00c1\u00c4\5:\36\2\u00c2\u00c4\5D#\2\u00c3\u00c0"+
- "\3\2\2\2\u00c3\u00c1\3\2\2\2\u00c3\u00c2\3\2\2\2\u00c4\21\3\2\2\2\u00c5"+
- "\u00c7\5\32\16\2\u00c6\u00c8\5\34\17\2\u00c7\u00c6\3\2\2\2\u00c7\u00c8"+
- "\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9\u00ca\5:\36\2\u00ca\23\3\2\2\2\u00cb"+
- "\u00cd\5\32\16\2\u00cc\u00ce\5\34\17\2\u00cd\u00cc\3\2\2\2\u00cd\u00ce"+
- "\3\2\2\2\u00ce\u00cf\3\2\2\2\u00cf\u00d0\5:\36\2\u00d0\u00d1\7\21\2\2"+
- "\u00d1\u00d2\5(\25\2\u00d2\25\3\2\2\2\u00d3\u00d4\7\22\2\2\u00d4\u00d5"+
- "\5\24\13\2\u00d5\27\3\2\2\2\u00d6\u00d7\7\23\2\2\u00d7\u00d8\5\24\13\2"+
- "\u00d8\31\3\2\2\2\u00d9\u00da\t\3\2\2\u00da\33\3\2\2\2\u00db\u00dc\7\35"+
- "\2\2\u00dc\u00dd\5(\25\2\u00dd\u00de\7\36\2\2\u00de\35\3\2\2\2\u00df\u00e0"+
- "\5 \21\2\u00e0\u00e1\7\21\2\2\u00e1\u00e2\5(\25\2\u00e2\37\3\2\2\2\u00e3"+
- "\u00e8\5$\23\2\u00e4\u00e5\7\20\2\2\u00e5\u00e7\5$\23\2\u00e6\u00e4\3"+
- "\2\2\2\u00e7\u00ea\3\2\2\2\u00e8\u00e6\3\2\2\2\u00e8\u00e9\3\2\2\2\u00e9"+
- "!\3\2\2\2\u00ea\u00e8\3\2\2\2\u00eb\u00ec\5$\23\2\u00ec\u00ed\t\4\2\2"+
- "\u00ed\u00ee\5(\25\2\u00ee#\3\2\2\2\u00ef\u00f4\5> \2\u00f0\u00f4\5:\36"+
- "\2\u00f1\u00f4\5<\37\2\u00f2\u00f4\5,\27\2\u00f3\u00ef\3\2\2\2\u00f3\u00f0"+
- "\3\2\2\2\u00f3\u00f1\3\2\2\2\u00f3\u00f2\3\2\2\2\u00f4%\3\2\2\2\u00f5"+
- "\u00f6\5$\23\2\u00f6\u00f7\t\5\2\2\u00f7\'\3\2\2\2\u00f8\u00f9\b\25\1"+
- "\2\u00f9\u00fa\7+\2\2\u00fa\u00fb\5(\25\2\u00fb\u00fc\7,\2\2\u00fc\u0108"+
- "\3\2\2\2\u00fd\u0108\5.\30\2\u00fe\u00ff\t\6\2\2\u00ff\u0108\5(\25\26"+
- "\u0100\u0101\7B\2\2\u0101\u0108\5(\25\t\u0102\u0108\5R*\2\u0103\u0108"+
- "\5> \2\u0104\u0108\5:\36\2\u0105\u0108\5<\37\2\u0106\u0108\5,\27\2\u0107"+
- "\u00f8\3\2\2\2\u0107\u00fd\3\2\2\2\u0107\u00fe\3\2\2\2\u0107\u0100\3\2"+
- "\2\2\u0107\u0102\3\2\2\2\u0107\u0103\3\2\2\2\u0107\u0104\3\2\2\2\u0107"+
- "\u0105\3\2\2\2\u0107\u0106\3\2\2\2\u0108\u0135\3\2\2\2\u0109\u010a\f\25"+
- "\2\2\u010a\u010b\7/\2\2\u010b\u0134\5(\25\26\u010c\u010d\f\24\2\2\u010d"+
- "\u010e\t\7\2\2\u010e\u0134\5(\25\25\u010f\u0110\f\23\2\2\u0110\u0111\t"+
- "\b\2\2\u0111\u0134\5(\25\24\u0112\u0113\f\22\2\2\u0113\u0114\t\t\2\2\u0114"+
- "\u0134\5(\25\23\u0115\u0116\f\21\2\2\u0116\u0117\t\n\2\2\u0117\u0134\5"+
- "(\25\22\u0118\u0119\f\20\2\2\u0119\u011a\7:\2\2\u011a\u0134\5(\25\21\u011b"+
- "\u011c\f\17\2\2\u011c\u011d\7;\2\2\u011d\u0134\5(\25\20\u011e\u011f\f"+
- "\16\2\2\u011f\u0120\7<\2\2\u0120\u0134\5(\25\17\u0121\u0122\f\f\2\2\u0122"+
- "\u0123\7?\2\2\u0123\u0134\5(\25\r\u0124\u0125\f\13\2\2\u0125\u0126\7@"+
- "\2\2\u0126\u0134\5(\25\f\u0127\u0128\f\n\2\2\u0128\u0129\7A\2\2\u0129"+
- "\u0134\5(\25\13\u012a\u012b\f\r\2\2\u012b\u012c\7=\2\2\u012c\u012f\5("+
- "\25\2\u012d\u012e\7>\2\2\u012e\u0130\5(\25\2\u012f\u012d\3\2\2\2\u012f"+
- "\u0130\3\2\2\2\u0130\u0134\3\2\2\2\u0131\u0132\f\3\2\2\u0132\u0134\5*"+
- "\26\2\u0133\u0109\3\2\2\2\u0133\u010c\3\2\2\2\u0133\u010f\3\2\2\2\u0133"+
- "\u0112\3\2\2\2\u0133\u0115\3\2\2\2\u0133\u0118\3\2\2\2\u0133\u011b\3\2"+
- "\2\2\u0133\u011e\3\2\2\2\u0133\u0121\3\2\2\2\u0133\u0124\3\2\2\2\u0133"+
- "\u0127\3\2\2\2\u0133\u012a\3\2\2\2\u0133\u0131\3\2\2\2\u0134\u0137\3\2"+
- "\2\2\u0135\u0133\3\2\2\2\u0135\u0136\3\2\2\2\u0136)\3\2\2\2\u0137\u0135"+
- "\3\2\2\2\u0138\u0139\7C\2\2\u0139\u013a\5\32\16\2\u013a+\3\2\2\2\u013b"+
- "\u013e\5:\36\2\u013c\u013e\5<\37\2\u013d\u013b\3\2\2\2\u013d\u013c\3\2"+
- "\2\2\u013e\u013f\3\2\2\2\u013f\u0140\5\34\17\2\u0140-\3\2\2\2\u0141\u0144"+
- "\5:\36\2\u0142\u0144\5<\37\2\u0143\u0141\3\2\2\2\u0143\u0142\3\2\2\2\u0144"+
- "\u0145\3\2\2\2\u0145\u0147\7+\2\2\u0146\u0148\5\62\32\2\u0147\u0146\3"+
- "\2\2\2\u0147\u0148\3\2\2\2\u0148\u0149\3\2\2\2\u0149\u014a\7,\2\2\u014a"+
- "/\3\2\2\2\u014b\u014e\5:\36\2\u014c\u014e\5<\37\2\u014d\u014b\3\2\2\2"+
- "\u014d\u014c\3\2\2\2\u014e\u014f\3\2\2\2\u014f\u0151\7+\2\2\u0150\u0152"+
- "\5\62\32\2\u0151\u0150\3\2\2\2\u0151\u0152\3\2\2\2\u0152\u0153\3\2\2\2"+
- "\u0153\u0154\7,\2\2\u0154\61\3\2\2\2\u0155\u015d\5(\25\2\u0156\u0158\7"+
- "\20\2\2\u0157\u0159\7s\2\2\u0158\u0157\3\2\2\2\u0158\u0159\3\2\2\2\u0159"+
- "\u015a\3\2\2\2\u015a\u015c\5(\25\2\u015b\u0156\3\2\2\2\u015c\u015f\3\2"+
- "\2\2\u015d\u015b\3\2\2\2\u015d\u015e\3\2\2\2\u015e\63\3\2\2\2\u015f\u015d"+
- "\3\2\2\2\u0160\u0162\7D\2\2\u0161\u0163\5\62\32\2\u0162\u0161\3\2\2\2"+
- "\u0162\u0163\3\2\2\2\u0163\65\3\2\2\2\u0164\u0165\7E\2\2\u0165\67\3\2"+
- "\2\2\u0166\u0167\7F\2\2\u01679\3\2\2\2\u0168\u0169\7t\2\2\u0169;\3\2\2"+
- "\2\u016a\u016d\7t\2\2\u016b\u016c\7G\2\2\u016c\u016e\7t\2\2\u016d\u016b"+
- "\3\2\2\2\u016e\u016f\3\2\2\2\u016f\u016d\3\2\2\2\u016f\u0170\3\2\2\2\u0170"+
- "=\3\2\2\2\u0171\u0172\t\13\2\2\u0172?\3\2\2\2\u0173\u0174\t\f\2\2\u0174"+
- "A\3\2\2\2\u0175\u0176\t\r\2\2\u0176C\3\2\2\2\u0177\u0179\t\16\2\2\u0178"+
- "\u017a\5F$\2\u0179\u0178\3\2\2\2\u0179\u017a\3\2\2\2\u017aE\3\2\2\2\u017b"+
- "\u017c\7R\2\2\u017cG\3\2\2\2\u017d\u017e\t\17\2\2\u017eI\3\2\2\2\u017f"+
- "\u0181\7\35\2\2\u0180\u0182\7s\2\2\u0181\u0180\3\2\2\2\u0181\u0182\3\2"+
- "\2\2\u0182\u0183\3\2\2\2\u0183\u018b\5(\25\2\u0184\u0186\7\20\2\2\u0185"+
- "\u0187\7s\2\2\u0186\u0185\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0188\3\2"+
- "\2\2\u0188\u018a\5(\25\2\u0189\u0184\3\2\2\2\u018a\u018d\3\2\2\2\u018b"+
- "\u0189\3\2\2\2\u018b\u018c\3\2\2\2\u018c\u018f\3\2\2\2\u018d\u018b\3\2"+
- "\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\u0192\7\36\2\2\u0192K\3\2\2\2\u0193\u0194\7y\2\2"+
- "\u0194M\3\2\2\2\u0195\u0196\7{\2\2\u0196O\3\2\2\2\u0197\u0198\7x\2\2\u0198"+
- "Q\3\2\2\2\u0199\u01a0\5D#\2\u019a\u01a0\5H%\2\u019b\u01a0\5J&\2\u019c"+
- "\u01a0\5L\'\2\u019d\u01a0\5N(\2\u019e\u01a0\5P)\2\u019f\u0199\3\2\2\2"+
- "\u019f\u019a\3\2\2\2\u019f\u019b\3\2\2\2\u019f\u019c\3\2\2\2\u019f\u019d"+
- "\3\2\2\2\u019f\u019e\3\2\2\2\u01a0S\3\2\2\2\u01a1\u01a2\7U\2\2\u01a2\u01a3"+
- "\7z\2\2\u01a3U\3\2\2\2\u01a4\u01a5\7V\2\2\u01a5\u01a6\5:\36\2\u01a6\u01a8"+
- "\7+\2\2\u01a7\u01a9\5\\/\2\u01a8\u01a7\3\2\2\2\u01a8\u01a9\3\2\2\2\u01a9"+
- "\u01aa\3\2\2\2\u01aa\u01ac\7,\2\2\u01ab\u01ad\5X-\2\u01ac\u01ab\3\2\2"+
- "\2\u01ac\u01ad\3\2\2\2\u01ad\u01ae\3\2\2\2\u01ae\u01af\5Z.\2\u01af\u01b0"+
- "\7s\2\2\u01b0W\3\2\2\2\u01b1\u01b2\7W\2\2\u01b2\u01b3\5^\60\2\u01b3Y\3"+
- "\2\2\2\u01b4\u01b5\7X\2\2\u01b5\u01ba\7s\2\2\u01b6\u01b9\5\b\5\2\u01b7"+
- "\u01b9\7s\2\2\u01b8\u01b6\3\2\2\2\u01b8\u01b7\3\2\2\2\u01b9\u01bc\3\2"+
- "\2\2\u01ba\u01b8\3\2\2\2\u01ba\u01bb\3\2\2\2\u01bb\u01bd\3\2\2\2\u01bc"+
- "\u01ba\3\2\2\2\u01bd\u01be\7Y\2\2\u01be[\3\2\2\2\u01bf\u01c7\5\22\n\2"+
- "\u01c0\u01c2\7\20\2\2\u01c1\u01c3\7s\2\2\u01c2\u01c1\3\2\2\2\u01c2\u01c3"+
- "\3\2\2\2\u01c3\u01c4\3\2\2\2\u01c4\u01c6\5\22\n\2\u01c5\u01c0\3\2\2\2"+
- "\u01c6\u01c9\3\2\2\2\u01c7\u01c5\3\2\2\2\u01c7\u01c8\3\2\2\2\u01c8]\3"+
- "\2\2\2\u01c9\u01c7\3\2\2\2\u01ca\u01d2\5\32\16\2\u01cb\u01cd\7\20\2\2"+
- "\u01cc\u01ce\7s\2\2\u01cd\u01cc\3\2\2\2\u01cd\u01ce\3\2\2\2\u01ce\u01cf"+
- "\3\2\2\2\u01cf\u01d1\5\32\16\2\u01d0\u01cb\3\2\2\2\u01d1\u01d4\3\2\2\2"+
- "\u01d2\u01d0\3\2\2\2\u01d2\u01d3\3\2\2\2\u01d3_\3\2\2\2\u01d4\u01d2\3"+
- "\2\2\2\u01d5\u01d6\7Z\2\2\u01d6\u01d7\5:\36\2\u01d7\u01d9\7+\2\2\u01d8"+
- "\u01da\5d\63\2\u01d9\u01d8\3\2\2\2\u01d9\u01da\3\2\2\2\u01da\u01db\3\2"+
- "\2\2\u01db\u01dc\7,\2\2\u01dc\u01dd\7W\2\2\u01dd\u01de\7[\2\2\u01de\u01e0"+
- "\7+\2\2\u01df\u01e1\5h\65\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\7W\2\2\u01e4\u01e6\7+\2"+
- "\2\u01e5\u01e7\5j\66\2\u01e6\u01e5\3\2\2\2\u01e6\u01e7\3\2\2\2\u01e7\u01e8"+
- "\3\2\2\2\u01e8\u01eb\7,\2\2\u01e9\u01ec\5b\62\2\u01ea\u01ec\5Z.\2\u01eb"+
- "\u01e9\3\2\2\2\u01eb\u01ea\3\2\2\2\u01eca\3\2\2\2\u01ed\u01ee\7\21\2\2"+
- "\u01ee\u01ef\5D#\2\u01efc\3\2\2\2\u01f0\u01f8\5f\64\2\u01f1\u01f3\7\20"+
- "\2\2\u01f2\u01f4\7s\2\2\u01f3\u01f2\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4"+
- "\u01f5\3\2\2\2\u01f5\u01f7\5f\64\2\u01f6\u01f1\3\2\2\2\u01f7\u01fa\3\2"+
- "\2\2\u01f8\u01f6\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9e\3\2\2\2\u01fa\u01f8"+
- "\3\2\2\2\u01fb\u01fc\5\22\n\2\u01fc\u01ff\7\\\2\2\u01fd\u0200\5@!\2\u01fe"+
- "\u0200\5B\"\2\u01ff\u01fd\3\2\2\2\u01ff\u01fe\3\2\2\2\u0200g\3\2\2\2\u0201"+
- "\u0206\5> \2\u0202\u0203\7\20\2\2\u0203\u0205\5> \2\u0204\u0202\3\2\2"+
- "\2\u0205\u0208\3\2\2\2\u0206\u0204\3\2\2\2\u0206\u0207\3\2\2\2\u0207i"+
- "\3\2\2\2\u0208\u0206\3\2\2\2\u0209\u0211\5l\67\2\u020a\u020c\7\20\2\2"+
- "\u020b\u020d\7s\2\2\u020c\u020b\3\2\2\2\u020c\u020d\3\2\2\2\u020d\u020e"+
- "\3\2\2\2\u020e\u0210\5l\67\2\u020f\u020a\3\2\2\2\u0210\u0213\3\2\2\2\u0211"+
- "\u020f\3\2\2\2\u0211\u0212\3\2\2\2\u0212k\3\2\2\2\u0213\u0211\3\2\2\2"+
- "\u0214\u0215\5\32\16\2\u0215\u0218\7\\\2\2\u0216\u0219\5@!\2\u0217\u0219"+
- "\5B\"\2\u0218\u0216\3\2\2\2\u0218\u0217\3\2\2\2\u0219m\3\2\2\2\u021a\u021b"+
- "\7]\2\2\u021b\u021d\5(\25\2\u021c\u021e\7s\2\2\u021d\u021c\3\2\2\2\u021d"+
- "\u021e\3\2\2\2\u021e\u0221\3\2\2\2\u021f\u0222\5\b\5\2\u0220\u0222\5Z"+
- ".\2\u0221\u021f\3\2\2\2\u0221\u0220\3\2\2\2\u0222\u0224\3\2\2\2\u0223"+
- "\u0225\7s\2\2\u0224\u0223\3\2\2\2\u0224\u0225\3\2\2\2\u0225\u0227\3\2"+
- "\2\2\u0226\u0228\5p9\2\u0227\u0226\3\2\2\2\u0227\u0228\3\2\2\2\u0228\u0229"+
- "\3\2\2\2\u0229\u022a\7s\2\2\u022ao\3\2\2\2\u022b\u022d\7^\2\2\u022c\u022e"+
- "\7s\2\2\u022d\u022c\3\2\2\2\u022d\u022e\3\2\2\2\u022e\u0231\3\2\2\2\u022f"+
- "\u0232\5\b\5\2\u0230\u0232\5Z.\2\u0231\u022f\3\2\2\2\u0231\u0230\3\2\2"+
- "\2\u0232q\3\2\2\2\u0233\u0235\5t;\2\u0234\u0236\7s\2\2\u0235\u0234\3\2"+
- "\2\2\u0235\u0236\3\2\2\2\u0236\u0239\3\2\2\2\u0237\u023a\5\b\5\2\u0238"+
- "\u023a\5Z.\2\u0239\u0237\3\2\2\2\u0239\u0238\3\2\2\2\u023a\u023c\3\2\2"+
- "\2\u023b\u023d\7s\2\2\u023c\u023b\3\2\2\2\u023c\u023d\3\2\2\2\u023d\u023f"+
- "\3\2\2\2\u023e\u0240\5p9\2\u023f\u023e\3\2\2\2\u023f\u0240\3\2\2\2\u0240"+
- "\u0241\3\2\2\2\u0241\u0242\7s\2\2\u0242s\3\2\2\2\u0243\u0244\t\20\2\2"+
- "\u0244u\3\2\2\2\u0245\u0247\7k\2\2\u0246\u0248\5\32\16\2\u0247\u0246\3"+
- "\2\2\2\u0247\u0248\3\2\2\2\u0248\u024b\3\2\2\2\u0249\u024c\5> \2\u024a"+
- "\u024c\5:\36\2\u024b\u0249\3\2\2\2\u024b\u024a\3\2\2\2\u024c\u024d\3\2"+
- "\2\2\u024d\u024e\7l\2\2\u024e\u0250\5(\25\2\u024f\u0251\7s\2\2\u0250\u024f"+
- "\3\2\2\2\u0250\u0251\3\2\2\2\u0251\u0252\3\2\2\2\u0252\u0253\5Z.\2\u0253"+
- "w\3\2\2\2\u0254\u0255\7m\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\u025b\3\2\2\2\u0259\u025c\5\b"+
- "\5\2\u025a\u025c\5Z.\2\u025b\u0259\3\2\2\2\u025b\u025a\3\2\2\2\u025cy"+
- "\3\2\2\2\u025d\u0260\7n\2\2\u025e\u0261\5\b\5\2\u025f\u0261\5Z.\2\u0260"+
- "\u025e\3\2\2\2\u0260\u025f\3\2\2\2\u0261\u0263\3\2\2\2\u0262\u0264\7s"+
- "\2\2\u0263\u0262\3\2\2\2\u0263\u0264\3\2\2\2\u0264\u0265\3\2\2\2\u0265"+
- "\u0266\7o\2\2\u0266\u0267\5(\25\2\u0267{\3\2\2\2G~\u0080\u0087\u008c\u00a7"+
- "\u00b0\u00b4\u00bb\u00be\u00c3\u00c7\u00cd\u00e8\u00f3\u0107\u012f\u0133"+
- "\u0135\u013d\u0143\u0147\u014d\u0151\u0158\u015d\u0162\u016f\u0179\u0181"+
- "\u0186\u018b\u018f\u019f\u01a8\u01ac\u01b8\u01ba\u01c2\u01c7\u01cd\u01d2"+
- "\u01d9\u01e0\u01e6\u01eb\u01f3\u01f8\u01ff\u0206\u020c\u0211\u0218\u021d"+
- "\u0221\u0224\u0227\u022d\u0231\u0235\u0239\u023c\u023f\u0247\u024b\u0250"+
- "\u0257\u025b\u0260\u0263";
+ "\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"+
+ "\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"+
+ "\3\2\2\2\u008a\5\3\2\2\2\u008b\u008c\7\3\2\2\u008c\u008e\5<\37\2\u008d"+
+ "\u008f\5F$\2\u008e\u008d\3\2\2\2\u008e\u008f\3\2\2\2\u008f\u0090\3\2\2"+
+ "\2\u0090\u0091\5\\/\2\u0091\u0092\7s\2\2\u0092\7\3\2\2\2\u0093\u00aa\5"+
+ "\16\b\2\u0094\u00aa\5\24\13\2\u0095\u00aa\5\22\n\2\u0096\u00aa\5\26\f"+
+ "\2\u0097\u00aa\5\30\r\2\u0098\u00aa\5\36\20\2\u0099\u00aa\5\"\22\2\u009a"+
+ "\u00aa\5\f\7\2\u009b\u00aa\5&\24\2\u009c\u00aa\5\62\32\2\u009d\u00aa\5"+
+ "p9\2\u009e\u00aa\5t;\2\u009f\u00aa\5X-\2\u00a0\u00aa\5b\62\2\u00a1\u00aa"+
+ "\5V,\2\u00a2\u00aa\5\66\34\2\u00a3\u00aa\5x=\2\u00a4\u00aa\5z>\2\u00a5"+
+ "\u00aa\5|?\2\u00a6\u00aa\58\35\2\u00a7\u00aa\5:\36\2\u00a8\u00aa\5\n\6"+
+ "\2\u00a9\u0093\3\2\2\2\u00a9\u0094\3\2\2\2\u00a9\u0095\3\2\2\2\u00a9\u0096"+
+ "\3\2\2\2\u00a9\u0097\3\2\2\2\u00a9\u0098\3\2\2\2\u00a9\u0099\3\2\2\2\u00a9"+
+ "\u009a\3\2\2\2\u00a9\u009b\3\2\2\2\u00a9\u009c\3\2\2\2\u00a9\u009d\3\2"+
+ "\2\2\u00a9\u009e\3\2\2\2\u00a9\u009f\3\2\2\2\u00a9\u00a0\3\2\2\2\u00a9"+
+ "\u00a1\3\2\2\2\u00a9\u00a2\3\2\2\2\u00a9\u00a3\3\2\2\2\u00a9\u00a4\3\2"+
+ "\2\2\u00a9\u00a5\3\2\2\2\u00a9\u00a6\3\2\2\2\u00a9\u00a7\3\2\2\2\u00a9"+
+ "\u00a8\3\2\2\2\u00aa\t\3\2\2\2\u00ab\u00ac\5<\37\2\u00ac\u00ad\7\4\2\2"+
+ "\u00ad\13\3\2\2\2\u00ae\u00b2\7\5\2\2\u00af\u00b3\5F$\2\u00b0\u00b3\5"+
+ "<\37\2\u00b1\u00b3\5> \2\u00b2\u00af\3\2\2\2\u00b2\u00b0\3\2\2\2\u00b2"+
+ "\u00b1\3\2\2\2\u00b3\r\3\2\2\2\u00b4\u00c0\t\2\2\2\u00b5\u00b7\5\20\t"+
+ "\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\u00c1\3\2\2\2\u00b8\u00bd"+
+ "\5\20\t\2\u00b9\u00ba\7\20\2\2\u00ba\u00bc\5\20\t\2\u00bb\u00b9\3\2\2"+
+ "\2\u00bc\u00bf\3\2\2\2\u00bd\u00bb\3\2\2\2\u00bd\u00be\3\2\2\2\u00be\u00c1"+
+ "\3\2\2\2\u00bf\u00bd\3\2\2\2\u00c0\u00b6\3\2\2\2\u00c0\u00b8\3\2\2\2\u00c1"+
+ "\17\3\2\2\2\u00c2\u00c6\5N(\2\u00c3\u00c6\5<\37\2\u00c4\u00c6\5F$\2\u00c5"+
+ "\u00c2\3\2\2\2\u00c5\u00c3\3\2\2\2\u00c5\u00c4\3\2\2\2\u00c6\21\3\2\2"+
+ "\2\u00c7\u00c9\5\32\16\2\u00c8\u00ca\5\34\17\2\u00c9\u00c8\3\2\2\2\u00c9"+
+ "\u00ca\3\2\2\2\u00ca\u00cb\3\2\2\2\u00cb\u00cc\5<\37\2\u00cc\23\3\2\2"+
+ "\2\u00cd\u00cf\5\32\16\2\u00ce\u00d0\5\34\17\2\u00cf\u00ce\3\2\2\2\u00cf"+
+ "\u00d0\3\2\2\2\u00d0\u00d1\3\2\2\2\u00d1\u00d2\5<\37\2\u00d2\u00d3\7\21"+
+ "\2\2\u00d3\u00d4\5(\25\2\u00d4\25\3\2\2\2\u00d5\u00d6\7\22\2\2\u00d6\u00d7"+
+ "\5\24\13\2\u00d7\27\3\2\2\2\u00d8\u00d9\7\23\2\2\u00d9\u00da\5\24\13\2"+
+ "\u00da\31\3\2\2\2\u00db\u00dc\t\3\2\2\u00dc\33\3\2\2\2\u00dd\u00de\7\35"+
+ "\2\2\u00de\u00df\5(\25\2\u00df\u00e0\7\36\2\2\u00e0\35\3\2\2\2\u00e1\u00e2"+
+ "\5 \21\2\u00e2\u00e3\7\21\2\2\u00e3\u00e4\5(\25\2\u00e4\37\3\2\2\2\u00e5"+
+ "\u00ea\5$\23\2\u00e6\u00e7\7\20\2\2\u00e7\u00e9\5$\23\2\u00e8\u00e6\3"+
+ "\2\2\2\u00e9\u00ec\3\2\2\2\u00ea\u00e8\3\2\2\2\u00ea\u00eb\3\2\2\2\u00eb"+
+ "!\3\2\2\2\u00ec\u00ea\3\2\2\2\u00ed\u00ee\5$\23\2\u00ee\u00ef\t\4\2\2"+
+ "\u00ef\u00f0\5(\25\2\u00f0#\3\2\2\2\u00f1\u00f7\5@!\2\u00f2\u00f7\5<\37"+
+ "\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"+
+ "\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";
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 1a3bc8ea3..600260ee0 100644
--- a/compiler/src/prog8/stackvm/StackVm.kt
+++ b/compiler/src/prog8/stackvm/StackVm.kt
@@ -277,6 +277,11 @@ class StackVm(private var traceOutputFile: String?) {
val address = ins.arg!!.integerValue()
evalstack.push(Value(DataType.FLOAT, mem.getFloat(address)))
}
+ Opcode.PUSH_MEMREAD -> {
+ val address = evalstack.pop()
+ checkDt(address, DataType.UWORD)
+ TODO("push_memread from $address")
+ }
Opcode.DISCARD_BYTE -> {
val value = evalstack.pop()
checkDt(value, DataType.UBYTE)
@@ -313,6 +318,13 @@ class StackVm(private var traceOutputFile: String?) {
val address = ins.arg!!.integerValue()
mem.setFloat(address, value.numericValue().toDouble())
}
+ Opcode.POP_MEMWRITE -> {
+ val address = evalstack.pop()
+ checkDt(address, DataType.UWORD)
+ val value = evalstack.pop()
+ checkDt(value, DataType.UBYTE)
+ TODO("pop_memwrite $value to $address")
+ }
Opcode.ADD_UB -> {
val (top, second) = evalstack.pop2()
checkDt(top, DataType.UBYTE)
diff --git a/docs/docs.iml b/docs/docs.iml
index af29c6a66..28bcee67e 100644
--- a/docs/docs.iml
+++ b/docs/docs.iml
@@ -5,7 +5,7 @@
-
+
\ No newline at end of file
diff --git a/docs/source/programming.rst b/docs/source/programming.rst
index b9bcc6ab8..873748122 100644
--- a/docs/source/programming.rst
+++ b/docs/source/programming.rst
@@ -291,6 +291,24 @@ are banked in (and your code imports the ``c64lib.p8``)
The largest 5-byte MFLPT float that can be stored is: **1.7014118345e+38** (negative: **-1.7014118345e+38**)
+Converting types into other types
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sometimes you need an unsigned word where you have an unsigned byte, or you need some other type conversion.
+Many type conversions are possible by just writing ``as `` at the end of an expression::
+
+ uword uw = $ea31
+ ubyte ub = uw as ubyte ; ub will be $31, identical to lsb(uw)
+ float f = uw as float ; f will be 59953, but this conversion can be omitted in this case
+ word w = uw as word ; w will be -5583 (simply reinterpret $ea31 as 2-complement negative number)
+ f = 56.777
+ ub = f as ubyte ; ub will be 56
+
+Sometimes it is a straight 'type cast' where the value is simply interpreted as being of the other type,
+sometimes an actual value conversion is done to convert it into the targe type.
+Try to avoid type conversions as much as possible.
+
+
Initial values across multiple runs of the program
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -305,21 +323,6 @@ expected when the program is restarted.
(This is an optimization choice to avoid having to store two copies of every string and array)
-Indirect addressing and address-of
-----------------------------------
-
-The ``#`` operator is used to take the address of the symbol following it.
-It can be used for example to work with the *address* of a memory mapped variable rather than
-the value it holds. You could take the address of a string as well, but that is redundant:
-the compiler already treats those as a value that you manipulate via its address.
-For most other types this prefix is not supported and will result in a compilation error.
-The resulting value is simply a 16 bit word.
-
-.. todo::
- This is not yet implemented.
- Indirect addressing, Indirect addressing in jumps (jmp/jsr indirect)
-
-
Loops
-----
@@ -411,6 +414,19 @@ a fixed amount of memory which will not change.
that there is a loss of precision. You can use builtin functions such as ``round`` and ``lsb`` to convert
to a smaller datatype, or revert to integer arithmetic.
+Direct access to memory locations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Normally memory locations are accessed by a *memory mapped* name, such as ``c64.BGCOL0`` that is defined
+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 = @$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 fa251c5ed..b81ce63a8 100644
--- a/docs/source/syntaxreference.rst
+++ b/docs/source/syntaxreference.rst
@@ -280,6 +280,12 @@ of something with an operand starting with 1 or 0, you'll have to add a space in
**@todo pointers/addresses? (as opposed to normal WORDs)**
+Data type conversion
+^^^^^^^^^^^^^^^^^^^^
+Many type conversions are possible by just writing ``as `` at the end of an expression,
+for example ``ubyte ub = floatvalue as ubyte`` will convert the floating point value to an unsigned byte.
+
+
Memory mapped variables
^^^^^^^^^^^^^^^^^^^^^^^
@@ -290,6 +296,16 @@ should be the *memory address* where the value is located::
memory byte BORDER = $d020
+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::
+
+ 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
^^^^^^^^^
diff --git a/prog8lib/c64lib.p8 b/prog8lib/c64lib.p8
index 7cb4ff1f0..4c5661c8f 100644
--- a/prog8lib/c64lib.p8
+++ b/prog8lib/c64lib.p8
@@ -29,6 +29,15 @@
const uword Screen = $0400 ; default character screen matrix @todo matrix/array? needs to support array size > 255
const uword Colors = $d800 ; character screen colors @todo matrix/array? needs to support array size > 255
+
+ memory ubyte SPRPTR0 = 2040 ; default sprite pointers (store address of sprite / 64)
+ memory ubyte SPRPTR1 = 2041
+ memory ubyte SPRPTR2 = 2042
+ memory ubyte SPRPTR3 = 2043
+ memory ubyte SPRPTR4 = 2044
+ memory ubyte SPRPTR5 = 2045
+ memory ubyte SPRPTR6 = 2046
+ memory ubyte SPRPTR7 = 2047
; ---- VIC-II registers ----
diff --git a/prog8lib/prog8lib.p8 b/prog8lib/prog8lib.p8
index 52cd120d6..4382b63b8 100644
--- a/prog8lib/prog8lib.p8
+++ b/prog8lib/prog8lib.p8
@@ -476,6 +476,7 @@ abs_f .proc
add_w .proc
; -- push word+word / uword+uword
+ ; @todo INLINE THIS
inx
clc
lda ESTACK_LO,x
@@ -489,6 +490,7 @@ add_w .proc
sub_w .proc
; -- push word-word
+ ; @todo INLINE THIS
inx
sec
lda ESTACK_LO+1,x