Merge remote-tracking branch 'origin/develop' into develop

Author: EvilBeaver

src/OneScript.Native/Compiler/MethodCompiler.cs

@@ -99,7 +99,7 @@ private void CompileFragment(BslSyntaxNode node, Action<BslSyntaxNode> visitor)
             {
                 MethodReturn = Expression.Label(typeof(BslValue))
             });
-            Symbols.PushScope(new SymbolScope(), ScopeBindingDescriptor.Static(null));
+            Symbols.PushScope(new SymbolScope(), ScopeBindingDescriptor.ThisScope());
             FillParameterVariables();
 
             try

src/ScriptEngine/Compiler/StackMachineCodeGenerator.cs

@@ -199,7 +199,7 @@ protected override void VisitModuleBody(BslSyntaxNode child)
 
             var entry = _module.Code.Count;
             var localCtx = new SymbolScope();
-            _ctx.PushScope(localCtx, ScopeBindingDescriptor.Static(null));
+            _ctx.PushScope(localCtx, ScopeBindingDescriptor.ThisScope());
 
             try
             {
@@ -294,7 +294,7 @@ protected override void VisitMethod(MethodNode methodNode)
                 methodCtx.DefineVariable(new LocalVariableSymbol(paramNode.Name));
             }
 
-            _ctx.PushScope(methodCtx, ScopeBindingDescriptor.Static(null));
+            _ctx.PushScope(methodCtx, ScopeBindingDescriptor.ThisScope());
             var entryPoint = _module.Code.Count;
             try
             {