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

Various changes and tweaks to run better

Browse Source
This commit is contained in:
Deukhoofd
2018-12-08 16:18:38 +01:00
parent f6947194b9
commit 43d9360145
15 changed files with 142 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Upsilon/BoundTypes/BoundTypeHandler.cs
View File

@@ -1,5 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Linq;
using Upsilon.BaseTypes;
@@ -7,33 +7,29 @@ namespace Upsilon.BoundTypes
{
public static class BoundTypeHandler
{
private static readonly Dictionary<string, BoundTypeDefinition> DefaultTypeDefinitions =
new Dictionary<string, BoundTypeDefinition>
private static void AddDefaults(ConcurrentDictionary<string, BoundTypeDefinition> dic)
{
{"string", new BoundTypeDefinition(Type.String, typeof(string))},
{
"number",
new BoundTypeDefinition(Type.Number,
new[] {typeof(int), typeof(long), typeof(float), typeof(double)})
},
{"bool", new BoundTypeDefinition(Type.Boolean, typeof(bool))},
{"table", new BoundTypeDefinition(Type.Table, typeof(IEnumerator))},
{"function", new BoundTypeDefinition(Type.Function, new System.Type[0])},
};
dic.TryAdd("string", new BoundTypeDefinition(Type.String, typeof(string)));
dic.TryAdd("number", new BoundTypeDefinition(Type.Number,
new[] {typeof(int), typeof(long), typeof(float), typeof(double)}));
dic.TryAdd("bool", new BoundTypeDefinition(Type.Boolean, typeof(bool)));
dic.TryAdd("table", new BoundTypeDefinition(Type.Table, typeof(IEnumerator)));
dic.TryAdd("function", new BoundTypeDefinition(Type.Function, new System.Type[0]));
}
private static Dictionary<string, BoundTypeDefinition> _typeDefinitions =
new Dictionary<string, BoundTypeDefinition>(DefaultTypeDefinitions);
private static readonly ConcurrentDictionary<string, BoundTypeDefinition> TypeDefinitions = Reset();
public static void Reset()
public static ConcurrentDictionary<string, BoundTypeDefinition> Reset()
{
_typeDefinitions =
new Dictionary<string, BoundTypeDefinition>(DefaultTypeDefinitions);
var dic = new ConcurrentDictionary<string, BoundTypeDefinition>();
AddDefaults(dic);
return dic;
}
public static BoundTypeDefinition GetTypeDefinition(string key)
{
var normalizedName = key.ToLowerInvariant();
if (_typeDefinitions.TryGetValue(normalizedName, out var bt))
if (TypeDefinitions.TryGetValue(normalizedName, out var bt))
{
return bt;
}
@@ -42,20 +38,13 @@ namespace Upsilon.BoundTypes
public static BoundTypeDefinition GetTypeDefinition(System.Type type)
{
return _typeDefinitions.Values.FirstOrDefault(x => x.ValidInternalTypes.Contains(type));
return TypeDefinitions.Values.FirstOrDefault(x => x.ValidInternalTypes.Contains(type));
}
public static void LoadUserDataTypeDefinition(UserDataBoundTypeDefinition def)
{
var key = def.Name.ToLowerInvariant();
if (_typeDefinitions.ContainsKey(key))
{
_typeDefinitions[key] = def;
}
else
{
_typeDefinitions.Add(key, def);
}
TypeDefinitions.AddOrUpdate(key, def, (s, definition) => definition);
}
}
}