[1.10.2] 无缝升级&兼容性调整

LorisYounger · LorisYounger · commit 10f974170f71 · 2024-02-02T21:13:44.000+08:00
去除了次级空间 Structure 以免代码不通用
隐式转换 fint64 和 double
显式/隐式转换 SetObject 和 fint64
diff --git a/LinePutScript/Converter/LPSConvert.cs b/LinePutScript/Converter/LPSConvert.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using LinePutScript.Structure;
 #nullable enable
 namespace LinePutScript.Converter
 {
diff --git a/LinePutScript/Core/LinePutScript.Core.csproj b/LinePutScript/Core/LinePutScript.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <ImplicitUsings>disable</ImplicitUsings>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
diff --git a/LinePutScript/Dictionary/LPS_D.cs b/LinePutScript/Dictionary/LPS_D.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using LinePutScript.Structure;
 #nullable enable
 namespace LinePutScript.Dictionary
 {
diff --git a/LinePutScript/Dictionary/Line_D.cs b/LinePutScript/Dictionary/Line_D.cs
@@ -7,7 +7,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
-using LinePutScript.Structure;
 using static LinePutScript.Sub;
 #nullable enable
 namespace LinePutScript.Dictionary
diff --git a/LinePutScript/Interface/IGetOBJ.cs b/LinePutScript/Interface/IGetOBJ.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using LinePutScript.Structure;
 #nullable enable
 namespace LinePutScript
 {
diff --git a/LinePutScript/Interface/ILine.cs b/LinePutScript/Interface/ILine.cs
@@ -1,5 +1,4 @@
-﻿using LinePutScript.Structure;
-using System;
+﻿using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/LinePutScript/Interface/ISetObject.cs b/LinePutScript/Interface/ISetObject.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using fint64 = LinePutScript.Structure.FInt64;
+using fint64 = LinePutScript.FInt64;
 
 #nullable enable
 namespace LinePutScript
diff --git a/LinePutScript/Interface/ISub.cs b/LinePutScript/Interface/ISub.cs
@@ -1,5 +1,4 @@
-﻿using LinePutScript.Structure;
-using System;
+﻿using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/LinePutScript/Line.cs b/LinePutScript/Line.cs
@@ -1,5 +1,4 @@
 ﻿using LinePutScript.Dictionary;
-using LinePutScript.Structure;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
diff --git a/LinePutScript/LpsDocument.cs b/LinePutScript/LpsDocument.cs
@@ -1,5 +1,4 @@
 ﻿using LinePutScript.Dictionary;
-using LinePutScript.Structure;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/LinePutScript/Structure/FInt64.cs b/LinePutScript/Structure/FInt64.cs
@@ -5,9 +5,9 @@
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using fint64 = LinePutScript.Structure.FInt64;
+using fint64 = LinePutScript.FInt64;
 #nullable enable
-namespace LinePutScript.Structure
+namespace LinePutScript
 {
     /// <summary>
     /// fint64 类型 提供了在 long 范围内进行的固定精度数学运算
@@ -217,7 +217,7 @@ public string ToStoreString()
         /// <summary>
         /// 转换 FInt64 为 double
         /// </summary>
-        public static explicit operator double(fint64 v) => v.ToDouble();
+        public static implicit operator double(fint64 v) => v.ToDouble();
 
         #region 公共方法
         //
diff --git a/LinePutScript/Structure/SetObject.cs b/LinePutScript/Structure/SetObject.cs
@@ -4,11 +4,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using fint64 = LinePutScript.Structure.FInt64;
+using fint64 = LinePutScript.FInt64;
 
 #nullable enable
 
-namespace LinePutScript.Structure
+namespace LinePutScript
 {
     /// <summary>
     /// Set Object 可以储存任何类型的值 对性能进行优化
@@ -477,6 +477,15 @@ public void SetBoolean(bool value)
         /// 转换 SetObject 为 DateTime
         /// </summary>
         public static explicit operator DateTime(SetObject v) => v.GetDateTime();
+
+        /// <summary>
+        /// 转换 fint64 为 SetObject
+        /// </summary>
+        public static implicit operator SetObject(fint64 v) => new SetObject(v);
+        /// <summary>
+        /// 转换 SetObject 为 fint64
+        /// </summary>
+        public static explicit operator fint64(SetObject v) => v.GetFloat();
         #endregion
 
         /// <summary>
diff --git a/LinePutScript/Structure/StringStructure.cs b/LinePutScript/Structure/StringStructure.cs
@@ -2,10 +2,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using LinePutScript.Structure;
 
 #nullable enable
-namespace LinePutScript.Structure
+namespace LinePutScript
 {
     /// <summary>
     /// String 结构 通过String实时修改具体参数,为LineputScript提供第四层结构
diff --git a/LinePutScript/Sub.cs b/LinePutScript/Sub.cs
@@ -5,7 +5,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using LinePutScript.Structure;
 #nullable enable
 namespace LinePutScript
 {
diff --git a/TestConsole/Program.cs b/TestConsole/Program.cs
@@ -1,7 +1,6 @@
 ﻿using LinePutScript;
 using LinePutScript.Converter;
 using LinePutScript.Dictionary;
-using LinePutScript.Structure;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -48,10 +47,21 @@ static void Main(string[] args)
                     case "exit":
                     case "quit":
                         return;
+                    case "def":
+                        def();
+                        break;
                 }
             }
         }
 
+        static void def(FInt64 fInt64 = default)
+        {
+            Console.WriteLine("def:");
+            Console.WriteLine(fInt64.ToString());
+            Console.WriteLine(fInt64.m_value);
+
+        }
+
         static void Text()
         {
             //简单的测试LPS功能是否正常

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using System.Text;`
`7`		`-using LinePutScript.Structure;`
`8`	`7`	`#nullable enable`
`9`	`8`	`namespace LinePutScript.Converter`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using LinePutScript.Structure;`
`7`	`6`	`#nullable enable`
`8`	`7`	`namespace LinePutScript`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using LinePutScript.Dictionary;`
`2`		`-using LinePutScript.Structure;`
`3`	`2`	`using System;`
`4`	`3`	`using System.Collections.Generic;`
`5`	`4`	`using System.Dynamic;`