forked from pchote/Eluant
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from RoosterDragon/cache-metamethods
Cache metamethods, finalize references
- Loading branch information
Showing
6 changed files
with
52 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaClrObjectValue.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -25,6 +27,8 @@ | |
// THE SOFTWARE. | ||
|
||
using System; | ||
using System.Linq; | ||
using Eluant.ObjectBinding; | ||
|
||
namespace Eluant | ||
{ | ||
|
@@ -54,6 +58,15 @@ public override string ToString() | |
|
||
internal abstract object BackingCustomObject { get; } | ||
|
||
internal abstract MetamethodAttribute[] BackingCustomObjectMetamethods { get; } | ||
|
||
static internal MetamethodAttribute[] Metamethods(Type backingCustomObjectType) | ||
{ | ||
return backingCustomObjectType.GetInterfaces() | ||
.SelectMany(iface => iface.GetCustomAttributes(typeof(MetamethodAttribute), false).Cast<MetamethodAttribute>()) | ||
.ToArray(); | ||
} | ||
|
||
internal override object ToClrType(Type type) | ||
{ | ||
if (type == null) { throw new ArgumentNullException("type"); } | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaCustomClrObject.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -25,6 +27,7 @@ | |
// THE SOFTWARE. | ||
|
||
using System; | ||
using Eluant.ObjectBinding; | ||
|
||
namespace Eluant | ||
{ | ||
|
@@ -51,6 +54,13 @@ internal override object BackingCustomObject | |
{ | ||
get { return ClrObject; } | ||
} | ||
|
||
private MetamethodAttribute[] metamethods; | ||
|
||
internal override MetamethodAttribute[] BackingCustomObjectMetamethods | ||
{ | ||
get { return metamethods ?? (metamethods = Metamethods(BackingCustomObject.GetType())); } | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaOpaqueClrObject.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -25,6 +27,7 @@ | |
// THE SOFTWARE. | ||
|
||
using System; | ||
using Eluant.ObjectBinding; | ||
|
||
namespace Eluant | ||
{ | ||
|
@@ -51,6 +54,11 @@ internal override object BackingCustomObject | |
{ | ||
get { return null; } | ||
} | ||
|
||
internal override MetamethodAttribute[] BackingCustomObjectMetamethods | ||
{ | ||
get { return null; } | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaReference.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -50,6 +52,7 @@ internal LuaReference(LuaRuntime runtime, int reference) | |
public sealed override void Dispose() | ||
{ | ||
Dispose(true); | ||
GC.SuppressFinalize(this); | ||
} | ||
|
||
protected virtual void Dispose(bool disposing) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaRuntime.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -776,10 +778,7 @@ internal void PushCustomClrObject(LuaClrObjectValue obj) | |
LuaApi.lua_settable(LuaState, -3); | ||
|
||
// For all others, we use MetamethodAttribute on the interface to make this code less repetitive. | ||
var metamethods = obj.BackingCustomObject.GetType().GetInterfaces() | ||
.SelectMany(iface => iface.GetCustomAttributes(typeof(MetamethodAttribute), false).Cast<MetamethodAttribute>()); | ||
|
||
foreach (var metamethod in metamethods) { | ||
foreach (var metamethod in obj.BackingCustomObjectMetamethods) { | ||
LuaApi.lua_pushstring(LuaState, metamethod.MethodName); | ||
Push(metamethodCallbacks[metamethod.MethodName]); | ||
LuaApi.lua_settable(LuaState, -3); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
// | ||
// LuaTransparentClrObject.cs | ||
// | ||
// Author: | ||
// Authors: | ||
// Chris Howie <[email protected]> | ||
// Tom Roostan <[email protected]> | ||
// | ||
// Copyright (c) 2013 Chris Howie | ||
// Copyright (c) 2015 Tom Roostan | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
|
@@ -71,8 +73,15 @@ internal override object BackingCustomObject | |
get { return proxy; } | ||
} | ||
|
||
internal override MetamethodAttribute[] BackingCustomObjectMetamethods | ||
{ | ||
get { return TransparentClrObjectProxy.Metamethods; } | ||
} | ||
|
||
private class TransparentClrObjectProxy : ILuaTableBinding, ILuaEqualityBinding | ||
{ | ||
public static readonly MetamethodAttribute[] Metamethods = LuaClrObjectValue.Metamethods(typeof(TransparentClrObjectProxy)); | ||
|
||
private LuaTransparentClrObject clrObject; | ||
|
||
public TransparentClrObjectProxy(LuaTransparentClrObject obj) | ||
|