diff options
| author | Paul McGuire <ptmcg@users.noreply.github.com> | 2018-12-23 21:30:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 21:30:40 -0600 |
| commit | 4fba64a079016e6ea62d041f19b7eadd081341e8 (patch) | |
| tree | 6c5fdae41cf8b335ff1c64f37856786523e4fd0d /examples/wordsToNum.py | |
| parent | 59dfd314c23fd653271bdad37631f0497e8ad748 (diff) | |
| parent | de8326d00dffdb500c02839a98330b869c2457f3 (diff) | |
| download | pyparsing-git-4fba64a079016e6ea62d041f19b7eadd081341e8.tar.gz | |
Merge pull request #55 from jdufresne/ws
Trim trailing white space throughout the project
Diffstat (limited to 'examples/wordsToNum.py')
| -rw-r--r-- | examples/wordsToNum.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/wordsToNum.py b/examples/wordsToNum.py index 7cebbff..3d5c4b7 100644 --- a/examples/wordsToNum.py +++ b/examples/wordsToNum.py @@ -68,11 +68,11 @@ mag = Or(makeLit(s,v) for s,v in majorDefinitions) wordprod = lambda t: reduce(mul,t)
wordsum = lambda t: sum(t)
-numPart = (((( units + Optional(hundreds) ).setParseAction(wordprod) +
- Optional(tens)).setParseAction(wordsum)
+numPart = (((( units + Optional(hundreds) ).setParseAction(wordprod) +
+ Optional(tens)).setParseAction(wordsum)
^ tens )
+ Optional(units) ).setParseAction(wordsum)
-numWords = OneOrMore( (numPart + Optional(mag)).setParseAction(wordprod)
+numWords = OneOrMore( (numPart + Optional(mag)).setParseAction(wordprod)
).setParseAction(wordsum) + StringEnd()
numWords.ignore(Literal("-"))
numWords.ignore(CaselessLiteral("and"))
@@ -103,4 +103,4 @@ test("seventy-seven thousand eight hundred and nineteen", 77819) test("seven hundred seventy-seven thousand seven hundred and seventy-seven", 777777)
test("zero", 0)
test("forty two", 42)
-test("fourty two", 42)
\ No newline at end of file +test("fourty two", 42)
|