удален устаревший класс

Author: Mr-Rm

src/OneScript.Native/Compiler/ExpressionHelpers.cs

@@ -595,18 +595,12 @@ public static Expression CallOfInstanceMethod(Expression instance, string name,
 
         public static Expression AccessModuleVariable(ParameterExpression thisArg, int variableIndex)
         {
-            var contextProperty = PropertiesCache.GetOrAdd(
-                typeof(NativeClassInstanceWrapper),
-                nameof(NativeClassInstanceWrapper.Context),
-                BindingFlags.Instance | BindingFlags.Public);
-            
-            var contextAccess = Expression.Property(thisArg, contextProperty);
             var getVariableMethod = OperationsCache.GetOrAdd(
                 typeof(IAttachableContext),
                 nameof(IAttachableContext.GetVariable),
                 BindingFlags.Instance | BindingFlags.Public);
 
-            var iVariable = Expression.Call(contextAccess, getVariableMethod, Expression.Constant(variableIndex));
+            var iVariable = Expression.Call(thisArg, getVariableMethod, Expression.Constant(variableIndex));
             var valueProperty = PropertiesCache.GetOrAdd(
                 typeof(IValueReference),
                 nameof(IValueReference.BslValue),

src/OneScript.Native/Compiler/MethodCompiler.cs

@@ -142,7 +142,7 @@ private void CompileFragment(BslSyntaxNode node, Action<BslSyntaxNode> visitor)
         private void FillParameterVariables()
         {
             _declaredParameters = _method.GetBslParameters();
-            _thisParameter = _method.IsInstance ? Expression.Parameter(typeof(NativeClassInstanceWrapper), "$this") : null;
+            _thisParameter = _method.IsInstance ? Expression.Parameter(typeof(IAttachableContext), "$this") : null;
 
             var localScope = Symbols.GetScope(Symbols.ScopeCount-1);
             foreach (var parameter in _declaredParameters)

src/OneScript.Native/Runtime/CallableMethod.cs

@@ -27,7 +27,7 @@ internal class CallableMethod
     {
         private readonly BslNativeMethodInfo _method;
 
-        private delegate BslValue NativeCallable(NativeClassInstanceWrapper target, BslValue[] args, IBslProcess process);
+        private delegate BslValue NativeCallable(IAttachableContext target, BslValue[] args, IBslProcess process);
 
         private NativeCallable _delegate;
 
@@ -47,23 +47,16 @@ public BslValue Invoke(IBslProcess process, object target, BslValue[] args)
             return _delegate.Invoke(callableWrapper, args, process);
         }
 
-        private NativeClassInstanceWrapper GetCallableWrapper(object obj)
+        private IAttachableContext GetCallableWrapper(object obj)
         {
-            NativeClassInstanceWrapper callableWrapper;
+            IAttachableContext callableWrapper;
             if (_method.IsInstance)
             {
                 if (obj == null)
                     throw new InvalidOperationException($"Method {_method.Name} is not static and requires target");
-                if (obj is NativeClassInstanceWrapper w)
+                if (obj is IAttachableContext context)
                 {
-                    callableWrapper = w;
-                }
-                else if (obj is IAttachableContext context)
-                {
-                    callableWrapper = new NativeClassInstanceWrapper
-                    {
-                        Context = context
-                    };
+                    callableWrapper = context;
                 }
                 else
                 {
@@ -86,7 +79,7 @@ private static NativeCallable CreateDelegate(BslNativeMethodInfo method)
             if (method.Implementation == default)
                 throw new InvalidOperationException("Method has no implementation");
 
-            var targetParam = Expression.Parameter(typeof(NativeClassInstanceWrapper));
+            var targetParam = Expression.Parameter(typeof(IAttachableContext));
             var arrayOfValuesParam = Expression.Parameter(typeof(BslValue[]));
             var processParam = Expression.Parameter(typeof(IBslProcess));
             var convertedAccessList = new List<Expression>();