summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul McGuire <ptmcg@austin.rr.com>2019-06-29 01:23:27 -0500
committerPaul McGuire <ptmcg@austin.rr.com>2019-06-29 01:23:27 -0500
commit3f01989e4ee04bcb2d71008efa989f48bd7a5123 (patch)
tree91b7384b67fffc4f1d6ac703fe5998e89c1fad71
parent46c9b81857f56a245786dcdef3699e85f5fdd71a (diff)
parenta8e75d64d77724714977e378be42da124684aed0 (diff)
downloadpyparsing-git-3f01989e4ee04bcb2d71008efa989f48bd7a5123.tar.gz
Merge remote-tracking branch 'origin/master'
-rw-r--r--pyparsing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyparsing.py b/pyparsing.py
index b94040a..3688181 100644
--- a/pyparsing.py
+++ b/pyparsing.py
@@ -6166,10 +6166,10 @@ class pyparsing_common:
"""mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
mixed_integer.addParseAction(sum)
- real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
+ real = Regex(r'[+-]?\d*\.\d*').setName("real number").setParseAction(convertToFloat)
"""expression that parses a floating point number and returns a float"""
- sci_real = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
+ sci_real = Regex(r'[+-]?\d*([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
"""expression that parses a floating point number with optional
scientific notation and returns a float"""