Fix EvilBeaver#575: ThisObject.

dmpas · dmpas · commit 0775a9cd8940 · 2017-12-03T14:57:27.000+03:00
diff --git a/src/ScriptEngine.HostedScript/HostedScriptEngine.cs b/src/ScriptEngine.HostedScript/HostedScriptEngine.cs
@@ -10,9 +10,7 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.Machine;
 using ScriptEngine.Machine.Contexts;
 using System.Collections.Generic;
-using System.Linq;
 
-using OneScript.DebugProtocol;
 
 namespace ScriptEngine.HostedScript
 {
@@ -174,7 +172,7 @@ public CompilerService GetCompilerService()
             InitializeDirectiveResolver();
 
             var compilerSvc = _engine.GetCompilerService();
-            compilerSvc.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);
+            compilerSvc.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);
             return compilerSvc;
         }
 
diff --git a/src/ScriptEngine.HostedScript/LibraryLoader.cs b/src/ScriptEngine.HostedScript/LibraryLoader.cs
@@ -11,7 +11,6 @@ This Source Code Form is subject to the terms of the
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace ScriptEngine.HostedScript
 {
@@ -57,7 +56,7 @@ public static LibraryLoader Create(ScriptingEngine engine, RuntimeEnvironment en
         {
             var code = engine.Loader.FromFile(processingScript);
             var compiler = engine.GetCompilerService();
-            compiler.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);
+            compiler.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);
             
             for (int i = 0; i < _methods.Count; i++)
             {
@@ -135,6 +134,10 @@ protected override int FindOwnProperty(string name)
             {
                 return 0;
             }
+            if(StringComparer.OrdinalIgnoreCase.Compare(name, "ThisObject") == 0)
+            {
+                return 0;
+            }
 
             return base.FindOwnProperty(name);
         }
diff --git a/src/ScriptEngine/Machine/Contexts/AttachedScriptsFactory.cs b/src/ScriptEngine/Machine/Contexts/AttachedScriptsFactory.cs
@@ -6,7 +6,6 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using ScriptEngine.Environment;
 using System.Security.Cryptography;
@@ -156,12 +155,12 @@ private IRuntimeContextInstance LoadAndCreate(CompilerService compiler, Environm
 
         public ScriptModuleHandle CreateModuleFromSource(CompilerService compiler, Environment.ICodeSource code, ExternalContextData externalContext)
         {
-            compiler.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);
+            compiler.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);
             if (externalContext != null)
             {
                 foreach (var item in externalContext)
                 {
-                    compiler.DefineVariable(item.Key, SymbolType.ContextProperty);
+                    compiler.DefineVariable(item.Key, null, SymbolType.ContextProperty);
                 }
             }
 
@@ -190,7 +189,7 @@ public static IRuntimeContextInstance ScriptFactory(string typeName, IValue[] ar
             var module = _instance._loadedModules[typeName];
 
             var newObj = new UserScriptContextInstance(module, typeName, arguments);
-            newObj.AddProperty("ЭтотОбъект", newObj);
+            newObj.AddProperty("ЭтотОбъект", "ThisObject", newObj);
             newObj.InitOwnData();
             newObj.Initialize(_instance._engine.Machine);
 
diff --git a/src/ScriptEngine/ScriptingEngine.cs b/src/ScriptEngine/ScriptingEngine.cs
@@ -100,7 +100,7 @@ public LoadedModuleHandle LoadModuleImage(ScriptModuleHandle moduleImage)
         internal IRuntimeContextInstance NewObject(LoadedModule module, ExternalContextData externalContext = null)
         {
             var scriptContext = new Machine.Contexts.UserScriptContextInstance(module, "Сценарий");
-            scriptContext.AddProperty("ЭтотОбъект", scriptContext);
+            scriptContext.AddProperty("ЭтотОбъект", "ThisObject", scriptContext);
             if (externalContext != null)
             {
                 foreach (var item in externalContext)

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ This Source Code Form is subject to the terms of the`
`10`	`10`	`using ScriptEngine.Machine;`
`11`	`11`	`using ScriptEngine.Machine.Contexts;`
`12`	`12`	`using System.Collections.Generic;`
`13`		`-using System.Linq;`
`14`	`13`
`15`		`-using OneScript.DebugProtocol;`
`16`	`14`
`17`	`15`	`namespace ScriptEngine.HostedScript`
`18`	`16`	`{`
`@@ -174,7 +172,7 @@ public CompilerService GetCompilerService()`
`174`	`172`	`InitializeDirectiveResolver();`
`175`	`173`
`176`	`174`	`var compilerSvc = _engine.GetCompilerService();`
`177`		`- compilerSvc.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);`
	`175`	`+ compilerSvc.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);`
`178`	`176`	`return compilerSvc;`
`179`	`177`	`}`
`180`	`178`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ This Source Code Form is subject to the terms of the`
`11`	`11`	`using System.Collections.Generic;`
`12`	`12`	`using System.IO;`
`13`	`13`	`using System.Linq;`
`14`		`-using System.Text;`
`15`	`14`
`16`	`15`	`namespace ScriptEngine.HostedScript`
`17`	`16`	`{`
`@@ -57,7 +56,7 @@ public static LibraryLoader Create(ScriptingEngine engine, RuntimeEnvironment en`
`57`	`56`	`{`
`58`	`57`	`var code = engine.Loader.FromFile(processingScript);`
`59`	`58`	`var compiler = engine.GetCompilerService();`
`60`		`- compiler.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);`
	`59`	`+ compiler.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);`
`61`	`60`
`62`	`61`	`for (int i = 0; i < _methods.Count; i++)`
`63`	`62`	`{`
`@@ -135,6 +134,10 @@ protected override int FindOwnProperty(string name)`
`135`	`134`	`{`
`136`	`135`	`return 0;`
`137`	`136`	`}`
	`137`	`+ if(StringComparer.OrdinalIgnoreCase.Compare(name, "ThisObject") == 0)`
	`138`	`+ {`
	`139`	`+ return 0;`
	`140`	`+ }`
`138`	`141`
`139`	`142`	`return base.FindOwnProperty(name);`
`140`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ This Source Code Form is subject to the terms of the`
`6`	`6`	`----------------------------------------------------------*/`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections.Generic;`
`9`		`-using System.Linq;`
`10`	`9`	`using System.Text;`
`11`	`10`	`using ScriptEngine.Environment;`
`12`	`11`	`using System.Security.Cryptography;`
`@@ -156,12 +155,12 @@ private IRuntimeContextInstance LoadAndCreate(CompilerService compiler, Environm`
`156`	`155`
`157`	`156`	`public ScriptModuleHandle CreateModuleFromSource(CompilerService compiler, Environment.ICodeSource code, ExternalContextData externalContext)`
`158`	`157`	`{`
`159`		`- compiler.DefineVariable("ЭтотОбъект", SymbolType.ContextProperty);`
	`158`	`+ compiler.DefineVariable("ЭтотОбъект", "ThisObject", SymbolType.ContextProperty);`
`160`	`159`	`if (externalContext != null)`
`161`	`160`	`{`
`162`	`161`	`foreach (var item in externalContext)`
`163`	`162`	`{`
`164`		`- compiler.DefineVariable(item.Key, SymbolType.ContextProperty);`
	`163`	`+ compiler.DefineVariable(item.Key, null, SymbolType.ContextProperty);`
`165`	`164`	`}`
`166`	`165`	`}`
`167`	`166`
`@@ -190,7 +189,7 @@ public static IRuntimeContextInstance ScriptFactory(string typeName, IValue[] ar`
`190`	`189`	`var module = _instance._loadedModules[typeName];`
`191`	`190`
`192`	`191`	`var newObj = new UserScriptContextInstance(module, typeName, arguments);`
`193`		`- newObj.AddProperty("ЭтотОбъект", newObj);`
	`192`	`+ newObj.AddProperty("ЭтотОбъект", "ThisObject", newObj);`
`194`	`193`	`newObj.InitOwnData();`
`195`	`194`	`newObj.Initialize(_instance._engine.Machine);`
`196`	`195`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public LoadedModuleHandle LoadModuleImage(ScriptModuleHandle moduleImage)`
`100`	`100`	`internal IRuntimeContextInstance NewObject(LoadedModule module, ExternalContextData externalContext = null)`
`101`	`101`	`{`
`102`	`102`	`var scriptContext = new Machine.Contexts.UserScriptContextInstance(module, "Сценарий");`
`103`		`- scriptContext.AddProperty("ЭтотОбъект", scriptContext);`
	`103`	`+ scriptContext.AddProperty("ЭтотОбъект", "ThisObject", scriptContext);`
`104`	`104`	`if (externalContext != null)`
`105`	`105`	`{`
`106`	`106`	`foreach (var item in externalContext)`