universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bugs in JSON data format

Browse Source
This commit is contained in:
Michael Becker 2019-08-14 16:07:14 -04:00
parent b436b09c58
commit ffd4161a7a
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CSharp/Libraries/UniversalEditor.Essential/DataFormats/PropertyList/JavaScriptObjectNotation/JSONDataFormat.cs
View File

@ -141,8 +141,16 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
}
else if (c == ',')
{
list.Add(lastObject);
lastObject = null;
if (lastObject == null && !String.IsNullOrEmpty(ctx.CurrentString))
{
list.Add(ctx.CurrentString);
ctx.CurrentString = String.Empty;
}
else
{
list.Add(lastObject);
lastObject = null;
}
}
}
@ -151,6 +159,11 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
list.Add(lastObject);
lastObject = null;
}
else if (!String.IsNullOrEmpty(ctx.CurrentString))
{
list.Add(ctx.CurrentString);
ctx.CurrentString = String.Empty;
}
// hack hack hack
ctx.CurrentString = String.Empty;
return list.ToArray();
@ -193,6 +206,18 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
ctx.CurrentStringRaw = String.Empty;
return null;
}
else if (ctx.CurrentStringRaw == "true")
{
r.Seek(-1, SeekOrigin.Current);
ctx.CurrentStringRaw = String.Empty;
return true;
}
else if (ctx.CurrentStringRaw == "false")
{
r.Seek(-1, SeekOrigin.Current);
ctx.CurrentStringRaw = String.Empty;
return false;
}
}
else
{
@ -249,6 +274,12 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
ctx.Escaped = true;
continue;
}
else if (c == '\\' && ctx.Escaped)
{
ctx.Escaped = false;
ctx.CurrentString += '\\';
continue;
}
else if (c == '"' && !ctx.Escaped)
{
return;