Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvements LslSyntax

Browse Source
This commit is contained in:
cinder
2025-07-13 09:35:45 -05:00
committed by cinder
parent 399bbc46b6
commit 1b8bdc0f4f
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LibreMetaverse/LslSyntaxId.cs → LibreMetaverse/LslSyntax.cs
View File

@@ -38,7 +38,7 @@ using Logger = OpenMetaverse.Logger;
namespace LibreMetaverse
{
public class LslSyntaxId
public class LslSyntax
{
public enum LslCategory
{
@@ -65,10 +65,10 @@ namespace LibreMetaverse
private const string SYNTAX_FEATURE_IDENTIFIER = "LSLSyntaxId";
private const string SYNTAX_CAPABILITY_IDENTIFIER = "LSLSyntax";
private Dictionary<string, LslKeyword> _keywords = new Dictionary<string, LslKeyword>();
public FrozenDictionary<string, LslKeyword> Keywords => _keywords.ToFrozenDictionary();
private static Dictionary<string, LslKeyword> _keywords = new Dictionary<string, LslKeyword>();
public static FrozenDictionary<string, LslKeyword> Keywords => _keywords.ToFrozenDictionary();
private readonly GridClient _client;
private GridClient _client;
private UUID _syntaxId;
#region EVENTS
@@ -94,8 +94,22 @@ namespace LibreMetaverse
}
#endregion EVENTS
public LslSyntaxId(GridClient client)
public LslSyntax()
{
var keywordFile = Path.Combine(Settings.RESOURCE_DIR, KEYWORDS_DEFAULT);
using (FileStream fs = new FileStream(keywordFile, FileMode.Open, FileAccess.Read))
{
ParseFile(fs);
}
}
public LslSyntax(GridClient client)
{
Register(client);
}
public void Register(GridClient client)
{
_client = client;
@@ -309,7 +323,7 @@ namespace LibreMetaverse
Logger.Log($"Syntax parser exception: {e.Message}", Helpers.LogLevel.Warning);
}
Logger.Log($"Parsed Syntax file, added {added}/{tokens} tokens.", Helpers.LogLevel.Debug);
_keywords = keywords;
lock(_keywords) { _keywords = keywords; }
OnSyntaxChanged();
}

5
Programs/examples/TestClient/Commands/Land/SyntaxIdCommand.cs
View File

@@ -1,4 +1,5 @@
using System.Text;
using LibreMetaverse;
namespace OpenMetaverse.TestClient
{
@@ -13,11 +14,11 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
var syntax = new LibreMetaverse.LslSyntaxId(Client);
var syntax = new LibreMetaverse.LslSyntax(Client);
var output = new StringBuilder("LSL Tokens:");
output.AppendLine();
foreach (var token in syntax.Keywords.Keys)
foreach (var token in LslSyntax.Keywords.Keys)
{
output.AppendLine(token);
}