Skip to content

Commit ff2a072

Browse files
committed
Fix GitHub issue #63 - Handle +Infinity properly.
The code handled `Infinity` and `-Infinity` but not `+Infinity`. This change fixes that so all three are handled.
1 parent 25ca192 commit ff2a072

3 files changed

Lines changed: 16 additions & 11 deletions

File tree

‎json5/json5.g‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ id_continue = ascii_id_start
9898
| '\u200D'
9999

100100
num_literal = '-' num_literal:n -> '-' + n
101-
| '+'? dec_literal:d ~id_start -> d
101+
| '+' num_literal:n -> n
102+
| dec_literal:d ~id_start -> d
102103
| hex_literal
103104
| 'Infinity'
104105
| 'NaN'

‎json5/parser.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,8 @@ def _id_continue__c9_(self):
734734

735735
def _num_literal_(self):
736736
self._choose([self._num_literal__c0_, self._num_literal__c1_,
737-
self._hex_literal_, self._num_literal__c3_,
738-
self._num_literal__c4_])
737+
self._num_literal__c2_, self._hex_literal_,
738+
self._num_literal__c4_, self._num_literal__c5_])
739739

740740
def _num_literal__c0_(self):
741741
self._push('num_literal__c0')
@@ -746,19 +746,22 @@ def _num_literal__c0_(self):
746746

747747
def _num_literal__c1_(self):
748748
self._push('num_literal__c1')
749-
self._seq([self._num_literal__c1__s0_,
750-
lambda: self._bind(self._dec_literal_, 'd'),
751-
lambda: self._not(self._id_start_),
752-
lambda: self._succeed(self._get('d'))])
749+
self._seq([lambda: self._ch('+'),
750+
lambda: self._bind(self._num_literal_, 'n'),
751+
lambda: self._succeed(self._get('n'))])
753752
self._pop('num_literal__c1')
754753

755-
def _num_literal__c1__s0_(self):
756-
self._opt(lambda: self._ch('+'))
754+
def _num_literal__c2_(self):
755+
self._push('num_literal__c2')
756+
self._seq([lambda: self._bind(self._dec_literal_, 'd'),
757+
lambda: self._not(self._id_start_),
758+
lambda: self._succeed(self._get('d'))])
759+
self._pop('num_literal__c2')
757760

758-
def _num_literal__c3_(self):
761+
def _num_literal__c4_(self):
759762
self._str('Infinity')
760763

761-
def _num_literal__c4_(self):
764+
def _num_literal__c5_(self):
762765
self._str('NaN')
763766

764767
def _dec_literal_(self):

‎tests/lib_test.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ def test_numbers(self):
120120

121121
# names
122122
self.check('Infinity', float('inf'))
123+
self.check('+Infinity', float('inf'))
123124
self.check('-Infinity', float('-inf'))
124125
self.assertTrue(math.isnan(json5.loads('NaN')))
125126
self.assertTrue(math.isnan(json5.loads('-NaN')))

0 commit comments

Comments
 (0)