Skip to content

fix #1791: проверка обращений к свойствам и индексам #1794

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

Open
Mr-Rm wants to merge 2 commits into
base: develop
Choose a base branch
from
+74 −46
Open

fix #1791: проверка обращений к свойствам и индексам #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb3bcb1
проверка обращений к свойствам и индексам
Mr-Rm Oct 16, 2026
a311bff
продолжать разбор с места ошибки, если разрешено
Mr-Rm Oct 16, 2026
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
6 changes: 3 additions & 3 deletions src/OneScript.Language/ScriptException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ public override string Message
ColumnNumber = codeLine.Length;
}

if (ColumnNumber != ErrorPositionInfo.OUT_OF_TEXT)
if (ColumnNumber > 0)
{
sb.Append(codeLine[..ColumnNumber]);
sb.Append(codeLine[..(ColumnNumber - 1)]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
sb.Append("<<?>>");
sb.AppendLine(codeLine[ColumnNumber..]);
sb.AppendLine(codeLine[(ColumnNumber - 1)..]);
}
else
{
Expand Down
105 changes: 64 additions & 41 deletions src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,59 +1410,82 @@ private BslSyntaxNode BuildQuestionOperator()
}

return BuildDereference(node);
}
}

private bool IsDereferenceable(BslSyntaxNode node)
=> node.Kind switch
{
NodeKind.Identifier
or NodeKind.GlobalCall or NodeKind.MethodCall
or NodeKind.DereferenceOperation or NodeKind.IndexAccess
or NodeKind.TernaryOperator
or NodeKind.NewObject // несовместимо с 1С
=> true,

_ => false
};

private BslSyntaxNode BuildDereference(BslSyntaxNode target)
{
var activeTarget = BuildIndexerAccess(target);
if (_lastExtractedLexem.Token == Token.Dot)
if (_lastExtractedLexem.Token != Token.Dot)
{
return activeTarget;
}

if (!IsDereferenceable(target))
{
var dotNode = new NonTerminalNode(NodeKind.DereferenceOperation, _lastExtractedLexem);
dotNode.AddChild(activeTarget);
NextLexem();
if (!LanguageDef.IsValidPropertyName(_lastExtractedLexem))
{
return CreateError(LocalizedErrors.IdentifierExpected());
}

var identifier = _lastExtractedLexem;
NextLexem();
if (_lastExtractedLexem.Token == Token.OpenPar)
{
var ident = new TerminalNode(NodeKind.Identifier, identifier);
var call = BuildCall(ident, NodeKind.MethodCall);
dotNode.AddChild(call);
}
else
{
_lastDereferenceIsWritable = true;
CreateChild(dotNode, NodeKind.Identifier, identifier);
}

return BuildDereference(dotNode);
}

return activeTarget;
AddError(LocalizedErrors.ValueIsNotObjectException(), false);
}
var dotNode = new NonTerminalNode(NodeKind.DereferenceOperation, _lastExtractedLexem);
dotNode.AddChild(activeTarget);
NextLexem();
if (!LanguageDef.IsValidPropertyName(_lastExtractedLexem))
{
return CreateError(LocalizedErrors.IdentifierExpected());
}
var identifier = _lastExtractedLexem;
NextLexem();
if (_lastExtractedLexem.Token == Token.OpenPar)
{
var ident = new TerminalNode(NodeKind.Identifier, identifier);
var call = BuildCall(ident, NodeKind.MethodCall);
dotNode.AddChild(call);
}
else
{
_lastDereferenceIsWritable = true;
CreateChild(dotNode, NodeKind.Identifier, identifier);
}
return BuildDereference(dotNode);
}

private BslSyntaxNode BuildIndexerAccess(BslSyntaxNode target)
{
if (_lastExtractedLexem.Token == Token.OpenBracket)
if (_lastExtractedLexem.Token != Token.OpenBracket)
{
return target;
}

if (!IsDereferenceable(target))
{
var node = new NonTerminalNode(NodeKind.IndexAccess, _lastExtractedLexem);
node.AddChild(target);
NextLexem();
var expression = BuildExpression(node, Token.CloseBracket);
if (expression.Kind == NodeKind.Unknown)
{
return CreateError(LocalizedErrors.ExpressionSyntax());
}
NextLexem();
_lastDereferenceIsWritable = true;
return BuildDereference(node);
AddError(LocalizedErrors.ValueIsNotObjectException(), false);
}

return target;
var node = new NonTerminalNode(NodeKind.IndexAccess, _lastExtractedLexem);
node.AddChild(target);
NextLexem();
var expression = BuildExpression(node, Token.CloseBracket);
if (expression.Kind == NodeKind.Unknown)
{
return CreateError(LocalizedErrors.ExpressionSyntax());
}
NextLexem();
_lastDereferenceIsWritable = true;
return BuildDereference(node);
}

private BslSyntaxNode BuildNewObjectCreation()
Expand Down
9 changes: 7 additions & 2 deletions src/OneScript.Language/SyntaxAnalysis/LocalizedErrors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,10 @@ public static CodeError SymbolNotFound(string symbol) =>

public static CodeError AsyncMethodsNotSupported() =>
Create("Асинхронные методы не поддерживаются", "Async methods aren't supported");
}
}

public static CodeError ValueIsNotObjectException()
{
return Create("Значение не является значением объектного типа", "Value is not of object type");
}
}
}
Loading