Skip to content

fix: keep a leading + sign in the number spelling before hooks see it #160

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

Merged
dpranke merged 4 commits into from
Nov 2, 2026
Merged

fix: keep a leading + sign in the number spelling before hooks see it #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
326cee5
fix: keep a leading + sign in the number spelling
rahul05ranjan Nov 2, 2026
0bc8a79
fix: keep a leading + sign in the number spelling
rahul05ranjan Nov 2, 2026
5e3b7c6
fix: keep a leading + sign in the number spelling
rahul05ranjan Nov 2, 2026
2d43b78
test: parse hooks receive the as-written + spellings
rahul05ranjan Nov 2, 2026
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
2 changes: 1 addition & 1 deletion json5/json5.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ id_esc_continue = id_esc_start
| ~~('u' ('200C' | '200c' | '200D' | '200d')) unicode_esc

num_literal = '-' unsigned_lit:n -> '-' + n
| '+' unsigned_lit:n -> n
| '+' unsigned_lit:n -> '+' + n
| unsigned_lit:n -> n

unsigned_lit = dec_literal:d ~id_start -> d
Expand Down
4 changes: 2 additions & 2 deletions json5/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def _fp_constant_parser(s):
return float(s.replace('Infinity', 'inf').replace('NaN', 'nan'))

def _parse_int(s):
if s.lstrip('-').startswith(('0x', '0X')):
if s.lstrip('+-').startswith(('0x', '0X')):
return int(s, 16)
return int(s)

Expand Down Expand Up @@ -414,7 +414,7 @@ def _walk_ast(
return False
ty, v = el
if ty == 'number':
unsigned = v[1:] if v.startswith('-') else v
unsigned = v[1:] if v[:1] in ('-', '+') else v
if unsigned.startswith(('0x', '0X')):
return parse_int(v)
if '.' in v or 'e' in v or 'E' in v:
Expand Down
2 changes: 1 addition & 1 deletion json5/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ def _num_literal__c1_(self):
[
lambda: self._ch('+'),
lambda: self._bind(self._unsigned_lit_, 'n'),
lambda: self._succeed(self._get('n')),
lambda: self._succeed('+' + self._get('n')),
]
)
self._pop('num_literal__c1')
Expand Down
8 changes: 8 additions & 0 deletions tests/lib_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,12 +324,17 @@ def hook(x):
json5.loads('-Infinity', parse_constant=hook), '-Infinity'
)
self.assertEqual(json5.loads('NaN', parse_constant=hook), 'NaN')
self.assertEqual(
json5.loads('+Infinity', parse_constant=hook), '+Infinity'
)
self.assertEqual(json5.loads('+NaN', parse_constant=hook), '+NaN')

def test_parse_float(self):
def hook(x):
return x

self.assertEqual(json5.loads('1.0', parse_float=hook), '1.0')
self.assertEqual(json5.loads('+1.5', parse_float=hook), '+1.5')
for text in ('1E5', '1E+5', '2.5E-3', '1e5', '1e-5'):
with self.subTest(text=text):
self.assertEqual(json5.loads(text, parse_float=hook), text)
Expand All @@ -341,8 +346,11 @@ def hook(x):
self.assertEqual(json5.loads('1', parse_int=hook), '1')
self.assertEqual(json5.loads('0x10', parse_int=hook), '0x10')
self.assertEqual(json5.loads('-0xff', parse_int=hook), '-0xff')
self.assertEqual(json5.loads('+5', parse_int=hook), '+5')
self.assertEqual(json5.loads('+0xff', parse_int=hook), '+0xff')
self.assertEqual(json5.loads('0x10'), 16)
self.assertEqual(json5.loads('-0xff'), -255)
self.assertEqual(json5.loads('+0xff'), 255)
self.assertEqual(json5.loads('0X2a'), 42)

def test_sample_file(self):
Expand Down