Skip to content

Commit d119d6b

Browse files
committed
Update to fastJSON 2.4.0.3 (version 1.0.1) & finalise merging changes
- Update fastJSON to 2.4.0.3 - Fix documentation still being missing - Add some additional changes from the merge
1 parent a7cebd1 commit d119d6b

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

fastJSON.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<metadata>
55
<id>fastJSON5</id>
6-
<version>1.0.0</version>
6+
<version>1.0.1</version>
77
<title>fastJSON5</title>
88
<authors>hamarb123, mgholam</authors>
99
<owners />
1010
<projectUrl>https://github.com/hamarb123/fastJSON5</projectUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<license type="file">LICENSE</license>
13-
<description>Very fast, conformant, and polymorphic JSON5 serializer. This build is based on mgholam/fastJSON 2.4.0.1.</description>
13+
<description>Very fast, conformant, and polymorphic JSON5 serializer. This build is based on mgholam/fastJSON 2.4.0.3.</description>
1414
<copyright>mgholam © 2010-2021, hamarb123 © 2020-2021</copyright>
1515
</metadata>
1616
<files>

fastJSON/JsonParser.cs

-10
Original file line numberDiff line numberDiff line change
@@ -1028,16 +1028,6 @@ private unsafe void SkipWhitespace(char* p)
10281028

10291029
if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != '\v' && c != '\f' && c != '\u00A0' && c != '\u2028' && c != '\u2029' && c != '\uFEFF' && char.GetUnicodeCategory(c) != UnicodeCategory.SpaceSeparator)
10301030
break;
1031-
//switch (c)
1032-
//{
1033-
// case ' ':
1034-
// case '\t':
1035-
// case '\r':
1036-
// case '\n':
1037-
// break;
1038-
// default:
1039-
// return;
1040-
//}
10411031
} while (++index < _len);
10421032
}
10431033

fastJSON5Renamer/Program.cs

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Mono.Cecil;
22
using System;
3+
using System.IO;
34

45
namespace fastJSON5Renamer
56
{
@@ -18,6 +19,11 @@ static void Main(string[] args)
1819
}
1920
}
2021
library.Write(args[1]);
22+
string docFileName = args[1];
23+
if (docFileName.EndsWith(".dll")) docFileName = docFileName[..^4] + ".xml";
24+
var contents = File.ReadAllText(docFileName);
25+
contents = contents.Replace("fastJSON", "fastJSON5").Replace("fastJSON5.JSON", "fastJSON5.JSON5").Replace("fastJSON5.JSONParameters", "fastJSON5.JSON5Parameters").Replace("<name>fastJSON55</name>", "<name>fastJSON5</name>");
26+
File.WriteAllText(docFileName, contents);
2127
}
2228
}
2329
}

fastJSONcore/fastJSON.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Product>fastJSON5</Product>
1212
<Copyright>mgholam © 2010-2021, hamarb123 © 2020-2021</Copyright>
1313
<Company>hamarb123, mgholam</Company>
14-
<Version>1.0.0-2.4.0.1</Version>
14+
<Version>1.0.1-2.4.0.3</Version>
1515
<AssemblyName>fastJSON5</AssemblyName>
1616
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1717
<LangVersion>9</LangVersion>

history_json5.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.0.1-2.4.0.3
2+
- Update fastJSON to 2.4.0.3
3+
- Fix documentation still being missing
4+
15
1.0.0-2.4.0.1
26
- Add documentation that was missing
37
- Add warnings option to be conformant with the specification

0 commit comments

Comments
 (0)