From 01a6b15bb187c8c90e9d70c09424ab793eabea43 Mon Sep 17 00:00:00 2001 From: JanLJL Date: Tue, 28 May 2019 08:59:04 +0200 Subject: [PATCH] bugfix for testing --- osaca/parser/parser_AArch64v81.py | 8 ++++---- osaca/parser/parser_x86att.py | 6 +++--- tox.ini | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osaca/parser/parser_AArch64v81.py b/osaca/parser/parser_AArch64v81.py index 57cfba4..dde626e 100755 --- a/osaca/parser/parser_AArch64v81.py +++ b/osaca/parser/parser_AArch64v81.py @@ -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 diff --git a/osaca/parser/parser_x86att.py b/osaca/parser/parser_x86att.py index 5ff4d73..1d5396e 100755 --- a/osaca/parser/parser_x86att.py +++ b/osaca/parser/parser_x86att.py @@ -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) ) diff --git a/tox.ini b/tox.ini index 6dae751..84040ad 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36 +envlist = py35,py36 [testenv] commands= python tests/all_tests.py