zhusenlin/serein-flow
1
0
Fork 0
mirror of https://gitee.com/langsisi_admin/serein-flow synced 2026-03-03 00:00:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增了脚本节点对于集合对象[]下标/key取值的语法支持。修复了加载项目文件时无法加载脚本节点变量名称的问题

Browse Source
This commit is contained in:
fengjiayi
2025-03-15 14:02:12 +08:00
parent 1e09675ef1
commit d8f4a5a2c2
6 changed files with 147 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Serein.Script/SereinScriptParser.cs
View File

@@ -127,6 +127,11 @@ namespace Serein.Script
// 对象成员的获取
return ParseMemberAccessOrAssignment();
}
else if (_tempToken.Type == TokenType.SquareBracketsLeft)
{
// 数组 index; 字典 key obj.Member[xxx];
return ParseCollectionIndex();
}
else
{
// 不是函数调用，是变量赋值或其他
@@ -292,10 +297,13 @@ namespace Serein.Script
public ASTNode ParseCollectionIndex()
{
string functionName = _currentToken.Value.ToString();
_currentToken = _lexer.NextToken(); // consume identifier
var identifierNode = new IdentifierNode(_currentToken.Value.ToString()).SetTokenInfo(_currentToken);
if (_currentToken.Type != TokenType.ParenthesisLeft)
string collectionName = _currentToken.Value.ToString();
//_lexer.NextToken(); // consume "["
_currentToken = _lexer.NextToken(); // consume identifier
// ParenthesisLeft
if (_currentToken.Type != TokenType.SquareBracketsLeft)
throw new Exception("Expected '[' after function name");
_currentToken = _lexer.NextToken(); // consume "["
@@ -303,7 +311,7 @@ namespace Serein.Script
ASTNode indexValue = Expression(); // get index value
_currentToken = _lexer.NextToken(); // consume "]"
return new CollectionIndexNode(indexValue).SetTokenInfo(_currentToken);
return new CollectionIndexNode(identifierNode,indexValue).SetTokenInfo(_currentToken);
}
/// <summary>
@@ -631,6 +639,14 @@ namespace Serein.Script
{
return ParseMemberAccessOrAssignment();
}
// 数组 index; 字典 key obj.Member[xxx];
if (_identifierPeekToken.Type == TokenType.SquareBracketsLeft)
{
return ParseCollectionIndex();
}
_currentToken = _lexer.NextToken(); // 消耗标识符
return new IdentifierNode(identifier.ToString()).SetTokenInfo(_currentToken);
}