Переименовал класс в более понятный

EvilBeaver · Nov 4, 2024 · 59c8983 · 59c8983
1 parent 081ca65
commit 59c8983
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/src/OneScript.Core/Compilation/CompilerFrontendBase.cs b/src/OneScript.Core/Compilation/CompilerFrontendBase.cs
@@ -45,7 +45,7 @@ protected CompilerFrontendBase(
 
         public SymbolScope FillSymbols(Type targetType)
         {
-            var symbolsProvider = Services.Resolve<CompileTimeSymbolsProvider>();
+            var symbolsProvider = Services.Resolve<TypeSymbolsProviderFactory>();
             var typeSymbols = symbolsProvider.Get(targetType);
             ModuleSymbols = new SymbolScope();
             typeSymbols.FillSymbols(ModuleSymbols);

diff --git a/...ore/Compilation/IModuleSymbolsProvider.cs → ....Core/Compilation/ITypeSymbolsProvider.cs b/...ore/Compilation/IModuleSymbolsProvider.cs → ....Core/Compilation/ITypeSymbolsProvider.cs
@@ -9,7 +9,10 @@ This Source Code Form is subject to the terms of the
 
 namespace OneScript.Compilation
 {
-    public interface IModuleSymbolsProvider
+    /// <summary>
+    /// Провайдер дополнительных внешних символов для класса при компиляции.
+    /// </summary>
+    public interface ITypeSymbolsProvider
     {
         void FillSymbols(SymbolScope moduleScope);
     }

diff --git a/...Compilation/CompileTimeSymbolsProvider.cs → ...Compilation/TypeSymbolsProviderFactory.cs b/...Compilation/CompileTimeSymbolsProvider.cs → ...Compilation/TypeSymbolsProviderFactory.cs
@@ -12,19 +12,22 @@ This Source Code Form is subject to the terms of the
 
 namespace OneScript.Compilation
 {
-    public class CompileTimeSymbolsProvider
+    /// <summary>
+    /// Фабрика провайдеров дополнительных внешних символов для класса при компиляции.
+    /// </summary>
+    public class TypeSymbolsProviderFactory
     {
-        private delegate void Filler(CompileTimeSymbolsProvider provider, SymbolScope scope);
+        private delegate void Filler(TypeSymbolsProviderFactory providerFactory, SymbolScope scope);
 
         private readonly ConcurrentDictionary<Type, SymbolProvider> _providers =
             new ConcurrentDictionary<Type, SymbolProvider>();
 
-        public IModuleSymbolsProvider Get<T>()
+        public ITypeSymbolsProvider Get<T>()
         {
             return Get(typeof(T));
         }
 
-        public IModuleSymbolsProvider Get(Type type)
+        public ITypeSymbolsProvider Get(Type type)
         {
             return _providers.GetOrAdd(type, CreateProvider);
         }
@@ -46,32 +49,32 @@ private static Filler FindFillerMethod(Type type)
             return filler;
         }
 
-        private static void DoNothing(CompileTimeSymbolsProvider provider, SymbolScope scope)
+        private static void DoNothing(TypeSymbolsProviderFactory providerFactory, SymbolScope scope)
         {
         }
 
         private static bool IsFiller(MethodInfo methodInfo)
         {
             var parameters = methodInfo.GetParameters();
             return parameters.Length == 2
-                   && parameters[0].ParameterType == typeof(CompileTimeSymbolsProvider)
+                   && parameters[0].ParameterType == typeof(TypeSymbolsProviderFactory)
                    && parameters[1].ParameterType == typeof(SymbolScope);
         }
 
-        private class SymbolProvider : IModuleSymbolsProvider
+        private class SymbolProvider : ITypeSymbolsProvider
         {
-            private readonly CompileTimeSymbolsProvider _provider;
+            private readonly TypeSymbolsProviderFactory _providerFactory;
             private readonly Filler _filler;
 
-            public SymbolProvider(CompileTimeSymbolsProvider provider, Filler filler)
+            public SymbolProvider(TypeSymbolsProviderFactory providerFactory, Filler filler)
             {
-                _provider = provider;
+                _providerFactory = providerFactory;
                 _filler = filler;
             }
 
             public void FillSymbols(SymbolScope moduleScope)
             {
-                _filler(_provider, moduleScope);
+                _filler(_providerFactory, moduleScope);
             }
         }
     }

diff --git a/src/ScriptEngine/Hosting/EngineBuilderExtensions.cs b/src/ScriptEngine/Hosting/EngineBuilderExtensions.cs
@@ -51,7 +51,7 @@ public static IEngineBuilder SetDefaultOptions(this IEngineBuilder builder)
             services.RegisterSingleton<IGlobalsManager, GlobalInstancesManager>();
             services.RegisterSingleton<RuntimeEnvironment>();
             services.RegisterSingleton<IRuntimeEnvironment>(sp => sp.Resolve<RuntimeEnvironment>());
-            services.RegisterSingleton<CompileTimeSymbolsProvider>();
+            services.RegisterSingleton<TypeSymbolsProviderFactory>();
             services.RegisterSingleton<IErrorSink>(svc => new ThrowingErrorSink(CompilerException.FromCodeError));
             services.RegisterSingleton<IExceptionInfoFactory, ExceptionInfoFactory>();
 

diff --git a/src/ScriptEngine/Machine/Contexts/AutoScriptDrivenObject.cs b/src/ScriptEngine/Machine/Contexts/AutoScriptDrivenObject.cs
@@ -134,9 +134,9 @@ protected override void CallOwnProcedure(int index, IValue[] arguments)
         #endregion
 
         [SymbolsProvider]
-        private static void FillSymbols(CompileTimeSymbolsProvider provider, SymbolScope moduleScope)
+        private static void FillSymbols(TypeSymbolsProviderFactory providerFactory, SymbolScope moduleScope)
         {
-            var baseProvider = provider.Get<ThisAwareScriptedObjectBase>();
+            var baseProvider = providerFactory.Get<ThisAwareScriptedObjectBase>();
             baseProvider.FillSymbols(moduleScope);
 
             for (int i = 0; i < _ownProperties.Count; i++)

diff --git a/src/ScriptEngine/Machine/Contexts/ThisAwareScriptedObjectBase.cs b/src/ScriptEngine/Machine/Contexts/ThisAwareScriptedObjectBase.cs
@@ -93,7 +93,7 @@ protected override BslPropertyInfo GetOwnPropertyInfo(int index)
 
         [SymbolsProvider]
         // ReSharper disable once UnusedMember.Local
-        private static void CompileTimeSymbols(CompileTimeSymbolsProvider provider, SymbolScope moduleScope)
+        private static void CompileTimeSymbols(TypeSymbolsProviderFactory providerFactory, SymbolScope moduleScope)
         {
             moduleScope.Variables.Add(BslFieldBuilder.Create()
                 .Name(THISOBJ_RU)

diff --git a/src/ScriptEngine/Machine/Contexts/UserScriptContextInstance.cs b/src/ScriptEngine/Machine/Contexts/UserScriptContextInstance.cs
@@ -202,9 +202,9 @@ protected override BslPropertyInfo GetOwnPropertyInfo(int index)
         }
 
         [SymbolsProvider]
-        private static void PrepareCompilation(CompileTimeSymbolsProvider provider, SymbolScope scope)
+        private static void PrepareCompilation(TypeSymbolsProviderFactory providerFactory, SymbolScope scope)
         {
-            var baseSymbols = provider.Get<ThisAwareScriptedObjectBase>();
+            var baseSymbols = providerFactory.Get<ThisAwareScriptedObjectBase>();
             baseSymbols.FillSymbols(scope);
             GetOwnMethodsDefinition().ForEach(x => scope.DefineMethod(x.ToSymbol()));
         }

diff --git a/src/Tests/OneScript.Dynamic.Tests/NativeSdoTests.cs b/src/Tests/OneScript.Dynamic.Tests/NativeSdoTests.cs
@@ -51,7 +51,7 @@ public NativeSdoTests()
             testServices.Register(sp => sp);
             testServices.RegisterSingleton<ITypeManager, DefaultTypeManager>();
             testServices.RegisterSingleton<IGlobalsManager, GlobalInstancesManager>();
-            testServices.RegisterSingleton<CompileTimeSymbolsProvider>();
+            testServices.RegisterSingleton<TypeSymbolsProviderFactory>();
             testServices.RegisterEnumerable<IDirectiveHandler, EmptyDirectiveHandler>();
             testServices.Register<IErrorSink, ThrowingErrorSink>();
             testServices.UseImports();
@@ -437,7 +437,7 @@ Функция НайтиСовпадения(Текст) Экспорт
 
         private DynamicModule CreateModule(string code, IServiceContainer services, SymbolTable symbols)
         {
-            var symbolProvider = services.Resolve<CompileTimeSymbolsProvider>();
+            var symbolProvider = services.Resolve<TypeSymbolsProviderFactory>();
             var moduleScope = new SymbolScope();
             symbolProvider.Get<UserScriptContextInstance>().FillSymbols(moduleScope);
             symbols.PushScope(moduleScope, null);