Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.Core/Contexts/BslFieldInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ namespace OneScript.Contexts
public abstract class BslFieldInfo : FieldInfo, INameAndAliasProvider
{
private AnnotationHolder _annotations;

public string Alias => null;
public abstract string Alias { get; }
private AnnotationHolder Annotations
{
get
Expand Down
4 changes: 4 additions & 0 deletions src/OneScript.Core/Contexts/BslScriptFieldInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@ public class BslScriptFieldInfo : BslFieldInfo, IBuildableMember
private Type _declaringType;
private bool _isExported;
private string _name;
private string _alias;
private Type _dataType = typeof(BslValue);
private int _dispId = -1;

internal BslScriptFieldInfo(string name)
{
_name = name;
_alias = null;
}

public override Type DeclaringType => _declaringType;
public override string Name => _name;
public override string Alias => _alias;
public override Type ReflectedType => _declaringType;

public int DispatchId => _dispId;
Expand Down Expand Up @@ -63,6 +66,7 @@ void IBuildableMember.SetName(string name)

void IBuildableMember.SetAlias(string alias)
{
_alias = alias;
}

void IBuildableMember.SetExportFlag(bool isExport)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private static void CompileTimeSymbols(TypeSymbolsProviderFactory providerFactor
.Name(THISOBJ_RU)
.Alias(THISOBJ_EN)
.ValueType(typeof(ThisAwareScriptedObjectBase))
.SetDispatchingIndex(0)
.SetDispatchingIndex(THISOBJ_VARIABLE_INDEX)
.Build()
.ToSymbol());
}
Expand Down