diff options
| author | ptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b> | 2016-06-08 22:25:04 +0000 |
|---|---|---|
| committer | ptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b> | 2016-06-08 22:25:04 +0000 |
| commit | 954d356444a76281e4f5f18b70b041a32d475cc6 (patch) | |
| tree | 2e673666432ba3926641f2a29c2097f3a5d703ea | |
| parent | 2a43bc3bcddb48c1e199496816da5f77b78df702 (diff) | |
| download | pyparsing-954d356444a76281e4f5f18b70b041a32d475cc6.tar.gz | |
Add names to new pyparsing_common fraction expressions
git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@363 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b
| -rw-r--r-- | src/pyparsing.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pyparsing.py b/src/pyparsing.py index aeca65f..a72a2e1 100644 --- a/src/pyparsing.py +++ b/src/pyparsing.py @@ -3970,13 +3970,13 @@ class pyparsing_common: signedInteger = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
"""expression that parses an integer with optional leading sign, returns an int"""
- fraction = signedInteger.addParseAction(convertToFloat) + '/' + signedInteger.addParseAction(convertToFloat)
+ fraction = signedInteger.addParseAction(convertToFloat) + '/' + signedInteger.addParseAction(convertToFloat).setName("fraction")
"""fractional expression of an integer divided by an integer, returns a float"""
fraction.addParseAction(lambda t: t[0]/t[-1])
- mixed_integer = fraction | integer + Optional(Optional('-').suppress() + fraction)
+ mixed_integer = fraction | integer + Optional(Optional('-').suppress() + fraction).setName("fraction or mixed integer-fraction")
"""mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
- mixed_integer.addParseAction(lambda t: sum(t))
+ mixed_integer.addParseAction(sum)
real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
"""expression that parses a floating point number and returns a float"""
|