bugfix for testing

This commit is contained in:
JanLJL
2019-05-28 08:59:04 +02:00
parent 9fe507a482
commit ce2aad51fe
3 changed files with 8 additions and 8 deletions

View File

@@ -156,13 +156,13 @@ class ParserAArch64v81(BaseParser):
operand_rest = pp.Group((register ^ immediate ^ memory ^ arith_immediate) | identifier)
self.instruction_parser = (
mnemonic
+ pp.Optional(operand_first).setResultsName('operand1')
+ pp.Optional(operand_first.setResultsName('operand1'))
+ pp.Optional(pp.Suppress(pp.Literal(',')))
+ pp.Optional(operand_rest).setResultsName('operand2')
+ pp.Optional(operand_rest.setResultsName('operand2'))
+ pp.Optional(pp.Suppress(pp.Literal(',')))
+ pp.Optional(operand_rest).setResultsName('operand3')
+ pp.Optional(operand_rest.setResultsName('operand3'))
+ pp.Optional(pp.Suppress(pp.Literal(',')))
+ pp.Optional(operand_rest).setResultsName('operand4')
+ pp.Optional(operand_rest.setResultsName('operand4'))
+ pp.Optional(self.comment)
)
self.opf = operand_first

View File

@@ -86,11 +86,11 @@ class ParserX86ATT(BaseParser):
operand_rest = pp.Group(register ^ immediate ^ memory)
self.instruction_parser = (
mnemonic
+ pp.Optional(operand_first).setResultsName('operand1')
+ pp.Optional(operand_first.setResultsName('operand1'))
+ pp.Optional(pp.Suppress(pp.Literal(',')))
+ pp.Optional(operand_rest).setResultsName('operand2')
+ pp.Optional(operand_rest.setResultsName('operand2'))
+ pp.Optional(pp.Suppress(pp.Literal(',')))
+ pp.Optional(operand_rest).setResultsName('operand3')
+ pp.Optional(operand_rest.setResultsName('operand3'))
+ pp.Optional(self.comment)
)

View File

@@ -1,5 +1,5 @@
[tox]
envlist = py36
envlist = py35,py36
[testenv]
commands=
python tests/all_tests.py