Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Number parsing #64

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Number parsing #64

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f3ea3c
[fix] exponent letter can be uppercase
Dec 26, 2014
1d276fe
[fix] handle comma exponent
Dec 26, 2014
db7ab91
[fix] handle complex number with negative exponent
Dec 26, 2014
789be67
[mod] refactor matches using function
Dec 26, 2014
d012f0d
[mod] updates tests to match splitter's output
Dec 26, 2014
dd2496c
[mod] update tests to check splitter output
Dec 27, 2014
22c6e72
[fix] handle exponent beginning with dot
Dec 27, 2014
485d051
[enh] new token: FLOAT_EXPONANT_COMPLEX
Psycojoker Jan 10, 2015
e4989f3
[enh] take new token into account for parser
Psycojoker Jan 10, 2015
80aeb57
[doc] add some comments in grouper
Psycojoker Jan 10, 2015
90ff917
Merge remote-tracking branch 'origin/master' into number_parsing
Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions baron/grouper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,22 @@ def group_generator(sequence):
return

current = next(iterator)

# classical grouping using to_group
if current in to_group_keys and matching_found(to_group, current, iterator.show_next()):
current += next(iterator)
if current in to_group_keys and matching_found(to_group, current, iterator.show_next()):
current += next(iterator)

# unicode/raw/binary string notation
if current in list('uUrRbB') and str(iterator.show_next()).startswith(('"', "'")):
current += next(iterator)

# in case of unicode_raw or binary_raw string notation
if str(current).lower() in ["ur", "br"] and str(iterator.show_next()).startswith(('"', "'")):
current += next(iterator)

# float exponant notation
if any([re.match(x, current) for x in (r'^\d+[eE]$', r'^\d+\.\d*[eE]$', r'^\.\d+[eE]$')]):
current += next(iterator)
current += next(iterator)
Expand All @@ -63,17 +71,20 @@ def group_generator(sequence):
# ['123.123e', '[+-]', '123']
assert re.match(r'^\d+[eE][-+]?\d+[jJ]?$', current) or re.match(r'^\d*.\d*[eE][-+]?\d+[jJ]?$', current)

# escaped endl
if current == "\\" and iterator.show_next() in ('\n', '\r\n'):
current += next(iterator)
if re.match(r'^\s+$', str(iterator.show_next())):
current += next(iterator)

# escaped endl in window notation
if current == "\\" and iterator.show_next() == "\r" and iterator.show_next(2) == "\n":
current += next(iterator)
current += next(iterator)
if re.match(r'^\s+$', str(iterator.show_next())):
current += next(iterator)

# space before escaped endl
if re.match(r'^\s+$', current) and iterator.show_next() == "\\":
current += next(iterator)
current += next(iterator)
Expand All @@ -82,6 +93,7 @@ def group_generator(sequence):
if re.match(r'^\s+$', str(iterator.show_next())):
current += next(iterator)

# complex number notation
if (re.match(r'^\d+$', current) and match_on_next(r'^\.$', iterator)) or\
(current == "." and match_on_next(r'^\d+([jJ]|[eE]\d*)?$', iterator)):
current += next(iterator)
Expand Down