pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

do..while -> loop.until

Browse Source 
astyle indented the `while` wrongly as there's no semicolon
This commit is contained in:
Alex Bates 2020-10-23 21:07:11 +01:00
parent 52f5d3cc49
commit 1d2e46fcad
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/compile_dsl_macros.py
View File

@ -32,7 +32,6 @@ script_parser = Lark(r"""
| label ":" -> label_decl
| "goto" label -> label_goto
| if_stmt
| do_while_stmt
| "return" -> return_stmt
| "break" -> break_stmt
| "sleep" expr -> sleep_stmt
@ -49,6 +48,7 @@ script_parser = Lark(r"""
| resume_stmt
| kill_stmt
| loop_stmt
| loop_until_stmt
call: CNAME "(" [expr ("," expr)* [","]] ")"
@ -56,8 +56,6 @@ script_parser = Lark(r"""
?if_op: "==" -> if_op_eq
| "!=" -> if_op_ne
do_while_stmt: "do" block "while" expr if_op expr
suspend_stmt: "suspend" control_type expr ("," control_type expr)* [","]
resume_stmt: "resume" control_type expr ("," control_type expr)* [","]
kill_stmt: "kill" control_type expr ("," control_type expr)* [","]
@ -69,6 +67,7 @@ script_parser = Lark(r"""
bind_set_stmt: lhs "=" "bind" expr "to" expr expr
loop_stmt: "loop" [expr] block
loop_until_stmt: "loop" block "until" expr if_op expr
?expr: c_const_expr
| ESCAPED_STRING
@ -172,9 +171,9 @@ class LoopCtx(CmdCtx):
def break_opcode(self, meta):
return 0x07
class DoWhileCtx(CmdCtx):
class LoopUntilCtx(CmdCtx):
def break_opcode(self, meta):
raise CompileError("breaking out of a do..while loop is not supported (hint: use a label)", meta)
raise CompileError("breaking out of a loop..until is not supported (hint: use a label)", meta)
class CompileError(Exception):
def __init__(self, message, meta):
@ -267,13 +266,13 @@ class Compile(Transformer):
return [ Cmd(0x05, expr, meta=tree.meta), *block, Cmd(0x06) ]
# do..while pseudoinstruction
def do_while_stmt(self, tree):
block, a, op, b = tree.children
# loop..until pseudoinstruction
def loop_until_stmt(self, tree):
block, a, op, b = tree.children
for cmd in block:
if isinstance(cmd, BaseCmd):
cmd.add_context(DoWhileCtx())
cmd.add_context(LoopUntilCtx())
label = self.alloc.gen_label()