Some clean-up

budgetdevv · budgetdevv · commit 734a6bb80bbb · 2024-03-22T00:30:52.000+08:00
diff --git a/PythonNETExtensions/AsyncIO/AsyncIOCore.cs b/PythonNETExtensions/AsyncIO/AsyncIOCore.cs
@@ -92,7 +92,7 @@ private static dynamic GenerateAwaiter(dynamic taskCompletionSource, dynamic cor
                          TASK_COMPLETION_SOURCE_VAR_NAME = "tcs",
                          EXCEPTION_VAR_NAME = "exception";
             
-            var codegen = (RawPython.InterpolationHandler)
+            var codegen = (RawPython.CodeInterpolator)
             $"""
             async def {METHOD_NAME}():
                 try:
diff --git a/PythonNETExtensions/Core/RawPython.cs b/PythonNETExtensions/Core/RawPython.cs
@@ -25,7 +25,7 @@ public Object(dynamic item, string name = null)
         }
         
         [InterpolatedStringHandler]
-        public struct InterpolationHandler
+        public struct CodeInterpolator
         {
             [ThreadStatic]
             private static StringBuilder _StringBuilder;
@@ -54,7 +54,7 @@ StringBuilder CreateStringBuilder()
             public bool ShouldCompile;
             
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public InterpolationHandler(int literalLength, int formattedCount)
+            public CodeInterpolator(int literalLength, int formattedCount)
             {
                 var stringBuilder = LocalStringBuilder = STRING_BUILDER;
                 stringBuilder.Clear();
@@ -63,9 +63,6 @@ public InterpolationHandler(int literalLength, int formattedCount)
                 Scope = Py.CreateScope();
                 
                 ShouldCompile = true;
-
-                // var scope = Py.CreateScope();
-                // scope.Set()
             }
             
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -107,7 +104,7 @@ public void AppendFormatted(string text)
                 
                 LocalStringBuilder.Append(text);
             }
-
+            
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public void AppendFormatted<T>(T item)
             {
@@ -121,7 +118,7 @@ public void AppendFormatted(dynamic item, string format)
             }
             
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void AppendFormatted<T>(dynamic item, string format)
+            public void AppendFormatted<T>(T item, string format)
             {
                 if (format == "py")
                 {
@@ -150,19 +147,20 @@ public enum CompilationOption
 
         private static readonly ConcurrentDictionary<string, PyObject> CODE_TO_COMPILATION_MAP = new ConcurrentDictionary<string, PyObject>(); 
         
-        public static void Run(InterpolationHandler code, CompilationOption compilationOption = CompilationOption.Auto)
+        public static void Run(CodeInterpolator code, CompilationOption compilationOption = CompilationOption.Auto)
         {
             var codeText = code.ToString();
             using var scope = code.Scope;
             RunInternal(codeText, code, compilationOption);
         }
         
-        public static RetT Run<RetT>(InterpolationHandler code, CompilationOption compilationOption = CompilationOption.Auto)
+        public static RetT Run<RetT>(CodeInterpolator code, CompilationOption compilationOption = CompilationOption.Auto)
         {
             var codeText = code.ToString();
             
             const string METHOD_WRAPPER_NAME = "py_wrapper_method", RET_VAR_NAME = "py_ret";
             
+            // TODO: Somehow optimize performance of this
             codeText = 
             $"""
             def {METHOD_WRAPPER_NAME}():
@@ -177,7 +175,7 @@ public static RetT Run<RetT>(InterpolationHandler code, CompilationOption compil
             return scope.Get<RetT>(RET_VAR_NAME);
         }
 
-        private static void RunInternal(string codeText, InterpolationHandler code, CompilationOption compilationOption)
+        private static void RunInternal(string codeText, CodeInterpolator code, CompilationOption compilationOption)
         {
             var scope = code.Scope;
             

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Object(dynamic item, string name = null)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`[InterpolatedStringHandler]`
`28`		`- public struct InterpolationHandler`
	`28`	`+ public struct CodeInterpolator`
`29`	`29`	`{`
`30`	`30`	`[ThreadStatic]`
`31`	`31`	`private static StringBuilder _StringBuilder;`
`@@ -54,7 +54,7 @@ StringBuilder CreateStringBuilder()`
`54`	`54`	`public bool ShouldCompile;`
`55`	`55`
`56`	`56`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`57`		`- public InterpolationHandler(int literalLength, int formattedCount)`
	`57`	`+ public CodeInterpolator(int literalLength, int formattedCount)`
`58`	`58`	`{`
`59`	`59`	`var stringBuilder = LocalStringBuilder = STRING_BUILDER;`
`60`	`60`	`stringBuilder.Clear();`
`@@ -63,9 +63,6 @@ public InterpolationHandler(int literalLength, int formattedCount)`
`63`	`63`	`Scope = Py.CreateScope();`
`64`	`64`
`65`	`65`	`ShouldCompile = true;`
`66`		`-`
`67`		`- // var scope = Py.CreateScope();`
`68`		`- // scope.Set()`
`69`	`66`	`}`
`70`	`67`
`71`	`68`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`@@ -107,7 +104,7 @@ public void AppendFormatted(string text)`
`107`	`104`
`108`	`105`	`LocalStringBuilder.Append(text);`
`109`	`106`	`}`
`110`		`-`
	`107`	`+`
`111`	`108`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`112`	`109`	`public void AppendFormatted<T>(T item)`
`113`	`110`	`{`
`@@ -121,7 +118,7 @@ public void AppendFormatted(dynamic item, string format)`
`121`	`118`	`}`
`122`	`119`
`123`	`120`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`124`		`- public void AppendFormatted<T>(dynamic item, string format)`
	`121`	`+ public void AppendFormatted<T>(T item, string format)`
`125`	`122`	`{`
`126`	`123`	`if (format == "py")`
`127`	`124`	`{`
`@@ -150,19 +147,20 @@ public enum CompilationOption`
`150`	`147`
`151`	`148`	`private static readonly ConcurrentDictionary<string, PyObject> CODE_TO_COMPILATION_MAP = new ConcurrentDictionary<string, PyObject>();`
`152`	`149`
`153`		`- public static void Run(InterpolationHandler code, CompilationOption compilationOption = CompilationOption.Auto)`
	`150`	`+ public static void Run(CodeInterpolator code, CompilationOption compilationOption = CompilationOption.Auto)`
`154`	`151`	`{`
`155`	`152`	`var codeText = code.ToString();`
`156`	`153`	`using var scope = code.Scope;`
`157`	`154`	`RunInternal(codeText, code, compilationOption);`
`158`	`155`	`}`
`159`	`156`
`160`		`- public static RetT Run<RetT>(InterpolationHandler code, CompilationOption compilationOption = CompilationOption.Auto)`
	`157`	`+ public static RetT Run<RetT>(CodeInterpolator code, CompilationOption compilationOption = CompilationOption.Auto)`
`161`	`158`	`{`
`162`	`159`	`var codeText = code.ToString();`
`163`	`160`
`164`	`161`	`const string METHOD_WRAPPER_NAME = "py_wrapper_method", RET_VAR_NAME = "py_ret";`
`165`	`162`
	`163`	`+ // TODO: Somehow optimize performance of this`
`166`	`164`	`codeText =`
`167`	`165`	`$"""`
`168`	`166`	`def {METHOD_WRAPPER_NAME}():`
`@@ -177,7 +175,7 @@ public static RetT Run<RetT>(InterpolationHandler code, CompilationOption compil`
`177`	`175`	`return scope.Get<RetT>(RET_VAR_NAME);`
`178`	`176`	`}`
`179`	`177`
`180`		`- private static void RunInternal(string codeText, InterpolationHandler code, CompilationOption compilationOption)`
	`178`	`+ private static void RunInternal(string codeText, CodeInterpolator code, CompilationOption compilationOption)`
`181`	`179`	`{`
`182`	`180`	`var scope = code.Scope;`
`183`	`181`