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

Support for casting to other types

This commit is contained in:
Deukhoofd 2019-01-19 17:13:53 +01:00
parent 96b0959bd6
commit fd8f7bf9f8
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Upsilon/Binder/Binder.cs
View File

@ -352,7 +352,7 @@ namespace Upsilon.Binder
var boundDef = BoundTypeHandler.GetTypeDefinition(bDefProperty.ActualType); var boundDef = BoundTypeHandler.GetTypeDefinition(bDefProperty.ActualType);
if (boundDef != null) if (boundDef != null)
{ {
return new UserDataVariableSymbol(fullStopIndexExpression.Index, boundDef, parent); return new UserDataVariableSymbol(fullStopIndexExpression.Index, boundDef, true, parent);
} }
} }
} }
@ -365,7 +365,7 @@ namespace Upsilon.Binder
{ {
var property = bProp.Properties[fullStopIndexExpression.Index.ToLowerInvariant()]; var property = bProp.Properties[fullStopIndexExpression.Index.ToLowerInvariant()];
var boundDef = BoundTypeHandler.GetTypeDefinition(property.ActualType); var boundDef = BoundTypeHandler.GetTypeDefinition(property.ActualType);
return new UserDataVariableSymbol(fullStopIndexExpression.Index, boundDef, bProp); return new UserDataVariableSymbol(fullStopIndexExpression.Index, boundDef, true, bProp);
} }
} }
@ -463,6 +463,11 @@ namespace Upsilon.Binder
variable = new TableVariableSymbol(name, isLocal, assignment.Type); variable = new TableVariableSymbol(name, isLocal, assignment.Type);
} }
} }
else if (assignment.Type == Type.UserData)
{
variable = new UserDataVariableSymbol(name,
BoundTypeHandler.GetTypeDefinition(assignment.Type.UserData), isLocal);
}
else else
{ {
variable = new VariableSymbol(name, assignment.Type, isLocal); variable = new VariableSymbol(name, assignment.Type, isLocal);
@ -604,16 +609,16 @@ namespace Upsilon.Binder
if (type == null) if (type == null)
{ {
_diagnostics.LogError($"Unknown type name '{variable.TypeName.Name}'", variable.Span); _diagnostics.LogError($"Unknown type name '{variable.TypeName.Name}'", variable.Span);
variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, Type.Unknown); variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, Type.Unknown, true);
} }
else else
{ {
variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, type); variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, type, true);
} }
} }
else else
{ {
variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, Type.Unknown); variableSymbol = new UserDataVariableSymbol(variable.IdentifierName.Name, Type.Unknown, true);
} }
parameters.Add(new BoundVariableSymbol(variableSymbol, true, identifierToken.Span)); parameters.Add(new BoundVariableSymbol(variableSymbol, true, identifierToken.Span));
innerScope.DefineLocalVariable(variableSymbol); innerScope.DefineLocalVariable(variableSymbol);
@ -958,7 +963,7 @@ namespace Upsilon.Binder
if (type == Type.UserData) if (type == Type.UserData)
{ {
valueVariable = new UserDataVariableSymbol(valueVar.Name, valueVariable = new UserDataVariableSymbol(valueVar.Name,
BoundTypeHandler.GetTypeDefinition(type.UserData)); BoundTypeHandler.GetTypeDefinition(type.UserData), true);
} }
else else
{ {

6
Upsilon/Binder/VariableSymbols/UserDataVariableSymbol.cs
View File

@ -8,13 +8,13 @@ namespace Upsilon.Binder.VariableSymbols
public BoundTypeDefinition BoundTypeDefinition { get; } public BoundTypeDefinition BoundTypeDefinition { get; }
public UserDataBoundTypeDefinition Parent { get; } public UserDataBoundTypeDefinition Parent { get; }
public UserDataVariableSymbol(string name, Type typeContainer) : base(name, typeContainer, true) public UserDataVariableSymbol(string name, Type typeContainer, bool isLocal) : base(name, typeContainer, isLocal)
{ {
_typeContainer = typeContainer; _typeContainer = typeContainer;
} }
public UserDataVariableSymbol(string name, BoundTypeDefinition type, UserDataBoundTypeDefinition parent = null) public UserDataVariableSymbol(string name, BoundTypeDefinition type, bool isLocal, UserDataBoundTypeDefinition parent = null)
: base(name, type.ScriptType, true) : base(name, type.ScriptType, isLocal)
{ {
BoundTypeDefinition = type; BoundTypeDefinition = type;
Parent = parent; Parent = parent;

22
Upsilon/StandardLibraries/BasicFunctions.cs
View File

@ -4,6 +4,7 @@ using Upsilon.BaseTypes.Number;
using Upsilon.BaseTypes.ScriptTypeInterfaces; using Upsilon.BaseTypes.ScriptTypeInterfaces;
using Upsilon.Binder; using Upsilon.Binder;
using Upsilon.Binder.VariableSymbols; using Upsilon.Binder.VariableSymbols;
using Upsilon.BoundTypes;
using Upsilon.Evaluator; using Upsilon.Evaluator;
// ReSharper disable UnusedMember.Global // ReSharper disable UnusedMember.Global
@ -109,5 +110,26 @@ namespace Upsilon.StandardLibraries
return new ScriptString(obj.Type.ToString()); return new ScriptString(obj.Type.ToString());
} }
[ScriptFunction("cast", "Casts an object to a given type.", directScriptManipulation: true,
overrideReturnType: typeof(BasicFunctions), overrideReturnMethod: nameof(CastBindHelper))]
public ScriptType Cast(ScriptType obj, ScriptString typeName)
{
return obj;
}
private static TypeContainer CastBindHelper(BoundExpression[] expressions)
{
if (expressions.Length != 2)
return BaseTypes.Type.Unknown;
var typeNameExpression = expressions[1];
if (!(typeNameExpression is BoundLiteralExpression literal) || literal.Type != BaseTypes.Type.String)
return BaseTypes.Type.Unknown;
var boundType = BoundTypeHandler.GetTypeDefinition(((ScriptString) literal.Value));
if (boundType == null)
return BaseTypes.Type.Unknown;
return boundType.ScriptType;
}
} }
} }

4
Upsilon/StandardLibraries/StaticScope.cs
View File

@ -75,7 +75,7 @@ namespace Upsilon.StandardLibraries
UserDataTypeHandler.LoadType<MathLibrary>(); UserDataTypeHandler.LoadType<MathLibrary>();
funcs.Add("math", new MathLibrary().ToScriptType()); funcs.Add("math", new MathLibrary().ToScriptType());
boundFuncs.Add("math", boundFuncs.Add("math",
new UserDataVariableSymbol("math", BoundTypeHandler.GetTypeDefinition(typeof(MathLibrary)))); new UserDataVariableSymbol("math", BoundTypeHandler.GetTypeDefinition(typeof(MathLibrary)), true));
var scope = new EvaluationScope(funcs); var scope = new EvaluationScope(funcs);
var boundScope = new BoundScope(boundFuncs, null); var boundScope = new BoundScope(boundFuncs, null);
@ -89,7 +89,7 @@ namespace Upsilon.StandardLibraries
VariableSymbol varSymbol = null; VariableSymbol varSymbol = null;
if (ubDef != null) if (ubDef != null)
{ {
varSymbol = new UserDataVariableSymbol(name, ubDef); varSymbol = new UserDataVariableSymbol(name, ubDef, true);
} }
else else
{ {