Refactor and update code

zhossain-info · zhossain-info · commit 37e1afb4e92e · 2023-10-06T14:20:05.000+06:00
diff --git a/JsonSchema/JsonSchema.csproj b/JsonSchema/JsonSchema.csproj
@@ -5,9 +5,9 @@
         <Description>A simplified, concise, intuitive, and extensible JSON Schema</Description>
         <Authors>Relogic Labs</Authors>
         <Company>Relogic Labs</Company>
-        <Version>1.3.0</Version>
-        <PackageVersion>1.3.0</PackageVersion>
-        <AssemblyVersion>1.3.0</AssemblyVersion>
+        <Version>1.4.0</Version>
+        <PackageVersion>1.4.0</PackageVersion>
+        <AssemblyVersion>1.4.0</AssemblyVersion>
         <PackageTags>JsonSchema;Schema;Json;Validation;Assert;Test</PackageTags>
         <Copyright>Copyright © Relogic Labs. All rights reserved.</Copyright>
         <NeutralLanguage>en</NeutralLanguage>
@@ -29,7 +29,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.0"/>
+        <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1"/>
         <InternalsVisibleTo Include="RelogicLabs.JsonSchema.Tests"/>
         <AssemblyAttribute Include="System.CLSCompliantAttribute">
             <_Parameter1>true</_Parameter1>
@@ -40,4 +40,4 @@
         <EmbeddedResource Remove="docs\**"/>
         <None Remove="docs\**"/>
     </ItemGroup>
-</Project>
+</Project>
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/DateTimeLexer.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/DateTimeLexer.cs
@@ -170,4 +170,4 @@ static DateTimeLexer() {
 
 
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonLexer.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonLexer.cs
@@ -149,4 +149,4 @@ static JsonLexer() {
 
 
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParser.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParser.cs
@@ -586,4 +586,4 @@ public PrimitiveContext primitive() {
 
 
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParserBaseVisitor.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParserBaseVisitor.cs
@@ -161,4 +161,4 @@ internal partial class JsonParserBaseVisitor<Result> : AbstractParseTreeVisitor<
 	/// <return>The visitor result.</return>
 	public virtual Result VisitPrimitiveNull([NotNull] JsonParser.PrimitiveNullContext context) { return VisitChildren(context); }
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParserVisitor.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/JsonParserVisitor.cs
@@ -110,4 +110,4 @@ internal interface IJsonParserVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitPrimitiveNull([NotNull] JsonParser.PrimitiveNullContext context);
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaLexer.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaLexer.cs
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaLexer.interp b/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaLexer.interp
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParser.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParser.cs
@@ -1572,4 +1572,4 @@ public PrimitiveContext primitive() {
 
 
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParserBaseVisitor.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParserBaseVisitor.cs
@@ -294,4 +294,4 @@ internal partial class SchemaParserBaseVisitor<Result> : AbstractParseTreeVisito
 	/// <return>The visitor result.</return>
 	public virtual Result VisitPrimitiveUndefined([NotNull] SchemaParser.PrimitiveUndefinedContext context) { return VisitChildren(context); }
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParserVisitor.cs b/JsonSchema/RelogicLabs/JsonSchema/Antlr/SchemaParserVisitor.cs
@@ -191,4 +191,4 @@ internal interface ISchemaParserVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitPrimitiveUndefined([NotNull] SchemaParser.PrimitiveUndefinedContext context);
 }
-} // namespace RelogicLabs.JsonSchema.Antlr
+} // namespace RelogicLabs.JsonSchema.Antlr
diff --git a/JsonSchema/RelogicLabs/JsonSchema/Grammar/SchemaLexer.g4 b/JsonSchema/RelogicLabs/JsonSchema/Grammar/SchemaLexer.g4
@@ -67,7 +67,7 @@ fragment WHITE_SPC: [\n\r\t ]+;
 mode DIRECTIVE_VERSION1;
 
 COLON1: ':';
-VERSION_NUMBER1: DIGIT ('.' DIGIT+)* -> popMode;
+VERSION_NUMBER1: DIGIT+ ('.' DIGIT+)* -> popMode;
 WHITE_SPACE1: WHITE_SPC -> channel(HIDDEN);
 MULTILINE_COMMENT1: MULTILINE_CMT -> channel(HIDDEN);
 LINE_COMMENT1: LINE_CMT -> channel(HIDDEN);

Original file line number	Diff line number	Diff line change
`@@ -170,4 +170,4 @@ static DateTimeLexer() {`
`170`	`170`
`171`	`171`
`172`	`172`	`}`
`173`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`173`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -149,4 +149,4 @@ static JsonLexer() {`
`149`	`149`
`150`	`150`
`151`	`151`	`}`
`152`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`152`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -586,4 +586,4 @@ public PrimitiveContext primitive() {`
`586`	`586`
`587`	`587`
`588`	`588`	`}`
`589`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`589`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,4 @@ internal partial class JsonParserBaseVisitor<Result> : AbstractParseTreeVisitor<`
`161`	`161`	`/// <return>The visitor result.</return>`
`162`	`162`	`public virtual Result VisitPrimitiveNull([NotNull] JsonParser.PrimitiveNullContext context) { return VisitChildren(context); }`
`163`	`163`	`}`
`164`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`164`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -110,4 +110,4 @@ internal interface IJsonParserVisitor<Result> : IParseTreeVisitor<Result> {`
`110`	`110`	`/// <return>The visitor result.</return>`
`111`	`111`	`Result VisitPrimitiveNull([NotNull] JsonParser.PrimitiveNullContext context);`
`112`	`112`	`}`
`113`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`113`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -1572,4 +1572,4 @@ public PrimitiveContext primitive() {`
`1572`	`1572`
`1573`	`1573`
`1574`	`1574`	`}`
`1575`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`1575`	`+} // namespace RelogicLabs.JsonSchema.Antlr`
Original file line number	Diff line number	Diff line change
`@@ -294,4 +294,4 @@ internal partial class SchemaParserBaseVisitor<Result> : AbstractParseTreeVisito`
`294`	`294`	`/// <return>The visitor result.</return>`
`295`	`295`	`public virtual Result VisitPrimitiveUndefined([NotNull] SchemaParser.PrimitiveUndefinedContext context) { return VisitChildren(context); }`
`296`	`296`	`}`
`297`		`-} // namespace RelogicLabs.JsonSchema.Antlr`
	`297`	`+} // namespace RelogicLabs.JsonSchema.Antlr`