Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Fix some simple stringify issues #19

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

Fix some simple stringify issues #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ac33ca
Fix EscapedCharactersTest
aholkner Dec 3, 2018
e3b2640
Fix object keys stringified as identifiers
aholkner Dec 3, 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
13 changes: 8 additions & 5 deletions Json5/Json5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,23 @@ private static string EscapeChar(char c, char quote)

switch (c)
{
case '\0': return "\\0";
case '\b': return "\\b";
case '\t': return "\\t";
case '\n': return "\\n";
case '\f': return "\\f";
case '\r': return "\\r";
case '\v': return "\\v";
case '\\': return "\\\\";
case '\u2028': return "\\u2028";
case '\u2029': return "\\u2029";
}

if (c < ' ')
{
return "\\x" + ((int)c).ToString("x2");
}

switch (char.GetUnicodeCategory(c))
{
case UnicodeCategory.Control:
Expand All @@ -176,11 +183,7 @@ private static string EscapeChar(char c, char quote)
case UnicodeCategory.OtherNotAssigned:
return "\\u" + ((int)c).ToString("x4");
}

// // Node does this.
//if(c <= 31)
// return "\\u" + ((int)c).ToString("x4");


return c.ToString();
}
}
Expand Down
28 changes: 11 additions & 17 deletions Json5/Json5Object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Json5
{
using Parsing;
using System.Text.RegularExpressions;

public class Json5Object : Json5Container, IEnumerable<KeyValuePair<string, Json5Value>>
{
Expand Down Expand Up @@ -105,25 +106,18 @@ internal override string ToJson5String(string space, string indent, bool useOneS
return s;
}

// https://www.ecma-international.org/ecma-262/5.1/
// Match IdentifierName (except escapes)
private static Regex identifierNameRegex = new Regex(@"
^
[\$_\p{L}\p{Nl}]
[\$_\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\u200c\u200d]*
$
", RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);

private string KeyToString(string key)
{
if (key.Length == 0)
return "''";


// TODO: Create a Utility class for interally used methods.

//if(char.IsLetter(key[0]) || char.GetUnicodeCategory(key[0]) == System.Globalization.UnicodeCategory.LetterNumber)
//{
// for(int i = 1; i < key.Length; i++)
// {

// }
//}

// This will not always work unless we check for Eof after the Identifier.
// We should probably handle this another way.
if (new Json5Lexer(key).Read().Type == Json5TokenType.Identifier)
if (identifierNameRegex.IsMatch(key))
return key;

return Json5.QuoteString(key);
Expand Down