Skip to content

Merge from master #1

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
mcraiha merged 4 commits into from
Aug 19, 2018
Merged

Merge from master #1

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
939a7e6
Print doubles with InvariantCulture
mcraiha Aug 9, 2018
a398f20
Change parsing of hex numbers
mcraiha Aug 18, 2018
92739d2
Merge pull request #11 from mcraiha/hexadecimal-parse
jordanbtucker Aug 18, 2018
edfc83f
Merge pull request #9 from mcraiha/infinity
jordanbtucker Aug 18, 2018
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
4 changes: 3 additions & 1 deletion Json5/Json5Number.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Globalization;

namespace Json5
{
public class Json5Number : Json5Primitive
Expand All @@ -21,7 +23,7 @@ protected override object Value

internal override string ToJson5String(string space, string indent)
{
return this.value.ToString();
return this.value.ToString(CultureInfo.InvariantCulture);
}

public static implicit operator double(Json5Number value)
Expand Down
3 changes: 2 additions & 1 deletion Json5/Parsing/Json5Lexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,8 @@ public Json5Token Read()
}

// Parse this value with BigInteger because ulong can only parse numbers up to 0xFFFFFFFFFFFFFFFF.
return Token(Json5TokenType.Number, sign * (double)BigInteger.Parse(valueBuffer, NumberStyles.HexNumber), inputBuffer);
// Add '0' to valueBuffer since otherwise it will be parsed as signed value (e.g. ff would be -1)
return Token(Json5TokenType.Number, sign * (double)BigInteger.Parse("0" + valueBuffer, NumberStyles.HexNumber), inputBuffer);

case State.String:
switch (r)
Expand Down