Final ver of proxy objects. Commented AOT tests in Travis build. Seem…

…s the CI server is going through arch changes and AOT breaks long before reaching moonsharp code :(
moonsharp-devs · Jan 23, 2016 · 89fe273 · 89fe273
1 parent 772bed7
commit 89fe273
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,8 @@ script:
   - xbuild /p:TargetFrameworkProfile='' /p:Configuration=Release src/moonsharp_ci_net35.sln
   - cd src/TestRunners/ConsoleTestRunner/bin/Release
   - mono ConsoleTestRunner.exe
-  - chmod 777 aotregen.sh
-  - chmod 777 aottest.sh
-  - sudo ./aotregen.sh
-  - sudo ./aottest.sh
+#  - chmod 777 aotregen.sh
+#  - chmod 777 aottest.sh
+#  - sudo ./aotregen.sh
+#  - sudo ./aottest.sh
 
diff --git a/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ProxyUserDataDescriptor.cs b/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ProxyUserDataDescriptor.cs
@@ -10,14 +10,14 @@ namespace MoonSharp.Interpreter.Interop
 	/// </summary>
 	public sealed class ProxyUserDataDescriptor : IUserDataDescriptor
 	{
-		StandardUserDataDescriptor m_ProxyDescriptor;
+		IUserDataDescriptor m_ProxyDescriptor;
 		IProxyFactory m_ProxyFactory;
 
-		internal ProxyUserDataDescriptor(IProxyFactory proxyFactory, InteropAccessMode accessMode = InteropAccessMode.Default, string friendlyName = null)
+		internal ProxyUserDataDescriptor(IProxyFactory proxyFactory, IUserDataDescriptor proxyDescriptor, string friendlyName = null)
 		{
 			m_ProxyFactory = proxyFactory;
 			Name = friendlyName ?? (proxyFactory.TargetType.Name + "::proxy");
-			m_ProxyDescriptor = new StandardUserDataDescriptor(proxyFactory.ProxyType, accessMode, friendlyName + "::proxied");
+			m_ProxyDescriptor = proxyDescriptor;
 		}
 
 		/// <summary>

diff --git a/src/MoonSharp.Interpreter/Interop/UserDataRegistries/TypeDescriptorRegistry.cs b/src/MoonSharp.Interpreter/Interop/UserDataRegistries/TypeDescriptorRegistry.cs
@@ -120,8 +120,8 @@ internal static InteropAccessMode DefaultAccessMode
 		/// <returns></returns>
 		internal static IUserDataDescriptor RegisterProxyType_Impl(IProxyFactory proxyFactory, InteropAccessMode accessMode, string friendlyName)
 		{
-			accessMode = ResolveDefaultAccessModeForType(accessMode, proxyFactory.ProxyType);
-			return RegisterType_Impl(proxyFactory.TargetType, accessMode, friendlyName, new ProxyUserDataDescriptor(proxyFactory, accessMode, friendlyName));
+			IUserDataDescriptor proxyDescriptor = RegisterType_Impl(proxyFactory.ProxyType, accessMode, friendlyName, null);
+			return RegisterType_Impl(proxyFactory.TargetType, accessMode, friendlyName, new ProxyUserDataDescriptor(proxyFactory, proxyDescriptor, friendlyName));
 		}