Add SyntaxKind, fix Visitor

xoofx · Feb 4, 2019 · 4a766e4 · 4a766e4
1 parent 6d14fef
commit 4a766e4
Show file tree

Hide file tree

Showing 35 changed files with 503 additions and 179 deletions.
diff --git a/src/SharpToml.Tests/StandardTests.cs b/src/SharpToml.Tests/StandardTests.cs
@@ -35,7 +35,7 @@ public static void SpecInvalid(string inputName, string toml, string json)
 
         private static void ValidateSpec(string type, string inputName, string toml, string json)
         {
-            var doc = Toml.Parse(toml);
+            var doc = Toml.ParseAndValidate(toml);
 
             Console.WriteLine();
             DisplayHeader("input");

diff --git a/src/SharpToml/Parsing/Lexer.cs b/src/SharpToml/Parsing/Lexer.cs
@@ -499,7 +499,7 @@ private void ReadNumberOrDate(char32? signPrefix = null, TextPosition? signPrefi
             }
 
             // Parse leading digits
-            ReadDigits(ref end);
+            ReadDigits(ref end, hasLeadingZero);
 
             // We are in the case of a date
             if (_c == '-' || _c == ':')
@@ -583,7 +583,7 @@ private void ReadNumberOrDate(char32? signPrefix = null, TextPosition? signPrefi
                 }
 
                 isFloat = true;
-                ReadDigits(ref end);
+                ReadDigits(ref end, false);
             }
 
             // Parse only the exponent if we don't have a range
@@ -607,7 +607,7 @@ private void ReadNumberOrDate(char32? signPrefix = null, TextPosition? signPrefi
                     _token = new SyntaxTokenValue(TokenKind.Invalid, start, end);
                     return;
                 }
-                ReadDigits(ref end);
+                ReadDigits(ref end, false);
             }
 
             var numberAsText = _textBuilder.ToString();
@@ -646,10 +646,9 @@ private void ReadNumberOrDate(char32? signPrefix = null, TextPosition? signPrefi
             _token = new SyntaxTokenValue(isFloat ? TokenKind.Float : TokenKind.Integer, start, end, resolvedValue);
         }
 
-        private void ReadDigits(ref TextPosition end)
+        private void ReadDigits(ref TextPosition end, bool isPreviousDigit)
         {
             bool isDigit;
-            bool isPreviousDigit = CharHelper.IsDigit(_c);
             while ((isDigit = CharHelper.IsDigit(_c)) || _c == '_')
             {
                 if (isDigit)
@@ -671,7 +670,7 @@ private void ReadDigits(ref TextPosition end)
 
             if (!isPreviousDigit)
             {
-                AddError("An underscore `_` must not follow a digit", _position, _position);
+                AddError("An underscore `_` must not followed a digit", _position, _position);
             }
         }
 

diff --git a/src/SharpToml/Parsing/Parser.cs b/src/SharpToml/Parsing/Parser.cs
@@ -18,7 +18,7 @@ internal partial class Parser<TSourceView> where TSourceView : ISourceView
         private SyntaxTokenValue _token;
         private bool _hideNewLine;
         private readonly List<SyntaxTrivia> _currentTrivias;
-        private TableSyntax _currentTable = null;
+        private TableSyntaxBase _currentTable = null;
         private DiagnosticsBag _diagnostics;
 
         /// <summary>
@@ -48,19 +48,19 @@ public DocumentSyntax Run()
             {
                 if (itemEntry == null) continue;
 
-                if (itemEntry is TableSyntax table)
+                if (itemEntry is TableSyntaxBase table)
                 {
                     _currentTable = table;
-                    AddToListAndUpdateSpan(doc.Entries, itemEntry);
+                    AddToListAndUpdateSpan(doc.Items, itemEntry);
                 }
                 else if (_currentTable == null)
                 {
-                    AddToListAndUpdateSpan(doc.Entries, itemEntry);
+                    AddToListAndUpdateSpan(doc.Items, itemEntry);
                 }
                 else
                 {
                     // Otherwise, we know that we can only have a key-value
-                    AddToListAndUpdateSpan(_currentTable.KeyValues, (KeyValueSyntax)itemEntry);
+                    AddToListAndUpdateSpan(_currentTable.Items, (KeyValueSyntax)itemEntry);
                 }
             }
 
@@ -361,7 +361,7 @@ private InlineTableSyntax ParseInlineTable()
             return Close(inlineTable);
         }
 
-        private TableSyntax ParseTableOrTableArray()
+        private TableSyntaxBase ParseTableOrTableArray()
         {
             // If we have a pending table, close it
             if (_currentTable != null)
@@ -372,7 +372,7 @@ private TableSyntax ParseTableOrTableArray()
 
             var previousState = _hideNewLine;
             _hideNewLine = false;
-            var table = Open<TableSyntax>();
+            var table = isTableArray ? (TableSyntaxBase)Open<TableArraySyntax>() : Open<TableSyntax>();
             try
             {
                 table.OpenBracket = EatToken();

diff --git a/src/SharpToml/SharpToml.csproj b/src/SharpToml/SharpToml.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3</TargetFrameworks>
+    <!--<TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.0;net471</TargetFrameworks>-->
     <LangVersion>7.3</LangVersion>
     <Description>SharpToml is a TOML parser library for .NET+Core with support for loading/saving while preserving perfect roundtrip</Description>
     <Copyright>Alexandre Mutel</Copyright>

diff --git a/src/SharpToml/Syntax/ArrayItemSyntax.cs b/src/SharpToml/Syntax/ArrayItemSyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -8,6 +8,10 @@ public sealed class ArrayItemSyntax : SyntaxNode
         private ValueSyntax _value;
         private SyntaxToken _comma;
 
+        public ArrayItemSyntax() : base(SyntaxKind.ArrayItem)
+        {
+        }
+
         public ValueSyntax Value
         {
             get => _value;
@@ -20,9 +24,9 @@ public SyntaxToken Comma
             set => ParentToThis(ref _comma, value, TokenKind.Comma);
         }
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         public override int ChildrenCount => 2;

diff --git a/src/SharpToml/Syntax/ArraySyntax.cs b/src/SharpToml/Syntax/ArraySyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -8,7 +8,7 @@ public sealed class ArraySyntax : ValueSyntax
         private SyntaxToken _openBracket;
         private SyntaxToken _closeBracket;
 
-        public ArraySyntax()
+        public ArraySyntax() : base(SyntaxKind.Array)
         {
             Items = new SyntaxList<ArrayItemSyntax>() { Parent = this };
         }
@@ -27,9 +27,9 @@ public SyntaxToken CloseBracket
             set => ParentToThis(ref _closeBracket, value, TokenKind.CloseBracket);
         }
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         public override int ChildrenCount => 3;

diff --git a/src/SharpToml/Syntax/BasicKeySyntax.cs b/src/SharpToml/Syntax/BasicKeySyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -7,6 +7,10 @@ public sealed class BasicKeySyntax : BasicValueSyntax
     {
         private SyntaxToken _key;
 
+        public BasicKeySyntax() : base(SyntaxKind.BasicKey)
+        {
+        }
+
         public SyntaxToken Key
         {
             get => _key;
@@ -15,9 +19,9 @@ public SyntaxToken Key
 
         public override int ChildrenCount => 1;
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         protected override SyntaxNode GetChildrenImpl(int index)

diff --git a/src/SharpToml/Syntax/BasicValueSyntax.cs b/src/SharpToml/Syntax/BasicValueSyntax.cs
@@ -1,9 +1,12 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
 {
     public abstract class BasicValueSyntax : ValueSyntax
     {
+        protected BasicValueSyntax(SyntaxKind kind) : base(kind)
+        {
+        }
     }
 }
diff --git a/src/SharpToml/Syntax/BooleanValueSyntax.cs b/src/SharpToml/Syntax/BooleanValueSyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -8,6 +8,10 @@ public sealed class BooleanValueSyntax : ValueSyntax
         private SyntaxToken _token;
         private bool _value;
 
+        public BooleanValueSyntax() : base(SyntaxKind.Boolean)
+        {
+        }
+
         public SyntaxToken Token
         {
             get => _token;
@@ -44,9 +48,9 @@ public bool Value
             }
         }
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         public override int ChildrenCount => 1;

diff --git a/src/SharpToml/Syntax/DateTimeValueSyntax.cs b/src/SharpToml/Syntax/DateTimeValueSyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 using System;
@@ -7,9 +7,13 @@ namespace SharpToml.Syntax
 {
     public sealed class DateTimeValueSyntax : ValueSyntax
     {
-        public override void Visit(ISyntaxVisitor visitor)
+        public DateTimeValueSyntax() : base(SyntaxKind.DateTime)
         {
-            visitor.Accept(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.Visit(this);
         }
 
         public SyntaxToken Token { get; set; }

diff --git a/src/SharpToml/Syntax/DiagnosticsBag.cs b/src/SharpToml/Syntax/DiagnosticsBag.cs
@@ -41,6 +41,16 @@ public void Clear()
             HasErrors = false;
         }
 
+        public void Warning(SourceSpan span, string text)
+        {
+            Add(new DiagnosticMessage(DiagnosticMessageKind.Warning, span, text));
+        }
+
+        public void Error(SourceSpan span, string text)
+        {
+            Add(new DiagnosticMessage(DiagnosticMessageKind.Error, span, text));
+        }
+
         public List<DiagnosticMessage>.Enumerator GetEnumerator()
         {
             return _messages.GetEnumerator();

diff --git a/src/SharpToml/Syntax/DocumentSyntax.cs b/src/SharpToml/Syntax/DocumentSyntax.cs
@@ -5,27 +5,27 @@ namespace SharpToml.Syntax
 {
     public sealed class DocumentSyntax : SyntaxNode
     {
-        public DocumentSyntax()
+        public DocumentSyntax() : base(SyntaxKind.Document)
         {
-            Entries = new SyntaxList<TableEntrySyntax>() { Parent = this };
+            Items = new SyntaxList<TableEntrySyntax>() { Parent = this };
             Diagnostics = new DiagnosticsBag();
         }
         public DiagnosticsBag Diagnostics { get; }
 
         public bool HasErrors => Diagnostics.HasErrors;
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
-        public SyntaxList<TableEntrySyntax> Entries { get; }
+        public SyntaxList<TableEntrySyntax> Items { get; }
 
         public override int ChildrenCount => 1;
 
         protected override SyntaxNode GetChildrenImpl(int index)
         {
-            return Entries;
+            return Items;
         }
     }
 }
diff --git a/src/SharpToml/Syntax/DottedKeyItemSyntax.cs b/src/SharpToml/Syntax/DottedKeyItemSyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -8,6 +8,10 @@ public sealed class DottedKeyItemSyntax : ValueSyntax
         private SyntaxToken _dot;
         private BasicValueSyntax _value;
 
+        public DottedKeyItemSyntax() : base(SyntaxKind.DottedKeyItem)
+        {
+        }
+
         public SyntaxToken Dot
         {
             get => _dot;
@@ -20,9 +24,9 @@ public BasicValueSyntax Value
             set => ParentToThis(ref _value, value);
         }
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         public override int ChildrenCount => 2;

diff --git a/src/SharpToml/Syntax/FloatValueSyntax.cs b/src/SharpToml/Syntax/FloatValueSyntax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
+// Copyright (c) 2019 - Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license. 
 // See license.txt file in the project root for full license information.
 namespace SharpToml.Syntax
@@ -7,6 +7,10 @@ public sealed class FloatValueSyntax : ValueSyntax
     {
         private SyntaxToken _token;
 
+        public FloatValueSyntax() : base(SyntaxKind.Float)
+        {
+        }
+
         public SyntaxToken Token
         {
             get => _token;
@@ -15,9 +19,9 @@ public SyntaxToken Token
 
         public double Value { get; set; }
 
-        public override void Visit(ISyntaxVisitor visitor)
+        public override void Accept(SyntaxVisitor visitor)
         {
-            visitor.Accept(this);
+            visitor.Visit(this);
         }
 
         public override int ChildrenCount => 1;