diff options
| author | Marcin Jaworski <mrjaworski@gmail.com> | 2020-05-03 19:15:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 12:15:23 -0500 |
| commit | 827f615719ae83800e4252593da5b9d05a97e11a (patch) | |
| tree | c43a0088378fb0bf2b0381788394f21461949701 /tests/test_unit.py | |
| parent | 39934574db9796f27397b9f76a112c2466bd1a69 (diff) | |
| download | pyparsing-git-827f615719ae83800e4252593da5b9d05a97e11a.tar.gz | |
Pop counter token and return rest instead of dropping all tokens in countedArray (#209)
* Pop counter token and return rest instead of dropping all tokens
* Include only named results from intExpr in countedArray results
* Remove internal Group from countedArray
* Fix operator precedence
* Update countedArray tests
Diffstat (limited to 'tests/test_unit.py')
| -rw-r--r-- | tests/test_unit.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_unit.py b/tests/test_unit.py index 9f27375..d774fc6 100644 --- a/tests/test_unit.py +++ b/tests/test_unit.py @@ -2963,14 +2963,14 @@ class Test2_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase): print("got maximum excursion limit exception") def testCountedArray(self): - from pyparsing import Word, nums, OneOrMore, countedArray + from pyparsing import Word, nums, OneOrMore, Group, countedArray testString = "2 5 7 6 0 1 2 3 4 5 0 3 5 4 3" integer = Word(nums).setParseAction(lambda t: int(t[0])) countedField = countedArray(integer) - r = OneOrMore(countedField).parseString(testString) + r = OneOrMore(Group(countedField)).parseString(testString) print(testString) print(r) @@ -2980,7 +2980,7 @@ class Test2_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase): # addresses bug raised by Ralf Vosseler def testCountedArrayTest2(self): - from pyparsing import Word, nums, OneOrMore, countedArray + from pyparsing import Word, nums, OneOrMore, Group, countedArray testString = "2 5 7 6 0 1 2 3 4 5 0 3 5 4 3" @@ -2988,7 +2988,7 @@ class Test2_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase): countedField = countedArray(integer) dummy = Word("A") - r = OneOrMore(dummy ^ countedField).parseString(testString) + r = OneOrMore(Group(dummy ^ countedField)).parseString(testString) print(testString) print(r) @@ -2997,7 +2997,7 @@ class Test2_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase): ) def testCountedArrayTest3(self): - from pyparsing import Word, nums, OneOrMore, countedArray, alphas + from pyparsing import Word, nums, OneOrMore, Group, countedArray, alphas int_chars = "_" + alphas array_counter = Word(int_chars).setParseAction(lambda t: int_chars.index(t[0])) @@ -3008,7 +3008,7 @@ class Test2_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase): integer = Word(nums).setParseAction(lambda t: int(t[0])) countedField = countedArray(integer, intExpr=array_counter) - r = OneOrMore(countedField).parseString(testString) + r = OneOrMore(Group(countedField)).parseString(testString) print(testString) print(r) |