From 74c01effe4cabbc9d0e2e87b0d295bb29d7c62ba Mon Sep 17 00:00:00 2001 From: Nitload Date: Wed, 30 Apr 2025 07:38:04 +0800 Subject: [PATCH] Daily update on 20250430-073804 by Nitload Youmu. Additional Message : full function of syntax analyze to STEP file Signed-off-by: Nitload --- StgSharp.C/hash.c | 3 +- StgSharp.C/x64/Debug/StgSharp.C.ilk | Bin 2041720 -> 2045592 bytes .../Debug/StgSharp.C.tlog/CL.command.1.tlog | Bin 10872 -> 10872 bytes .../x64/Debug/StgSharp.C.tlog/CL.read.1.tlog | Bin 222988 -> 223378 bytes .../x64/Debug/StgSharp.C.tlog/CL.write.1.tlog | Bin 13976 -> 14706 bytes StgSharp.C/x64/Debug/StgSharpC.log | 65 +--- StgSharp.C/x64/Debug/hash.cod | 49 +-- StgSharp.C/x64/Debug/hash.obj | Bin 35380 -> 35388 bytes StgSharp.C/x64/Debug/hash.sbr | Bin 2258751 -> 2258754 bytes StgSharp.C/x64/Debug/vc143.idb | Bin 347136 -> 347136 bytes StgSharp.C/x64/Debug/vc143.pdb | Bin 241664 -> 241664 bytes StgSharp.Common/Counter.cs | 17 +- .../Graphics/OpenGL/ShaderEdit/Shader.cs | 120 +++--- StgSharp.Common/Graphics/OpenGL/glFunction.cs | 353 +++++++++--------- StgSharp.Common/Internal/InternalResource.cs | 17 +- StgSharp.Common/Stg/Bullet.cs | 8 +- .../net8.0/StgSharp.Common.AssemblyInfo.cs | 9 +- StgSharp.Common/obj/project.packagespec.json | 1 + .../net8.0/StgSharp.Common.AssemblyInfo.cs | 2 +- .../net8.0/StgSharp.Common.sourcelink.json | 2 +- .../net8.0/StgSharp.Generator.AssemblyInfo.cs | 9 +- .../obj/project.packagespec.json | 1 + .../STEP/Analyser/StepDependencyDetector.cs | 61 +++ .../STEP/Analyser/StepEntityDefineSequence.cs | 54 +++ .../STEP/StepHeaderLineConstructor.cs | 101 +++++ .../net8.0/StgSharp.Model.AssemblyInfo.cs | 9 +- StgSharp.Model/obj/project.packagespec.json | 1 + .../net8.0/StgSharp.Model.AssemblyInfo.cs | 2 +- .../net8.0/StgSharp.Model.sourcelink.json | 2 +- StgSharp.Script/Common/CompileStack.cs | 12 +- StgSharp.Script/Express/CompileEnv/KeyWord.cs | 4 +- .../Express/Element/ExpFunction.cs | 2 +- .../ExpAstNode/ExpBinaryOperatorNode.cs | 29 +- .../ExpAstNode/ExpCollectionIndexNode.cs | 2 +- .../ExpAstNode/ExpFunctionCallingNode.cs | 2 +- .../Express/ExpAstNode/ExpRepeatNode.cs | 2 +- .../ExpAstNode/ExpUnaryOperatorNode.cs | 8 +- StgSharp.Script/Express/ExpExceptions.cs | 25 +- ...xpSyntaxAnalyzer.PrefixReverseAnalysing.cs | 2 +- StgSharp.Script/Express/ExpTokenReader.cs | 25 +- .../net8.0/StgSharp.Script.AssemblyInfo.cs | 9 +- StgSharp.Script/obj/project.packagespec.json | 1 + .../net8.0/StgSharp.Script.AssemblyInfo.cs | 2 +- .../net8.0/StgSharp.Script.sourcelink.json | 2 +- ...CoreApp,Version=v8.0.AssemblyAttributes.cs | 34 +- .../StgSharp.TerminalDialogue.AssemblyInfo.cs | 9 +- .../obj/project.packagespec.json | 1 + StgSharpDebug/Program.cs | 12 +- StgSharpDebug/StepReadingTest.cs | 61 +++ StgSharpDebug/obj/project.packagespec.json | 1 + .../net8.0/StgSharpDebug.AssemblyInfo.cs | 2 +- .../net8.0/StgSharpDebug.sourcelink.json | 2 +- 52 files changed, 693 insertions(+), 442 deletions(-) create mode 100644 StgSharp.Common/obj/project.packagespec.json create mode 100644 StgSharp.Generator/obj/project.packagespec.json create mode 100644 StgSharp.Model/STEP/Analyser/StepDependencyDetector.cs create mode 100644 StgSharp.Model/STEP/Analyser/StepEntityDefineSequence.cs create mode 100644 StgSharp.Model/STEP/StepHeaderLineConstructor.cs create mode 100644 StgSharp.Model/obj/project.packagespec.json create mode 100644 StgSharp.Script/obj/project.packagespec.json create mode 100644 StgSharp.TerminalDialogue/obj/project.packagespec.json create mode 100644 StgSharpDebug/StepReadingTest.cs create mode 100644 StgSharpDebug/obj/project.packagespec.json diff --git a/StgSharp.C/hash.c b/StgSharp.C/hash.c index 8939ef66..a4256a4d 100644 --- a/StgSharp.C/hash.c +++ b/StgSharp.C/hash.c @@ -19,7 +19,8 @@ INTERNAL int SSCDECL city_hash_simplify_sse(byte const *str, int const length) hash = _mm_crc32_u16(hash, *ptr); } } else { - byte *last_128 = end - 16, *last_32 = end - 4; + byte *last_128 = end - 16; + byte *last_32 = end - 4; uint64_t hash64 = size; for (; ptr < last_128; ptr += 16) { __m128i vec = _mm_loadu_si32((int *)ptr); diff --git a/StgSharp.C/x64/Debug/StgSharp.C.ilk b/StgSharp.C/x64/Debug/StgSharp.C.ilk index 380997684919baca44eb7ddbce964fef3a7f2bdf..aee14176fd3187e765f7f785fc160f2ee397a419 100644 GIT binary patch delta 21247 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 XB&+`5Qpg7P=@BmN9T6@a61)8$@tiT! diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog index 39d34ba0a8a7d9013d8dc437aeafc00dfdc18d51..66bef181e1d0673cc5afea5f6af647a6e92f5ff6 100644 GIT binary patch delta 25 hcmewn@*`x!1L4U%(mb2@iSH7coW(z3^8;ZgW&oy13ta#J delta 29 jcmewn@*`x!1L4UTS^}H9Sd^GSjLBN!b2h&b-X#P8#5)W6 diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog index c3da481df9c898587cadc59e0094cf5633aca5e6..18832a2163ad90c1d872703bc91e9d90643afac9 100644 GIT binary patch delta 53 zcmeA<$2;jF?}imerpE~}v$emGWCUWS?QbNR6?~_k6J(w+dBqWd=~J?q#Fi&zF)?jF Ju$PH11OQrT6(9fr delta 57 zcmV-90LK54(G85w4X~)hmtGPB5R)1nke4780U(z=7Xpy8&~!*ow@wfOrUaKDy#fY< PuEd9~!~wUi!~!5qe_IwL diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog index fca4f9ba09cc27df76b39332f1a31c0e77a5e94b..9c290a6ff6b073391a7a0c88c1119d17e34aacba 100644 GIT binary patch delta 54 zcmV-60LlNDZSr!k%qo+R3J|l#CQJddfGrpalkhB%la2)plh`V}leQeBlTZN)lM(`~ MlRy{>v)&eV0f;#j*#H0l delta 24 gcmexVG$VJz8Li0|OixU9Fr6@Y0++z%J6b7R0HB)-YybcN diff --git a/StgSharp.C/x64/Debug/StgSharpC.log b/StgSharp.C/x64/Debug/StgSharpC.log index d995dc14..11a5cd61 100644 --- a/StgSharp.C/x64/Debug/StgSharpC.log +++ b/StgSharp.C/x64/Debug/StgSharpC.log @@ -1,62 +1,7 @@ C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(517,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠，因为必须有这个斜杠才能正确计算 Output 目录。 - mat4.c - string.c -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\string.c(21,54): warning C4267: “return”: 从“size_t”转换到“int”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(9,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\string.c(36,54): warning C4267: “return”: 从“size_t”转换到“int”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(9,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(11,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(11,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(20,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(20,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(22,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(22,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(24,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(24,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(26,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(26,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(36,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(36,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(38,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(38,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(40,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(40,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(42,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(42,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(51,54): warning C4028: 形参 1 与声明不同 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(51,84): warning C4028: 形参 2 与声明不同 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(53,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(54,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(55,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(56,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,28): warning C4013: “det_mat3_internal”未定义；假设外部返回 int -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,28): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,62): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(60,28): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(60,62): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(61,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(69,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(69,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(70,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(70,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(71,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(71,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(72,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(72,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(77,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(77,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(78,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(78,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(88,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(88,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(89,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(89,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(90,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(90,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(91,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(91,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(96,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(96,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(97,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(97,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 + hash.c +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(30,43): warning C4244: “函数”: 从“uint64_t”转换到“unsigned char”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(31,50): warning C4244: “函数”: 从“uint64_t”转换到“unsigned char”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(7,15): warning C4090: “初始化”: 不同的“const”限定符 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(7,34): warning C4090: “初始化”: 不同的“const”限定符 StgSharpC.vcxproj -> D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\build\StgSharp.C.dll diff --git a/StgSharp.C/x64/Debug/hash.cod b/StgSharp.C/x64/Debug/hash.cod index d6f90aa0..2f0b8e8a 100644 --- a/StgSharp.C/x64/Debug/hash.cod +++ b/StgSharp.C/x64/Debug/hash.cod @@ -332,24 +332,27 @@ $LN9@city_hash_: 00101 e9 21 01 00 00 jmp $LN23@city_hash_ $LN22@city_hash_: -; 22 : byte *last_128 = end - 16, *last_32 = end - 4; +; 22 : byte *last_128 = end - 16; 00106 48 8b 45 48 mov rax, QWORD PTR end$[rbp] 0010a 48 83 e8 10 sub rax, 16 0010e 48 89 85 a8 00 00 00 mov QWORD PTR last_128$2[rbp], rax + +; 23 : byte *last_32 = end - 4; + 00115 48 8b 45 48 mov rax, QWORD PTR end$[rbp] 00119 48 83 e8 04 sub rax, 4 0011d 48 89 85 c8 00 00 00 mov QWORD PTR last_32$3[rbp], rax -; 23 : uint64_t hash64 = size; +; 24 : uint64_t hash64 = size; 00124 8b 45 24 mov eax, DWORD PTR size$[rbp] 00127 48 89 85 e8 00 00 00 mov QWORD PTR hash64$4[rbp], rax -; 24 : for (; ptr < last_128; ptr += 16) { +; 25 : for (; ptr < last_128; ptr += 16) { 0012e eb 0c jmp SHORT $LN13@city_hash_ $LN11@city_hash_: @@ -362,14 +365,14 @@ $LN13@city_hash_: 00143 48 39 45 68 cmp QWORD PTR ptr$[rbp], rax 00147 73 5e jae SHORT $LN12@city_hash_ -; 25 : __m128i vec = _mm_loadu_si32((int *)ptr); +; 26 : __m128i vec = _mm_loadu_si32((int *)ptr); 00149 48 8b 45 68 mov rax, QWORD PTR ptr$[rbp] 0014d 66 0f 6e 00 movd xmm0, DWORD PTR [rax] 00151 66 0f 7f 85 10 01 00 00 movdqa XMMWORD PTR vec$5[rbp], xmm0 -; 26 : hash64 = _mm_crc32_u64(hash64, _mm_extract_epi64(vec, 0)); +; 27 : hash64 = _mm_crc32_u64(hash64, _mm_extract_epi64(vec, 0)); 00159 66 0f 6f 85 10 01 00 00 movdqa xmm0, XMMWORD PTR vec$5[rbp] @@ -383,7 +386,7 @@ $LN13@city_hash_: 00178 48 89 85 e8 00 00 00 mov QWORD PTR hash64$4[rbp], rax -; 27 : hash64 = _mm_crc32_u64(hash64, _mm_extract_epi64(vec, 1)); +; 28 : hash64 = _mm_crc32_u64(hash64, _mm_extract_epi64(vec, 1)); 0017f 66 0f 6f 85 10 01 00 00 movdqa xmm0, XMMWORD PTR vec$5[rbp] @@ -397,19 +400,19 @@ $LN13@city_hash_: 0019e 48 89 85 e8 00 00 00 mov QWORD PTR hash64$4[rbp], rax -; 28 : } +; 29 : } 001a5 eb 89 jmp SHORT $LN11@city_hash_ $LN12@city_hash_: -; 29 : hash = _mm_crc32_u8(hash, hash64); +; 30 : hash = _mm_crc32_u8(hash, hash64); 001a7 8b 45 04 mov eax, DWORD PTR hash$[rbp] 001aa f2 0f 38 f0 85 e8 00 00 00 crc32 eax, BYTE PTR hash64$4[rbp] 001b3 89 45 04 mov DWORD PTR hash$[rbp], eax -; 30 : hash = _mm_crc32_u8(hash, hash64 >> 32); +; 31 : hash = _mm_crc32_u8(hash, hash64 >> 32); 001b6 48 8b 85 e8 00 00 00 mov rax, QWORD PTR hash64$4[rbp] @@ -419,7 +422,7 @@ $LN12@city_hash_: 001c9 8b c1 mov eax, ecx 001cb 89 45 04 mov DWORD PTR hash$[rbp], eax -; 31 : for (; ptr < last_32; ptr += 4) { +; 32 : for (; ptr < last_32; ptr += 4) { 001ce eb 0c jmp SHORT $LN16@city_hash_ $LN14@city_hash_: @@ -432,7 +435,7 @@ $LN16@city_hash_: 001e3 48 39 45 68 cmp QWORD PTR ptr$[rbp], rax 001e7 73 13 jae SHORT $LN15@city_hash_ -; 32 : hash = _mm_crc32_u32(hash,*(uint32_t *)ptr); +; 33 : hash = _mm_crc32_u32(hash,*(uint32_t *)ptr); 001e9 48 8b 45 68 mov rax, QWORD PTR ptr$[rbp] 001ed 8b 4d 04 mov ecx, DWORD PTR hash$[rbp] @@ -440,12 +443,12 @@ $LN16@city_hash_: 001f5 8b c1 mov eax, ecx 001f7 89 45 04 mov DWORD PTR hash$[rbp], eax -; 33 : } +; 34 : } 001fa eb d4 jmp SHORT $LN14@city_hash_ $LN15@city_hash_: -; 34 : for (; ptr < end; ptr += 2) { +; 35 : for (; ptr < end; ptr += 2) { 001fc eb 0c jmp SHORT $LN19@city_hash_ $LN17@city_hash_: @@ -457,7 +460,7 @@ $LN19@city_hash_: 0020e 48 39 45 68 cmp QWORD PTR ptr$[rbp], rax 00212 73 13 jae SHORT $LN18@city_hash_ -; 35 : hash = _mm_crc32_u8(hash,*ptr); +; 36 : hash = _mm_crc32_u8(hash,*ptr); 00214 48 8b 45 68 mov rax, QWORD PTR ptr$[rbp] 00218 8b 4d 04 mov ecx, DWORD PTR hash$[rbp] @@ -465,15 +468,15 @@ $LN19@city_hash_: 00220 8b c1 mov eax, ecx 00222 89 45 04 mov DWORD PTR hash$[rbp], eax -; 36 : } +; 37 : } 00225 eb d7 jmp SHORT $LN17@city_hash_ $LN18@city_hash_: $LN23@city_hash_: $LN21@city_hash_: -; 37 : } -; 38 : hash ^= hash >> 16; +; 38 : } +; 39 : hash ^= hash >> 16; 00227 8b 45 04 mov eax, DWORD PTR hash$[rbp] 0022a c1 e8 10 shr eax, 16 @@ -482,13 +485,13 @@ $LN21@city_hash_: 00232 8b c1 mov eax, ecx 00234 89 45 04 mov DWORD PTR hash$[rbp], eax -; 39 : hash *= 0x85ebca6b; +; 40 : hash *= 0x85ebca6b; 00237 69 45 04 6b ca eb 85 imul eax, DWORD PTR hash$[rbp], -2048144789 ; 85ebca6bH 0023e 89 45 04 mov DWORD PTR hash$[rbp], eax -; 40 : hash ^= hash >> 13; +; 41 : hash ^= hash >> 13; 00241 8b 45 04 mov eax, DWORD PTR hash$[rbp] 00244 c1 e8 0d shr eax, 13 @@ -497,13 +500,13 @@ $LN21@city_hash_: 0024c 8b c1 mov eax, ecx 0024e 89 45 04 mov DWORD PTR hash$[rbp], eax -; 41 : hash *= 0xc2b2ae35; +; 42 : hash *= 0xc2b2ae35; 00251 69 45 04 35 ae b2 c2 imul eax, DWORD PTR hash$[rbp], -1028477387 ; c2b2ae35H 00258 89 45 04 mov DWORD PTR hash$[rbp], eax -; 42 : hash ^= hash >> 16; +; 43 : hash ^= hash >> 16; 0025b 8b 45 04 mov eax, DWORD PTR hash$[rbp] 0025e c1 e8 10 shr eax, 16 @@ -512,11 +515,11 @@ $LN21@city_hash_: 00266 8b c1 mov eax, ecx 00268 89 45 04 mov DWORD PTR hash$[rbp], eax -; 43 : return hash; +; 44 : return hash; 0026b 8b 45 04 mov eax, DWORD PTR hash$[rbp] -; 44 : } +; 45 : } 0026e 48 8d a5 f8 01 00 00 lea rsp, QWORD PTR [rbp+504] diff --git a/StgSharp.C/x64/Debug/hash.obj b/StgSharp.C/x64/Debug/hash.obj index 45eca682762e365f50baa7cae05f9ddda77a2ae6..4beb8e7c334a782c230e782298a30337e5f4b23a 100644 GIT binary patch delta 407 zcmX}mPbhL9{<7OU*&Q$w5i7 zt(3ycYQ@2U%gkX%6f28qXp}}W-;?L^`F@|v^Be`(lK{(~S}G=8H>GCl0l$^u=U76F zvxMlWfl)9)YGIVTV>=;dbd6E)?vNhoDN+{ci>4R_Tj1aX?6gcCy2kuU ze$eJW7X1Fn>$lLm)1{vuxaC&mhdl*_gwU*RjN39Bc#;u@{LefN-=jBT(?@^jsHXx= zM2NQ@ieWR9KqIV#qp%8kU^NUvDGWmyjKCUr1?4aeYvDJngFjFKg}7V~8(;%eLM0*1 z-Zlih2jsm>m6f9X{1y3EnUd3mqXlo5|TzY4ZDMag(1mdRxI o-Ol0u{K~|hZ^)NSYd*`KBEIgBA-rR8a~+PBA|}V#7B5Qv0Nspqb^rhX delta 372 zcmXxePbhaFjoR3FmxD;!PLf>sZ7HRp zjFP{v-cpKIQ%CHBdJd(+BRN_jSUd{!aVsQ7pxEQ*avWz??o;SjK z%F6KNS;}*jPNvOFE@tT4;>}PQC4`yX6Z%2W$J9EWu<3LWqm*25Fn01fDbZ_owvP=rO;2!CJ`tj0wNdY~K1&+uF5nQE0|0?@ByPba zI0H4)(pV0@y8eIF`t|+yYJXJEScExh%(K8E5so@bG+1VZRn}N%gH5*BW``y*2`$=m z*riL4K7&a*%wlPp%bGQxxxK%6c)UJ4HGZ61iANV%nmi@OzvtF}sPv7bW&F#zEj~Z{0Q(+>7z_({7`A9q8~YLt2S69>O*oKC*1q3A zvE!oBuZB+5^5=!W6;EIY){wzEHjssZMGl+T!ZvoWi#!V0!#)mBL{F(Yct;ZZb@to*#yj$J?t*a_^p{OzwU~iSy-oJe-WL`{dp{8>x`{@a*OaeT`Jf zJr6iZE<8_1cfpn#IsF)*vef@kYo$T%Rs94r4N5a|rAAt5i_S`0+R-1af@iIfPMXre fX{sAjy3J}&?@y8AaLP$kPQzK0vnZX1)7soG!y9C) diff --git a/StgSharp.C/x64/Debug/vc143.idb b/StgSharp.C/x64/Debug/vc143.idb index 502da69ce66fd60ae20fb654b5bca36317131ce8..cf2749cb4da642e55062a8b6a24835741a1be4ce 100644 GIT binary patch delta 1379 zcma*nT}TvB6bJCRGk0~3EnVGBH#HSCkTlvvu+Y*-$WUnsE6We0f(nJSlq^IkM1%@; zs!=GYD8q*ybkIrqLeW4%O2`MPNTH(0$gOnMbhmr{`BD%xFuy%}|7XsfnT4%yv)8xT zo8zoZlB7L?9VStTBhPRy@)0H8OMxuadwkn6sH9_}j(dHI^w=kkD9Km%M0fJ%ikiV! zw3^LPvtEz1^*?%VS!`E#^E5RrVud^yr|&#fD|7E)T(;V^Hq@9{#nKoHR3qO#6MhO> zFSJ|9Ojr)v;Sj00t!$r&vxBLr>ce^AJnHxmT5-Wz*a^oV`$%aLEU;1C0K4ED7+|OM z6j%x`!ah6gXkATdIy?riz<&4zIzp)@3s%7Ea2U>frZi@X%!M^!RNsN4a0w_7LTZn~@tW+@bXg`WpQd;SwHrpdDb0pe@TPlxQsD1j zUwYs#;pF1`-H7zMllNb-hknbU_&6wX@$zw9{5P89g0CfEZf;mQT-*}OnATTnlOpP>CGrI|k|ZAU!>-7s>I(rj1-Z^98c5961p z#|3L)Cme&!OKB1;fDNS4wSnz3F|G$hd!kyeah)GttkYVo$~v_qCrHc7UGX)|5zMmGUtmad;c{_ zQTsQ={5^lfW*n?wR%VF7ms#&ACY}IO)S5G~Y_r;VHvI4VwwT2ZcJUt=Njtd?t<#U^ eUR{1}wR~;35go?g%8kBrOq}$o7`}6y4gUfa3AR!I delta 2327 zcmeH}T}TvB6vyZ8+?Cz1a&y=H$ZEq;47YN0KXs)I40b9;(W|&$j9++E`|-@Z9YswN)Zc| zBG%$WafOTfPAE9z1m5mKKJJ3x0q*v=Bz1Tb+reX3ip6UR5Ia$T)%v-3#>H1I{B9_< z&5bE-ZcG{EV%h+{mB9km2N0_dK-M`Ax_3R`zV-m~%di`~IMn2YCB5fvt`A7r2V}Eh zFZ+<3@Zr?6TsSx5&wLDpI{BGmsIVOA?OdEHPqLy<%c1m_ax5yzh$Xp5$*_W(vI(ef z4pB%euE2zb3QXv(z?nXn5xZiqEHZC)uo9V;N~m?Q5~dt6?2KXUL5PHcSo25_u&YM! z0T0dvv4|&xqBaEB(GX_!8}5_PUKaF*q2RVK4z-0bWsnKu&QFJNwWSdhoe`*ZJAx_i zBCyR3(F-O&8pR6PC}7qYV$m45&D^~fLu`VJSp!&Jg?yq4r|Ydka*~UAE()um=GJQ1 z$c<`DoHBx6xGTjmJsAi1bR713)37h&W=gsSkpLGBHIl|Ux7(8L4~zxK8!^Z1bS39h zSc@m=phe3r5{YDJVnH0rB{VG+va)~E@Wr^zrG_^imH(>Yl}Y{x_;35YXvk0K^`wpc zv6k8%-lG4m?e8UQlo;Ow?(`L>=By)gqAH&!JG33Wbme-j=`_hB_Fe2vU(e1w^<+CK zQhUx24}2r2qkW=Zvz;ZaqIT>I=^^6{q?Rbzg9Vv=V?!46t3o-xcD3fO6F-R>_0XS| QOL`Y!CtO8M@1o@SZwybL>Hq)$ diff --git a/StgSharp.C/x64/Debug/vc143.pdb b/StgSharp.C/x64/Debug/vc143.pdb index 2f73bebcc6c97381a2a7f24ed362006c3012865b..629f56f807f4179cf5f7f657832d1ad6f82d628a 100644 GIT binary patch delta 183 zcmZp8z}N7AZ-U9T1YfU$ueWB?~fgE`3J>ADV#-HfKw XcRDc2Z@?N_-p;AO_?>^60<#LMB~YR8c1;E5>-=p2jLQO;4ls)_Fl=VN@Rxs? z1Eat)17?9~4vak8c?1~0@GrU`uq=UDV4DCVhX5nYz($#yUGOSJMsW`3@+;c diff --git a/StgSharp.Common/Counter.cs b/StgSharp.Common/Counter.cs index 28045a5a..dbb1d05c 100644 --- a/StgSharp.Common/Counter.cs +++ b/StgSharp.Common/Counter.cs @@ -42,20 +42,17 @@ namespace StgSharp internal readonly T _defualtIncreament; - public Counter( - T defualtValue, - T defualtIncreament, - T defualtDecreament ) + public Counter( T defaultValue, T defaultIncrement, T defaultDecrement ) { - _value = defualtValue; - _defaultValue = defualtValue; - _defualtIncreament = defualtIncreament; - _defualtDecreament = defualtDecreament; + _value = defaultValue; + _defaultValue = defaultValue; + _defualtIncreament = defaultIncrement; + _defualtDecreament = defaultDecrement; } - public T DecreamentSoan => _defualtDecreament; + public T DecrementSpan => _defualtDecreament; - public T IncreamentSpan => _defualtIncreament; + public T IncrementSpan => _defualtIncreament; public T CurrentSpan => _value - _defaultValue; diff --git a/StgSharp.Common/Graphics/OpenGL/ShaderEdit/Shader.cs b/StgSharp.Common/Graphics/OpenGL/ShaderEdit/Shader.cs index 0794d5c1..2e427b18 100644 --- a/StgSharp.Common/Graphics/OpenGL/ShaderEdit/Shader.cs +++ b/StgSharp.Common/Graphics/OpenGL/ShaderEdit/Shader.cs @@ -45,9 +45,11 @@ namespace StgSharp.Graphics.OpenGL { /// - /// Create an instance of program + /// Create an instance of program /// - /// New instance of instance. + /// + /// New instance of instance. + /// [MethodImpl( MethodImplOptions.AggressiveInlining )] protected override sealed ShaderProgram CreateShaderProgram() { @@ -55,9 +57,7 @@ namespace StgSharp.Graphics.OpenGL } [MethodImpl( MethodImplOptions.AggressiveInlining )] - protected override sealed Shader CreateShaderSegment( - ShaderType type, - int count ) + protected override sealed Shader CreateShaderSegment( ShaderType type, int count ) { return new Shader( GL.CreateShaderSet( count, type ), type, this ); } @@ -71,10 +71,7 @@ namespace StgSharp.Graphics.OpenGL internal readonly GlHandle[] handle; public readonly ShaderType type; - internal unsafe Shader( - GlHandle[] handle, - ShaderType usage, - glRender stream ) + internal unsafe Shader( GlHandle[] handle, ShaderType usage, glRender stream ) { this.handle = handle; GL = stream.GL; @@ -84,10 +81,14 @@ namespace StgSharp.Graphics.OpenGL public SerializableTypeCode SSDTypeCode => SerializableTypeCode.Shader; /// - /// Attach one shader code to a shader program. + /// Attach one shader code to a shader program. /// - /// Shader program to attach - /// Index of shader code in current shader code set. + /// + /// Shader program to attach + /// + /// + /// Index of shader code in current shader code set. + /// [MethodImpl( MethodImplOptions.AggressiveInlining )] public void AttachTo( int index, ShaderProgram target ) { @@ -98,16 +99,22 @@ namespace StgSharp.Graphics.OpenGL { string log = GL.GetShaderStatus( this, index, ( int )status ); if( !string.IsNullOrEmpty( log ) ) { - throw new Exception( $"{$"Shader Error \t{status}\n"}{log}" ); + throw new InvalidOperationException( $"{$"Shader Error \t{status}\n"}{log}" ); } } + [MethodImpl( MethodImplOptions.AggressiveInlining )] + public unsafe void Compile( int index, ReadOnlySpan codeU8Stream ) + { + GL.LoadShaderSource( handle[ index ], codeU8Stream ); + GL.CompileShader( handle[ index ] ); + CheckStatus( index, ShaderStatus.CompileStatus ); + } + [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void Compile( int index, byte[] codeStream ) { - if( codeStream == null ) { - throw new ArgumentNullException( nameof( codeStream ) ); - } + ArgumentNullException.ThrowIfNull( codeStream ); GL.LoadShaderSource( handle[ index ], codeStream ); GL.CompileShader( handle[ index ] ); CheckStatus( index, ShaderStatus.CompileStatus ); @@ -119,8 +126,7 @@ namespace StgSharp.Graphics.OpenGL if( codeStream == null ) { throw new ArgumentNullException( nameof( codeStream ) ); } - GL.LoadShaderSource( - handle[ index ], codeStream.AsSpan() ); + GL.LoadShaderSource( handle[ index ], codeStream.AsSpan() ); GL.CompileShader( handle[ index ] ); CheckStatus( index, ShaderStatus.CompileStatus ); } @@ -134,8 +140,7 @@ namespace StgSharp.Graphics.OpenGL { string str = File.ReadAllText( fileRoute ); if( string.IsNullOrEmpty( str ) ) { - throw new InvalidOperationException( - $"Cannot load and GLSL code from {fileRoute}" ); + throw new InvalidOperationException( $"Cannot load and GLSL code from {fileRoute}" ); } return Encoding.UTF8.GetBytes( str ); } @@ -171,7 +176,7 @@ namespace StgSharp.Graphics.OpenGL internal readonly GlHandle handle; /// - /// CustomizeInit a program with no shader attached. + /// CustomizeInit a program with no shader attached. /// internal unsafe ShaderProgram( glRender binding ) { @@ -180,10 +185,14 @@ namespace StgSharp.Graphics.OpenGL } /// - /// Get a uniform form current shader, the value type of the uniform should be provided. + /// Get a uniform form current shader, the value type of the uniform should be provided. /// - /// ContextName of the Uniform in shader code - /// + /// + /// ContextName of the Uniform in shader code + /// + /// + /// + /// [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe Uniform GetUniform( string name ) where T: struct { @@ -191,70 +200,79 @@ namespace StgSharp.Graphics.OpenGL } /// - /// Get a uniform form current shader, the value type of the uniform should be provided. + /// Get a uniform form current shader, the value type of the uniform should be provided. /// - /// ContextName of the Uniform in shader code - /// - public unsafe Uniform GetUniform( string name ) - where T: struct - where U: struct + /// + /// ContextName of the Uniform in shader code + /// + /// + /// + /// + public unsafe Uniform GetUniform( string name ) where T: struct where U: struct { - return new Uniform( - GL.GetUniformLocation( this.handle, name ) ); + return new Uniform( GL.GetUniformLocation( this.handle, name ) ); } /// - /// Get a uniform form current shader, the value type of the uniform should be provided. + /// Get a uniform form current shader, the value type of the uniform should be provided. /// - /// ContextName of the Uniform in shader code - /// - public unsafe Uniform GetUniform( string name ) - where T: struct + /// + /// ContextName of the Uniform in shader code + /// + /// + /// + /// + public unsafe Uniform GetUniform( string name ) where T: struct where U: struct where V: struct { - return new Uniform( - GL.GetUniformLocation( this.handle, name ) ); + return new Uniform( GL.GetUniformLocation( this.handle, name ) ); } /// - /// Get a uniform form current shader, the value type of the uniform should be provided. + /// Get a uniform form current shader, the value type of the uniform should be provided. /// - /// ContextName of the Uniform in shader code - /// - public unsafe Uniform GetUniform( string name ) - where T: struct + /// + /// ContextName of the Uniform in shader code + /// + /// + /// + /// + public unsafe Uniform GetUniform( string name ) where T: struct where U: struct where V: struct where W: struct { - return new Uniform( - GL.GetUniformLocation( this.handle, name ) ); + return new Uniform( GL.GetUniformLocation( this.handle, name ) ); } /// - /// Link the shader to current viewPortDisplay. + /// Link the shader to current viewPortDisplay. /// public unsafe void Link() { if( InternalIO.InternalLinkShaderProgram( - ( OpenglContext* )this.GL.ContextHandle, handle.Value ) == 0 ) { + ( OpenglContext* )this.GL.ContextHandle, handle.Value ) == + 0 ) + { IntPtr logPtr = InternalIO.InternalReadSSCLog(); - try { + try + { byte[] logByte = new byte[512]; Marshal.Copy( logPtr, logByte, 0, 512 ); string log = Encoding.UTF8.GetString( logByte ); log = log.Replace( "\0", string.Empty ); InternalIO.InternalWriteLog( log, LogType.Error ); } - catch( Exception ex ) { + catch( Exception ex ) + { InternalIO.InternalWriteLog( ex.Message, LogType.Error ); } } } /// - /// Let the current viewPortDisplay use this shader. + /// Let the current viewPortDisplay use this shader. /// [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void Use() diff --git a/StgSharp.Common/Graphics/OpenGL/glFunction.cs b/StgSharp.Common/Graphics/OpenGL/glFunction.cs index 6636edb7..80f19661 100644 --- a/StgSharp.Common/Graphics/OpenGL/glFunction.cs +++ b/StgSharp.Common/Graphics/OpenGL/glFunction.cs @@ -50,8 +50,7 @@ namespace StgSharp.Graphics.OpenGL private static Dictionary contextToGLMap = new Dictionary( ); - private static ThreadLocal _currentGL = new ThreadLocal( - ); + private static ThreadLocal _currentGL = new ThreadLocal(); private OpenglContext* _context; private Lazy _attachmentColorRange; @@ -64,8 +63,7 @@ namespace StgSharp.Graphics.OpenGL InitializeUnusedTextureImageUint ); _attachmentColorRange = new Lazy( () => { - return GetMaskInteger( - ( uint )glConst.MAX_COLOR_ATTACHMENTS ); + return GetMaskInteger( ( uint )glConst.MAX_COLOR_ATTACHMENTS ); } ); } @@ -87,7 +85,8 @@ namespace StgSharp.Graphics.OpenGL get { #if DEBUG - if( ( IntPtr )_context == IntPtr.Zero ) { + if( ( IntPtr )_context == IntPtr.Zero ) + { throw new NullReferenceException(); } #endif @@ -126,11 +125,15 @@ namespace StgSharp.Graphics.OpenGL } /// - /// Bind a frame Buffer to a frame Buffer target Same function as glBindFramebuffer. + /// Bind a frame Buffer to a frame Buffer target Same function as glBindFramebuffer . /// - /// The frame Buffer target of the binding operation. - /// The handle of the frame Buffer object to bind. + /// + /// The frame Buffer target of the binding operation. + /// + /// + /// The handle of the frame Buffer object to bind. + /// [MethodImpl( MethodImplOptions.AggressiveInlining )] public void BindFrameBuffer( FrameBufferTarget target, GlHandle handle ) { @@ -156,11 +159,9 @@ namespace StgSharp.Graphics.OpenGL } [MethodImpl( MethodImplOptions.AggressiveInlining )] - public FrameBufferStatus CheckFrameBufferStatus( - FrameBufferTarget target ) + public FrameBufferStatus CheckFrameBufferStatus( FrameBufferTarget target ) { - return ( FrameBufferStatus )Context.glCheckFramebufferStatus( - ( uint )target ); + return ( FrameBufferStatus )Context.glCheckFramebufferStatus( ( uint )target ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] @@ -179,7 +180,8 @@ namespace StgSharp.Graphics.OpenGL public void ClearError() { uint code = 0; - for( int i = 0; i < 1024; i++ ) { + for( int i = 0; i < 1024; i++ ) + { code = Context.glGetError(); if( code == 0 ) { return; @@ -201,12 +203,11 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public void CombineFrameBufferRenderBuffer( - FrameBufferAttachment attachment, - GlHandle rboHandle ) + FrameBufferAttachment attachment, + GlHandle rboHandle ) { Context.glFramebufferRenderbuffer( - glConst.FRAMEBUFFER, ( uint )attachment, glConst.RENDERBUFFER, - rboHandle.Value ); + glConst.FRAMEBUFFER, ( uint )attachment, glConst.RENDERBUFFER, rboHandle.Value ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] @@ -242,12 +243,13 @@ namespace StgSharp.Graphics.OpenGL { GlHandle[] ret = new GlHandle[count]; uint t = ( uint )type; - for( int i = 0; i < count; i++ ) { + for( int i = 0; i < count; i++ ) + { uint id = Context.glCreateShader( t ); - if( id == 0 ) { + if( id == 0 ) + { uint error = Context.glGetError(); - throw new InvalidOperationException( - $"Failed in creating shader: {error}" ); + throw new InvalidOperationException( $"Failed in creating shader: {error}" ); } ret[ i ] = GlHandle.Alloc( id ); } @@ -266,7 +268,8 @@ namespace StgSharp.Graphics.OpenGL if( ( handle == null ) || ( handle.Length == 0 ) ) { throw new ArgumentNullException( nameof( handle ) ); } - fixed( GlHandle* hptr = handle ) { + fixed( GlHandle* hptr = handle ) + { uint* iptr = ( uint* )hptr; for( int i = 0; i < handle.Length; i++ ) { Context.glDeleteBuffers( 1, iptr + i ); @@ -275,11 +278,14 @@ namespace StgSharp.Graphics.OpenGL } /// - /// Delete a render Buffer object Very simlilar function as glDeleteRenderbuffers. The only - /// deifference is that this mehtod can only delete one renderbuffer at the same time. + /// Delete a render Buffer object Very simlilar function as glDeleteRenderbuffers . The + /// only deifference is that this mehtod can only delete one renderbuffer at the same + /// time. /// - /// Handle to Buffer to delete. + /// + /// Handle to Buffer to delete. + /// public unsafe void DeleteRenderBuffer( GlHandle bufferHandle ) { Context.glDeleteRenderbuffers( 1, &bufferHandle.Value ); @@ -288,7 +294,8 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void DeleteVertexArrays( GlHandle[] arrays ) { - fixed( GlHandle* hptr = arrays ) { + fixed( GlHandle* hptr = arrays ) + { uint* iptr = ( uint* )hptr; for( int i = 0; i < arrays.Length; i++ ) { Context.glDeleteVertexArrays( 1, iptr + i ); @@ -297,11 +304,7 @@ namespace StgSharp.Graphics.OpenGL } [MethodImpl( MethodImplOptions.AggressiveInlining )] - public unsafe void DrawElements( - GeometryType mode, - uint count, - TypeCode type, - IntPtr ptr ) + public unsafe void DrawElements( GeometryType mode, uint count, TypeCode type, IntPtr ptr ) { uint a; a = type switch @@ -317,14 +320,15 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public void DrawElementsInstanced( - GeometryType mode, - uint count, - TypeCode type, - IntPtr ptr, - uint amount ) + GeometryType mode, + uint count, + TypeCode type, + IntPtr ptr, + uint amount ) { uint a; - switch( type ) { + switch( type ) + { case TypeCode.UInt32: a = glConst.UNSIGNED_INT; break; @@ -343,8 +347,7 @@ namespace StgSharp.Graphics.OpenGL LogType.Error ); return; } - Context.glDrawElementsInstanced( - ( uint )mode, count, a, ( void* )ptr, amount ); + Context.glDrawElementsInstanced( ( uint )mode, count, a, ( void* )ptr, amount ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] @@ -355,22 +358,22 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public void FrameBufferTexture2d( - FrameBufferTarget target, - uint attachment, - Texture2DTarget texTarget, - GlHandle textureHandle, - int level ) + FrameBufferTarget target, + uint attachment, + Texture2DTarget texTarget, + GlHandle textureHandle, + int level ) { Context.glFramebufferTexture2D( - ( uint )target, attachment, ( uint )texTarget, - textureHandle.Value, level ); + ( uint )target, attachment, ( uint )texTarget, textureHandle.Value, level ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe GlHandle[] GenBuffers( int count ) { GlHandle[] h = new GlHandle[count]; - fixed( GlHandle* hptr = h ) { + fixed( GlHandle* hptr = h ) + { for( int i = 0; i < count; i++ ) { Context.glGenBuffers( count, ( ( uint* )hptr ) + i ); } @@ -448,51 +451,48 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void GetTextureImage( - Texture2DTarget target, - int level, - ImageChannel channel, - PixelChannelLayout channelLayout, - T[] dataStream ) + Texture2DTarget target, + int level, + ImageChannel channel, + PixelChannelLayout channelLayout, + T[] dataStream ) where T: struct,INumber { #pragma warning disable CS8500 - fixed( T* tptr = dataStream ) { + fixed( T* tptr = dataStream ) + { Context.glGetTexImage( - ( uint )target, level, ( uint )channel, - ( uint )channelLayout, tptr ); + ( uint )target, level, ( uint )channel, ( uint )channelLayout, tptr ); } #pragma warning restore CS8500 } [MethodImpl( MethodImplOptions.AggressiveInlining )] public void GetTextureLevelProperty( - uint textureTypeMask, - int level, - uint propertyMask, - out int propertyValue ) + uint textureTypeMask, + int level, + uint propertyMask, + out int propertyValue ) { fixed( int* iptr = &propertyValue ) { - Context.glGetTexLevelParameteriv( - textureTypeMask, level, propertyMask, iptr ); + Context.glGetTexLevelParameteriv( textureTypeMask, level, propertyMask, iptr ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] - public unsafe GlHandle GetUniformLocation( - GlHandle program, - string name ) + public unsafe GlHandle GetUniformLocation( GlHandle program, string name ) { byte[] code = Encoding.UTF8.GetBytes( name ); - fixed( byte* ptr = code ) { + fixed( byte* ptr = code ) + { int ret = Context.glGetUniformLocation( program.Value, ptr ); #if DEBUG - if( ( ret == glConst.INVALID_OPERATION ) || ( ret == - glConst.INVALID_VALUE ) ) { + if( ( ret == glConst.INVALID_OPERATION ) || ( ret == glConst.INVALID_VALUE ) ) + { throw new InvalidOperationException(); } if( ret == -1 ) { - throw new UniformEmptyReferenceException( - nameof( program ), name ); + throw new UniformEmptyReferenceException( nameof( program ), name ); } #endif return GlHandle.SignedAlloc( ret ); @@ -500,47 +500,51 @@ namespace StgSharp.Graphics.OpenGL } [MethodImpl( MethodImplOptions.AggressiveInlining )] - public unsafe void LoadShaderSource( - GlHandle shaderHandle, - byte[] codeStream ) + public unsafe void LoadShaderSource( GlHandle shaderHandle, byte[] codeStream ) { fixed( byte* streamPtr = codeStream ) { - Context.glShaderSource( - shaderHandle.Value, 1, &streamPtr, ( void* )0 ); + Context.glShaderSource( shaderHandle.Value, 1, &streamPtr, ( void* )0 ); } } - public unsafe void LoadShaderSource( - GlHandle shaderHandle, - ReadOnlySpan codeStream ) + public unsafe void LoadShaderSource( GlHandle shaderHandle, ReadOnlySpan codeStream ) { - fixed( char* streamPtr = codeStream ) { + fixed( char* streamPtr = codeStream ) + { byte* bptr = ( byte* )streamPtr; - Context.glShaderSource( - shaderHandle.Value, 1, &bptr, ( void* )0 ); + Context.glShaderSource( shaderHandle.Value, 1, &bptr, ( void* )0 ); + } + } + + public unsafe void LoadShaderSource( GlHandle shaderHandle, ReadOnlySpan codeStream ) + { + fixed( byte* streamPtr = codeStream ) + { + byte* bptr = streamPtr; + Context.glShaderSource( shaderHandle.Value, 1, &bptr, ( void* )0 ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public void ReadPixels( - (int X, int Y) beginPosition, - (int width, int height) size, - FrameBufferChannel format, - PixelChannelLayout dataType, - ref byte[] stream ) + (int X, int Y) beginPosition, + (int width, int height) size, + FrameBufferChannel format, + PixelChannelLayout dataType, + ref byte[] stream ) { fixed( byte* bptr = stream ) { Context.glReadPixels( - beginPosition.X, beginPosition.Y, size.width, size.height, - ( uint )format, ( uint )dataType, bptr ); + beginPosition.X, beginPosition.Y, size.width, size.height, ( uint )format, + ( uint )dataType, bptr ); } } public void RereadImage( - in Image i, - (int X, int Y) beginPosition, - FrameBufferChannel format, - PixelChannelLayout dataType ) + in Image i, + (int X, int Y) beginPosition, + FrameBufferChannel format, + PixelChannelLayout dataType ) { byte[] pixels = i.PixelBuffer; if( !pixels.CheckArrayFormat( dataType ) ) { @@ -548,33 +552,31 @@ namespace StgSharp.Graphics.OpenGL } fixed( byte* bptr = pixels ) { Context.glReadPixels( - beginPosition.X, beginPosition.Y, i.Width, i.Height, - ( uint )format, ( uint )dataType, bptr ); + beginPosition.X, beginPosition.Y, i.Width, i.Height, ( uint )format, + ( uint )dataType, bptr ); } i.PixelUpdateCount++; } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferData( - BufferType bufferType, - T bufferData, - BufferUsage usage ) + BufferType bufferType, + T bufferData, + BufferUsage usage ) where T: struct { int size = Marshal.SizeOf(); #pragma warning disable CS8500 T* p = &bufferData; #pragma warning restore CS8500 - Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )p, - ( uint )usage ); + Context.glBufferData( ( uint )bufferType, ( IntPtr )size, ( IntPtr )p, ( uint )usage ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferData( - BufferType bufferType, - T[] bufferArray, - BufferUsage usage ) + BufferType bufferType, + T[] bufferArray, + BufferUsage usage ) where T: struct,INumber { int size = bufferArray.Length * Marshal.SizeOf( typeof( T ) ); @@ -583,19 +585,18 @@ namespace StgSharp.Graphics.OpenGL } #pragma warning disable CS8500 fixed( void* bufferPtr = bufferArray ) - #pragma warning restore CS8500 - { + #pragma warning restore CS8500 + { Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, - ( uint )usage ); + ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, ( uint )usage ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferData( - BufferType bufferType, - ReadOnlySpan bufferArray, - BufferUsage usage ) + BufferType bufferType, + ReadOnlySpan bufferArray, + BufferUsage usage ) where T: struct,INumber { int size = bufferArray.Length * Marshal.SizeOf( typeof( T ) ); @@ -604,19 +605,18 @@ namespace StgSharp.Graphics.OpenGL } #pragma warning disable CS8500 fixed( void* bufferPtr = bufferArray ) - #pragma warning restore CS8500 - { + #pragma warning restore CS8500 + { Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, - ( uint )usage ); + ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, ( uint )usage ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferData( - BufferType bufferType, - Span bufferArray, - BufferUsage usage ) + BufferType bufferType, + Span bufferArray, + BufferUsage usage ) where T: struct, INumber { int size = bufferArray.Length * Marshal.SizeOf( typeof( T ) ); @@ -626,19 +626,18 @@ namespace StgSharp.Graphics.OpenGL #pragma warning disable CS8500 fixed( void* bufferPtr = &bufferArray.GetPinnableReference() ) - #pragma warning restore CS8500 - { + #pragma warning restore CS8500 + { Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, - ( uint )usage ); + ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, ( uint )usage ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferVectorData( - BufferType bufferType, - ReadOnlySpan bufferArray, - BufferUsage usage ) + BufferType bufferType, + ReadOnlySpan bufferArray, + BufferUsage usage ) where T: struct, IVector { int size = bufferArray.Length * Marshal.SizeOf( typeof( T ) ); @@ -647,19 +646,18 @@ namespace StgSharp.Graphics.OpenGL } #pragma warning disable CS8500 fixed( void* bufferPtr = &bufferArray.GetPinnableReference() ) - #pragma warning restore CS8500 - { + #pragma warning restore CS8500 + { Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, - ( uint )usage ); + ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, ( uint )usage ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetBufferVectorData( - BufferType bufferType, - T[] bufferArray, - BufferUsage usage ) + BufferType bufferType, + T[] bufferArray, + BufferUsage usage ) where T: struct, IVector { int size = bufferArray.Length * Marshal.SizeOf( typeof( T ) ); @@ -668,28 +666,26 @@ namespace StgSharp.Graphics.OpenGL } #pragma warning disable CS8500 fixed( void* bufferPtr = bufferArray ) - #pragma warning restore CS8500 - { + #pragma warning restore CS8500 + { Context.glBufferData( - ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, - ( uint )usage ); + ( uint )bufferType, ( IntPtr )size, ( IntPtr )bufferPtr, ( uint )usage ); } } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetRenderBufferStorage( - RenderBufferInternalFormat internalFormat, - (int width, int height) size ) + RenderBufferInternalFormat internalFormat, + (int width, int height) size ) { Context.glRenderbufferStorage( - glConst.RENDERBUFFER, ( uint )internalFormat, size.width, - size.height ); + glConst.RENDERBUFFER, ( uint )internalFormat, size.width, size.height ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] public unsafe void SetRenderBufferStorage( - RenderBufferInternalFormat internalFormat, - (uint width, uint height) size ) + RenderBufferInternalFormat internalFormat, + (uint width, uint height) size ) { Context.glRenderbufferStorage( glConst.RENDERBUFFER, ( uint )internalFormat, ( int )size.width, @@ -698,60 +694,60 @@ namespace StgSharp.Graphics.OpenGL [MethodImpl( MethodImplOptions.AggressiveInlining )] public void SetVertexAttribute( - uint index, - int size, - TypeCode t, - bool normalized, - uint stride, - int pointer ) + uint index, + int size, + TypeCode t, + bool normalized, + uint stride, + int pointer ) { uint type = InternalIO.GLtype[ t ]; Context.glVertexAttribPointer( - index, size, type, normalized ? 1 : 0, stride, - ( void* )pointer ); + index, size, type, normalized ? 1 : 0, stride, ( void* )pointer ); Context.glEnableVertexAttribArray( index ); } [MethodImpl( MethodImplOptions.AggressiveInlining )] public void TextureImage2d( - Texture2DTarget target, - int level, - ImageChannel sourceChannel, - uint width, - uint height, - ImageChannel targetChannel, - PixelChannelLayout type, - T[] pixels ) + Texture2DTarget target, + int level, + ImageChannel sourceChannel, + uint width, + uint height, + ImageChannel targetChannel, + PixelChannelLayout type, + T[] pixels ) where T: struct, INumber { #pragma warning disable CS8500 - fixed( T* tptr = pixels ) { - T* ptr = ( ( pixels == null ) || ( pixels.Length == 0 ) ) ? - ( T* )IntPtr.Zero : tptr; + fixed( T* tptr = pixels ) + { + T* ptr = ( ( pixels == null ) || ( pixels.Length == 0 ) ) ? ( T* )IntPtr.Zero : tptr; Context.glTexImage2D( - ( uint )target, level, ( uint )sourceChannel, width, height, - 0, ( uint )targetChannel, ( uint )type, tptr ); + ( uint )target, level, ( uint )sourceChannel, width, height, 0, + ( uint )targetChannel, ( uint )type, tptr ); } #pragma warning restore CS8500 } [MethodImpl( MethodImplOptions.AggressiveInlining )] public void TextureImage2d( - Texture2DTarget target, - int level, - ImageChannel sourceChannel, - uint width, - uint height, - ImageChannel targetChannel, - PixelChannelLayout type, - Span pixelSpan ) + Texture2DTarget target, + int level, + ImageChannel sourceChannel, + uint width, + uint height, + ImageChannel targetChannel, + PixelChannelLayout type, + Span pixelSpan ) where T: struct, INumber { #pragma warning disable CS8500 - fixed( T* tptr = pixelSpan ) { + fixed( T* tptr = pixelSpan ) + { Context.glTexImage2D( - ( uint )target, level, ( uint )sourceChannel, width, height, - 0, ( uint )targetChannel, ( uint )type, tptr ); + ( uint )target, level, ( uint )sourceChannel, width, height, 0, + ( uint )targetChannel, ( uint )type, tptr ); } #pragma warning restore CS8500 } @@ -763,8 +759,8 @@ namespace StgSharp.Graphics.OpenGL } public static bool TryGetFunctionPackage( - IntPtr handle, - out OpenGLFunction functionPackage ) + IntPtr handle, + out OpenGLFunction functionPackage ) { return contextToGLMap.TryGetValue( handle, out functionPackage ); } @@ -798,7 +794,10 @@ namespace StgSharp.Graphics.OpenGL if( contextToGLMap.TryGetValue( handle, out pack ) ) { return pack; } - pack = new OpenGLFunction { _context = ( OpenglContext* )handle }; + pack = new OpenGLFunction + { + _context = ( OpenglContext* )handle + }; contextToGLMap.Add( handle, pack ); return pack; } diff --git a/StgSharp.Common/Internal/InternalResource.cs b/StgSharp.Common/Internal/InternalResource.cs index 3daeae0d..fd73565e 100644 --- a/StgSharp.Common/Internal/InternalResource.cs +++ b/StgSharp.Common/Internal/InternalResource.cs @@ -49,7 +49,9 @@ namespace StgSharp.Internal #region CollisionTexture - internal const string CollisionTextureVertexShader = """ + internal static ReadOnlySpan CollisionTextureVertexShader + { + get => """ #version 430 core layout(location = 0) in vec2 localCollisionCoord; layout(location = 1) in vec2 spaceCoord; @@ -75,8 +77,12 @@ namespace StgSharp.Internal float angle = atan(realCoord.y, realCoord.x); gl_Position = vec4(angle, realCoord.y, dist, 1); } - """; - internal const string CollisionTextureFragmentShader = """ + """u8; + } + + internal static ReadOnlySpan CollisionTextureFragmentShader + { + get => """ #version 430 core out vec4 Color; @@ -92,8 +98,9 @@ namespace StgSharp.Internal gl_FragDepth = min(dist, gl_FragDepth); Color = vec4(dist,0,0,1); } - """; + """u8; + } - #endregion + #endregion } } diff --git a/StgSharp.Common/Stg/Bullet.cs b/StgSharp.Common/Stg/Bullet.cs index 1f31f3c5..ef4c73ec 100644 --- a/StgSharp.Common/Stg/Bullet.cs +++ b/StgSharp.Common/Stg/Bullet.cs @@ -7,7 +7,7 @@ // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation -// files (the Software), to deal in the Software without restriction, +// files (the ��Software��), to deal in the Software without restriction, // including without limitation the rights to use, copy, modify, merge, // publish, distribute, sublicense, and/or sell copies of the Software, // and to permit persons to whom the Software is furnished to do so, @@ -17,7 +17,7 @@ // this permission notice shall be included in all copies // or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED AS IS, +// THE SOFTWARE IS PROVIDED ��AS IS��, // WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -46,9 +46,7 @@ namespace StgSharp.Gaming float angle, float scale ) { - if( buffer == null ) { - throw new ArgumentNullException( nameof( buffer ) ); - } + ArgumentNullException.ThrowIfNull(buffer); GlobalBuffer = buffer; BufferId = buffer.CreateInstanceID(); ( ( IInstancing )this ).Scale = scale; diff --git a/StgSharp.Common/obj/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs b/StgSharp.Common/obj/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs index d87061fd..5e596158 100644 --- a/StgSharp.Common/obj/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs +++ b/StgSharp.Common/obj/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ccef0de6f686f94da655b0e7d854d0acaf907d04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Common/obj/project.packagespec.json b/StgSharp.Common/obj/project.packagespec.json new file mode 100644 index 00000000..ee8a3349 --- /dev/null +++ b/StgSharp.Common/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj","projectName":"StgSharp.Common","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"Microsoft.CSharp":{"target":"Package","version":"[4.7.0, )"},"System.Runtime.CompilerServices.Unsafe":{"target":"Package","version":"[6.1.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs index 5b2fe53e..5e596158 100644 --- a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs +++ b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b618fdf7b5295b190dcc6b7168e038d1d5a11455")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json index 77b8f154..6fa307cc 100644 --- a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json +++ b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/b618fdf7b5295b190dcc6b7168e038d1d5a11455/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/a6411e2f25010961d278c5bcb4a929e21b176bba/*"}} \ No newline at end of file diff --git a/StgSharp.Generator/obj/Debug/net8.0/StgSharp.Generator.AssemblyInfo.cs b/StgSharp.Generator/obj/Debug/net8.0/StgSharp.Generator.AssemblyInfo.cs index 961587ff..e592a92f 100644 --- a/StgSharp.Generator/obj/Debug/net8.0/StgSharp.Generator.AssemblyInfo.cs +++ b/StgSharp.Generator/obj/Debug/net8.0/StgSharp.Generator.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Generator")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ccef0de6f686f94da655b0e7d854d0acaf907d04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Generator")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Generator")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Generator/obj/project.packagespec.json b/StgSharp.Generator/obj/project.packagespec.json new file mode 100644 index 00000000..60093af2 --- /dev/null +++ b/StgSharp.Generator/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Generator\\StgSharp.Generator.csproj","projectName":"StgSharp.Generator","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Generator\\StgSharp.Generator.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Generator\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"Microsoft.CodeAnalysis.CSharp":{"suppressParent":"All","target":"Package","version":"[4.13.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharp.Model/STEP/Analyser/StepDependencyDetector.cs b/StgSharp.Model/STEP/Analyser/StepDependencyDetector.cs new file mode 100644 index 00000000..ea072bb6 --- /dev/null +++ b/StgSharp.Model/STEP/Analyser/StepDependencyDetector.cs @@ -0,0 +1,61 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="StepDependencyDetector.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using StgSharp.Model.Step; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Model.Step +{ + internal class StepDependencyDetector + { + + public StepDependencyDetector() { } + + public List Dependencies { get; private set; } = new(); + + public void AddDependency( StepEntityInstanceNode node ) + { + Dependencies.Add( node.Id ); + } + + public IEnumerable ExportAllDependencies() + { + List ret = Dependencies; + Dependencies = new List(); + return ret; + } + + } +} diff --git a/StgSharp.Model/STEP/Analyser/StepEntityDefineSequence.cs b/StgSharp.Model/STEP/Analyser/StepEntityDefineSequence.cs new file mode 100644 index 00000000..840ed15b --- /dev/null +++ b/StgSharp.Model/STEP/Analyser/StepEntityDefineSequence.cs @@ -0,0 +1,54 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="StepEntityDefineSequence.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using StgSharp.Script.Express; + +using System; +using System.Collections.Generic; +using System.ComponentModel.Design; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Model.Step +{ + public record class StepEntityDefineSequence + { + public StepEntityDefineSequence( ExpSyntaxNode node, IEnumerable dep ) + { + Expression = node; + Dependencies = dep; + } + + public ExpSyntaxNode Expression { get; init; } + + public IEnumerable Dependencies { get; init; } + } +} diff --git a/StgSharp.Model/STEP/StepHeaderLineConstructor.cs b/StgSharp.Model/STEP/StepHeaderLineConstructor.cs new file mode 100644 index 00000000..3595fa86 --- /dev/null +++ b/StgSharp.Model/STEP/StepHeaderLineConstructor.cs @@ -0,0 +1,101 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="StepHeaderLineConstructor.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace StgSharp.Model.Step +{ + public class StepHeaderLineConstructor + { + + private static Regex regex = new Regex( + @"(?.+?(\)|'\s?\)|'))\s?(?,)\s?(?(.|\(|\(\s?').+)", + RegexOptions.Compiled ); + + private readonly int _id; + private readonly List _paramList; + private string _caller; + + public StepHeaderLineConstructor( int id, string caller, string parameters ) + { + _caller = caller; + _paramList = new List(); + SplitParameter( parameters ); + } + + public string this[ int paramIndex ] + { + get => _paramList[ paramIndex ]; + } + + public ReadOnlyCollection ParamList + { + get => _paramList.AsReadOnly(); + } + + public static string TempCallerName + { + get => "TEMPCALLER"; + } + + public string Caller + { + get => _caller; + internal set => _caller = value; + } + + public static StepHeaderLineConstructor CreateTempExpression( int id ) + { + return new StepHeaderLineConstructor( id, "TEMPCALLER", string.Empty ); + } + + private void SplitParameter( string parameters ) + { + if( string.IsNullOrEmpty( parameters ) || string.IsNullOrWhiteSpace( parameters ) ) { + return; + } + Match match = regex.Match( parameters ); + while( match.Success ) + { + _paramList.Add( match.Groups[ "param1" ].Value ); + parameters = match.Groups[ "other" ].Value; + match = regex.Match( parameters ); + } + _paramList.Add( parameters ); + } + + } +} diff --git a/StgSharp.Model/obj/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs b/StgSharp.Model/obj/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs index 17640bef..ec6d5c05 100644 --- a/StgSharp.Model/obj/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs +++ b/StgSharp.Model/obj/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ccef0de6f686f94da655b0e7d854d0acaf907d04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Model/obj/project.packagespec.json b/StgSharp.Model/obj/project.packagespec.json new file mode 100644 index 00000000..6d25e4b5 --- /dev/null +++ b/StgSharp.Model/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Model\\StgSharp.Model.csproj","projectName":"StgSharp.Model","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Model\\StgSharp.Model.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Model\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj"},"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs index f8722827..ec6d5c05 100644 --- a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs +++ b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a0f7476291d65b51de2055f8b2d69fa44348d04b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json index 77b8f154..6fa307cc 100644 --- a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json +++ b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/b618fdf7b5295b190dcc6b7168e038d1d5a11455/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/a6411e2f25010961d278c5bcb4a929e21b176bba/*"}} \ No newline at end of file diff --git a/StgSharp.Script/Common/CompileStack.cs b/StgSharp.Script/Common/CompileStack.cs index ac3e595a..d5a9252f 100644 --- a/StgSharp.Script/Common/CompileStack.cs +++ b/StgSharp.Script/Common/CompileStack.cs @@ -89,6 +89,8 @@ namespace StgSharp.Script get => _statementCache.Peek(); } + public Stack DepthStack => _depthStack; + public void DecreaseDepth() { CompileDepthMark mark = _depthStack.Pop(); @@ -110,9 +112,13 @@ namespace StgSharp.Script if( StatementsInDepth.Count == 0 ) { return TNode.Empty; } - TNode first = StatementsInDepth.Peek(); - while( StatementsInDepth.Count > 0 ) { - first.PrependNode( StatementsInDepth.Pop() ); + TNode end = StatementsInDepth.Peek(); + TNode first = end; + while( StatementsInDepth.Count > 0 ) + { + first = StatementsInDepth.Pop(); + end.PrependNode( first ); + end = first; } return first; } diff --git a/StgSharp.Script/Express/CompileEnv/KeyWord.cs b/StgSharp.Script/Express/CompileEnv/KeyWord.cs index eb320d3e..85205451 100644 --- a/StgSharp.Script/Express/CompileEnv/KeyWord.cs +++ b/StgSharp.Script/Express/CompileEnv/KeyWord.cs @@ -69,7 +69,7 @@ namespace StgSharp.Script.Express Dot, Comma, Semicolon, Colon, Percent, Apostrophe, Backslash, IndexOf, RightBracket, LeftBrace, RightBrace, Pipe, LeftParen, RightParen, LeftAsterisk, - Assignment, DoublePipe, ExpSymbole, CommentSingleLine, + Assignment, DoublePipe, ExpSymbol, CommentSingleLine, CommentStart, CommentEnd, InstanceEqual, InstanceNotEqual ]; @@ -342,7 +342,7 @@ namespace StgSharp.Script.Express public const string LeftAsterisk = "<*"; public const string Assignment = ":="; public const string DoublePipe = "||"; - public const string ExpSymbole = "**"; + public const string ExpSymbol = "**"; public const string CommentSingleLine = "--"; public const string CommentStart = "(*"; public const string CommentEnd = "*)"; diff --git a/StgSharp.Script/Express/Element/ExpFunction.cs b/StgSharp.Script/Express/Element/ExpFunction.cs index e2cc7961..3f5b16a3 100644 --- a/StgSharp.Script/Express/Element/ExpFunction.cs +++ b/StgSharp.Script/Express/Element/ExpFunction.cs @@ -54,7 +54,7 @@ namespace StgSharp.Script.Express public override ExpElementType ElementType => ExpElementType.Function; - public IExpElementSource ReturningType { get; protected set; } + public ExpInstantiableElement ReturningType { get; protected set; } public override IScriptSourceProvider SourceProvider => _transmitter; diff --git a/StgSharp.Script/Express/ExpAstNode/ExpBinaryOperatorNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpBinaryOperatorNode.cs index a713a449..5d753d20 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpBinaryOperatorNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpBinaryOperatorNode.cs @@ -69,7 +69,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } bool isFloat = ( left._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0 || ( right._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == @@ -89,7 +90,7 @@ namespace StgSharp.Script.Express { if( left.EqualityTypeConvert != right.EqualityTypeConvert ) { throw new ExpInvalidTypeException( - left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); + source, left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -133,7 +134,7 @@ namespace StgSharp.Script.Express { if( right is not ExpMetaRefNode metaRef ) { throw new ExpInvalidTypeException( - "", right.EqualityTypeConvert.Name ); + source, "", right.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -153,7 +154,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } bool isFloat = ( left._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0 || ( right._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == @@ -173,7 +175,7 @@ namespace StgSharp.Script.Express { if( left.EqualityTypeConvert != right.EqualityTypeConvert ) { throw new ExpInvalidTypeException( - left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); + source, left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -189,7 +191,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -205,7 +208,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -221,7 +225,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } bool isFloat = ( left._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0 || ( right._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == @@ -241,7 +246,7 @@ namespace StgSharp.Script.Express { if( left.EqualityTypeConvert != right.EqualityTypeConvert ) { throw new ExpInvalidTypeException( - left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); + source, left.EqualityTypeConvert.Name, right.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -257,7 +262,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } return new ExpBinaryOperatorNode( source, left, right ) { @@ -273,7 +279,8 @@ namespace StgSharp.Script.Express ExpSyntaxNode right ) { if( !left.IsNumber && !right.IsNumber ) { - throw new ExpInvalidTypeException( "Number", left.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( source, "Number", + left.EqualityTypeConvert.Name ); } bool isFloat = ( left._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0 || ( right._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == diff --git a/StgSharp.Script/Express/ExpAstNode/ExpCollectionIndexNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpCollectionIndexNode.cs index 47ac0c43..ffaa0923 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpCollectionIndexNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpCollectionIndexNode.cs @@ -67,7 +67,7 @@ namespace StgSharp.Script.Express { if( !indexExpression.IsNumber ) { throw new ExpInvalidTypeException( - "Number", indexExpression.EqualityTypeConvert.Name ); + source, "Number", indexExpression.EqualityTypeConvert.Name ); } return new ExpCollectionIndexNode( source, instance, indexExpression ); } diff --git a/StgSharp.Script/Express/ExpAstNode/ExpFunctionCallingNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpFunctionCallingNode.cs index 16ebc340..f78ebf11 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpFunctionCallingNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpFunctionCallingNode.cs @@ -58,7 +58,7 @@ namespace StgSharp.Script.Express public ExpFunctionSource FunctionCaller => _function; - public override ExpInstantiableElement EqualityTypeConvert => _function.; + public override ExpInstantiableElement EqualityTypeConvert => _function.ReturningType; public override ExpSyntaxNode Left => Empty; diff --git a/StgSharp.Script/Express/ExpAstNode/ExpRepeatNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpRepeatNode.cs index 3d4018f5..969864a5 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpRepeatNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpRepeatNode.cs @@ -78,7 +78,7 @@ namespace StgSharp.Script.Express 1, isLiteral: true ); break; default: - throw new ExpInvalidTypeException( "Int or Real", "otherwise" ); + throw new ExpInvalidTypeException( variable, "Int or Real", "otherwise" ); } } _variable = variable; diff --git a/StgSharp.Script/Express/ExpAstNode/ExpUnaryOperatorNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpUnaryOperatorNode.cs index 63101d30..99e9e9c1 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpUnaryOperatorNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpUnaryOperatorNode.cs @@ -58,7 +58,8 @@ namespace StgSharp.Script.Express public static ExpUnaryOperatorNode UnaryMinus( Token source, ExpSyntaxNode operand ) { if( !operand.IsNumber ) { - throw new ExpInvalidTypeException( "Number", operand.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( + source, "Number", operand.EqualityTypeConvert.Name ); } bool isFloat = ( operand._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0; @@ -74,7 +75,7 @@ namespace StgSharp.Script.Express if( ( operand._nodeFlag | ( ExpNodeFlag.BuiltinType_Logic | ExpNodeFlag.BuiltinType_Logic ) ) == 0 ) { throw new ExpInvalidTypeException( - "Bool or Logic", operand.EqualityTypeConvert.Name ); + source, "Bool or Logic", operand.EqualityTypeConvert.Name ); } return new ExpUnaryOperatorNode( source ) { @@ -86,7 +87,8 @@ namespace StgSharp.Script.Express public static ExpUnaryOperatorNode UnaryPlus( Token source, ExpSyntaxNode operand ) { if( !operand.IsNumber ) { - throw new ExpInvalidTypeException( "Number", operand.EqualityTypeConvert.Name ); + throw new ExpInvalidTypeException( + source, "Number", operand.EqualityTypeConvert.Name ); } bool isFloat = ( operand._nodeFlag | ExpNodeFlag.BuiltinType_Real ) == 0; diff --git a/StgSharp.Script/Express/ExpExceptions.cs b/StgSharp.Script/Express/ExpExceptions.cs index cb82f4e4..d6cb855f 100644 --- a/StgSharp.Script/Express/ExpExceptions.cs +++ b/StgSharp.Script/Express/ExpExceptions.cs @@ -42,8 +42,23 @@ namespace StgSharp.Script.Express public class ExpException : Exception { + private Token _pos; + public ExpException( string message ) : base( message ) { } + public ExpException( Token position, string message ) + : base( $"Express compile error at {position.Line}-{position.Column}:\n{message}" ) + { + _pos = position; + } + + public ExpException( ExpSyntaxNode node, string message ) + : base( + $"Express compile error at {node.Source.Line}-{node.Source.Column}:\n{message}" ) + { + _pos = node._source; + } + } public class ExpInvalidCharException : ExpException @@ -100,11 +115,17 @@ namespace StgSharp.Script.Express } - public class ExpInvalidTypeException : InvalidCastException + public class ExpInvalidTypeException : ExpException { - public ExpInvalidTypeException( string required, string provided ) + public ExpInvalidTypeException( ExpSyntaxNode node, string required, string provided ) : base( + node, + $"Type {required} is required at position, but a {provided} instance is provided." ) { } + + public ExpInvalidTypeException( Token t, string required, string provided ) + : base( + t, $"Type {required} is required at position, but a {provided} instance is provided." ) { } } diff --git a/StgSharp.Script/Express/ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs b/StgSharp.Script/Express/ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs index ba58bee7..d522a1a5 100644 --- a/StgSharp.Script/Express/ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs +++ b/StgSharp.Script/Express/ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs @@ -54,7 +54,7 @@ namespace StgSharp.Script.Express _cache.StatementsInDepth.Push( statement ); } else { - ExpInvalidSyntaxException.ThrowNoOperator( rightSeparator ); + _cache.StatementsInDepth.Push( ExpSyntaxNode.Empty ); } } else { diff --git a/StgSharp.Script/Express/ExpTokenReader.cs b/StgSharp.Script/Express/ExpTokenReader.cs index 094fcc60..19e5f033 100644 --- a/StgSharp.Script/Express/ExpTokenReader.cs +++ b/StgSharp.Script/Express/ExpTokenReader.cs @@ -114,7 +114,7 @@ namespace StgSharp.Script.Express do { _lineCache = _provider.ReadLine( out _lineNum ); - } while (string.IsNullOrEmpty( _lineCache )); + } while (string.IsNullOrEmpty( _lineCache ) && !_provider.IsEmpty); _current = 0; } if( _isReadingMultiLineComment ) @@ -182,7 +182,7 @@ namespace StgSharp.Script.Express rest = match.Groups[ "rest" ].Index; _current = rest; _last = new( - ExpressCompile.PoolString( source[ 1..( end - begin ) ] ), _lineNum, + ExpressCompile.PoolString( source[ 0..( end - begin ) ] ), _lineNum, begin, TokenFlag.Member ); return _last; } else @@ -236,21 +236,12 @@ namespace StgSharp.Script.Express throw new ExpInvalidCharException( '\"' ); } case '(': - cNext = source[ 1 ]; - if( cNext == '*' ) - { - _isReadingMultiLineComment = true; - _current += 2; - goto readLine; - } else - { - begin = _current; - _current++; - _last = new( - ExpressCompile.PoolString( source[ ..1 ] ), _lineNum, begin, - TokenFlag.Separator_Left ); - return _last; - } + begin = _current; + _current++; + _last = new( + ExpressCompile.PoolString( source[ ..1 ] ), _lineNum, begin, + TokenFlag.Separator_Left ); + return _last; case ')' or '}': begin = _current; _current++; diff --git a/StgSharp.Script/obj/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs b/StgSharp.Script/obj/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs index c0cd0726..c2bbcd95 100644 --- a/StgSharp.Script/obj/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs +++ b/StgSharp.Script/obj/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ccef0de6f686f94da655b0e7d854d0acaf907d04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Script/obj/project.packagespec.json b/StgSharp.Script/obj/project.packagespec.json new file mode 100644 index 00000000..cae5fc4b --- /dev/null +++ b/StgSharp.Script/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj","projectName":"StgSharp.Script","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"CommunityToolkit.HighPerformance":{"target":"Package","version":"[8.4.0, )"},"Microsoft.CodeAnalysis.CSharp":{"target":"Package","version":"[4.13.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs index 1c90c81b..c2bbcd95 100644 --- a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs +++ b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b618fdf7b5295b190dcc6b7168e038d1d5a11455")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json index 77b8f154..6fa307cc 100644 --- a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json +++ b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/b618fdf7b5295b190dcc6b7168e038d1d5a11455/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/a6411e2f25010961d278c5bcb4a929e21b176bba/*"}} \ No newline at end of file diff --git a/StgSharp.TerminalDialogue/obj/Debug/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/StgSharp.TerminalDialogue/obj/Debug/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs index a73d1a1c..2217181c 100644 --- a/StgSharp.TerminalDialogue/obj/Debug/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs +++ b/StgSharp.TerminalDialogue/obj/Debug/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -1,36 +1,4 @@ -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- -// file=".NETCoreApp,Version=v8.0.AssemblyAttributes.cs" -// Project: StgSharp -// AuthorGroup: Nitload Space -// Copyright (c) Nitload Space. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the Software), to deal in the Software without restriction, -// including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, -// and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and -// this permission notice shall be included in all copies -// or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED AS IS, -// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH -// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- // using System; using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute( - ".NETCoreApp,Version=v8.0", - FrameworkDisplayName = ".NET 8.0" )] +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/StgSharp.TerminalDialogue/obj/Debug/StgSharp.TerminalDialogue.AssemblyInfo.cs b/StgSharp.TerminalDialogue/obj/Debug/StgSharp.TerminalDialogue.AssemblyInfo.cs index 434e588d..b130a49b 100644 --- a/StgSharp.TerminalDialogue/obj/Debug/StgSharp.TerminalDialogue.AssemblyInfo.cs +++ b/StgSharp.TerminalDialogue/obj/Debug/StgSharp.TerminalDialogue.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.TerminalDialogue")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ccef0de6f686f94da655b0e7d854d0acaf907d04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.TerminalDialogue")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.TerminalDialogue")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.TerminalDialogue/obj/project.packagespec.json b/StgSharp.TerminalDialogue/obj/project.packagespec.json new file mode 100644 index 00000000..45bed2a6 --- /dev/null +++ b/StgSharp.TerminalDialogue/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.TerminalDialogue\\StgSharp.TerminalDialogue.csproj","projectName":"StgSharp.TerminalDialogue","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.TerminalDialogue\\StgSharp.TerminalDialogue.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.TerminalDialogue\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"Terminal.Gui":{"target":"Package","version":"[2.0.0-v2-develop.2329, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharpDebug/Program.cs b/StgSharpDebug/Program.cs index 5bb33ee9..6f75701a 100644 --- a/StgSharpDebug/Program.cs +++ b/StgSharpDebug/Program.cs @@ -56,12 +56,12 @@ namespace StgSharp internal static unsafe void Main( string[] args ) { - try - { - StgSharp.Init(); - ExpLinearExpressionTest(); - return; - } + StgSharp.Init(); + TestStepRead(); + StgSharp.Terminate( 0 ); + return; + + try { } catch( Exception ex ) { Console.WriteLine( ex ); diff --git a/StgSharpDebug/StepReadingTest.cs b/StgSharpDebug/StepReadingTest.cs new file mode 100644 index 00000000..277726ef --- /dev/null +++ b/StgSharpDebug/StepReadingTest.cs @@ -0,0 +1,61 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="StepReadingTest.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the Software), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED AS IS, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using StgSharp.Model.Step; +using StgSharp.Script.Express; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp +{ + internal static partial class Program + { + + private static string[] stepFile = [ + @"D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\StepModel\_NPart#8299.stp", + @"D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\StepModel\ë.STEP", + ]; + + private static void TestStepRead() + { + ExpressCompile.InitCompile(); + if( StepReader.FromFile( stepFile[ 0 ], out StepReader reader ) ) + { + StepModel model = reader.ReadToModelSingleThread(); + reader.Dispose(); + } + } + + } +} diff --git a/StgSharpDebug/obj/project.packagespec.json b/StgSharpDebug/obj/project.packagespec.json new file mode 100644 index 00000000..a9ede609 --- /dev/null +++ b/StgSharpDebug/obj/project.packagespec.json @@ -0,0 +1 @@ +"restore":{"projectUniqueName":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharpDebug\\StgSharpDebug.csproj","projectName":"StgSharpDebug","projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharpDebug\\StgSharpDebug.csproj","outputPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharpDebug\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Common\\StgSharp.Common.csproj"},"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Model\\StgSharp.Model.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Model\\StgSharp.Model.csproj"},"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj":{"projectPath":"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\StgSharp.Script\\StgSharp.Script.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs index 9271c89a..2596b8a1 100644 --- a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs +++ b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c29993fd8497704d2ddeab3e1a3f8bfa5caa8d90")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6411e2f25010961d278c5bcb4a929e21b176bba")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json index 2440bc0f..6fa307cc 100644 --- a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json +++ b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/2692495dc8460e1f60a2d073f162c5f526e1ba1b/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/a6411e2f25010961d278c5bcb4a929e21b176bba/*"}} \ No newline at end of file