diff options
Diffstat (limited to 'testing/test_ops_abdl.py')
| -rw-r--r-- | testing/test_ops_abdl.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/testing/test_ops_abdl.py b/testing/test_ops_abdl.py index fe50369..3fba731 100644 --- a/testing/test_ops_abdl.py +++ b/testing/test_ops_abdl.py @@ -19,10 +19,10 @@ class OpHelper: def __enter__(self): self.pos += 1 first = self.pos - assert not isinstance(self.ops[first], abdl._End) - while not isinstance(self.ops[self.pos], abdl._End): + assert not isinstance(self.ops[first], abdl._vm.End) + while not isinstance(self.ops[self.pos], abdl._vm.End): self.pos += 1 - assert isinstance(self.ops[self.pos], abdl._End) + assert isinstance(self.ops[self.pos], abdl._vm.End) return self.ops[first:self.pos] def __exit__(self, exc_type, exc_value, traceback): @@ -35,7 +35,7 @@ def expect_types(seq, *tys): def expect_idents(oph, *idents): for ident in idents: with oph as ops: - expect_types(ops, abdl._Arrow, abdl._Ident) + expect_types(ops, abdl._vm.Arrow, abdl._vm.Ident) assert ops[1].key == ident def test_empty_iterator_pattern(): @@ -50,7 +50,7 @@ def test_four_depths_pattern(): def test_regex_pattern(): oph = OpHelper(abdl.compile("->/.../")) with oph as ops: - expect_types(ops, abdl._Arrow, abdl._RegexKey) + expect_types(ops, abdl._vm.Arrow, abdl._vm.RegexKey) assert ops[1].key == '...' assert ops[1].compiled == re.compile('...') assert ops[1].skippable == False @@ -59,7 +59,7 @@ def test_regex_pattern(): def test_regex_skippable_pattern(): oph = OpHelper(abdl.compile("->/.../?")) with oph as ops: - expect_types(ops, abdl._Arrow, abdl._RegexKey) + expect_types(ops, abdl._vm.Arrow, abdl._vm.RegexKey) assert ops[1].key == '...' assert ops[1].compiled == re.compile('...') assert ops[1].skippable == True @@ -68,7 +68,7 @@ def test_regex_skippable_pattern(): def test_regex_and_bind_pattern(): oph = OpHelper(abdl.compile("->/.../->Y")) with oph as ops: - expect_types(ops, abdl._Arrow, abdl._RegexKey) + expect_types(ops, abdl._vm.Arrow, abdl._vm.RegexKey) assert ops[1].key == '...' assert ops[1].compiled == re.compile('...') assert ops[1].skippable == False @@ -78,7 +78,7 @@ def test_regex_and_bind_pattern(): def test_empty_literal_skippable_and_bind_pattern(): oph = OpHelper(abdl.compile("->''?->Y")) with oph as ops: - expect_types(ops, abdl._Arrow, abdl._StringKey) + expect_types(ops, abdl._vm.Arrow, abdl._vm.StringKey) assert ops[1].key == '' assert ops[1].skippable == True expect_idents(oph, "Y") @@ -88,7 +88,7 @@ def test_type_pattern(): oph = OpHelper(abdl.compile("->X:?$a->Y", defs={'a': (dict, list, set)})) assert oph.pat._defs['a'] == (dict, list, set) with oph as ops: - expect_types(ops, abdl._Arrow, abdl._Ident, abdl._Ty) + expect_types(ops, abdl._vm.Arrow, abdl._vm.Ident, abdl._vm.ApplyPredicate) assert ops[1].key == 'X' assert ops[2].key == 'a' assert ops[2].skippable == True @@ -101,7 +101,7 @@ def test_multi_type_pattern(): assert oph.pat._defs['b'] == (dict, set) assert oph.pat._defs['c'] == dict with oph as ops: - expect_types(ops, abdl._Arrow, abdl._Ident, abdl._Ty, abdl._Ty, abdl._Ty) + expect_types(ops, abdl._vm.Arrow, abdl._vm.Ident, abdl._vm.ApplyPredicate, abdl._vm.ApplyPredicate, abdl._vm.ApplyPredicate) assert ops[1].key == 'X' assert ops[2].key == 'a' assert ops[2].skippable == False @@ -116,10 +116,10 @@ def test_key_subtree_pattern(): oph = OpHelper(abdl.compile("->[:?$set->A]->D", defs={'set': set})) assert oph.pat._defs['set'] == set with oph as ops: - expect_types(ops, abdl._Arrow, abdl._KeySubtree) + expect_types(ops, abdl._vm.Arrow, abdl._vm.KeySubtree) oph2 = OpHelper(None, ops=ops[1].key) with oph2 as ops2: - expect_types(ops2, abdl._Ty, abdl._Arrow, abdl._Ident) + expect_types(ops2, abdl._vm.ApplyPredicate, abdl._vm.Arrow, abdl._vm.Ident) assert ops2[0].key == 'set' assert ops2[0].skippable == True assert ops2[2].key == 'A' @@ -132,7 +132,7 @@ def test_param_pattern(): assert oph.pat._defs['a'] == '0' expect_idents(oph, "X") with oph as ops: - expect_types(ops, abdl._Arrow, abdl._Param) + expect_types(ops, abdl._vm.Arrow, abdl._vm.Param) assert ops[1].key == 'a' assert ops[1].skippable == False expect_idents(oph, "Z") @@ -141,19 +141,19 @@ def test_param_pattern(): def test_value_subtree_pattern(): oph = OpHelper(abdl.compile("(->foo'foo')(->bar'bar')")) with oph as ops: - expect_types(ops, abdl._ValueSubtree) + expect_types(ops, abdl._vm.ValueSubtree) oph2 = OpHelper(None, ops=ops[0].key) with oph2 as ops2: - expect_types(ops2, abdl._Arrow, abdl._Ident, abdl._StringKey) + expect_types(ops2, abdl._vm.Arrow, abdl._vm.Ident, abdl._vm.StringKey) assert ops2[1].key == 'foo' assert ops2[2].key == 'foo' assert ops2[2].skippable == False oph2.done() with oph as ops: - expect_types(ops, abdl._ValueSubtree) + expect_types(ops, abdl._vm.ValueSubtree) oph2 = OpHelper(None, ops=ops[0].key) with oph2 as ops2: - expect_types(ops2, abdl._Arrow, abdl._Ident, abdl._StringKey) + expect_types(ops2, abdl._vm.Arrow, abdl._vm.Ident, abdl._vm.StringKey) assert ops2[1].key == 'bar' assert ops2[2].key == 'bar' assert ops2[2].skippable == False |