diff --git a/compiler/antlr/prog8.g4 b/compiler/antlr/prog8.g4 index af3c30464..4cd24d42f 100644 --- a/compiler/antlr/prog8.g4 +++ b/compiler/antlr/prog8.g4 @@ -214,7 +214,7 @@ else_part : 'else' EOL? (statement | statement_block) ; // statement is const branch_stmt : branchcondition EOL? (statement | statement_block) EOL? else_part? EOL ; -branchcondition: 'if_cs' | 'if_cc' | 'if_eq' | 'if_ne' | 'if_pl' | 'if_mi' | 'if_vs' | 'if_vc' ; +branchcondition: 'if_cs' | 'if_cc' | 'if_eq' | 'if_z' | 'if_ne' | 'if_nz' | 'if_pl' | 'if_pos' | 'if_mi' | 'if_neg' | 'if_vs' | 'if_vc' ; forloop : diff --git a/compiler/examples/test.p8 b/compiler/examples/test.p8 index 2183919f3..6bbaa9ed2 100644 --- a/compiler/examples/test.p8 +++ b/compiler/examples/test.p8 @@ -5,18 +5,31 @@ sub start() -> () { byte i - byte from = 250 - byte last = 255 + byte from = 0 + byte last = 5 - for i in from to last { - _vm_write_num(i) + if (i>last) { + _vm_write_num(100) _vm_write_char($8d) } -; _vm_write_char($8d) -; _vm_write_num(i) + +; for i in from to last { +; _vm_write_num(i) +; _vm_write_char($8d) +; } ; _vm_write_char($8d) ; _vm_write_char($8d) + +; from=250 +; last=255 +; for i in from to last { +; _vm_write_num(i) +; _vm_write_char($8d) +; } +; _vm_write_char($8d) +; _vm_write_char($8d) +; ; ; from = 8 ; last = 0 @@ -25,9 +38,7 @@ sub start() -> () { ; _vm_write_num(i) ; _vm_write_char($8d) ; } -; ; _vm_write_char($8d) -; _vm_write_num(i) ; _vm_write_char($8d) } diff --git a/compiler/src/prog8/ast/AST.kt b/compiler/src/prog8/ast/AST.kt index 9a8ce1603..57bb0e8a5 100644 --- a/compiler/src/prog8/ast/AST.kt +++ b/compiler/src/prog8/ast/AST.kt @@ -45,11 +45,15 @@ enum class BranchCondition { CS, CC, EQ, + Z, NE, + NZ, VS, VC, MI, - PL + NEG, + PL, + POS } diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt index f30c88ab1..89b34517f 100644 --- a/compiler/src/prog8/compiler/Compiler.kt +++ b/compiler/src/prog8/compiler/Compiler.kt @@ -207,37 +207,38 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram, priva * Which is translated into: * BCS _stmt_999_else * stuff - * JUMP _stmt_999_continue + * JUMP _stmt_999_end * _stmt_999_else: * other_stuff ;; optional - * _stmt_999_continue: - * ... + * _stmt_999_end: + * nop */ stackvmProg.line(branch.position) val labelElse = makeLabel("else") - val labelContinue = makeLabel("continue") + val labelEnd = makeLabel("end") val opcode = when(branch.condition) { BranchCondition.CS -> Opcode.BCC BranchCondition.CC -> Opcode.BCS - BranchCondition.EQ -> Opcode.BNE - BranchCondition.NE -> Opcode.BEQ + BranchCondition.EQ, BranchCondition.Z -> Opcode.BNZ + BranchCondition.NE, BranchCondition.NZ -> Opcode.BZ BranchCondition.VS -> TODO("Opcode.BVC") BranchCondition.VC -> TODO("Opcode.BVS") - BranchCondition.MI -> Opcode.BPL - BranchCondition.PL -> Opcode.BMI + BranchCondition.MI, BranchCondition.NEG -> Opcode.BPOS + BranchCondition.PL, BranchCondition.POS -> Opcode.BNEG } if(branch.elsepart.isEmpty()) { - stackvmProg.instr(opcode, callLabel = labelContinue) + stackvmProg.instr(opcode, callLabel = labelEnd) translate(branch.statements) - stackvmProg.label(labelContinue) + stackvmProg.label(labelEnd) } else { stackvmProg.instr(opcode, callLabel = labelElse) translate(branch.statements) - stackvmProg.instr(Opcode.JUMP, callLabel = labelContinue) + stackvmProg.instr(Opcode.JUMP, callLabel = labelEnd) stackvmProg.label(labelElse) translate(branch.elsepart) - stackvmProg.label(labelContinue) + stackvmProg.label(labelEnd) } + stackvmProg.instr(Opcode.NOP) } private fun makeLabel(postfix: String): String = "_prog8stmt_${stmtUniqueSequenceNr}_$postfix" @@ -247,30 +248,39 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram, priva * An IF statement: IF (condition-expression) { stuff } else { other_stuff } * Which is translated into: * - * BEQ _stmt_999_else + * BZ _stmt_999_else * stuff - * JUMP _stmt_999_continue + * JUMP _stmt_999_end * _stmt_999_else: * other_stuff ;; optional - * _stmt_999_continue: - * ... + * _stmt_999_end: + * nop + * + * or when there is no else block: + * + * BNZ _stmt_999_end + * stuff + * _stmt_999_end: + * nop + * */ stackvmProg.line(stmt.position) translate(stmt.condition) - val labelElse = makeLabel("else") - val labelContinue = makeLabel("continue") + val labelEnd = makeLabel("end") if(stmt.elsepart.isEmpty()) { - stackvmProg.instr(Opcode.BEQ, callLabel = labelContinue) + stackvmProg.instr(Opcode.BNZ, callLabel = labelEnd) translate(stmt.statements) - stackvmProg.label(labelContinue) + stackvmProg.label(labelEnd) } else { - stackvmProg.instr(Opcode.BEQ, callLabel = labelElse) + val labelElse = makeLabel("else") + stackvmProg.instr(Opcode.BZ, callLabel = labelElse) translate(stmt.statements) - stackvmProg.instr(Opcode.JUMP, callLabel = labelContinue) + stackvmProg.instr(Opcode.JUMP, callLabel = labelEnd) stackvmProg.label(labelElse) translate(stmt.elsepart) - stackvmProg.label(labelContinue) + stackvmProg.label(labelEnd) } + stackvmProg.instr(Opcode.NOP) } private fun translate(expr: IExpression) { @@ -622,7 +632,7 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram, priva stackvmProg.instr(Opcode.PUSH, Value(varDt, range.last+range.step)) stackvmProg.instr(Opcode.PUSH_VAR, varValue) stackvmProg.instr(Opcode.SUB) - stackvmProg.instr(Opcode.BNE, callLabel = loopLabel) + stackvmProg.instr(Opcode.BNZ, callLabel = loopLabel) stackvmProg.label(breakLabel) stackvmProg.instr(Opcode.NOP) @@ -675,7 +685,6 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram, priva continueStmtLabelStack.push(continueLabel) breakStmtLabelStack.push(breakLabel) - TODO("fix this code generated") stackvmProg.label(loopLabel) if(literalStepValue!=null) { val loopVar = @@ -703,28 +712,30 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram, priva TODO("code for non-constant step comparison") } - translate(body) - stackvmProg.label(continueLabel) - when (literalStepValue) { - 1 -> { - // LV++ - val postIncr = PostIncrDecr(makeAssignmentTarget(), "++", range.position) - postIncr.linkParents(range.parent) - translate(postIncr) - } - -1 -> { - // LV-- - val postIncr = PostIncrDecr(makeAssignmentTarget(), "--", range.position) - postIncr.linkParents(range.parent) - translate(postIncr) - } - else -> { - // LV += step - val addAssignment = Assignment(makeAssignmentTarget(), "+=", range.step, range.position) - addAssignment.linkParents(range.parent) - translate(addAssignment) - } - } + stackvmProg.label("body_goes_here") // todo weg + +// translate(body) +// stackvmProg.label(continueLabel) +// when (literalStepValue) { +// 1 -> { +// // LV++ +// val postIncr = PostIncrDecr(makeAssignmentTarget(), "++", range.position) +// postIncr.linkParents(range.parent) +// translate(postIncr) +// } +// -1 -> { +// // LV-- +// val postIncr = PostIncrDecr(makeAssignmentTarget(), "--", range.position) +// postIncr.linkParents(range.parent) +// translate(postIncr) +// } +// else -> { +// // LV += step +// val addAssignment = Assignment(makeAssignmentTarget(), "+=", range.step, range.position) +// addAssignment.linkParents(range.parent) +// translate(addAssignment) +// } +// } stackvmProg.label(breakLabel) stackvmProg.instr(Opcode.NOP) diff --git a/compiler/src/prog8/parser/prog8Lexer.java b/compiler/src/prog8/parser/prog8Lexer.java index 50b76fe76..e179b08e3 100644 --- a/compiler/src/prog8/parser/prog8Lexer.java +++ b/compiler/src/prog8/parser/prog8Lexer.java @@ -30,8 +30,9 @@ public class prog8Lexer extends Lexer { T__73=74, T__74=75, T__75=76, T__76=77, T__77=78, T__78=79, T__79=80, T__80=81, T__81=82, T__82=83, T__83=84, T__84=85, T__85=86, T__86=87, T__87=88, T__88=89, T__89=90, T__90=91, T__91=92, T__92=93, T__93=94, - T__94=95, LINECOMMENT=96, COMMENT=97, WS=98, EOL=99, NAME=100, DEC_INTEGER=101, - HEX_INTEGER=102, BIN_INTEGER=103, FLOAT_NUMBER=104, STRING=105, INLINEASMBLOCK=106; + T__94=95, T__95=96, T__96=97, T__97=98, T__98=99, LINECOMMENT=100, COMMENT=101, + WS=102, EOL=103, NAME=104, DEC_INTEGER=105, HEX_INTEGER=106, BIN_INTEGER=107, + FLOAT_NUMBER=108, STRING=109, INLINEASMBLOCK=110; public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" }; @@ -52,9 +53,10 @@ public class prog8Lexer extends Lexer { "T__65", "T__66", "T__67", "T__68", "T__69", "T__70", "T__71", "T__72", "T__73", "T__74", "T__75", "T__76", "T__77", "T__78", "T__79", "T__80", "T__81", "T__82", "T__83", "T__84", "T__85", "T__86", "T__87", "T__88", - "T__89", "T__90", "T__91", "T__92", "T__93", "T__94", "LINECOMMENT", "COMMENT", - "WS", "EOL", "NAME", "DEC_INTEGER", "HEX_INTEGER", "BIN_INTEGER", "FLOAT_NUMBER", - "FNUMBER", "STRING_ESCAPE_SEQ", "STRING", "INLINEASMBLOCK" + "T__89", "T__90", "T__91", "T__92", "T__93", "T__94", "T__95", "T__96", + "T__97", "T__98", "LINECOMMENT", "COMMENT", "WS", "EOL", "NAME", "DEC_INTEGER", + "HEX_INTEGER", "BIN_INTEGER", "FLOAT_NUMBER", "FNUMBER", "STRING_ESCAPE_SEQ", + "STRING", "INLINEASMBLOCK" }; private static final String[] _LITERAL_NAMES = { @@ -68,8 +70,9 @@ public class prog8Lexer extends Lexer { "'step'", "'and'", "'or'", "'xor'", "'not'", "'return'", "'break'", "'continue'", "'.'", "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", "'Pv'", "'.w'", "'true'", "'false'", "'%asm'", "'sub'", "'->'", "'{'", - "'}'", "'?'", "'if'", "'else'", "'if_cs'", "'if_cc'", "'if_eq'", "'if_ne'", - "'if_pl'", "'if_mi'", "'if_vs'", "'if_vc'", "'for'", "'in'" + "'}'", "'?'", "'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'" }; private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null, null, @@ -80,8 +83,9 @@ public class prog8Lexer extends Lexer { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - "LINECOMMENT", "COMMENT", "WS", "EOL", "NAME", "DEC_INTEGER", "HEX_INTEGER", - "BIN_INTEGER", "FLOAT_NUMBER", "STRING", "INLINEASMBLOCK" + null, null, null, null, "LINECOMMENT", "COMMENT", "WS", "EOL", "NAME", + "DEC_INTEGER", "HEX_INTEGER", "BIN_INTEGER", "FLOAT_NUMBER", "STRING", + "INLINEASMBLOCK" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); @@ -143,10 +147,10 @@ public class prog8Lexer extends Lexer { @Override public void action(RuleContext _localctx, int ruleIndex, int actionIndex) { switch (ruleIndex) { - case 106: + case 110: STRING_action((RuleContext)_localctx, actionIndex); break; - case 107: + case 111: INLINEASMBLOCK_action((RuleContext)_localctx, actionIndex); break; } @@ -175,7 +179,7 @@ public class prog8Lexer extends Lexer { } public static final String _serializedATN = - "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2l\u02da\b\1\4\2\t"+ + "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2p\u02fb\b\1\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"+ @@ -187,236 +191,246 @@ public class prog8Lexer extends Lexer { "\tI\4J\tJ\4K\tK\4L\tL\4M\tM\4N\tN\4O\tO\4P\tP\4Q\tQ\4R\tR\4S\tS\4T\tT"+ "\4U\tU\4V\tV\4W\tW\4X\tX\4Y\tY\4Z\tZ\4[\t[\4\\\t\\\4]\t]\4^\t^\4_\t_\4"+ "`\t`\4a\ta\4b\tb\4c\tc\4d\td\4e\te\4f\tf\4g\tg\4h\th\4i\ti\4j\tj\4k\t"+ - "k\4l\tl\4m\tm\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5"+ - "\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3"+ - "\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\t\3\t\3\t"+ - "\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3"+ - "\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f"+ - "\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16"+ - "\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21"+ - "\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\24\3\24"+ - "\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\26\3\26"+ - "\3\27\3\27\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31"+ - "\3\31\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\36\3\36"+ - "\3\36\3\36\3\37\3\37\3\37\3 \3 \3 \3 \3!\3!\3!\3\"\3\"\3\"\3#\3#\3#\3"+ - "$\3$\3$\3%\3%\3%\3&\3&\3\'\3\'\3(\3(\3)\3)\3*\3*\3*\3+\3+\3,\3,\3-\3-"+ - "\3-\3.\3.\3/\3/\3\60\3\60\3\61\3\61\3\61\3\62\3\62\3\62\3\63\3\63\3\63"+ - "\3\64\3\64\3\64\3\65\3\65\3\66\3\66\3\67\3\67\38\38\38\39\39\39\39\39"+ - "\3:\3:\3:\3:\3;\3;\3;\3<\3<\3<\3<\3=\3=\3=\3=\3>\3>\3>\3>\3>\3>\3>\3?"+ - "\3?\3?\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3B\3B\3C\3C\3D\3D\3E"+ - "\3E\3E\3F\3F\3F\3G\3G\3G\3H\3H\3H\3I\3I\3I\3J\3J\3J\3K\3K\3K\3L\3L\3L"+ - "\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O\3O\3P\3P\3P\3P\3Q\3Q\3Q"+ - "\3R\3R\3S\3S\3T\3T\3U\3U\3U\3V\3V\3V\3V\3V\3W\3W\3W\3W\3W\3W\3X\3X\3X"+ - "\3X\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\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`\3a\3a\7a\u0271\na\fa\16a\u0274\13a\3a\3a\3a\3a\3b\3b\7b\u027c\n"+ - "b\fb\16b\u027f\13b\3b\3b\3c\3c\3c\3c\3d\6d\u0288\nd\rd\16d\u0289\3e\3"+ - "e\7e\u028e\ne\fe\16e\u0291\13e\3f\3f\3f\6f\u0296\nf\rf\16f\u0297\5f\u029a"+ - "\nf\3g\3g\6g\u029e\ng\rg\16g\u029f\3h\3h\6h\u02a4\nh\rh\16h\u02a5\3i\3"+ - "i\3i\5i\u02ab\ni\3i\5i\u02ae\ni\3j\6j\u02b1\nj\rj\16j\u02b2\3j\3j\6j\u02b7"+ - "\nj\rj\16j\u02b8\5j\u02bb\nj\3k\3k\3k\3k\5k\u02c1\nk\3l\3l\3l\7l\u02c6"+ - "\nl\fl\16l\u02c9\13l\3l\3l\3l\3m\3m\3m\3m\6m\u02d2\nm\rm\16m\u02d3\3m"+ - "\3m\3m\3m\3m\3\u02d3\2n\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f"+ - "\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63"+ - "\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62"+ - "c\63e\64g\65i\66k\67m8o9q:s;u{?}@\177A\u0081B\u0083C\u0085D\u0087"+ - "E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009b"+ - "O\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00af"+ - "Y\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3"+ - "c\u00c5d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1j\u00d3\2\u00d5\2\u00d7"+ - "k\u00d9l\3\2\n\4\2\f\f\17\17\4\2\13\13\"\"\5\2C\\aac|\6\2\62;C\\aac|\5"+ - "\2\62;CHch\4\2GGgg\4\2--//\6\2\f\f\16\17$$^^\2\u02e8\2\3\3\2\2\2\2\5\3"+ - "\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2"+ - "\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3"+ - "\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'"+ - "\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63"+ - "\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2"+ - "?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3"+ - "\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2"+ - "\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2"+ - "e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3"+ - "\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2"+ - "\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087"+ - "\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2"+ - "\2\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099"+ - "\3\2\2\2\2\u009b\3\2\2\2\2\u009d\3\2\2\2\2\u009f\3\2\2\2\2\u00a1\3\2\2"+ - "\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab"+ - "\3\2\2\2\2\u00ad\3\2\2\2\2\u00af\3\2\2\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2"+ - "\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd"+ - "\3\2\2\2\2\u00bf\3\2\2\2\2\u00c1\3\2\2\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2"+ - "\2\2\u00c7\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf"+ - "\3\2\2\2\2\u00d1\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2\2\3\u00db\3\2\2"+ - "\2\5\u00dd\3\2\2\2\7\u00df\3\2\2\2\t\u00e4\3\2\2\2\13\u00ec\3\2\2\2\r"+ - "\u00f6\3\2\2\2\17\u0100\3\2\2\2\21\u0109\3\2\2\2\23\u0111\3\2\2\2\25\u011d"+ - "\3\2\2\2\27\u0129\3\2\2\2\31\u0134\3\2\2\2\33\u013c\3\2\2\2\35\u013e\3"+ - "\2\2\2\37\u0140\3\2\2\2!\u0146\3\2\2\2#\u014d\3\2\2\2%\u0152\3\2\2\2\'"+ - "\u0157\3\2\2\2)\u015d\3\2\2\2+\u0161\3\2\2\2-\u0167\3\2\2\2/\u016d\3\2"+ - "\2\2\61\u0174\3\2\2\2\63\u0176\3\2\2\2\65\u0178\3\2\2\2\67\u017b\3\2\2"+ - "\29\u017e\3\2\2\2;\u0181\3\2\2\2=\u0185\3\2\2\2?\u0188\3\2\2\2A\u018c"+ - "\3\2\2\2C\u018f\3\2\2\2E\u0192\3\2\2\2G\u0195\3\2\2\2I\u0198\3\2\2\2K"+ - "\u019b\3\2\2\2M\u019d\3\2\2\2O\u019f\3\2\2\2Q\u01a1\3\2\2\2S\u01a3\3\2"+ - "\2\2U\u01a6\3\2\2\2W\u01a8\3\2\2\2Y\u01aa\3\2\2\2[\u01ad\3\2\2\2]\u01af"+ - "\3\2\2\2_\u01b1\3\2\2\2a\u01b3\3\2\2\2c\u01b6\3\2\2\2e\u01b9\3\2\2\2g"+ - "\u01bc\3\2\2\2i\u01bf\3\2\2\2k\u01c1\3\2\2\2m\u01c3\3\2\2\2o\u01c5\3\2"+ - "\2\2q\u01c8\3\2\2\2s\u01cd\3\2\2\2u\u01d1\3\2\2\2w\u01d4\3\2\2\2y\u01d8"+ - "\3\2\2\2{\u01dc\3\2\2\2}\u01e3\3\2\2\2\177\u01e9\3\2\2\2\u0081\u01f2\3"+ - "\2\2\2\u0083\u01f4\3\2\2\2\u0085\u01f6\3\2\2\2\u0087\u01f8\3\2\2\2\u0089"+ - "\u01fa\3\2\2\2\u008b\u01fd\3\2\2\2\u008d\u0200\3\2\2\2\u008f\u0203\3\2"+ - "\2\2\u0091\u0206\3\2\2\2\u0093\u0209\3\2\2\2\u0095\u020c\3\2\2\2\u0097"+ - "\u020f\3\2\2\2\u0099\u0212\3\2\2\2\u009b\u0217\3\2\2\2\u009d\u021d\3\2"+ - "\2\2\u009f\u0222\3\2\2\2\u00a1\u0226\3\2\2\2\u00a3\u0229\3\2\2\2\u00a5"+ - "\u022b\3\2\2\2\u00a7\u022d\3\2\2\2\u00a9\u022f\3\2\2\2\u00ab\u0232\3\2"+ - "\2\2\u00ad\u0237\3\2\2\2\u00af\u023d\3\2\2\2\u00b1\u0243\3\2\2\2\u00b3"+ - "\u0249\3\2\2\2\u00b5\u024f\3\2\2\2\u00b7\u0255\3\2\2\2\u00b9\u025b\3\2"+ - "\2\2\u00bb\u0261\3\2\2\2\u00bd\u0267\3\2\2\2\u00bf\u026b\3\2\2\2\u00c1"+ - "\u026e\3\2\2\2\u00c3\u0279\3\2\2\2\u00c5\u0282\3\2\2\2\u00c7\u0287\3\2"+ - "\2\2\u00c9\u028b\3\2\2\2\u00cb\u0299\3\2\2\2\u00cd\u029b\3\2\2\2\u00cf"+ - "\u02a1\3\2\2\2\u00d1\u02a7\3\2\2\2\u00d3\u02b0\3\2\2\2\u00d5\u02c0\3\2"+ - "\2\2\u00d7\u02c2\3\2\2\2\u00d9\u02cd\3\2\2\2\u00db\u00dc\7\u0080\2\2\u00dc"+ - "\4\3\2\2\2\u00dd\u00de\7<\2\2\u00de\6\3\2\2\2\u00df\u00e0\7i\2\2\u00e0"+ - "\u00e1\7q\2\2\u00e1\u00e2\7v\2\2\u00e2\u00e3\7q\2\2\u00e3\b\3\2\2\2\u00e4"+ - "\u00e5\7\'\2\2\u00e5\u00e6\7q\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7v\2"+ - "\2\u00e8\u00e9\7r\2\2\u00e9\u00ea\7w\2\2\u00ea\u00eb\7v\2\2\u00eb\n\3"+ - "\2\2\2\u00ec\u00ed\7\'\2\2\u00ed\u00ee\7n\2\2\u00ee\u00ef\7c\2\2\u00ef"+ - "\u00f0\7w\2\2\u00f0\u00f1\7p\2\2\u00f1\u00f2\7e\2\2\u00f2\u00f3\7j\2\2"+ - "\u00f3\u00f4\7g\2\2\u00f4\u00f5\7t\2\2\u00f5\f\3\2\2\2\u00f6\u00f7\7\'"+ - "\2\2\u00f7\u00f8\7|\2\2\u00f8\u00f9\7g\2\2\u00f9\u00fa\7t\2\2\u00fa\u00fb"+ - "\7q\2\2\u00fb\u00fc\7r\2\2\u00fc\u00fd\7c\2\2\u00fd\u00fe\7i\2\2\u00fe"+ - "\u00ff\7g\2\2\u00ff\16\3\2\2\2\u0100\u0101\7\'\2\2\u0101\u0102\7c\2\2"+ - "\u0102\u0103\7f\2\2\u0103\u0104\7f\2\2\u0104\u0105\7t\2\2\u0105\u0106"+ - "\7g\2\2\u0106\u0107\7u\2\2\u0107\u0108\7u\2\2\u0108\20\3\2\2\2\u0109\u010a"+ - "\7\'\2\2\u010a\u010b\7k\2\2\u010b\u010c\7o\2\2\u010c\u010d\7r\2\2\u010d"+ - "\u010e\7q\2\2\u010e\u010f\7t\2\2\u010f\u0110\7v\2\2\u0110\22\3\2\2\2\u0111"+ - "\u0112\7\'\2\2\u0112\u0113\7d\2\2\u0113\u0114\7t\2\2\u0114\u0115\7g\2"+ - "\2\u0115\u0116\7c\2\2\u0116\u0117\7m\2\2\u0117\u0118\7r\2\2\u0118\u0119"+ - "\7q\2\2\u0119\u011a\7k\2\2\u011a\u011b\7p\2\2\u011b\u011c\7v\2\2\u011c"+ - "\24\3\2\2\2\u011d\u011e\7\'\2\2\u011e\u011f\7c\2\2\u011f\u0120\7u\2\2"+ - "\u0120\u0121\7o\2\2\u0121\u0122\7k\2\2\u0122\u0123\7p\2\2\u0123\u0124"+ - "\7e\2\2\u0124\u0125\7n\2\2\u0125\u0126\7w\2\2\u0126\u0127\7f\2\2\u0127"+ - "\u0128\7g\2\2\u0128\26\3\2\2\2\u0129\u012a\7\'\2\2\u012a\u012b\7c\2\2"+ - "\u012b\u012c\7u\2\2\u012c\u012d\7o\2\2\u012d\u012e\7d\2\2\u012e\u012f"+ - "\7k\2\2\u012f\u0130\7p\2\2\u0130\u0131\7c\2\2\u0131\u0132\7t\2\2\u0132"+ - "\u0133\7{\2\2\u0133\30\3\2\2\2\u0134\u0135\7\'\2\2\u0135\u0136\7q\2\2"+ - "\u0136\u0137\7r\2\2\u0137\u0138\7v\2\2\u0138\u0139\7k\2\2\u0139\u013a"+ - "\7q\2\2\u013a\u013b\7p\2\2\u013b\32\3\2\2\2\u013c\u013d\7.\2\2\u013d\34"+ - "\3\2\2\2\u013e\u013f\7?\2\2\u013f\36\3\2\2\2\u0140\u0141\7e\2\2\u0141"+ - "\u0142\7q\2\2\u0142\u0143\7p\2\2\u0143\u0144\7u\2\2\u0144\u0145\7v\2\2"+ - "\u0145 \3\2\2\2\u0146\u0147\7o\2\2\u0147\u0148\7g\2\2\u0148\u0149\7o\2"+ - "\2\u0149\u014a\7q\2\2\u014a\u014b\7t\2\2\u014b\u014c\7{\2\2\u014c\"\3"+ - "\2\2\2\u014d\u014e\7d\2\2\u014e\u014f\7{\2\2\u014f\u0150\7v\2\2\u0150"+ - "\u0151\7g\2\2\u0151$\3\2\2\2\u0152\u0153\7y\2\2\u0153\u0154\7q\2\2\u0154"+ - "\u0155\7t\2\2\u0155\u0156\7f\2\2\u0156&\3\2\2\2\u0157\u0158\7h\2\2\u0158"+ - "\u0159\7n\2\2\u0159\u015a\7q\2\2\u015a\u015b\7c\2\2\u015b\u015c\7v\2\2"+ - "\u015c(\3\2\2\2\u015d\u015e\7u\2\2\u015e\u015f\7v\2\2\u015f\u0160\7t\2"+ - "\2\u0160*\3\2\2\2\u0161\u0162\7u\2\2\u0162\u0163\7v\2\2\u0163\u0164\7"+ - "t\2\2\u0164\u0165\7a\2\2\u0165\u0166\7r\2\2\u0166,\3\2\2\2\u0167\u0168"+ - "\7u\2\2\u0168\u0169\7v\2\2\u0169\u016a\7t\2\2\u016a\u016b\7a\2\2\u016b"+ - "\u016c\7u\2\2\u016c.\3\2\2\2\u016d\u016e\7u\2\2\u016e\u016f\7v\2\2\u016f"+ - "\u0170\7t\2\2\u0170\u0171\7a\2\2\u0171\u0172\7r\2\2\u0172\u0173\7u\2\2"+ - "\u0173\60\3\2\2\2\u0174\u0175\7]\2\2\u0175\62\3\2\2\2\u0176\u0177\7_\2"+ - "\2\u0177\64\3\2\2\2\u0178\u0179\7-\2\2\u0179\u017a\7?\2\2\u017a\66\3\2"+ - "\2\2\u017b\u017c\7/\2\2\u017c\u017d\7?\2\2\u017d8\3\2\2\2\u017e\u017f"+ - "\7\61\2\2\u017f\u0180\7?\2\2\u0180:\3\2\2\2\u0181\u0182\7\61\2\2\u0182"+ - "\u0183\7\61\2\2\u0183\u0184\7?\2\2\u0184<\3\2\2\2\u0185\u0186\7,\2\2\u0186"+ - "\u0187\7?\2\2\u0187>\3\2\2\2\u0188\u0189\7,\2\2\u0189\u018a\7,\2\2\u018a"+ - "\u018b\7?\2\2\u018b@\3\2\2\2\u018c\u018d\7(\2\2\u018d\u018e\7?\2\2\u018e"+ - "B\3\2\2\2\u018f\u0190\7~\2\2\u0190\u0191\7?\2\2\u0191D\3\2\2\2\u0192\u0193"+ - "\7`\2\2\u0193\u0194\7?\2\2\u0194F\3\2\2\2\u0195\u0196\7-\2\2\u0196\u0197"+ - "\7-\2\2\u0197H\3\2\2\2\u0198\u0199\7/\2\2\u0199\u019a\7/\2\2\u019aJ\3"+ - "\2\2\2\u019b\u019c\7*\2\2\u019cL\3\2\2\2\u019d\u019e\7+\2\2\u019eN\3\2"+ - "\2\2\u019f\u01a0\7-\2\2\u01a0P\3\2\2\2\u01a1\u01a2\7/\2\2\u01a2R\3\2\2"+ - "\2\u01a3\u01a4\7,\2\2\u01a4\u01a5\7,\2\2\u01a5T\3\2\2\2\u01a6\u01a7\7"+ - ",\2\2\u01a7V\3\2\2\2\u01a8\u01a9\7\61\2\2\u01a9X\3\2\2\2\u01aa\u01ab\7"+ - "\61\2\2\u01ab\u01ac\7\61\2\2\u01acZ\3\2\2\2\u01ad\u01ae\7\'\2\2\u01ae"+ - "\\\3\2\2\2\u01af\u01b0\7>\2\2\u01b0^\3\2\2\2\u01b1\u01b2\7@\2\2\u01b2"+ - "`\3\2\2\2\u01b3\u01b4\7>\2\2\u01b4\u01b5\7?\2\2\u01b5b\3\2\2\2\u01b6\u01b7"+ - "\7@\2\2\u01b7\u01b8\7?\2\2\u01b8d\3\2\2\2\u01b9\u01ba\7?\2\2\u01ba\u01bb"+ - "\7?\2\2\u01bbf\3\2\2\2\u01bc\u01bd\7#\2\2\u01bd\u01be\7?\2\2\u01beh\3"+ - "\2\2\2\u01bf\u01c0\7(\2\2\u01c0j\3\2\2\2\u01c1\u01c2\7`\2\2\u01c2l\3\2"+ - "\2\2\u01c3\u01c4\7~\2\2\u01c4n\3\2\2\2\u01c5\u01c6\7v\2\2\u01c6\u01c7"+ - "\7q\2\2\u01c7p\3\2\2\2\u01c8\u01c9\7u\2\2\u01c9\u01ca\7v\2\2\u01ca\u01cb"+ - "\7g\2\2\u01cb\u01cc\7r\2\2\u01ccr\3\2\2\2\u01cd\u01ce\7c\2\2\u01ce\u01cf"+ - "\7p\2\2\u01cf\u01d0\7f\2\2\u01d0t\3\2\2\2\u01d1\u01d2\7q\2\2\u01d2\u01d3"+ - "\7t\2\2\u01d3v\3\2\2\2\u01d4\u01d5\7z\2\2\u01d5\u01d6\7q\2\2\u01d6\u01d7"+ - "\7t\2\2\u01d7x\3\2\2\2\u01d8\u01d9\7p\2\2\u01d9\u01da\7q\2\2\u01da\u01db"+ - "\7v\2\2\u01dbz\3\2\2\2\u01dc\u01dd\7t\2\2\u01dd\u01de\7g\2\2\u01de\u01df"+ - "\7v\2\2\u01df\u01e0\7w\2\2\u01e0\u01e1\7t\2\2\u01e1\u01e2\7p\2\2\u01e2"+ - "|\3\2\2\2\u01e3\u01e4\7d\2\2\u01e4\u01e5\7t\2\2\u01e5\u01e6\7g\2\2\u01e6"+ - "\u01e7\7c\2\2\u01e7\u01e8\7m\2\2\u01e8~\3\2\2\2\u01e9\u01ea\7e\2\2\u01ea"+ - "\u01eb\7q\2\2\u01eb\u01ec\7p\2\2\u01ec\u01ed\7v\2\2\u01ed\u01ee\7k\2\2"+ - "\u01ee\u01ef\7p\2\2\u01ef\u01f0\7w\2\2\u01f0\u01f1\7g\2\2\u01f1\u0080"+ - "\3\2\2\2\u01f2\u01f3\7\60\2\2\u01f3\u0082\3\2\2\2\u01f4\u01f5\7C\2\2\u01f5"+ - "\u0084\3\2\2\2\u01f6\u01f7\7Z\2\2\u01f7\u0086\3\2\2\2\u01f8\u01f9\7[\2"+ - "\2\u01f9\u0088\3\2\2\2\u01fa\u01fb\7C\2\2\u01fb\u01fc\7Z\2\2\u01fc\u008a"+ - "\3\2\2\2\u01fd\u01fe\7C\2\2\u01fe\u01ff\7[\2\2\u01ff\u008c\3\2\2\2\u0200"+ - "\u0201\7Z\2\2\u0201\u0202\7[\2\2\u0202\u008e\3\2\2\2\u0203\u0204\7R\2"+ - "\2\u0204\u0205\7e\2\2\u0205\u0090\3\2\2\2\u0206\u0207\7R\2\2\u0207\u0208"+ - "\7|\2\2\u0208\u0092\3\2\2\2\u0209\u020a\7R\2\2\u020a\u020b\7p\2\2\u020b"+ - "\u0094\3\2\2\2\u020c\u020d\7R\2\2\u020d\u020e\7x\2\2\u020e\u0096\3\2\2"+ - "\2\u020f\u0210\7\60\2\2\u0210\u0211\7y\2\2\u0211\u0098\3\2\2\2\u0212\u0213"+ - "\7v\2\2\u0213\u0214\7t\2\2\u0214\u0215\7w\2\2\u0215\u0216\7g\2\2\u0216"+ - "\u009a\3\2\2\2\u0217\u0218\7h\2\2\u0218\u0219\7c\2\2\u0219\u021a\7n\2"+ - "\2\u021a\u021b\7u\2\2\u021b\u021c\7g\2\2\u021c\u009c\3\2\2\2\u021d\u021e"+ - "\7\'\2\2\u021e\u021f\7c\2\2\u021f\u0220\7u\2\2\u0220\u0221\7o\2\2\u0221"+ - "\u009e\3\2\2\2\u0222\u0223\7u\2\2\u0223\u0224\7w\2\2\u0224\u0225\7d\2"+ - "\2\u0225\u00a0\3\2\2\2\u0226\u0227\7/\2\2\u0227\u0228\7@\2\2\u0228\u00a2"+ - "\3\2\2\2\u0229\u022a\7}\2\2\u022a\u00a4\3\2\2\2\u022b\u022c\7\177\2\2"+ - "\u022c\u00a6\3\2\2\2\u022d\u022e\7A\2\2\u022e\u00a8\3\2\2\2\u022f\u0230"+ - "\7k\2\2\u0230\u0231\7h\2\2\u0231\u00aa\3\2\2\2\u0232\u0233\7g\2\2\u0233"+ - "\u0234\7n\2\2\u0234\u0235\7u\2\2\u0235\u0236\7g\2\2\u0236\u00ac\3\2\2"+ - "\2\u0237\u0238\7k\2\2\u0238\u0239\7h\2\2\u0239\u023a\7a\2\2\u023a\u023b"+ - "\7e\2\2\u023b\u023c\7u\2\2\u023c\u00ae\3\2\2\2\u023d\u023e\7k\2\2\u023e"+ - "\u023f\7h\2\2\u023f\u0240\7a\2\2\u0240\u0241\7e\2\2\u0241\u0242\7e\2\2"+ - "\u0242\u00b0\3\2\2\2\u0243\u0244\7k\2\2\u0244\u0245\7h\2\2\u0245\u0246"+ - "\7a\2\2\u0246\u0247\7g\2\2\u0247\u0248\7s\2\2\u0248\u00b2\3\2\2\2\u0249"+ - "\u024a\7k\2\2\u024a\u024b\7h\2\2\u024b\u024c\7a\2\2\u024c\u024d\7p\2\2"+ - "\u024d\u024e\7g\2\2\u024e\u00b4\3\2\2\2\u024f\u0250\7k\2\2\u0250\u0251"+ - "\7h\2\2\u0251\u0252\7a\2\2\u0252\u0253\7r\2\2\u0253\u0254\7n\2\2\u0254"+ - "\u00b6\3\2\2\2\u0255\u0256\7k\2\2\u0256\u0257\7h\2\2\u0257\u0258\7a\2"+ - "\2\u0258\u0259\7o\2\2\u0259\u025a\7k\2\2\u025a\u00b8\3\2\2\2\u025b\u025c"+ - "\7k\2\2\u025c\u025d\7h\2\2\u025d\u025e\7a\2\2\u025e\u025f\7x\2\2\u025f"+ - "\u0260\7u\2\2\u0260\u00ba\3\2\2\2\u0261\u0262\7k\2\2\u0262\u0263\7h\2"+ - "\2\u0263\u0264\7a\2\2\u0264\u0265\7x\2\2\u0265\u0266\7e\2\2\u0266\u00bc"+ - "\3\2\2\2\u0267\u0268\7h\2\2\u0268\u0269\7q\2\2\u0269\u026a\7t\2\2\u026a"+ - "\u00be\3\2\2\2\u026b\u026c\7k\2\2\u026c\u026d\7p\2\2\u026d\u00c0\3\2\2"+ - "\2\u026e\u0272\t\2\2\2\u026f\u0271\t\3\2\2\u0270\u026f\3\2\2\2\u0271\u0274"+ - "\3\2\2\2\u0272\u0270\3\2\2\2\u0272\u0273\3\2\2\2\u0273\u0275\3\2\2\2\u0274"+ - "\u0272\3\2\2\2\u0275\u0276\5\u00c3b\2\u0276\u0277\3\2\2\2\u0277\u0278"+ - "\ba\2\2\u0278\u00c2\3\2\2\2\u0279\u027d\7=\2\2\u027a\u027c\n\2\2\2\u027b"+ - "\u027a\3\2\2\2\u027c\u027f\3\2\2\2\u027d\u027b\3\2\2\2\u027d\u027e\3\2"+ - "\2\2\u027e\u0280\3\2\2\2\u027f\u027d\3\2\2\2\u0280\u0281\bb\2\2\u0281"+ - "\u00c4\3\2\2\2\u0282\u0283\t\3\2\2\u0283\u0284\3\2\2\2\u0284\u0285\bc"+ - "\3\2\u0285\u00c6\3\2\2\2\u0286\u0288\t\2\2\2\u0287\u0286\3\2\2\2\u0288"+ - "\u0289\3\2\2\2\u0289\u0287\3\2\2\2\u0289\u028a\3\2\2\2\u028a\u00c8\3\2"+ - "\2\2\u028b\u028f\t\4\2\2\u028c\u028e\t\5\2\2\u028d\u028c\3\2\2\2\u028e"+ - "\u0291\3\2\2\2\u028f\u028d\3\2\2\2\u028f\u0290\3\2\2\2\u0290\u00ca\3\2"+ - "\2\2\u0291\u028f\3\2\2\2\u0292\u029a\4\62;\2\u0293\u0295\4\63;\2\u0294"+ - "\u0296\4\62;\2\u0295\u0294\3\2\2\2\u0296\u0297\3\2\2\2\u0297\u0295\3\2"+ - "\2\2\u0297\u0298\3\2\2\2\u0298\u029a\3\2\2\2\u0299\u0292\3\2\2\2\u0299"+ - "\u0293\3\2\2\2\u029a\u00cc\3\2\2\2\u029b\u029d\7&\2\2\u029c\u029e\t\6"+ - "\2\2\u029d\u029c\3\2\2\2\u029e\u029f\3\2\2\2\u029f\u029d\3\2\2\2\u029f"+ - "\u02a0\3\2\2\2\u02a0\u00ce\3\2\2\2\u02a1\u02a3\7\'\2\2\u02a2\u02a4\4\62"+ - "\63\2\u02a3\u02a2\3\2\2\2\u02a4\u02a5\3\2\2\2\u02a5\u02a3\3\2\2\2\u02a5"+ - "\u02a6\3\2\2\2\u02a6\u00d0\3\2\2\2\u02a7\u02ad\5\u00d3j\2\u02a8\u02aa"+ - "\t\7\2\2\u02a9\u02ab\t\b\2\2\u02aa\u02a9\3\2\2\2\u02aa\u02ab\3\2\2\2\u02ab"+ - "\u02ac\3\2\2\2\u02ac\u02ae\5\u00d3j\2\u02ad\u02a8\3\2\2\2\u02ad\u02ae"+ - "\3\2\2\2\u02ae\u00d2\3\2\2\2\u02af\u02b1\4\62;\2\u02b0\u02af\3\2\2\2\u02b1"+ - "\u02b2\3\2\2\2\u02b2\u02b0\3\2\2\2\u02b2\u02b3\3\2\2\2\u02b3\u02ba\3\2"+ - "\2\2\u02b4\u02b6\7\60\2\2\u02b5\u02b7\4\62;\2\u02b6\u02b5\3\2\2\2\u02b7"+ - "\u02b8\3\2\2\2\u02b8\u02b6\3\2\2\2\u02b8\u02b9\3\2\2\2\u02b9\u02bb\3\2"+ - "\2\2\u02ba\u02b4\3\2\2\2\u02ba\u02bb\3\2\2\2\u02bb\u00d4\3\2\2\2\u02bc"+ - "\u02bd\7^\2\2\u02bd\u02c1\13\2\2\2\u02be\u02bf\7^\2\2\u02bf\u02c1\5\u00c7"+ - "d\2\u02c0\u02bc\3\2\2\2\u02c0\u02be\3\2\2\2\u02c1\u00d6\3\2\2\2\u02c2"+ - "\u02c7\7$\2\2\u02c3\u02c6\5\u00d5k\2\u02c4\u02c6\n\t\2\2\u02c5\u02c3\3"+ - "\2\2\2\u02c5\u02c4\3\2\2\2\u02c6\u02c9\3\2\2\2\u02c7\u02c5\3\2\2\2\u02c7"+ - "\u02c8\3\2\2\2\u02c8\u02ca\3\2\2\2\u02c9\u02c7\3\2\2\2\u02ca\u02cb\7$"+ - "\2\2\u02cb\u02cc\bl\4\2\u02cc\u00d8\3\2\2\2\u02cd\u02ce\7}\2\2\u02ce\u02cf"+ - "\7}\2\2\u02cf\u02d1\3\2\2\2\u02d0\u02d2\13\2\2\2\u02d1\u02d0\3\2\2\2\u02d2"+ - "\u02d3\3\2\2\2\u02d3\u02d4\3\2\2\2\u02d3\u02d1\3\2\2\2\u02d4\u02d5\3\2"+ - "\2\2\u02d5\u02d6\7\177\2\2\u02d6\u02d7\7\177\2\2\u02d7\u02d8\3\2\2\2\u02d8"+ - "\u02d9\bm\5\2\u02d9\u00da\3\2\2\2\25\2\u0272\u027d\u0289\u028f\u0297\u0299"+ - "\u029d\u029f\u02a5\u02aa\u02ad\u02b2\u02b8\u02ba\u02c0\u02c5\u02c7\u02d3"+ - "\6\2\3\2\b\2\2\3l\2\3m\3"; + "k\4l\tl\4m\tm\4n\tn\4o\to\4p\tp\4q\tq\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4"+ + "\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3"+ + "\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\3\b"+ + "\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3"+ + "\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3"+ + "\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r"+ + "\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20"+ + "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23"+ + "\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\26"+ + "\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\27\3\27\3\30\3\30\3\30"+ + "\3\30\3\30\3\30\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34"+ + "\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3 \3 \3 \3 \3!\3!\3"+ + "!\3\"\3\"\3\"\3#\3#\3#\3$\3$\3$\3%\3%\3%\3&\3&\3\'\3\'\3(\3(\3)\3)\3*"+ + "\3*\3*\3+\3+\3,\3,\3-\3-\3-\3.\3.\3/\3/\3\60\3\60\3\61\3\61\3\61\3\62"+ + "\3\62\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3\66\3\66\3\67\3\67"+ + "\38\38\38\39\39\39\39\39\3:\3:\3:\3:\3;\3;\3;\3<\3<\3<\3<\3=\3=\3=\3="+ + "\3>\3>\3>\3>\3>\3>\3>\3?\3?\3?\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A"+ + "\3A\3B\3B\3C\3C\3D\3D\3E\3E\3E\3F\3F\3F\3G\3G\3G\3H\3H\3H\3I\3I\3I\3J"+ + "\3J\3J\3K\3K\3K\3L\3L\3L\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O"+ + "\3O\3P\3P\3P\3P\3Q\3Q\3Q\3R\3R\3S\3S\3T\3T\3U\3U\3U\3V\3V\3V\3V\3V\3W"+ + "\3W\3W\3W\3W\3W\3X\3X\3X\3X\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\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`\3`\3`\3`\3a\3a\3a\3a\3a\3a\3b"+ + "\3b\3b\3b\3b\3b\3c\3c\3c\3c\3d\3d\3d\3e\3e\7e\u0292\ne\fe\16e\u0295\13"+ + "e\3e\3e\3e\3e\3f\3f\7f\u029d\nf\ff\16f\u02a0\13f\3f\3f\3g\3g\3g\3g\3h"+ + "\6h\u02a9\nh\rh\16h\u02aa\3i\3i\7i\u02af\ni\fi\16i\u02b2\13i\3j\3j\3j"+ + "\6j\u02b7\nj\rj\16j\u02b8\5j\u02bb\nj\3k\3k\6k\u02bf\nk\rk\16k\u02c0\3"+ + "l\3l\6l\u02c5\nl\rl\16l\u02c6\3m\3m\3m\5m\u02cc\nm\3m\5m\u02cf\nm\3n\6"+ + "n\u02d2\nn\rn\16n\u02d3\3n\3n\6n\u02d8\nn\rn\16n\u02d9\5n\u02dc\nn\3o"+ + "\3o\3o\3o\5o\u02e2\no\3p\3p\3p\7p\u02e7\np\fp\16p\u02ea\13p\3p\3p\3p\3"+ + "q\3q\3q\3q\6q\u02f3\nq\rq\16q\u02f4\3q\3q\3q\3q\3q\3\u02f4\2r\3\3\5\4"+ + "\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22"+ + "#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C"+ + "#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091"+ + "J\u0093K\u0095L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5"+ + "T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9"+ + "^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cbg\u00cd"+ + "h\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9n\u00db\2\u00dd\2\u00dfo\u00e1"+ + "p\3\2\n\4\2\f\f\17\17\4\2\13\13\"\"\5\2C\\aac|\6\2\62;C\\aac|\5\2\62;"+ + "CHch\4\2GGgg\4\2--//\6\2\f\f\16\17$$^^\2\u0309\2\3\3\2\2\2\2\5\3\2\2\2"+ + "\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3"+ + "\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2"+ + "\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2"+ + "\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2"+ + "\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2"+ + "\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2"+ + "\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y"+ + "\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2"+ + "\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2"+ + "\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177"+ + "\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2"+ + "\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091"+ + "\3\2\2\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2"+ + "\2\2\u009b\3\2\2\2\2\u009d\3\2\2\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3"+ + "\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2"+ + "\2\2\u00ad\3\2\2\2\2\u00af\3\2\2\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2\2\2\u00b5"+ + "\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd\3\2\2"+ + "\2\2\u00bf\3\2\2\2\2\u00c1\3\2\2\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2\2\2\u00c7"+ + "\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2"+ + "\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9"+ + "\3\2\2\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\3\u00e3\3\2\2\2\5\u00e5\3\2\2"+ + "\2\7\u00e7\3\2\2\2\t\u00ec\3\2\2\2\13\u00f4\3\2\2\2\r\u00fe\3\2\2\2\17"+ + "\u0108\3\2\2\2\21\u0111\3\2\2\2\23\u0119\3\2\2\2\25\u0125\3\2\2\2\27\u0131"+ + "\3\2\2\2\31\u013c\3\2\2\2\33\u0144\3\2\2\2\35\u0146\3\2\2\2\37\u0148\3"+ + "\2\2\2!\u014e\3\2\2\2#\u0155\3\2\2\2%\u015a\3\2\2\2\'\u015f\3\2\2\2)\u0165"+ + "\3\2\2\2+\u0169\3\2\2\2-\u016f\3\2\2\2/\u0175\3\2\2\2\61\u017c\3\2\2\2"+ + "\63\u017e\3\2\2\2\65\u0180\3\2\2\2\67\u0183\3\2\2\29\u0186\3\2\2\2;\u0189"+ + "\3\2\2\2=\u018d\3\2\2\2?\u0190\3\2\2\2A\u0194\3\2\2\2C\u0197\3\2\2\2E"+ + "\u019a\3\2\2\2G\u019d\3\2\2\2I\u01a0\3\2\2\2K\u01a3\3\2\2\2M\u01a5\3\2"+ + "\2\2O\u01a7\3\2\2\2Q\u01a9\3\2\2\2S\u01ab\3\2\2\2U\u01ae\3\2\2\2W\u01b0"+ + "\3\2\2\2Y\u01b2\3\2\2\2[\u01b5\3\2\2\2]\u01b7\3\2\2\2_\u01b9\3\2\2\2a"+ + "\u01bb\3\2\2\2c\u01be\3\2\2\2e\u01c1\3\2\2\2g\u01c4\3\2\2\2i\u01c7\3\2"+ + "\2\2k\u01c9\3\2\2\2m\u01cb\3\2\2\2o\u01cd\3\2\2\2q\u01d0\3\2\2\2s\u01d5"+ + "\3\2\2\2u\u01d9\3\2\2\2w\u01dc\3\2\2\2y\u01e0\3\2\2\2{\u01e4\3\2\2\2}"+ + "\u01eb\3\2\2\2\177\u01f1\3\2\2\2\u0081\u01fa\3\2\2\2\u0083\u01fc\3\2\2"+ + "\2\u0085\u01fe\3\2\2\2\u0087\u0200\3\2\2\2\u0089\u0202\3\2\2\2\u008b\u0205"+ + "\3\2\2\2\u008d\u0208\3\2\2\2\u008f\u020b\3\2\2\2\u0091\u020e\3\2\2\2\u0093"+ + "\u0211\3\2\2\2\u0095\u0214\3\2\2\2\u0097\u0217\3\2\2\2\u0099\u021a\3\2"+ + "\2\2\u009b\u021f\3\2\2\2\u009d\u0225\3\2\2\2\u009f\u022a\3\2\2\2\u00a1"+ + "\u022e\3\2\2\2\u00a3\u0231\3\2\2\2\u00a5\u0233\3\2\2\2\u00a7\u0235\3\2"+ + "\2\2\u00a9\u0237\3\2\2\2\u00ab\u023a\3\2\2\2\u00ad\u023f\3\2\2\2\u00af"+ + "\u0245\3\2\2\2\u00b1\u024b\3\2\2\2\u00b3\u0251\3\2\2\2\u00b5\u0256\3\2"+ + "\2\2\u00b7\u025c\3\2\2\2\u00b9\u0262\3\2\2\2\u00bb\u0268\3\2\2\2\u00bd"+ + "\u026f\3\2\2\2\u00bf\u0275\3\2\2\2\u00c1\u027c\3\2\2\2\u00c3\u0282\3\2"+ + "\2\2\u00c5\u0288\3\2\2\2\u00c7\u028c\3\2\2\2\u00c9\u028f\3\2\2\2\u00cb"+ + "\u029a\3\2\2\2\u00cd\u02a3\3\2\2\2\u00cf\u02a8\3\2\2\2\u00d1\u02ac\3\2"+ + "\2\2\u00d3\u02ba\3\2\2\2\u00d5\u02bc\3\2\2\2\u00d7\u02c2\3\2\2\2\u00d9"+ + "\u02c8\3\2\2\2\u00db\u02d1\3\2\2\2\u00dd\u02e1\3\2\2\2\u00df\u02e3\3\2"+ + "\2\2\u00e1\u02ee\3\2\2\2\u00e3\u00e4\7\u0080\2\2\u00e4\4\3\2\2\2\u00e5"+ + "\u00e6\7<\2\2\u00e6\6\3\2\2\2\u00e7\u00e8\7i\2\2\u00e8\u00e9\7q\2\2\u00e9"+ + "\u00ea\7v\2\2\u00ea\u00eb\7q\2\2\u00eb\b\3\2\2\2\u00ec\u00ed\7\'\2\2\u00ed"+ + "\u00ee\7q\2\2\u00ee\u00ef\7w\2\2\u00ef\u00f0\7v\2\2\u00f0\u00f1\7r\2\2"+ + "\u00f1\u00f2\7w\2\2\u00f2\u00f3\7v\2\2\u00f3\n\3\2\2\2\u00f4\u00f5\7\'"+ + "\2\2\u00f5\u00f6\7n\2\2\u00f6\u00f7\7c\2\2\u00f7\u00f8\7w\2\2\u00f8\u00f9"+ + "\7p\2\2\u00f9\u00fa\7e\2\2\u00fa\u00fb\7j\2\2\u00fb\u00fc\7g\2\2\u00fc"+ + "\u00fd\7t\2\2\u00fd\f\3\2\2\2\u00fe\u00ff\7\'\2\2\u00ff\u0100\7|\2\2\u0100"+ + "\u0101\7g\2\2\u0101\u0102\7t\2\2\u0102\u0103\7q\2\2\u0103\u0104\7r\2\2"+ + "\u0104\u0105\7c\2\2\u0105\u0106\7i\2\2\u0106\u0107\7g\2\2\u0107\16\3\2"+ + "\2\2\u0108\u0109\7\'\2\2\u0109\u010a\7c\2\2\u010a\u010b\7f\2\2\u010b\u010c"+ + "\7f\2\2\u010c\u010d\7t\2\2\u010d\u010e\7g\2\2\u010e\u010f\7u\2\2\u010f"+ + "\u0110\7u\2\2\u0110\20\3\2\2\2\u0111\u0112\7\'\2\2\u0112\u0113\7k\2\2"+ + "\u0113\u0114\7o\2\2\u0114\u0115\7r\2\2\u0115\u0116\7q\2\2\u0116\u0117"+ + "\7t\2\2\u0117\u0118\7v\2\2\u0118\22\3\2\2\2\u0119\u011a\7\'\2\2\u011a"+ + "\u011b\7d\2\2\u011b\u011c\7t\2\2\u011c\u011d\7g\2\2\u011d\u011e\7c\2\2"+ + "\u011e\u011f\7m\2\2\u011f\u0120\7r\2\2\u0120\u0121\7q\2\2\u0121\u0122"+ + "\7k\2\2\u0122\u0123\7p\2\2\u0123\u0124\7v\2\2\u0124\24\3\2\2\2\u0125\u0126"+ + "\7\'\2\2\u0126\u0127\7c\2\2\u0127\u0128\7u\2\2\u0128\u0129\7o\2\2\u0129"+ + "\u012a\7k\2\2\u012a\u012b\7p\2\2\u012b\u012c\7e\2\2\u012c\u012d\7n\2\2"+ + "\u012d\u012e\7w\2\2\u012e\u012f\7f\2\2\u012f\u0130\7g\2\2\u0130\26\3\2"+ + "\2\2\u0131\u0132\7\'\2\2\u0132\u0133\7c\2\2\u0133\u0134\7u\2\2\u0134\u0135"+ + "\7o\2\2\u0135\u0136\7d\2\2\u0136\u0137\7k\2\2\u0137\u0138\7p\2\2\u0138"+ + "\u0139\7c\2\2\u0139\u013a\7t\2\2\u013a\u013b\7{\2\2\u013b\30\3\2\2\2\u013c"+ + "\u013d\7\'\2\2\u013d\u013e\7q\2\2\u013e\u013f\7r\2\2\u013f\u0140\7v\2"+ + "\2\u0140\u0141\7k\2\2\u0141\u0142\7q\2\2\u0142\u0143\7p\2\2\u0143\32\3"+ + "\2\2\2\u0144\u0145\7.\2\2\u0145\34\3\2\2\2\u0146\u0147\7?\2\2\u0147\36"+ + "\3\2\2\2\u0148\u0149\7e\2\2\u0149\u014a\7q\2\2\u014a\u014b\7p\2\2\u014b"+ + "\u014c\7u\2\2\u014c\u014d\7v\2\2\u014d \3\2\2\2\u014e\u014f\7o\2\2\u014f"+ + "\u0150\7g\2\2\u0150\u0151\7o\2\2\u0151\u0152\7q\2\2\u0152\u0153\7t\2\2"+ + "\u0153\u0154\7{\2\2\u0154\"\3\2\2\2\u0155\u0156\7d\2\2\u0156\u0157\7{"+ + "\2\2\u0157\u0158\7v\2\2\u0158\u0159\7g\2\2\u0159$\3\2\2\2\u015a\u015b"+ + "\7y\2\2\u015b\u015c\7q\2\2\u015c\u015d\7t\2\2\u015d\u015e\7f\2\2\u015e"+ + "&\3\2\2\2\u015f\u0160\7h\2\2\u0160\u0161\7n\2\2\u0161\u0162\7q\2\2\u0162"+ + "\u0163\7c\2\2\u0163\u0164\7v\2\2\u0164(\3\2\2\2\u0165\u0166\7u\2\2\u0166"+ + "\u0167\7v\2\2\u0167\u0168\7t\2\2\u0168*\3\2\2\2\u0169\u016a\7u\2\2\u016a"+ + "\u016b\7v\2\2\u016b\u016c\7t\2\2\u016c\u016d\7a\2\2\u016d\u016e\7r\2\2"+ + "\u016e,\3\2\2\2\u016f\u0170\7u\2\2\u0170\u0171\7v\2\2\u0171\u0172\7t\2"+ + "\2\u0172\u0173\7a\2\2\u0173\u0174\7u\2\2\u0174.\3\2\2\2\u0175\u0176\7"+ + "u\2\2\u0176\u0177\7v\2\2\u0177\u0178\7t\2\2\u0178\u0179\7a\2\2\u0179\u017a"+ + "\7r\2\2\u017a\u017b\7u\2\2\u017b\60\3\2\2\2\u017c\u017d\7]\2\2\u017d\62"+ + "\3\2\2\2\u017e\u017f\7_\2\2\u017f\64\3\2\2\2\u0180\u0181\7-\2\2\u0181"+ + "\u0182\7?\2\2\u0182\66\3\2\2\2\u0183\u0184\7/\2\2\u0184\u0185\7?\2\2\u0185"+ + "8\3\2\2\2\u0186\u0187\7\61\2\2\u0187\u0188\7?\2\2\u0188:\3\2\2\2\u0189"+ + "\u018a\7\61\2\2\u018a\u018b\7\61\2\2\u018b\u018c\7?\2\2\u018c<\3\2\2\2"+ + "\u018d\u018e\7,\2\2\u018e\u018f\7?\2\2\u018f>\3\2\2\2\u0190\u0191\7,\2"+ + "\2\u0191\u0192\7,\2\2\u0192\u0193\7?\2\2\u0193@\3\2\2\2\u0194\u0195\7"+ + "(\2\2\u0195\u0196\7?\2\2\u0196B\3\2\2\2\u0197\u0198\7~\2\2\u0198\u0199"+ + "\7?\2\2\u0199D\3\2\2\2\u019a\u019b\7`\2\2\u019b\u019c\7?\2\2\u019cF\3"+ + "\2\2\2\u019d\u019e\7-\2\2\u019e\u019f\7-\2\2\u019fH\3\2\2\2\u01a0\u01a1"+ + "\7/\2\2\u01a1\u01a2\7/\2\2\u01a2J\3\2\2\2\u01a3\u01a4\7*\2\2\u01a4L\3"+ + "\2\2\2\u01a5\u01a6\7+\2\2\u01a6N\3\2\2\2\u01a7\u01a8\7-\2\2\u01a8P\3\2"+ + "\2\2\u01a9\u01aa\7/\2\2\u01aaR\3\2\2\2\u01ab\u01ac\7,\2\2\u01ac\u01ad"+ + "\7,\2\2\u01adT\3\2\2\2\u01ae\u01af\7,\2\2\u01afV\3\2\2\2\u01b0\u01b1\7"+ + "\61\2\2\u01b1X\3\2\2\2\u01b2\u01b3\7\61\2\2\u01b3\u01b4\7\61\2\2\u01b4"+ + "Z\3\2\2\2\u01b5\u01b6\7\'\2\2\u01b6\\\3\2\2\2\u01b7\u01b8\7>\2\2\u01b8"+ + "^\3\2\2\2\u01b9\u01ba\7@\2\2\u01ba`\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+ + "\7?\2\2\u01bdb\3\2\2\2\u01be\u01bf\7@\2\2\u01bf\u01c0\7?\2\2\u01c0d\3"+ + "\2\2\2\u01c1\u01c2\7?\2\2\u01c2\u01c3\7?\2\2\u01c3f\3\2\2\2\u01c4\u01c5"+ + "\7#\2\2\u01c5\u01c6\7?\2\2\u01c6h\3\2\2\2\u01c7\u01c8\7(\2\2\u01c8j\3"+ + "\2\2\2\u01c9\u01ca\7`\2\2\u01cal\3\2\2\2\u01cb\u01cc\7~\2\2\u01ccn\3\2"+ + "\2\2\u01cd\u01ce\7v\2\2\u01ce\u01cf\7q\2\2\u01cfp\3\2\2\2\u01d0\u01d1"+ + "\7u\2\2\u01d1\u01d2\7v\2\2\u01d2\u01d3\7g\2\2\u01d3\u01d4\7r\2\2\u01d4"+ + "r\3\2\2\2\u01d5\u01d6\7c\2\2\u01d6\u01d7\7p\2\2\u01d7\u01d8\7f\2\2\u01d8"+ + "t\3\2\2\2\u01d9\u01da\7q\2\2\u01da\u01db\7t\2\2\u01dbv\3\2\2\2\u01dc\u01dd"+ + "\7z\2\2\u01dd\u01de\7q\2\2\u01de\u01df\7t\2\2\u01dfx\3\2\2\2\u01e0\u01e1"+ + "\7p\2\2\u01e1\u01e2\7q\2\2\u01e2\u01e3\7v\2\2\u01e3z\3\2\2\2\u01e4\u01e5"+ + "\7t\2\2\u01e5\u01e6\7g\2\2\u01e6\u01e7\7v\2\2\u01e7\u01e8\7w\2\2\u01e8"+ + "\u01e9\7t\2\2\u01e9\u01ea\7p\2\2\u01ea|\3\2\2\2\u01eb\u01ec\7d\2\2\u01ec"+ + "\u01ed\7t\2\2\u01ed\u01ee\7g\2\2\u01ee\u01ef\7c\2\2\u01ef\u01f0\7m\2\2"+ + "\u01f0~\3\2\2\2\u01f1\u01f2\7e\2\2\u01f2\u01f3\7q\2\2\u01f3\u01f4\7p\2"+ + "\2\u01f4\u01f5\7v\2\2\u01f5\u01f6\7k\2\2\u01f6\u01f7\7p\2\2\u01f7\u01f8"+ + "\7w\2\2\u01f8\u01f9\7g\2\2\u01f9\u0080\3\2\2\2\u01fa\u01fb\7\60\2\2\u01fb"+ + "\u0082\3\2\2\2\u01fc\u01fd\7C\2\2\u01fd\u0084\3\2\2\2\u01fe\u01ff\7Z\2"+ + "\2\u01ff\u0086\3\2\2\2\u0200\u0201\7[\2\2\u0201\u0088\3\2\2\2\u0202\u0203"+ + "\7C\2\2\u0203\u0204\7Z\2\2\u0204\u008a\3\2\2\2\u0205\u0206\7C\2\2\u0206"+ + "\u0207\7[\2\2\u0207\u008c\3\2\2\2\u0208\u0209\7Z\2\2\u0209\u020a\7[\2"+ + "\2\u020a\u008e\3\2\2\2\u020b\u020c\7R\2\2\u020c\u020d\7e\2\2\u020d\u0090"+ + "\3\2\2\2\u020e\u020f\7R\2\2\u020f\u0210\7|\2\2\u0210\u0092\3\2\2\2\u0211"+ + "\u0212\7R\2\2\u0212\u0213\7p\2\2\u0213\u0094\3\2\2\2\u0214\u0215\7R\2"+ + "\2\u0215\u0216\7x\2\2\u0216\u0096\3\2\2\2\u0217\u0218\7\60\2\2\u0218\u0219"+ + "\7y\2\2\u0219\u0098\3\2\2\2\u021a\u021b\7v\2\2\u021b\u021c\7t\2\2\u021c"+ + "\u021d\7w\2\2\u021d\u021e\7g\2\2\u021e\u009a\3\2\2\2\u021f\u0220\7h\2"+ + "\2\u0220\u0221\7c\2\2\u0221\u0222\7n\2\2\u0222\u0223\7u\2\2\u0223\u0224"+ + "\7g\2\2\u0224\u009c\3\2\2\2\u0225\u0226\7\'\2\2\u0226\u0227\7c\2\2\u0227"+ + "\u0228\7u\2\2\u0228\u0229\7o\2\2\u0229\u009e\3\2\2\2\u022a\u022b\7u\2"+ + "\2\u022b\u022c\7w\2\2\u022c\u022d\7d\2\2\u022d\u00a0\3\2\2\2\u022e\u022f"+ + "\7/\2\2\u022f\u0230\7@\2\2\u0230\u00a2\3\2\2\2\u0231\u0232\7}\2\2\u0232"+ + "\u00a4\3\2\2\2\u0233\u0234\7\177\2\2\u0234\u00a6\3\2\2\2\u0235\u0236\7"+ + "A\2\2\u0236\u00a8\3\2\2\2\u0237\u0238\7k\2\2\u0238\u0239\7h\2\2\u0239"+ + "\u00aa\3\2\2\2\u023a\u023b\7g\2\2\u023b\u023c\7n\2\2\u023c\u023d\7u\2"+ + "\2\u023d\u023e\7g\2\2\u023e\u00ac\3\2\2\2\u023f\u0240\7k\2\2\u0240\u0241"+ + "\7h\2\2\u0241\u0242\7a\2\2\u0242\u0243\7e\2\2\u0243\u0244\7u\2\2\u0244"+ + "\u00ae\3\2\2\2\u0245\u0246\7k\2\2\u0246\u0247\7h\2\2\u0247\u0248\7a\2"+ + "\2\u0248\u0249\7e\2\2\u0249\u024a\7e\2\2\u024a\u00b0\3\2\2\2\u024b\u024c"+ + "\7k\2\2\u024c\u024d\7h\2\2\u024d\u024e\7a\2\2\u024e\u024f\7g\2\2\u024f"+ + "\u0250\7s\2\2\u0250\u00b2\3\2\2\2\u0251\u0252\7k\2\2\u0252\u0253\7h\2"+ + "\2\u0253\u0254\7a\2\2\u0254\u0255\7|\2\2\u0255\u00b4\3\2\2\2\u0256\u0257"+ + "\7k\2\2\u0257\u0258\7h\2\2\u0258\u0259\7a\2\2\u0259\u025a\7p\2\2\u025a"+ + "\u025b\7g\2\2\u025b\u00b6\3\2\2\2\u025c\u025d\7k\2\2\u025d\u025e\7h\2"+ + "\2\u025e\u025f\7a\2\2\u025f\u0260\7p\2\2\u0260\u0261\7|\2\2\u0261\u00b8"+ + "\3\2\2\2\u0262\u0263\7k\2\2\u0263\u0264\7h\2\2\u0264\u0265\7a\2\2\u0265"+ + "\u0266\7r\2\2\u0266\u0267\7n\2\2\u0267\u00ba\3\2\2\2\u0268\u0269\7k\2"+ + "\2\u0269\u026a\7h\2\2\u026a\u026b\7a\2\2\u026b\u026c\7r\2\2\u026c\u026d"+ + "\7q\2\2\u026d\u026e\7u\2\2\u026e\u00bc\3\2\2\2\u026f\u0270\7k\2\2\u0270"+ + "\u0271\7h\2\2\u0271\u0272\7a\2\2\u0272\u0273\7o\2\2\u0273\u0274\7k\2\2"+ + "\u0274\u00be\3\2\2\2\u0275\u0276\7k\2\2\u0276\u0277\7h\2\2\u0277\u0278"+ + "\7a\2\2\u0278\u0279\7p\2\2\u0279\u027a\7g\2\2\u027a\u027b\7i\2\2\u027b"+ + "\u00c0\3\2\2\2\u027c\u027d\7k\2\2\u027d\u027e\7h\2\2\u027e\u027f\7a\2"+ + "\2\u027f\u0280\7x\2\2\u0280\u0281\7u\2\2\u0281\u00c2\3\2\2\2\u0282\u0283"+ + "\7k\2\2\u0283\u0284\7h\2\2\u0284\u0285\7a\2\2\u0285\u0286\7x\2\2\u0286"+ + "\u0287\7e\2\2\u0287\u00c4\3\2\2\2\u0288\u0289\7h\2\2\u0289\u028a\7q\2"+ + "\2\u028a\u028b\7t\2\2\u028b\u00c6\3\2\2\2\u028c\u028d\7k\2\2\u028d\u028e"+ + "\7p\2\2\u028e\u00c8\3\2\2\2\u028f\u0293\t\2\2\2\u0290\u0292\t\3\2\2\u0291"+ + "\u0290\3\2\2\2\u0292\u0295\3\2\2\2\u0293\u0291\3\2\2\2\u0293\u0294\3\2"+ + "\2\2\u0294\u0296\3\2\2\2\u0295\u0293\3\2\2\2\u0296\u0297\5\u00cbf\2\u0297"+ + "\u0298\3\2\2\2\u0298\u0299\be\2\2\u0299\u00ca\3\2\2\2\u029a\u029e\7=\2"+ + "\2\u029b\u029d\n\2\2\2\u029c\u029b\3\2\2\2\u029d\u02a0\3\2\2\2\u029e\u029c"+ + "\3\2\2\2\u029e\u029f\3\2\2\2\u029f\u02a1\3\2\2\2\u02a0\u029e\3\2\2\2\u02a1"+ + "\u02a2\bf\2\2\u02a2\u00cc\3\2\2\2\u02a3\u02a4\t\3\2\2\u02a4\u02a5\3\2"+ + "\2\2\u02a5\u02a6\bg\3\2\u02a6\u00ce\3\2\2\2\u02a7\u02a9\t\2\2\2\u02a8"+ + "\u02a7\3\2\2\2\u02a9\u02aa\3\2\2\2\u02aa\u02a8\3\2\2\2\u02aa\u02ab\3\2"+ + "\2\2\u02ab\u00d0\3\2\2\2\u02ac\u02b0\t\4\2\2\u02ad\u02af\t\5\2\2\u02ae"+ + "\u02ad\3\2\2\2\u02af\u02b2\3\2\2\2\u02b0\u02ae\3\2\2\2\u02b0\u02b1\3\2"+ + "\2\2\u02b1\u00d2\3\2\2\2\u02b2\u02b0\3\2\2\2\u02b3\u02bb\4\62;\2\u02b4"+ + "\u02b6\4\63;\2\u02b5\u02b7\4\62;\2\u02b6\u02b5\3\2\2\2\u02b7\u02b8\3\2"+ + "\2\2\u02b8\u02b6\3\2\2\2\u02b8\u02b9\3\2\2\2\u02b9\u02bb\3\2\2\2\u02ba"+ + "\u02b3\3\2\2\2\u02ba\u02b4\3\2\2\2\u02bb\u00d4\3\2\2\2\u02bc\u02be\7&"+ + "\2\2\u02bd\u02bf\t\6\2\2\u02be\u02bd\3\2\2\2\u02bf\u02c0\3\2\2\2\u02c0"+ + "\u02be\3\2\2\2\u02c0\u02c1\3\2\2\2\u02c1\u00d6\3\2\2\2\u02c2\u02c4\7\'"+ + "\2\2\u02c3\u02c5\4\62\63\2\u02c4\u02c3\3\2\2\2\u02c5\u02c6\3\2\2\2\u02c6"+ + "\u02c4\3\2\2\2\u02c6\u02c7\3\2\2\2\u02c7\u00d8\3\2\2\2\u02c8\u02ce\5\u00db"+ + "n\2\u02c9\u02cb\t\7\2\2\u02ca\u02cc\t\b\2\2\u02cb\u02ca\3\2\2\2\u02cb"+ + "\u02cc\3\2\2\2\u02cc\u02cd\3\2\2\2\u02cd\u02cf\5\u00dbn\2\u02ce\u02c9"+ + "\3\2\2\2\u02ce\u02cf\3\2\2\2\u02cf\u00da\3\2\2\2\u02d0\u02d2\4\62;\2\u02d1"+ + "\u02d0\3\2\2\2\u02d2\u02d3\3\2\2\2\u02d3\u02d1\3\2\2\2\u02d3\u02d4\3\2"+ + "\2\2\u02d4\u02db\3\2\2\2\u02d5\u02d7\7\60\2\2\u02d6\u02d8\4\62;\2\u02d7"+ + "\u02d6\3\2\2\2\u02d8\u02d9\3\2\2\2\u02d9\u02d7\3\2\2\2\u02d9\u02da\3\2"+ + "\2\2\u02da\u02dc\3\2\2\2\u02db\u02d5\3\2\2\2\u02db\u02dc\3\2\2\2\u02dc"+ + "\u00dc\3\2\2\2\u02dd\u02de\7^\2\2\u02de\u02e2\13\2\2\2\u02df\u02e0\7^"+ + "\2\2\u02e0\u02e2\5\u00cfh\2\u02e1\u02dd\3\2\2\2\u02e1\u02df\3\2\2\2\u02e2"+ + "\u00de\3\2\2\2\u02e3\u02e8\7$\2\2\u02e4\u02e7\5\u00ddo\2\u02e5\u02e7\n"+ + "\t\2\2\u02e6\u02e4\3\2\2\2\u02e6\u02e5\3\2\2\2\u02e7\u02ea\3\2\2\2\u02e8"+ + "\u02e6\3\2\2\2\u02e8\u02e9\3\2\2\2\u02e9\u02eb\3\2\2\2\u02ea\u02e8\3\2"+ + "\2\2\u02eb\u02ec\7$\2\2\u02ec\u02ed\bp\4\2\u02ed\u00e0\3\2\2\2\u02ee\u02ef"+ + "\7}\2\2\u02ef\u02f0\7}\2\2\u02f0\u02f2\3\2\2\2\u02f1\u02f3\13\2\2\2\u02f2"+ + "\u02f1\3\2\2\2\u02f3\u02f4\3\2\2\2\u02f4\u02f5\3\2\2\2\u02f4\u02f2\3\2"+ + "\2\2\u02f5\u02f6\3\2\2\2\u02f6\u02f7\7\177\2\2\u02f7\u02f8\7\177\2\2\u02f8"+ + "\u02f9\3\2\2\2\u02f9\u02fa\bq\5\2\u02fa\u00e2\3\2\2\2\25\2\u0293\u029e"+ + "\u02aa\u02b0\u02b8\u02ba\u02be\u02c0\u02c6\u02cb\u02ce\u02d3\u02d9\u02db"+ + "\u02e1\u02e6\u02e8\u02f4\6\2\3\2\b\2\2\3p\2\3q\3"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/compiler/src/prog8/parser/prog8Parser.java b/compiler/src/prog8/parser/prog8Parser.java index d9a22590f..e9f1c35b7 100644 --- a/compiler/src/prog8/parser/prog8Parser.java +++ b/compiler/src/prog8/parser/prog8Parser.java @@ -30,8 +30,9 @@ public class prog8Parser extends Parser { T__73=74, T__74=75, T__75=76, T__76=77, T__77=78, T__78=79, T__79=80, T__80=81, T__81=82, T__82=83, T__83=84, T__84=85, T__85=86, T__86=87, T__87=88, T__88=89, T__89=90, T__90=91, T__91=92, T__92=93, T__93=94, - T__94=95, LINECOMMENT=96, COMMENT=97, WS=98, EOL=99, NAME=100, DEC_INTEGER=101, - HEX_INTEGER=102, BIN_INTEGER=103, FLOAT_NUMBER=104, STRING=105, INLINEASMBLOCK=106; + T__94=95, T__95=96, T__96=97, T__97=98, T__98=99, LINECOMMENT=100, COMMENT=101, + WS=102, EOL=103, NAME=104, DEC_INTEGER=105, HEX_INTEGER=106, BIN_INTEGER=107, + FLOAT_NUMBER=108, STRING=109, INLINEASMBLOCK=110; public static final int RULE_module = 0, RULE_modulestatement = 1, RULE_block = 2, RULE_statement = 3, RULE_labeldef = 4, RULE_unconditionaljump = 5, RULE_directive = 6, RULE_directivearg = 7, @@ -71,8 +72,9 @@ public class prog8Parser extends Parser { "'step'", "'and'", "'or'", "'xor'", "'not'", "'return'", "'break'", "'continue'", "'.'", "'A'", "'X'", "'Y'", "'AX'", "'AY'", "'XY'", "'Pc'", "'Pz'", "'Pn'", "'Pv'", "'.w'", "'true'", "'false'", "'%asm'", "'sub'", "'->'", "'{'", - "'}'", "'?'", "'if'", "'else'", "'if_cs'", "'if_cc'", "'if_eq'", "'if_ne'", - "'if_pl'", "'if_mi'", "'if_vs'", "'if_vc'", "'for'", "'in'" + "'}'", "'?'", "'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'" }; private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null, null, @@ -83,8 +85,9 @@ public class prog8Parser extends Parser { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - "LINECOMMENT", "COMMENT", "WS", "EOL", "NAME", "DEC_INTEGER", "HEX_INTEGER", - "BIN_INTEGER", "FLOAT_NUMBER", "STRING", "INLINEASMBLOCK" + null, null, null, null, "LINECOMMENT", "COMMENT", "WS", "EOL", "NAME", + "DEC_INTEGER", "HEX_INTEGER", "BIN_INTEGER", "FLOAT_NUMBER", "STRING", + "INLINEASMBLOCK" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); @@ -300,7 +303,7 @@ public class prog8Parser extends Parser { setState(114); _errHandler.sync(this); _la = _input.LA(1); - if (((((_la - 101)) & ~0x3f) == 0 && ((1L << (_la - 101)) & ((1L << (DEC_INTEGER - 101)) | (1L << (HEX_INTEGER - 101)) | (1L << (BIN_INTEGER - 101)))) != 0)) { + if (((((_la - 105)) & ~0x3f) == 0 && ((1L << (_la - 105)) & ((1L << (DEC_INTEGER - 105)) | (1L << (HEX_INTEGER - 105)) | (1L << (BIN_INTEGER - 105)))) != 0)) { { setState(113); integerliteral(); @@ -2071,7 +2074,7 @@ public class prog8Parser extends Parser { setState(326); ((IntegerliteralContext)_localctx).intpart = _input.LT(1); _la = _input.LA(1); - if ( !(((((_la - 101)) & ~0x3f) == 0 && ((1L << (_la - 101)) & ((1L << (DEC_INTEGER - 101)) | (1L << (HEX_INTEGER - 101)) | (1L << (BIN_INTEGER - 101)))) != 0)) ) { + if ( !(((((_la - 105)) & ~0x3f) == 0 && ((1L << (_la - 105)) & ((1L << (DEC_INTEGER - 105)) | (1L << (HEX_INTEGER - 105)) | (1L << (BIN_INTEGER - 105)))) != 0)) ) { ((IntegerliteralContext)_localctx).intpart = (Token)_errHandler.recoverInline(this); } else { @@ -2523,7 +2526,7 @@ public class prog8Parser extends Parser { setState(384); _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__14) | (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__60) | (1L << T__61) | (1L << T__62))) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & ((1L << (T__64 - 65)) | (1L << (T__65 - 65)) | (1L << (T__66 - 65)) | (1L << (T__67 - 65)) | (1L << (T__68 - 65)) | (1L << (T__69 - 65)) | (1L << (T__77 - 65)) | (1L << (T__78 - 65)) | (1L << (T__83 - 65)) | (1L << (T__85 - 65)) | (1L << (T__86 - 65)) | (1L << (T__87 - 65)) | (1L << (T__88 - 65)) | (1L << (T__89 - 65)) | (1L << (T__90 - 65)) | (1L << (T__91 - 65)) | (1L << (T__92 - 65)) | (1L << (T__93 - 65)) | (1L << (EOL - 65)) | (1L << (NAME - 65)))) != 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__14) | (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__60) | (1L << T__61) | (1L << T__62))) != 0) || ((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & ((1L << (T__64 - 65)) | (1L << (T__65 - 65)) | (1L << (T__66 - 65)) | (1L << (T__67 - 65)) | (1L << (T__68 - 65)) | (1L << (T__69 - 65)) | (1L << (T__77 - 65)) | (1L << (T__78 - 65)) | (1L << (T__83 - 65)) | (1L << (T__85 - 65)) | (1L << (T__86 - 65)) | (1L << (T__87 - 65)) | (1L << (T__88 - 65)) | (1L << (T__89 - 65)) | (1L << (T__90 - 65)) | (1L << (T__91 - 65)) | (1L << (T__92 - 65)) | (1L << (T__93 - 65)) | (1L << (T__94 - 65)) | (1L << (T__95 - 65)) | (1L << (T__96 - 65)) | (1L << (T__97 - 65)) | (1L << (EOL - 65)) | (1L << (NAME - 65)))) != 0)) { { setState(382); _errHandler.sync(this); @@ -2568,6 +2571,10 @@ public class prog8Parser extends Parser { case T__91: case T__92: case T__93: + case T__94: + case T__95: + case T__96: + case T__97: case NAME: { setState(380); @@ -2989,6 +2996,10 @@ public class prog8Parser extends Parser { case T__91: case T__92: case T__93: + case T__94: + case T__95: + case T__96: + case T__97: case NAME: { setState(431); @@ -3115,6 +3126,10 @@ public class prog8Parser extends Parser { case T__91: case T__92: case T__93: + case T__94: + case T__95: + case T__96: + case T__97: case NAME: { setState(447); @@ -3228,6 +3243,10 @@ public class prog8Parser extends Parser { case T__91: case T__92: case T__93: + case T__94: + case T__95: + case T__96: + case T__97: case NAME: { setState(455); @@ -3294,7 +3313,7 @@ public class prog8Parser extends Parser { { setState(467); _la = _input.LA(1); - if ( !(((((_la - 86)) & ~0x3f) == 0 && ((1L << (_la - 86)) & ((1L << (T__85 - 86)) | (1L << (T__86 - 86)) | (1L << (T__87 - 86)) | (1L << (T__88 - 86)) | (1L << (T__89 - 86)) | (1L << (T__90 - 86)) | (1L << (T__91 - 86)) | (1L << (T__92 - 86)))) != 0)) ) { + if ( !(((((_la - 86)) & ~0x3f) == 0 && ((1L << (_la - 86)) & ((1L << (T__85 - 86)) | (1L << (T__86 - 86)) | (1L << (T__87 - 86)) | (1L << (T__88 - 86)) | (1L << (T__89 - 86)) | (1L << (T__90 - 86)) | (1L << (T__91 - 86)) | (1L << (T__92 - 86)) | (1L << (T__93 - 86)) | (1L << (T__94 - 86)) | (1L << (T__95 - 86)) | (1L << (T__96 - 86)))) != 0)) ) { _errHandler.recoverInline(this); } else { @@ -3346,7 +3365,7 @@ public class prog8Parser extends Parser { enterOuterAlt(_localctx, 1); { setState(469); - match(T__93); + match(T__97); setState(472); _errHandler.sync(this); switch (_input.LA(1)) { @@ -3371,7 +3390,7 @@ public class prog8Parser extends Parser { throw new NoViableAltException(this); } setState(474); - match(T__94); + match(T__98); setState(475); expression(0); setState(477); @@ -3441,7 +3460,7 @@ public class prog8Parser extends Parser { } public static final String _serializedATN = - "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3l\u01e5\4\2\t\2\4"+ + "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3p\u01e5\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"+ @@ -3478,7 +3497,7 @@ public class prog8Parser extends Parser { "\n\62\3\62\3\62\3\62\5\62\u01e0\n\62\3\62\3\62\3\62\3\62\2\3&\63\2\4\6"+ "\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRT"+ "VXZ\\^`b\2\20\3\2\6\16\3\2\23\31\3\2\34$\3\2%&\4\2\3\3)*\3\2,/\3\2)*\3"+ - "\2\60\63\3\2\64\65\3\2CH\3\2IL\3\2gi\3\2NO\3\2X_\2\u020e\2h\3\2\2\2\4"+ + "\2\60\63\3\2\64\65\3\2CH\3\2IL\3\2km\3\2NO\3\2Xc\2\u020e\2h\3\2\2\2\4"+ "o\3\2\2\2\6q\3\2\2\2\b\u008c\3\2\2\2\n\u008e\3\2\2\2\f\u0091\3\2\2\2\16"+ "\u0097\3\2\2\2\20\u00a8\3\2\2\2\22\u00aa\3\2\2\2\24\u00b0\3\2\2\2\26\u00b8"+ "\3\2\2\2\30\u00bb\3\2\2\2\32\u00be\3\2\2\2\34\u00c0\3\2\2\2\36\u00c8\3"+ @@ -3489,10 +3508,10 @@ public class prog8Parser extends Parser { "\u015b\3\2\2\2F\u015d\3\2\2\2H\u0164\3\2\2\2J\u0166\3\2\2\2L\u0169\3\2"+ "\2\2N\u017c\3\2\2\2P\u0187\3\2\2\2R\u018a\3\2\2\2T\u0192\3\2\2\2V\u01a1"+ "\3\2\2\2X\u01a5\3\2\2\2Z\u01aa\3\2\2\2\\\u01bd\3\2\2\2^\u01c5\3\2\2\2"+ - "`\u01d5\3\2\2\2b\u01d7\3\2\2\2dg\5\4\3\2eg\7e\2\2fd\3\2\2\2fe\3\2\2\2"+ + "`\u01d5\3\2\2\2b\u01d7\3\2\2\2dg\5\4\3\2eg\7i\2\2fd\3\2\2\2fe\3\2\2\2"+ "gj\3\2\2\2hf\3\2\2\2hi\3\2\2\2ik\3\2\2\2jh\3\2\2\2kl\7\2\2\3l\3\3\2\2"+ "\2mp\5\16\b\2np\5\6\4\2om\3\2\2\2on\3\2\2\2p\5\3\2\2\2qr\7\3\2\2rt\5\64"+ - "\33\2su\5<\37\2ts\3\2\2\2tu\3\2\2\2uv\3\2\2\2vw\5N(\2wx\7e\2\2x\7\3\2"+ + "\33\2su\5<\37\2ts\3\2\2\2tu\3\2\2\2uv\3\2\2\2vw\5N(\2wx\7i\2\2x\7\3\2"+ "\2\2y\u008d\5\16\b\2z\u008d\5\24\13\2{\u008d\5\22\n\2|\u008d\5\26\f\2"+ "}\u008d\5\30\r\2~\u008d\5\36\20\2\177\u008d\5 \21\2\u0080\u008d\5\f\7"+ "\2\u0081\u008d\5$\23\2\u0082\u008d\5*\26\2\u0083\u008d\5Z.\2\u0084\u008d"+ @@ -3562,8 +3581,8 @@ public class prog8Parser extends Parser { "\2\2\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131-\3\2\2\2\u0132\u0130"+ "\3\2\2\2\u0133\u0135\7?\2\2\u0134\u0136\5,\27\2\u0135\u0134\3\2\2\2\u0135"+ "\u0136\3\2\2\2\u0136/\3\2\2\2\u0137\u0138\7@\2\2\u0138\61\3\2\2\2\u0139"+ - "\u013a\7A\2\2\u013a\63\3\2\2\2\u013b\u013c\7f\2\2\u013c\65\3\2\2\2\u013d"+ - "\u0140\7f\2\2\u013e\u013f\7B\2\2\u013f\u0141\7f\2\2\u0140\u013e\3\2\2"+ + "\u013a\7A\2\2\u013a\63\3\2\2\2\u013b\u013c\7j\2\2\u013c\65\3\2\2\2\u013d"+ + "\u0140\7j\2\2\u013e\u013f\7B\2\2\u013f\u0141\7j\2\2\u0140\u013e\3\2\2"+ "\2\u0141\u0142\3\2\2\2\u0142\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\67"+ "\3\2\2\2\u0144\u0145\t\13\2\2\u01459\3\2\2\2\u0146\u0147\t\f\2\2\u0147"+ ";\3\2\2\2\u0148\u014a\t\r\2\2\u0149\u014b\5> \2\u014a\u0149\3\2\2\2\u014a"+ @@ -3572,18 +3591,18 @@ public class prog8Parser extends Parser { "\2\u0152\u0153\7\17\2\2\u0153\u0155\5&\24\2\u0154\u0152\3\2\2\2\u0155"+ "\u0158\3\2\2\2\u0156\u0154\3\2\2\2\u0156\u0157\3\2\2\2\u0157\u0159\3\2"+ "\2\2\u0158\u0156\3\2\2\2\u0159\u015a\7\33\2\2\u015aC\3\2\2\2\u015b\u015c"+ - "\7k\2\2\u015cE\3\2\2\2\u015d\u015e\7j\2\2\u015eG\3\2\2\2\u015f\u0165\5"+ + "\7o\2\2\u015cE\3\2\2\2\u015d\u015e\7n\2\2\u015eG\3\2\2\2\u015f\u0165\5"+ "<\37\2\u0160\u0165\5@!\2\u0161\u0165\5B\"\2\u0162\u0165\5D#\2\u0163\u0165"+ "\5F$\2\u0164\u015f\3\2\2\2\u0164\u0160\3\2\2\2\u0164\u0161\3\2\2\2\u0164"+ "\u0162\3\2\2\2\u0164\u0163\3\2\2\2\u0165I\3\2\2\2\u0166\u0167\7P\2\2\u0167"+ - "\u0168\7l\2\2\u0168K\3\2\2\2\u0169\u016a\7Q\2\2\u016a\u016b\5\64\33\2"+ + "\u0168\7p\2\2\u0168K\3\2\2\2\u0169\u016a\7Q\2\2\u016a\u016b\5\64\33\2"+ "\u016b\u016d\7\'\2\2\u016c\u016e\5R*\2\u016d\u016c\3\2\2\2\u016d\u016e"+ "\3\2\2\2\u016e\u016f\3\2\2\2\u016f\u0170\7(\2\2\u0170\u0171\7R\2\2\u0171"+ "\u0173\7\'\2\2\u0172\u0174\5V,\2\u0173\u0172\3\2\2\2\u0173\u0174\3\2\2"+ "\2\u0174\u0175\3\2\2\2\u0175\u017a\7(\2\2\u0176\u017b\5P)\2\u0177\u0178"+ - "\5N(\2\u0178\u0179\7e\2\2\u0179\u017b\3\2\2\2\u017a\u0176\3\2\2\2\u017a"+ - "\u0177\3\2\2\2\u017bM\3\2\2\2\u017c\u017d\7S\2\2\u017d\u0182\7e\2\2\u017e"+ - "\u0181\5\b\5\2\u017f\u0181\7e\2\2\u0180\u017e\3\2\2\2\u0180\u017f\3\2"+ + "\5N(\2\u0178\u0179\7i\2\2\u0179\u017b\3\2\2\2\u017a\u0176\3\2\2\2\u017a"+ + "\u0177\3\2\2\2\u017bM\3\2\2\2\u017c\u017d\7S\2\2\u017d\u0182\7i\2\2\u017e"+ + "\u0181\5\b\5\2\u017f\u0181\7i\2\2\u0180\u017e\3\2\2\2\u0180\u017f\3\2"+ "\2\2\u0181\u0184\3\2\2\2\u0182\u0180\3\2\2\2\u0182\u0183\3\2\2\2\u0183"+ "\u0185\3\2\2\2\u0184\u0182\3\2\2\2\u0185\u0186\7T\2\2\u0186O\3\2\2\2\u0187"+ "\u0188\7\20\2\2\u0188\u0189\5<\37\2\u0189Q\3\2\2\2\u018a\u018f\5T+\2\u018b"+ @@ -3598,25 +3617,25 @@ public class prog8Parser extends Parser { "\u01a6\5:\36\2\u01a5\u01a3\3\2\2\2\u01a5\u01a4\3\2\2\2\u01a6\u01a8\3\2"+ "\2\2\u01a7\u01a9\7U\2\2\u01a8\u01a7\3\2\2\2\u01a8\u01a9\3\2\2\2\u01a9"+ "Y\3\2\2\2\u01aa\u01ab\7V\2\2\u01ab\u01ac\7\'\2\2\u01ac\u01ad\5&\24\2\u01ad"+ - "\u01af\7(\2\2\u01ae\u01b0\7e\2\2\u01af\u01ae\3\2\2\2\u01af\u01b0\3\2\2"+ + "\u01af\7(\2\2\u01ae\u01b0\7i\2\2\u01af\u01ae\3\2\2\2\u01af\u01b0\3\2\2"+ "\2\u01b0\u01b3\3\2\2\2\u01b1\u01b4\5\b\5\2\u01b2\u01b4\5N(\2\u01b3\u01b1"+ - "\3\2\2\2\u01b3\u01b2\3\2\2\2\u01b4\u01b6\3\2\2\2\u01b5\u01b7\7e\2\2\u01b6"+ + "\3\2\2\2\u01b3\u01b2\3\2\2\2\u01b4\u01b6\3\2\2\2\u01b5\u01b7\7i\2\2\u01b6"+ "\u01b5\3\2\2\2\u01b6\u01b7\3\2\2\2\u01b7\u01b9\3\2\2\2\u01b8\u01ba\5\\"+ "/\2\u01b9\u01b8\3\2\2\2\u01b9\u01ba\3\2\2\2\u01ba\u01bb\3\2\2\2\u01bb"+ - "\u01bc\7e\2\2\u01bc[\3\2\2\2\u01bd\u01bf\7W\2\2\u01be\u01c0\7e\2\2\u01bf"+ + "\u01bc\7i\2\2\u01bc[\3\2\2\2\u01bd\u01bf\7W\2\2\u01be\u01c0\7i\2\2\u01bf"+ "\u01be\3\2\2\2\u01bf\u01c0\3\2\2\2\u01c0\u01c3\3\2\2\2\u01c1\u01c4\5\b"+ "\5\2\u01c2\u01c4\5N(\2\u01c3\u01c1\3\2\2\2\u01c3\u01c2\3\2\2\2\u01c4]"+ - "\3\2\2\2\u01c5\u01c7\5`\61\2\u01c6\u01c8\7e\2\2\u01c7\u01c6\3\2\2\2\u01c7"+ + "\3\2\2\2\u01c5\u01c7\5`\61\2\u01c6\u01c8\7i\2\2\u01c7\u01c6\3\2\2\2\u01c7"+ "\u01c8\3\2\2\2\u01c8\u01cb\3\2\2\2\u01c9\u01cc\5\b\5\2\u01ca\u01cc\5N"+ "(\2\u01cb\u01c9\3\2\2\2\u01cb\u01ca\3\2\2\2\u01cc\u01ce\3\2\2\2\u01cd"+ - "\u01cf\7e\2\2\u01ce\u01cd\3\2\2\2\u01ce\u01cf\3\2\2\2\u01cf\u01d1\3\2"+ + "\u01cf\7i\2\2\u01ce\u01cd\3\2\2\2\u01ce\u01cf\3\2\2\2\u01cf\u01d1\3\2"+ "\2\2\u01d0\u01d2\5\\/\2\u01d1\u01d0\3\2\2\2\u01d1\u01d2\3\2\2\2\u01d2"+ - "\u01d3\3\2\2\2\u01d3\u01d4\7e\2\2\u01d4_\3\2\2\2\u01d5\u01d6\t\17\2\2"+ - "\u01d6a\3\2\2\2\u01d7\u01da\7`\2\2\u01d8\u01db\58\35\2\u01d9\u01db\5\64"+ + "\u01d3\3\2\2\2\u01d3\u01d4\7i\2\2\u01d4_\3\2\2\2\u01d5\u01d6\t\17\2\2"+ + "\u01d6a\3\2\2\2\u01d7\u01da\7d\2\2\u01d8\u01db\58\35\2\u01d9\u01db\5\64"+ "\33\2\u01da\u01d8\3\2\2\2\u01da\u01d9\3\2\2\2\u01db\u01dc\3\2\2\2\u01dc"+ - "\u01dd\7a\2\2\u01dd\u01df\5&\24\2\u01de\u01e0\7e\2\2\u01df\u01de\3\2\2"+ + "\u01dd\7e\2\2\u01dd\u01df\5&\24\2\u01de\u01e0\7i\2\2\u01df\u01de\3\2\2"+ "\2\u01df\u01e0\3\2\2\2\u01e0\u01e1\3\2\2\2\u01e1\u01e2\5N(\2\u01e2\u01e3"+ - "\7e\2\2\u01e3c\3\2\2\2\65fhot\u008c\u0095\u0099\u00a0\u00a3\u00a8\u00ac"+ + "\7i\2\2\u01e3c\3\2\2\2\65fhot\u008c\u0095\u0099\u00a0\u00a3\u00a8\u00ac"+ "\u00b2\u00c4\u00d3\u00e6\u0110\u0112\u0114\u0119\u011d\u0123\u0127\u0130"+ "\u0135\u0142\u014a\u0156\u0164\u016d\u0173\u017a\u0180\u0182\u018f\u0196"+ "\u019e\u01a1\u01a5\u01a8\u01af\u01b3\u01b6\u01b9\u01bf\u01c3\u01c7\u01cb"+ diff --git a/compiler/src/prog8/stackvm/StackVm.kt b/compiler/src/prog8/stackvm/StackVm.kt index 78bc7ea31..2ad98eb2f 100644 --- a/compiler/src/prog8/stackvm/StackVm.kt +++ b/compiler/src/prog8/stackvm/StackVm.kt @@ -98,10 +98,10 @@ enum class Opcode { JUMP, BCS, BCC, - BEQ, // branch if value on top of stack is zero - BNE, // branch if value on top of stack is not zero - BMI, // branch if value on top of stack < 0 - BPL, // branch if value on top of stack >= 0 + BZ, // branch if value on top of stack is zero + BNZ, // branch if value on top of stack is not zero + BNEG, // branch if value on top of stack < 0 + BPOS, // branch if value on top of stack >= 0 // BVS, // status flag V (overflow) not implemented // BVC, // status flag V (overflow) not implemented @@ -621,8 +621,8 @@ class Program (val name: String, val args = if(parts.size==2) parts[1] else null val instruction = when(opcode) { Opcode.LINE -> Instruction(opcode, Value(DataType.STR, null, stringvalue = args)) - Opcode.JUMP, Opcode.CALL, Opcode.BMI, Opcode.BPL, - Opcode.BEQ, Opcode.BNE, Opcode.BCS, Opcode.BCC -> { + Opcode.JUMP, Opcode.CALL, Opcode.BNEG, Opcode.BPOS, + Opcode.BZ, Opcode.BNZ, Opcode.BCS, Opcode.BCC -> { if(args!!.startsWith('$')) { Instruction(opcode, Value(DataType.WORD, args.substring(1).toInt(16))) } else { @@ -777,7 +777,7 @@ class Program (val name: String, instr.next = target } } - Opcode.BCC, Opcode.BCS, Opcode.BEQ, Opcode.BNE, Opcode.BMI, Opcode.BPL -> { + Opcode.BCC, Opcode.BCS, Opcode.BZ, Opcode.BNZ, Opcode.BNEG, Opcode.BPOS -> { if(instr.callLabel==null) { throw VmExecutionException("stackVm doesn't support branch to memory address") } else { @@ -1324,13 +1324,13 @@ class StackVm(val traceOutputFile: String?) { return if(P_carry) ins.next else ins.nextAlt!! Opcode.BCC -> return if(P_carry) ins.nextAlt!! else ins.next - Opcode.BEQ -> + Opcode.BZ -> return if(evalstack.pop().numericValue().toDouble()==0.0) ins.next else ins.nextAlt!! - Opcode.BNE -> + Opcode.BNZ -> return if(evalstack.pop().numericValue().toDouble()!=0.0) ins.next else ins.nextAlt!! - Opcode.BMI -> + Opcode.BNEG -> return if(evalstack.pop().numericValue().toDouble()<0.0) ins.next else ins.nextAlt!! - Opcode.BPL -> { + Opcode.BPOS -> { return if (evalstack.pop().numericValue().toDouble() >= 0.0) ins.next else ins.nextAlt!! } Opcode.CALL -> diff --git a/compiler/test/StackVMOpcodes.kt b/compiler/test/StackVMOpcodes.kt index d5151e09c..fc3b6844f 100644 --- a/compiler/test/StackVMOpcodes.kt +++ b/compiler/test/StackVMOpcodes.kt @@ -1040,12 +1040,12 @@ class TestStackVmOpcodes { } @Test - fun testBEQ() { + fun testBZ() { val ins = mutableListOf( Instruction(Opcode.PUSH, Value(DataType.WORD, 1)), - Instruction(Opcode.BEQ, callLabel = "label"), + Instruction(Opcode.BZ, callLabel = "label"), Instruction(Opcode.PUSH, Value(DataType.WORD, 0)), - Instruction(Opcode.BEQ, callLabel = "label"), + Instruction(Opcode.BZ, callLabel = "label"), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string1")), Instruction(Opcode.TERMINATE), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string2"))) @@ -1060,12 +1060,12 @@ class TestStackVmOpcodes { } @Test - fun testBNE() { + fun testBNZ() { val ins = mutableListOf( Instruction(Opcode.PUSH, Value(DataType.WORD, 0)), - Instruction(Opcode.BNE, callLabel = "label"), + Instruction(Opcode.BNZ, callLabel = "label"), Instruction(Opcode.PUSH, Value(DataType.WORD, 1)), - Instruction(Opcode.BNE, callLabel = "label"), + Instruction(Opcode.BNZ, callLabel = "label"), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string1")), Instruction(Opcode.TERMINATE), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string2"))) @@ -1080,14 +1080,14 @@ class TestStackVmOpcodes { } @Test - fun testBMI() { + fun testBNEG() { val ins = mutableListOf( Instruction(Opcode.PUSH, Value(DataType.WORD, 0)), - Instruction(Opcode.BMI, callLabel = "label"), + Instruction(Opcode.BNEG, callLabel = "label"), Instruction(Opcode.PUSH, Value(DataType.WORD, 1)), - Instruction(Opcode.BMI, callLabel = "label"), + Instruction(Opcode.BNEG, callLabel = "label"), Instruction(Opcode.PUSH, Value(DataType.FLOAT, -99)), - Instruction(Opcode.BMI, callLabel = "label"), + Instruction(Opcode.BNEG, callLabel = "label"), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string1")), Instruction(Opcode.TERMINATE), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string2"))) @@ -1104,12 +1104,12 @@ class TestStackVmOpcodes { } @Test - fun testBPL() { + fun testBPOS() { val ins = mutableListOf( Instruction(Opcode.PUSH, Value(DataType.FLOAT, -99)), - Instruction(Opcode.BPL, callLabel = "label"), + Instruction(Opcode.BPOS, callLabel = "label"), Instruction(Opcode.PUSH, Value(DataType.WORD, 0)), - Instruction(Opcode.BPL, callLabel = "label"), + Instruction(Opcode.BPOS, callLabel = "label"), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string1")), Instruction(Opcode.TERMINATE), Instruction(Opcode.LINE, Value(DataType.STR, null, stringvalue = "string2"))) diff --git a/docs/source/programming.rst b/docs/source/programming.rst index 124243f98..9ae5cd55e 100644 --- a/docs/source/programming.rst +++ b/docs/source/programming.rst @@ -332,8 +332,21 @@ if you run into this type of assembler error. There is a special form of the if-statement that immediately translates into one of the 6502's branching instructions. This allows you to write a conditional jump or block execution directly acting on the current values of the CPU's status register bits. -The eight branching instructions of the CPU each have an if-equivalent: -``if_cs``, ``if_cc``, ``if_eq``, ``if_ne``, ``if_pl``, ``if_mi``, ``if_vs`` and ``if_vc``. +The eight branching instructions of the CPU each have an if-equivalent (and there are some easier to understand aliases): + +====================== ===================== +condition meaning +====================== ===================== +``if_cs`` if carry status is set +``if_cc`` if carry status is clear +``if_vs`` if overflow status is set +``if_vc`` if overflow status is clear +``if_eq`` / ``if_z`` if result is equal to zero +``if_ne`` / ``if_nz`` if result is not equal to zero +``if_pl`` / ``if_pos`` if result is 'plus' (>= zero) +``if_mi`` / ``if_neg`` if result is 'minus' (< zero) +====================== ===================== + So ``if_cc goto target`` will directly translate into the single CPU instruction ``BCC target``. .. note:: diff --git a/docs/source/syntaxreference.rst b/docs/source/syntaxreference.rst index 4bd485406..be74bdfc7 100644 --- a/docs/source/syntaxreference.rst +++ b/docs/source/syntaxreference.rst @@ -324,10 +324,10 @@ address-of: ``#`` arithmetic: ``+`` ``-`` ``*`` ``/`` ``//`` ``**`` ``%`` - ``+``, ``-``, ``*``, ``/`` are the familiar arithmetic operations. + ``+``, ``-``, ``*``, ``/`` are the familiar arithmetic operations. ``//`` is the floor-divide, the division resulting in a whole number rounded towards minus infinity. - ``**`` is the power operator: ``3 ** 5`` is equal to 3*3*3*3*3 and is 243. - ``%`` is the remainder operator: ``25 % 7`` is 4. + ``**`` is the power operator: ``3 ** 5`` is equal to 3*3*3*3*3 and is 243. + ``%`` is the remainder operator: ``25 % 7`` is 4. bitwise arithmetic: ``&`` ``|`` ``^`` ``~`` @@ -496,7 +496,7 @@ repeat--until loop Conditional Execution and Jumps ------------------------------- -unconditional jump +Unconditional jump ^^^^^^^^^^^^^^^^^^ To jump to another part of the program, you use a ``goto`` statement with an addres or the name @@ -543,4 +543,5 @@ where can be just a single statement for instance just a ``goto``, } The XX corresponds to one of the eigth branching instructions so the possibilities are: -``if_cs``, ``if_cc``, ``if_eq``, ``if_ne``, ``if_pl``, ``if_mi``, ``if_vs`` and ``if_vc``. \ No newline at end of file +``if_cs``, ``if_cc``, ``if_eq``, ``if_ne``, ``if_pl``, ``if_mi``, ``if_vs`` and ``if_vc``. +It can also be one of the four aliases that are easier to read: ``if_z``, ``if_nz``, ``if_pos`` and ``if_neg``.