Deukhoofd/Upsilon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't allow indexing unregistered types on evaluation

Browse Source
This commit is contained in:
Deukhoofd
2019-02-19 12:48:57 +01:00
parent 02fb3867e1
commit 18ca112624
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Upsilon/Binder/BoundExpressions/BoundIndexExpression.cs
View File

@@ -47,6 +47,17 @@ namespace Upsilon.Binder
{ {
innerScope = scopeOwner.EvaluationScope; innerScope = scopeOwner.EvaluationScope;
} }
if (variable.Type == Type.Unknown)
{
throw new EvaluationException(state.Script.FileName,
$"Variable of type '{variable.Type}' is not a registered type, and can't be indexed.", Span);
}
if (variable.Type == Type.UserData && variable.Type is UndefinedUserDataTypeContainer userDataTypeContainer)
{
throw new EvaluationException(state.Script.FileName,
$"Variable of type '{userDataTypeContainer.UserData}' is not a registered type, and can't be indexed.", Span);
}
var indexer = Index.Evaluate(scope, diagnostics, ref state); var indexer = Index.Evaluate(scope, diagnostics, ref state);
return indexable.Get(diagnostics, Span, indexer, innerScope); return indexable.Get(diagnostics, Span, indexer, innerScope);
@@ -87,6 +98,12 @@ namespace Upsilon.Binder
$"Variable of type '{variable.Type}' is not indexable.", Span); $"Variable of type '{variable.Type}' is not indexable.", Span);
} }
if (variable.Type == Type.UserData && variable.Type is UndefinedUserDataTypeContainer userDataTypeContainer)
{
throw new EvaluationException(state.Script.FileName,
$"Variable of type '{userDataTypeContainer.UserData}' is not a registered type, and can't be indexed.", Span);
}
var innerScope = scope; var innerScope = scope;
if (variable is IScopeOwner scopeOwner) if (variable is IScopeOwner scopeOwner)
{ {