mirror of
https://github.com/xoofx/markdig.git
synced 2026-11-16 09:20:40 +00:00
Store trivia next to DataEntries
This commit is contained in:
@@ -14,8 +14,8 @@ namespace Markdig.Syntax
|
||||
/// <seealso cref="MarkdownObject" />
|
||||
public abstract class Block : MarkdownObject, IBlock
|
||||
{
|
||||
private BlockTriviaProperties? _trivia;
|
||||
private BlockTriviaProperties Trivia => _trivia ??= new();
|
||||
private BlockTriviaProperties? _trivia => GetTrivia<BlockTriviaProperties>();
|
||||
private BlockTriviaProperties Trivia => GetOrSetTrivia<BlockTriviaProperties>();
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="Block"/> class.
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace Markdig.Syntax.Inlines
|
||||
[DebuggerDisplay("`{Content}`")]
|
||||
public class CodeInline : LeafInline
|
||||
{
|
||||
private TriviaProperties? _trivia;
|
||||
private TriviaProperties Trivia => _trivia ??= new();
|
||||
private TriviaProperties? _trivia => GetTrivia<TriviaProperties>();
|
||||
private TriviaProperties Trivia => GetOrSetTrivia<TriviaProperties>();
|
||||
|
||||
public CodeInline(string content)
|
||||
{
|
||||
|
||||
@@ -13,8 +13,8 @@ namespace Markdig.Syntax.Inlines
|
||||
/// <seealso cref="DelimiterInline" />
|
||||
public class LinkDelimiterInline : DelimiterInline
|
||||
{
|
||||
private TriviaProperties? _trivia;
|
||||
private TriviaProperties Trivia => _trivia ??= new();
|
||||
private TriviaProperties? _trivia => GetTrivia<TriviaProperties>();
|
||||
private TriviaProperties Trivia => GetOrSetTrivia<TriviaProperties>();
|
||||
|
||||
public LinkDelimiterInline(InlineParser parser) : base(parser)
|
||||
{
|
||||
|
||||
@@ -21,8 +21,8 @@ namespace Markdig.Syntax.Inlines
|
||||
[DebuggerDisplay("Url: {Url} Title: {Title} Image: {IsImage}")]
|
||||
public class LinkInline : ContainerInline
|
||||
{
|
||||
private TriviaProperties? _trivia;
|
||||
private TriviaProperties Trivia => _trivia ??= new();
|
||||
private TriviaProperties? _trivia => GetTrivia<TriviaProperties>();
|
||||
private TriviaProperties Trivia => GetOrSetTrivia<TriviaProperties>();
|
||||
|
||||
/// <summary>
|
||||
/// A delegate to use if it is setup on this instance to allow late binding
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace Markdig.Syntax
|
||||
/// as we expect less than 5~10 entries, usually typically 1 (HtmlAttributes)
|
||||
/// so it will gives faster access than a Dictionary, and lower memory occupation
|
||||
/// </summary>
|
||||
private DataEntries? _attachedDatas;
|
||||
private DataEntriesAndTrivia? _attachedDatas;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the text column this instance was declared (zero-based).
|
||||
@@ -111,7 +111,7 @@ namespace Markdig.Syntax
|
||||
/// <param name="key">The key.</param>
|
||||
/// <param name="value">The value.</param>
|
||||
/// <exception cref="ArgumentNullException">if key is null</exception>
|
||||
public void SetData(object key, object value) => (_attachedDatas ??= new DataEntries()).SetData(key, value);
|
||||
public void SetData(object key, object value) => (_attachedDatas ??= new DataEntriesAndTrivia()).SetData(key, value);
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether this instance contains the specified key data.
|
||||
@@ -137,7 +137,21 @@ namespace Markdig.Syntax
|
||||
/// <exception cref="ArgumentNullException"></exception>
|
||||
public bool RemoveData(object key) => _attachedDatas?.RemoveData(key) ?? false;
|
||||
|
||||
private class DataEntries
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private protected T? GetTrivia<T>() where T : class
|
||||
{
|
||||
object? trivia = _attachedDatas?.Trivia;
|
||||
return trivia is null ? null : Unsafe.As<T>(trivia);
|
||||
}
|
||||
|
||||
private protected T GetOrSetTrivia<T>() where T : class, new()
|
||||
{
|
||||
var storage = _attachedDatas ??= new DataEntriesAndTrivia();
|
||||
storage.Trivia ??= new T();
|
||||
return Unsafe.As<T>(storage.Trivia);
|
||||
}
|
||||
|
||||
private class DataEntriesAndTrivia
|
||||
{
|
||||
private struct DataEntry
|
||||
{
|
||||
@@ -151,37 +165,41 @@ namespace Markdig.Syntax
|
||||
}
|
||||
}
|
||||
|
||||
private DataEntry[] _entries;
|
||||
private DataEntry[]? _entries;
|
||||
private int _count;
|
||||
|
||||
public DataEntries()
|
||||
{
|
||||
_entries = new DataEntry[2];
|
||||
}
|
||||
public object? Trivia;
|
||||
|
||||
public void SetData(object key, object value)
|
||||
{
|
||||
if (key is null) ThrowHelper.ArgumentNullException_key();
|
||||
|
||||
DataEntry[] entries = _entries;
|
||||
DataEntry[]? entries = _entries;
|
||||
int count = _count;
|
||||
|
||||
for (int i = 0; i < entries.Length && i < count; i++)
|
||||
if (entries is null)
|
||||
{
|
||||
ref DataEntry entry = ref entries[i];
|
||||
if (entry.Key == key)
|
||||
_entries = new DataEntry[2];
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < entries.Length && i < count; i++)
|
||||
{
|
||||
entry.Value = value;
|
||||
return;
|
||||
ref DataEntry entry = ref entries[i];
|
||||
if (entry.Key == key)
|
||||
{
|
||||
entry.Value = value;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (count == entries.Length)
|
||||
{
|
||||
Array.Resize(ref _entries, count + 2);
|
||||
}
|
||||
}
|
||||
|
||||
if (count == entries.Length)
|
||||
{
|
||||
Array.Resize(ref _entries, count + 2);
|
||||
}
|
||||
|
||||
_entries[count] = new DataEntry(key, value);
|
||||
_entries![count] = new DataEntry(key, value);
|
||||
_count++;
|
||||
}
|
||||
|
||||
@@ -189,7 +207,12 @@ namespace Markdig.Syntax
|
||||
{
|
||||
if (key is null) ThrowHelper.ArgumentNullException_key();
|
||||
|
||||
DataEntry[] entries = _entries;
|
||||
DataEntry[]? entries = _entries;
|
||||
if (entries is null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
int count = _count;
|
||||
|
||||
for (int i = 0; i < entries.Length && i < count; i++)
|
||||
@@ -208,7 +231,12 @@ namespace Markdig.Syntax
|
||||
{
|
||||
if (key is null) ThrowHelper.ArgumentNullException_key();
|
||||
|
||||
DataEntry[] entries = _entries;
|
||||
DataEntry[]? entries = _entries;
|
||||
if (entries is null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int count = _count;
|
||||
|
||||
for (int i = 0; i < entries.Length && i < count; i++)
|
||||
@@ -226,7 +254,12 @@ namespace Markdig.Syntax
|
||||
{
|
||||
if (key is null) ThrowHelper.ArgumentNullException_key();
|
||||
|
||||
DataEntry[] entries = _entries;
|
||||
DataEntry[]? entries = _entries;
|
||||
if (entries is null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int count = _count;
|
||||
|
||||
for (int i = 0; i < entries.Length && i < count; i++)
|
||||
|
||||
Reference in New Issue
Block a user