Skip to content

V2: оптимизация лескического разбора #1640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EvilBeaver merged 6 commits into from
Dec 23, 2025
Merged

V2: оптимизация лескического разбора #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0441b5d
упорядочивание токенов; замена цепочек сравнений
Mr-Rm Dec 20, 2025
f3bdb66
кэшировать размер кода
Mr-Rm Dec 20, 2025
6323232
разделение литералов/слов на типы и рефакторинг лексера
Mr-Rm Dec 21, 2025
ab43599
убраны пустые ноды при добавлении; ускорено получение значениий
Mr-Rm Dec 21, 2025
8ea8b74
вынесена проверка границы; доп. функция; мелочи
Mr-Rm Dec 21, 2025
a7c5fad
сокращено получение CurrentColumn
Mr-Rm Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 67 additions & 79 deletions src/OneScript.Language/IdentifiersTrie.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,20 @@ public class IdentifiersTrie<T> : IDictionary<string, T>

private class TrieNode
{
public char charL;
public char charU;
public TrieNode sibl;
public TrieNode next;
internal char charL;
internal char charU;
internal TrieNode sibl;
internal TrieNode next;

private T _value;
internal T value;

public T Value
{
get => _value;
set
{
HasValue = true;
_value = value;
}
}

public bool HasValue { get; private set; }

public TrieNode Find(char ch)
internal bool hasValue;

internal TrieNode() { }
internal TrieNode(char ch)
{ charL = char.ToLower(ch); charU = char.ToUpper(ch); }

internal TrieNode Find(char ch)
{
var node = sibl;
while (node != null)
Expand All @@ -47,47 +41,46 @@ public TrieNode Find(char ch)
}
return null;
}

}

}

public void Add(string str, T val)
{
var node = _root;
TrieNode key = node;
foreach (char ch in str)
{
var key = node.Find(ch);
if (key == null)
if (node == null)
{
key = new TrieNode
node = new TrieNode(ch);
key.next = node;
key = node;
node = null;
}
else
{
TrieNode last = node;
key = node;
while (key != null && key.charL != ch && key.charU != ch)
{
last = key;
key = key.sibl;
}
if (key == null)
{
charL = char.ToLower(ch),
charU = char.ToUpper(ch),
Value = default(T),
sibl = node.sibl
};
node.sibl = key;
key.next = new TrieNode();
key = new TrieNode(ch);
last.sibl = key;
}
node = key.next;
}
node = key.next;
}

node.Value = val;
key.value = val;
key.hasValue = true;
}

public bool ContainsKey(string key)
{
var node = _root;
foreach (char ch in key)
{
var keyNode = node.Find(ch);
if (keyNode == null)
{
return false;
}
node = keyNode.next;
}

return node.next == null && node.HasValue;
public bool ContainsKey(string str)
{
return TryGetValue(str, out _);
}

public bool Remove(string key)
Expand All @@ -96,22 +89,10 @@ public bool Remove(string key)
}

public T Get(string str)
{
var node = _root;
foreach (char ch in str)
{
TrieNode key = node.Find(ch);
if (key == null)
throw new KeyNotFoundException();

node = key.next;
}

if (!node.HasValue)
throw new KeyNotFoundException();

return node.Value;
}
{
return TryGetValue(str, out var value) ? value
: throw new KeyNotFoundException();
}

public T this[string index]
{
Expand All @@ -124,27 +105,34 @@ public T this[string index]

public bool TryGetValue(string str, out T value)
{
var node = _root;
TrieNode key = _root;
var node = key.sibl;
foreach (char ch in str)
{
var key = node.Find(ch);
if (key == null)
{
value = default;
return false;
}

{
while (node != null && node.charL != ch && node.charU != ch)
{
node = node.sibl;
}
if (node == null)
{
value = default;
return false;
}

key = node;
node = key.next;
}

if (!node.HasValue)
{
value = default;
return false;
if (key.hasValue)
{
value = key.value;
return true;
}
else
{
value = default;
return false;
}

value = node.Value;
return true;
}

public IEnumerator<KeyValuePair<string, T>> GetEnumerator()
Expand Down
Loading