Daily update on 20251020-041041 by Nitload Youmu. Additional Message : Code cleanup and new design of parallel (maybe THE THENTH VERSION? Tough work!).

Signed-off-by: Nitload <YoumuLiu_NSI@whv0t.onmicrosoft.com>

StgSharp.Common/Controlling/Controls/DecorationBox.cs

@@ -1,39 +1,40 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-// file="DecorationBox"
+// file="DecorationBox.cs"
 // Project: StgSharp
-// AuthorGroup: Nitload
+// AuthorGroup: Nitload Space
-// Copyright (c) Nitload. All rights reserved.
+// Copyright (c) Nitload Space. All rights reserved.
 //     
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// Permission is hereby granted, free of charge, to any person 
-// of this software and associated documentation files (the "Software"), to deal
+// obtaining a copy of this software and associated documentation 
-// in the Software without restriction, including without limitation the rights
+// files (the “Software”), to deal in the Software without restriction, 
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// including without limitation the rights to use, copy, modify, merge,
-// copies of the Software, and to permit persons to whom the Software is
+// publish, distribute, sublicense, and/or sell copies of the Software, 
-// furnished to do so, subject to the following conditions:
+// 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
+// The above copyright notice and 
-// copies or substantial portions of the Software.
+// 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
+// THE SOFTWARE IS PROVIDED “AS IS”, 
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
-// SOFTWARE.
+// ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-using StgSharp.Controls;
 using StgSharp.Geometries;
 using StgSharp.Graphics;
-using StgSharp.Mathematics;
 using StgSharp.Mathematics.Graphic;
 
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Runtime.CompilerServices;
 
 namespace StgSharp.Controls
 {
@@ -52,6 +53,7 @@ namespace StgSharp.Controls
 
         public ReadOnlySpan<Vec4> TextureBox
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => renderMesh.TextureCoord;
         }
 

StgSharp.Mathematics/Numeric/MatrixParallel.Publish.cs

@@ -2,8 +2,8 @@
 // -----------------------------------------------------------------------
 // file="MatrixParallel.Publish"
 // Project: StgSharp
-// AuthorGroup: Nitload
+// AuthorGroup: Nitload Space
-// Copyright (c) Nitload. All rights reserved.
+// 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
@@ -830,12 +830,15 @@ namespace StgSharp.Mathematics.Numeric
             int total = tileCount;
             List<MatrixParallelWrap> w = new List<MatrixParallelWrap>(Wraps.Count);
 
+            int baseTile = 0;
+
+            // TODO 干脆用四个掩码分别表示各种部分算了。
             for (int i = 0; i < Wraps.Count; i++)
             {
                 MatrixParallelWrap wrap = Wraps.Pop();
                 wrap.WrapTask = (MatrixParallelTaskPackageNonGeneric*)package;
-                wrap.WrapTaskCapacity = ;
+                wrap.WrapTaskCapacity = tilePerThreadLess + (i < extraTiles ? 1 : 0);
-                wrap.WrapTaskSliceCount = ;
+                wrap.WrapTaskSliceCount = (i * tilePerThreadLess) + Math.Min(i, extraTiles);
                 w.Add(wrap);
             }
         }

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.Common.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.Common.cs"
+// file="ExpSyntaxAnalyzer.Common"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.Enum.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.Enum.cs"
+// file="ExpSyntaxAnalyzer.Enum"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.ErrorProcess.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.ErrorProcess.cs"
+// file="ExpSyntaxAnalyzer.ErrorProcess"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.OperatorParser.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.OperatorParser.cs"
+// file="ExpSyntaxAnalyzer.OperatorParser"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.PrefixReverseAnalysing.cs"
+// file="ExpSyntaxAnalyzer.PrefixReverseAnalysing"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/ExpSyntaxAnalyzer.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpSyntaxAnalyzer.cs"
+// file="ExpSyntaxAnalyzer"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/StepDataSectionsTranmitter.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepDataSectionsTranmitter.cs"
+// file="StepDataSectionsTranmitter"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/StepDataTokenReader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepDataTokenReader.cs"
+// file="StepDataTokenReader"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -48,9 +45,7 @@ namespace StgSharp.Model.Step
 
         private ExpTokenReader _reader;
 
-        private HashSet<string> tokenHash = [
+        private HashSet<string> tokenHash = [ "T", "F", "UNSPECIFIED" ];
-            "T","F","UNSPECIFIED"
-            ];
         private Queue<Token> _cache = new Queue<Token>();
         private StepDataSectionTransmitter _transmitter;
 
@@ -155,19 +150,13 @@ namespace StgSharp.Model.Step
                 return false;
             }
 
-            [GeneratedRegex(
+            [GeneratedRegex(@"(?<token>#[0-9A-Za-z]+)(?<end>\s*?)(?<rest>\S|$)", RegexOptions.Singleline)]
-                    @"(?<token>#[0-9A-Za-z]+)(?<end>\s*?)(?<rest>\S|$)",
-                    RegexOptions.Singleline )]
             private static partial Regex GetEntityTagSymbolPattern();
 
-            [GeneratedRegex(
+            [GeneratedRegex(@"(?<token>\.[A-Za-z_]+\.)(?<end>\s*)(?<rest>\S*)", RegexOptions.Singleline)]
-                    @"(?<token>\.[A-Za-z_]+\.)(?<end>\s*)(?<rest>\S*)",
-                    RegexOptions.Singleline )]
             private static partial Regex GetNextEnumPattern();
 
-            [GeneratedRegex(
+            [GeneratedRegex(@"(?<token>')(?>\\\\|''|(?!')[^'])*(?<end>')\s*?(?<rest>\S|$)", RegexOptions.Singleline)]
-                    @"(?<token>')(?>\\\\|''|(?!')[^'])*(?<end>')\s*?(?<rest>\S|$)",
-                    RegexOptions.Singleline )]
             private static partial Regex GetStringPattern();
 
         }

StgSharp.Model/Step/Analyser/StepDependencyDetector.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepDependencyDetector.cs"
+// file="StepDependencyDetector"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Analyser/StepEntityDefineSequence.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityDefineSequence.cs"
+// file="StepEntityDefineSequence"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -41,6 +38,7 @@ namespace StgSharp.Model.Step
 {
     public record class StepEntityDefineSequence
     {
+
         public StepEntityDefineSequence(ExpSyntaxNode node, IEnumerable<int> dep)
         {
             Expression = node;
@@ -50,5 +48,6 @@ namespace StgSharp.Model.Step
         public ExpSyntaxNode Expression { get; init; }
 
         public IEnumerable<int> Dependencies { get; init; }
+
     }
 }

StgSharp.Model/Step/ExpressStepUtil.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpressStepUtil.cs"
+// file="ExpressStepUtil"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -65,27 +62,7 @@ namespace StgSharp.Model.Step
         public const string VertexPointText = "VERTEX_POINT";
 
         private static
-            HashSet<string> names = [
+            HashSet<string> names = [ AdvancedFaceText, Axis2Placement2DText, Axis2Placement3DText, BSplineCurveWithKnotsText, CartesianPointText, CircleText, CylindricalSurfaceText, DirectionText, EdgeCurveText, EdgeLoopText, EllipseText, FaceBoundText, FaceOuterBoundText, LineText, OrientedEdgeText, PlaneText, RepresentationItemText, VectorText, VertexPointText, ];
-                AdvancedFaceText,
-                Axis2Placement2DText,
-                Axis2Placement3DText,
-                BSplineCurveWithKnotsText,
-                CartesianPointText,
-                CircleText,
-                CylindricalSurfaceText,
-                DirectionText,
-                EdgeCurveText,
-                EdgeLoopText,
-                EllipseText,
-                FaceBoundText,
-                FaceOuterBoundText,
-                LineText,
-                OrientedEdgeText,
-                PlaneText,
-                RepresentationItemText,
-                VectorText,
-                VertexPointText,
-                ];
 
         private FrozenDictionary<string, ExpEntitySource> entitiesDefine;
         private StringPool _entityNamePool = new StringPool();

StgSharp.Model/Step/Items/StepAdvancedFace.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepAdvancedFace.cs"
+// file="StepAdvancedFace"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepAxis2Placement.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepAxis2Placement.cs"
+// file="StepAxis2Placement"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepAxis2Placement2D.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepAxis2Placement2D.cs"
+// file="StepAxis2Placement2D"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -42,10 +39,7 @@ namespace StgSharp.Model.Step
 
         private StepAxis2Placement2D(StepModel model) : base(model) { }
 
-        public StepAxis2Placement2D(
+        public StepAxis2Placement2D(StepModel model, StepCartesianPoint location, StepDirection direction)
-               StepModel model,
-               StepCartesianPoint location,
-               StepDirection direction )
             : base(model)
         {
             Location = location;
@@ -61,9 +55,7 @@ namespace StgSharp.Model.Step
             RefDirection = entity.RefDirection;
         }
 
-        internal static StepAxis2Placement2D FromSyntax(
+        internal static StepAxis2Placement2D FromSyntax(StepModel binder, ExpSyntaxNode syntaxList)
-                                             StepModel binder,
-                                             ExpSyntaxNode syntaxList )
         {
             ExpNodePresidentEnumerator enumerator = new ExpNodePresidentEnumerator(syntaxList);
             StepAxis2Placement2D axis = new StepAxis2Placement2D(binder);

StgSharp.Model/Step/Items/StepAxis2Placement3D.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepAxis2Placement3D.cs"
+// file="StepAxis2Placement3D"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -73,9 +70,7 @@ namespace StgSharp.Model.Step
             throw new NotImplementedException();
         }
 
-        internal static StepAxis2Placement3D FromSyntax(
+        internal static StepAxis2Placement3D FromSyntax(StepModel binder, ExpSyntaxNode syntaxList)
-                                             StepModel binder,
-                                             ExpSyntaxNode syntaxList )
         {
             ExpNodePresidentEnumerator enumerator = new ExpNodePresidentEnumerator(syntaxList);
             StepAxis2Placement3D axis = new StepAxis2Placement3D(binder);

StgSharp.Model/Step/Items/StepBSplineCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBSplineCurve.cs"
+// file="StepBSplineCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -61,14 +58,7 @@ namespace StgSharp.Model.Step
         internal const string POLYLINE_FORM = "POLYLINE_FORM";
         internal const string UNSPECIFIED = "UNSPECIFIED";
 
-        internal static HashSet<string> AllPossibleValue { get; } = [
+        internal static HashSet<string> AllPossibleValue { get; } = [ CIRCULAR_ARC, ELLIPTIC_ARC, HYPERBOLIC_ARC, PARABOLIC_ARC, POLYLINE_FORM, UNSPECIFIED, ];
-                CIRCULAR_ARC,
-                ELLIPTIC_ARC,
-                HYPERBOLIC_ARC,
-                PARABOLIC_ARC,
-                POLYLINE_FORM,
-                UNSPECIFIED,
-            ];
 
     }
 

StgSharp.Model/Step/Items/StepBSplineCurveWithKnots.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBSplineCurveWithKnots.cs"
+// file="StepBSplineCurveWithKnots"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -60,14 +57,10 @@ namespace StgSharp.Model.Step
         private const string UNIFORM_KNOTS = "UNIFORM_KNOTS";
         private const string UNSPECIFIED = "UNSPECIFIED";
 
-        public StepBSplineCurveWithKnots(
+        public StepBSplineCurveWithKnots(StepModel model, IEnumerable<StepCartesianPoint> controlPoints)
-               StepModel model,
-               IEnumerable<StepCartesianPoint> controlPoints )
             : base(model, controlPoints) { }
 
-        public StepBSplineCurveWithKnots(
+        public StepBSplineCurveWithKnots(StepModel model, params StepCartesianPoint[] controlPoints)
-               StepModel model,
-               params StepCartesianPoint[] controlPoints )
             : base(model, controlPoints) { }
 
         public List<int> KnotMultiplicities { get; } = new List<int>();
@@ -88,9 +81,7 @@ namespace StgSharp.Model.Step
             Knots.AddRange(entity.Knots);
         }
 
-        internal static StepBSplineCurveWithKnots FromSyntax(
+        internal static StepBSplineCurveWithKnots FromSyntax(StepModel binder, ExpSyntaxNode syntaxList)
-                                                  StepModel binder,
-                                                  ExpSyntaxNode syntaxList )
         {
             ExpNodePresidentEnumerator enumerator = syntaxList .ToPresidentEnumerator();
             enumerator.AssertEnumeratorCount(9);

StgSharp.Model/Step/Items/StepBSplineSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBSplineSurface.cs"
+// file="StepBSplineSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepBoundedCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBoundedCurve.cs"
+// file="StepBoundedCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepBoundedSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBoundedSurface.cs"
+// file="StepBoundedSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepBoundedSurfaceCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepBoundedSurfaceCurve.cs"
+// file="StepBoundedSurfaceCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepCartesianPoint.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepCartesianPoint.cs"
+// file="StepCartesianPoint"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -39,8 +36,7 @@ namespace StgSharp.Model.Step
 
         private StepCartesianPoint(StepModel model) : base(model) { }
 
-        public StepCartesianPoint( StepModel model, float x, float y, float z )
+        public StepCartesianPoint(StepModel model, float x, float y, float z) : base(model, x, y, z) { }
-            : base( model, x, y, z ) { }
 
         public override StepItemType ItemType => StepItemType.CartesianPoint;
 

StgSharp.Model/Step/Items/StepCircle.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepCircle.cs"
+// file="StepCircle"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepConic.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepConic.cs"
+// file="StepConic"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepCurve.cs"
+// file="StepCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepCylindricalSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepCylindricalSurface.cs"
+// file="StepCylindricalSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -42,10 +39,7 @@ namespace StgSharp.Model.Step
 
         public StepCylindricalSurface(StepModel model) : base(model) { }
 
-        public StepCylindricalSurface(
+        public StepCylindricalSurface(StepModel model, StepAxis2Placement3D position, float radius)
-               StepModel model,
-               StepAxis2Placement3D position,
-               float radius )
             : base(model, position)
         {
             Radius = radius;
@@ -61,9 +55,7 @@ namespace StgSharp.Model.Step
             Radius = entity.Radius;
         }
 
-        internal static StepRepresentationItem FromSyntax(
+        internal static StepRepresentationItem FromSyntax(StepModel binder, ExpSyntaxNode syntaxList)
-                                               StepModel binder,
-                                               ExpSyntaxNode syntaxList )
         {
             ExpNodePresidentEnumerator enumerator = new ExpNodePresidentEnumerator(syntaxList);
             enumerator.AssertEnumeratorCount(3);

StgSharp.Model/Step/Items/StepDirection.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepDirection.cs"
+// file="StepDirection"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -39,8 +36,7 @@ namespace StgSharp.Model.Step
 
         private StepDirection(StepModel model) : base(model) { }
 
-        public StepDirection( StepModel model, float x, float y, float z )
+        public StepDirection(StepModel model, float x, float y, float z) : base(model, x, y, z) { }
-            : base( model, x, y, z ) { }
 
         public override StepItemType ItemType => StepItemType.Direction;
 

StgSharp.Model/Step/Items/StepEdge.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEdge.cs"
+// file="StepEdge"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepEdgeCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEdgeCurve.cs"
+// file="StepEdgeCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepEdgeLoop.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEdgeLoop.cs"
+// file="StepEdgeLoop"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepElementarySurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepElementarySurface.cs"
+// file="StepElementarySurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepEllipse.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEllipse.cs"
+// file="StepEllipse"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -44,12 +41,7 @@ namespace StgSharp.Model.Step
 
         private StepEllipse(StepModel model) : base(model) { }
 
-        public StepEllipse(
+        public StepEllipse(StepModel model, string name, StepAxis2Placement position, float semiAxis1, float semiAxis2)
-               StepModel model,
-               string name,
-               StepAxis2Placement position,
-               float semiAxis1,
-               float semiAxis2 )
             : base(model)
         {
             Position = position;

StgSharp.Model/Step/Items/StepFace.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepFace.cs"
+// file="StepFace"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepFaceBound.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepFaceBound.cs"
+// file="StepFaceBound"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepFaceOuterBound.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepFaceOuterBound.cs"
+// file="StepFaceOuterBound"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -49,9 +46,7 @@ namespace StgSharp.Model.Step
             base.FromInstance(entity);
         }
 
-        internal static new StepFaceOuterBound FromSyntax(
+        internal static new StepFaceOuterBound FromSyntax(StepModel binder, ExpSyntaxNode syntaxList)
-                                               StepModel binder,
-                                               ExpSyntaxNode syntaxList )
         {
             ExpNodePresidentEnumerator enumerator = new ExpNodePresidentEnumerator(syntaxList);
             enumerator.AssertEnumeratorCount(3);

StgSharp.Model/Step/Items/StepFaceSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepFaceSurface.cs"
+// file="StepFaceSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepGeometricRepresentationItem.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepGeometricRepresentationItem.cs"
+// file="StepGeometricRepresentationItem"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -46,8 +43,7 @@ namespace StgSharp.Model.Step
 
         public override bool IsConvertableTo(string entityName)
         {
-            return base.IsConvertableTo( entityName ) ||
+            return base.IsConvertableTo(entityName) || entityName is "StepGeometricRepresentationItem";
-                   entityName is "StepGeometricRepresentationItem";
         }
 
     }

StgSharp.Model/Step/Items/StepLine.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-// file="StepLine.cs"
+// file="StepLine"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-// Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-// files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-// including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-// and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-// subject to the following conditions:
 //
-// The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-// this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-// 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
-// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -82,14 +79,7 @@ namespace StgSharp.Model.Step
             Vector = entity.Vector;
         }
 
-        public static StepLine FromPoints(
+        public static StepLine FromPoints(StepModel model, float x1, float y1, float z1, float x2, float y2, float z2)
-                               StepModel model,
-                               float x1,
-                               float y1,
-                               float z1,
-                               float x2,
-                               float y2,
-                               float z2)
         {
             StepCartesianPoint start = new StepCartesianPoint(model, x1, y1, z1);
             float dx = x2 - x1;

StgSharp.Model/Step/Items/StepLoop.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepLoop.cs"
+// file="StepLoop"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepOrientedEdge.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepOrientedEdge.cs"
+// file="StepOrientedEdge"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepPcurveOrSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepPcurveOrSurface.cs"
+// file="StepPcurveOrSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepPlacement.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepPlacement.cs"
+// file="StepPlacement"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepPlane.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepPlane.cs"
+// file="StepPlane"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -40,8 +37,7 @@ namespace StgSharp.Model.Step
 
         public StepPlane(StepModel model) : base(model) { }
 
-        public StepPlane( StepModel model, StepAxis2Placement3D position )
+        public StepPlane(StepModel model, StepAxis2Placement3D position) : base(model, position) { }
-            : base( model, position ) { }
 
         public override StepItemType ItemType => StepItemType.Plane;
 

StgSharp.Model/Step/Items/StepPoint.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepPoint.cs"
+// file="StepPoint"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepRepresentationItem.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepRepresentationItem.cs"
+// file="StepRepresentationItem"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepSurface.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepSurface.cs"
+// file="StepSurface"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepSurfaceCurve.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepSurfaceCurve.cs"
+// file="StepSurfaceCurve"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepTopologicalRepresentationItem.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepTopologicalRepresentationItem.cs"
+// file="StepTopologicalRepresentationItem"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -48,8 +45,7 @@ namespace StgSharp.Model.Step
 
         public override bool IsConvertableTo(string entityName)
         {
-            return base.IsConvertableTo( entityName ) ||
+            return base.IsConvertableTo(entityName) || entityName == "StepTopologicalRepresentationItem";
-                   entityName == "StepTopologicalRepresentationItem";
         }
 
     }

StgSharp.Model/Step/Items/StepTriple.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-// file="StepTriple.cs"
+// file="StepTriple"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-// Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-// files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-// including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-// and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-// subject to the following conditions:
 //
-// The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-// this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-// 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
-// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepVector.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepVector.cs"
+// file="StepVector"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepVertex.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-// file="StepVertex.cs"
+// file="StepVertex"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-// Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-// files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-// including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-// and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-// subject to the following conditions:
 //
-// The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-// this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-// 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
-// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/Items/StepVertexPoint.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepVertexPoint.cs"
+// file="StepVertexPoint"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepDataParser.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-// file="StepDataParser.cs"
+// file="StepDataParser"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-// Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-// files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-// including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-// and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-// subject to the following conditions:
 //
-// The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-// this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-// 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
-// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepEntityBase.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityBase.cs"
+// file="StepEntityBase"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepEntityLabel.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityLabel.cs"
+// file="StepEntityLabel"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -40,6 +37,7 @@ namespace StgSharp.Model.Step
 {
     public record class StepEntityLabel : PipelineNodeLabel
     {
+
         public StepEntityLabel(int id)
         {
             Id = id;
@@ -56,5 +54,6 @@ namespace StgSharp.Model.Step
         {
             return $"StepEntityLabel: {Id}";
         }
+
     }
 }

StgSharp.Model/Step/StepEntityUnsupportedException.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityUnsupportedException.cs"
+// file="StepEntityUnsupportedException"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepHeader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepHeader.cs"
+// file="StepHeader"
-//     Project: World
+// Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -39,6 +36,7 @@ namespace StgSharp.Model.Step
     /// </summary>
     public record class StepInfo
     {
+
         private STEPFileDescriptor _header = new();
         private STEPFileName _name = new();
         private STEPSchema _schema = new();
@@ -126,6 +124,7 @@ namespace StgSharp.Model.Step
             get => _schema.Data;
             internal set => _schema.Data = value;
         }
+
     }
 
     /// <summary>
@@ -133,6 +132,7 @@ namespace StgSharp.Model.Step
     /// </summary>
     public record class STEPFileName
     {
+
         public DateTime TimeStamp { get; internal set; }
 
         public string Name { get; internal set; }
@@ -150,13 +150,16 @@ namespace StgSharp.Model.Step
         public string OriginatingSystem { get; internal set; }
 
         public string Authorization { get; internal set; }
+
     }
 
     public record class STEPSchema
     {
+
         private List<string> _schema = new();
 
         public string Data { get; internal set; }
+
     }
 
     /// <summary>
@@ -164,8 +167,10 @@ namespace StgSharp.Model.Step
     /// </summary>
     public record class STEPFileDescriptor
     {
+
         public (int mainLevel,int? subLevel) Level { get; internal set; }
 
         public string Description { get; internal set; }
+
     }
 }

StgSharp.Model/Step/StepHeaderLineConstructor.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepHeaderLineConstructor.cs"
+// file="StepHeaderLineConstructor"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepItemType.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepItemType.cs"
+// file="StepItemType"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepModel.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepModel.cs"
+// file="StepModel"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -150,9 +147,7 @@ namespace StgSharp.Model.Step
             _initScheduler = null!;
         }
 
-        public void ReplaceEntity(
+        public void ReplaceEntity(StepUninitializedEntity uninitialized, StepEntityBase accurateEntity)
-                    StepUninitializedEntity uninitialized,
-                    StepEntityBase accurateEntity )
         {
             ArgumentNullException.ThrowIfNull(uninitialized);
             if (uninitialized.Context != this || accurateEntity.Context != this) {
@@ -170,9 +165,7 @@ namespace StgSharp.Model.Step
             IEnumerable<PipelineNode> nodes = PipelineMarshal.GetNodeSortedEnumeration(
                 _initScheduler);
             int count = 0;
-            List<string> info = [
+            List<string> info = [ @$"Step model root", ];
-                @$"Step model root",
-                ];
             foreach (PipelineNode node in nodes)
             {
                 count++;

StgSharp.Model/Step/StepReader.DataSectionReader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepReader.DataSectionReader.cs"
+// file="StepReader.DataSectionReader"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepReader.HeadReader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepReader.HeadReader.cs"
+// file="StepReader.HeadReader"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepReader.ToModel.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepReader.ToModel.cs"
+// file="StepReader.ToModel"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -70,8 +67,7 @@ namespace StgSharp.Model.Step
             Task secTask = Task.Run(ReadDataSection);
             Task anTask = Task.Run(ReadStepToken);
             Model = new StepModel(_info);
-            while( initStatements.TryDequeue( out StepEntityDefineSequence? statement ) ||
+            while (initStatements.TryDequeue(out StepEntityDefineSequence? statement) || !anTask.IsCompleted)
-                   !anTask.IsCompleted )
             {
                 if (statement is null)
                 {

StgSharp.Model/Step/StepReader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepReader.cs"
+// file="StepReader"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -63,8 +60,7 @@ namespace StgSharp.Model.Step
             _fileStream = stream;
             _size = size;
             _memoryFile = MemoryMappedFile.CreateFromFile(
-                stream, mapName: null, size, MemoryMappedFileAccess.Read, HandleInheritability.None,
+                stream, mapName:null, size, MemoryMappedFileAccess.Read, HandleInheritability.None, leaveOpen:true);
-                leaveOpen: true );
         }
 
         // ~StepReader()
@@ -87,8 +83,7 @@ namespace StgSharp.Model.Step
                 return false;
             }
             FileStream stream = new FileStream(
-                path, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 4096,
+                path, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize:4096, useAsync:true);
-                useAsync: true );
             byte[] fileHead = new byte[40];
             stream.Read(fileHead, 0, fileLabel.Length);
             if (!Encoding.UTF8.GetString(fileHead).Contains(fileLabel)) {

StgSharp.Model/Step/StepUncertainEntity.Parse.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepUncertainElement.Parse.cs"
+// file="StepUncertainEntity.Parse"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -41,9 +38,7 @@ namespace StgSharp.Model.Step
     public partial class StepUninitializedEntity
     {
 
-        private static StepRepresentationItem ConvertSimpleEntity(
+        private static StepRepresentationItem ConvertSimpleEntity(StepModel context, ExpFunctionCallingNode calling)
-                                              StepModel context,
-                                              ExpFunctionCallingNode calling )
         {
             string name = calling.FunctionCaller.Name;
             return name switch

StgSharp.Model/Step/StepUncertainEntity.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepUncertainEntity.cs"
+// file="StepUncertainEntity"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/StepUnsupportedEntity.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepUnsupportedEntity.cs"
+// file="StepUnsupportedEntity"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/SyntaxNode/StepComplexEntityNode.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepComplexEntityNode.cs"
+// file="StepComplexEntityNode"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/SyntaxNode/StepEntityInitCaller.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityInitCaller.cs"
+// file="StepEntityInitCaller"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/SyntaxNode/StepEntityInstanceNode.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepEntityInstanceNode.cs"
+// file="StepEntityInstanceNode"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Model/Step/SyntaxNode/StepExpEnumValueNode.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="StepExpEnumValueNode.cs"
+// file="StepExpEnumValueNode"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/AbstractSyntaxTree.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="AbstractSyntaxTree.cs"
+// file="AbstractSyntaxTree"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/CodeLineHelper.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="CodeLineHelper.cs"
+// file="CodeLineHelper"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/CompileDepthState.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="CompileDepthState.cs"
+// file="CompileDepthState"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -54,11 +51,7 @@ namespace StgSharp.Script
             Usage = usage;
         }
 
-        internal CompileDepthMark(
+        internal CompileDepthMark(int operatorBegin, int operandBegin, int usage, ICompileDepthState stateCache)
-                 int operatorBegin,
-                 int operandBegin,
-                 int usage,
-                 ICompileDepthState stateCache )
         {
             OperatorBegin = operatorBegin;
             OperandBegin = operandBegin;

StgSharp.Script/Common/CompileStack.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="CompileStack.cs"
+// file="CompileStack"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -115,11 +112,7 @@ namespace StgSharp.Script
             }
         }
 
-        public bool GetOperandAt(
+        public bool GetOperandAt(CompileDepthMark depth, Index i, out Token operandToken, out TNode operandNode)
-                    CompileDepthMark depth,
-                    Index i,
-                    out Token operandToken,
-                    out TNode operandNode )
         {
             OperandIndex index = _isNode[i];
 

StgSharp.Script/Common/IScriptSourceProvider.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="IScriptSourceProvider.cs"
+// file="IScriptSourceProvider"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/IScriptTokenReader.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="IScriptTokenReader.cs"
+// file="IScriptTokenReader"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/ISyntaxAnalyzer.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ISyntaxAnalyzer.cs"
+// file="ISyntaxAnalyzer"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/ISyntaxNode.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ISyntaxNode.cs"
+// file="ISyntaxNode"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -39,8 +36,7 @@ using System.Text;
 
 namespace StgSharp.Script
 {
-    public interface ISyntaxNode<TNode, TType> where TNode: ISyntaxNode<TNode, TType>
+    public interface ISyntaxNode<TNode, TType> where TNode: ISyntaxNode<TNode, TType> where TType: ITypeSource<TType>
-        where TType: ITypeSource<TType>
     {
 
         long NodeFlag { get; }

StgSharp.Script/Common/ITypeSource.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ITypeSource.cs"
+// file="ITypeSource"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Common/ScriptSourceTransmitter.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ScriptSourceTransmitter.cs"
+// file="ScriptSourceTransmitter"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -81,8 +78,7 @@ namespace StgSharp.Script
             _index = 0;
         }
 
-        public bool IsEmpty => _isWriting ?
+        public bool IsEmpty => _isWriting ? (_cache.Count == 0) : (_buffer.Length == 0) || (_index >= _buffer.Length);
-                ( _cache.Count == 0 ) : ( _buffer.Length == 0 ) || ( _index >= _buffer.Length );
 
         public bool IsFrozen => !_isWriting;
 

StgSharp.Script/Common/Token.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="Token.cs"
+// file="Token"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Builtin/ExpBuiltinType.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpBuiltinType.cs"
+// file="ExpBuiltinType"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Builtin/ExpCollection.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpCollection.cs"
+// file="ExpCollection"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -51,7 +48,7 @@ namespace StgSharp.Script.Express
 
         public abstract int Count { get; }
 
-        public override sealed IScriptSourceProvider SourceProvider => ScriptSourceTransmitter.Empty;
+        public sealed override IScriptSourceProvider SourceProvider => ScriptSourceTransmitter.Empty;
 
         public string MemberType
         {
@@ -185,7 +182,7 @@ namespace StgSharp.Script.Express
             throw new NotImplementedException();
         }
 
-        public override sealed IEnumerator<ExpElementInstance> GetEnumerator()
+        public sealed override IEnumerator<ExpElementInstance> GetEnumerator()
         {
             return ((IEnumerable<ExpElementInstance>)_collection)
                 .GetEnumerator();

StgSharp.Script/Express/Builtin/ExpCollectionInstance.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpCollectionInstance.cs"
+// file="ExpCollectionInstance"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Builtin/ExpLogic.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpLogic.cs"
+// file="ExpLogic"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/CompileEnv/BuiltinType.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="BuiltinType.cs"
+// file="BuiltinType"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/CompileEnv/DefaultSchema.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="DefaultSchema.cs"
+// file="DefaultSchema"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -99,26 +96,18 @@ namespace StgSharp.Script.Express
 
         internal void Init()
         {
-            IEnumerable<KeyValuePair<string, ExpTypeSource>> builtinTypeSource = [
+            IEnumerable<KeyValuePair<string, ExpTypeSource>> builtinTypeSource = [ new KeyValuePair<string, ExpTypeSource>(
-                new KeyValuePair<string, ExpTypeSource>(
                 PoolString(Keyword.Integer),
-                new ExpBuiltinType( Keyword.Integer, typeof( int ) ) ),
+                new ExpBuiltinType(Keyword.Integer, typeof(int))), new KeyValuePair<string, ExpTypeSource>(
-                new KeyValuePair<string, ExpTypeSource>(
+                PoolString(Keyword.Real), new ExpBuiltinType(Keyword.Real, typeof(float))), new KeyValuePair<string, ExpTypeSource>(
-                PoolString( Keyword.Real ), new ExpBuiltinType( Keyword.Real, typeof( float ) ) ),
-                new KeyValuePair<string, ExpTypeSource>(
                 PoolString(Keyword.Boolean),
-                new ExpBuiltinType( Keyword.Boolean, typeof( bool ) ) ),
+                new ExpBuiltinType(Keyword.Boolean, typeof(bool))), new KeyValuePair<string, ExpTypeSource>(
-                new KeyValuePair<string, ExpTypeSource>(
                 PoolString(Keyword.Logical),
-                new ExpBuiltinType( Keyword.Logical, typeof( ExpLogic ) ) ),
+                new ExpBuiltinType(Keyword.Logical, typeof(ExpLogic))), new KeyValuePair<string, ExpTypeSource>(
-                new KeyValuePair<string, ExpTypeSource>(
                 PoolString(Keyword.String),
-                new ExpBuiltinType( Keyword.String, typeof( string ) ) ),
+                new ExpBuiltinType(Keyword.String, typeof(string))), new KeyValuePair<string, ExpTypeSource>(
-                new KeyValuePair<string, ExpTypeSource>(
                 PoolString(Keyword.Binary),
-                new ExpBuiltinType( Keyword.Binary, typeof( BitArray ) ) ),
+                new ExpBuiltinType(Keyword.Binary, typeof(BitArray))), ];
-
-                ];
             TypeDict = new Dictionary<string, ExpTypeSource>(builtinTypeSource,
                                                               Multiplexer).ToFrozenDictionary();
 

StgSharp.Script/Express/CompileEnv/ExpCompile.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpCompile.cs"
+// file="ExpCompile"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -87,25 +84,14 @@ namespace StgSharp.Script.Express
             PoolKeywords();
             InitPrecedence();
 
-            _operatorsWithLetter = [
+            _operatorsWithLetter = [ Keyword.Add, Keyword.Sub, Keyword.Mul, Keyword.Div, Keyword.And, Keyword.Or, Keyword.Xor, Keyword.AndOr, Keyword.Not, ];
-                Keyword.Add,
-                Keyword.Sub,
-                Keyword.Mul,
-                Keyword.Div,
-                Keyword.And,
-                Keyword.Or,
-                Keyword.Xor,
-                Keyword.AndOr,
-                Keyword.Not,
-                ];
 
             ExpSchema_Builtin.Only
                              .TryGetType(
                                  PoolString(Keyword.Integer), out ExpTypeSource? _expInt);
             ExpInt = _expInt;
 
-            ExpSchema_Builtin.Only
+            ExpSchema_Builtin.Only.TryGetType(PoolString(Keyword.Real), out ExpTypeSource? _expReal);
-                             .TryGetType( PoolString( Keyword.Real ), out ExpTypeSource? _expReal );
             ExpReal = _expReal;
             ExpSchema_Builtin.Only
                              .TryGetType(

StgSharp.Script/Express/CompileEnv/ExpOperatorPrecedence.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpOperatorPrecedence.cs"
+// file="ExpOperatorPrecedence"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -45,52 +42,17 @@ namespace StgSharp.Script.Express
             return _operatorPrecedence.TryGetValue(operatorName, out precedence);
         }
 
-        public static bool TryGetSuperTypeOperatorPrecedence(
+        public static bool TryGetSuperTypeOperatorPrecedence(string operatorName, out int precedence)
-                           string operatorName,
-                           out int precedence )
         {
             return _superTypeOperatorPrecedent.TryGetValue(operatorName, out precedence);
         }
 
         private static void InitPrecedence()
         {
-            KeyValuePair<string, int>[] source = [
+            KeyValuePair<string, int>[] source = [ new KeyValuePair<string, int>(PoolString("["), 1), new KeyValuePair<string, int>(PoolString("."), 1), new KeyValuePair<string, int>(PoolString("\\"), 1), new KeyValuePair<string, int>(PoolString("unary+"), 2), new KeyValuePair<string, int>(PoolString("unary-"), 2), new KeyValuePair<string, int>(PoolString("NOT"), 2), new KeyValuePair<string, int>(PoolString("**"), 3), new KeyValuePair<string, int>(PoolString("*"), 4), new KeyValuePair<string, int>(PoolString("/"), 4), new KeyValuePair<string, int>(PoolString("AND"), 4), new KeyValuePair<string, int>(PoolString("MOD"), 4), new KeyValuePair<string, int>(PoolString("DIV"), 4), new KeyValuePair<string, int>(PoolString("||"), 4), new KeyValuePair<string, int>(PoolString("+"), 5), new KeyValuePair<string, int>(PoolString("-"), 5), new KeyValuePair<string, int>(PoolString("OR"), 5), new KeyValuePair<string, int>(PoolString("XOR"), 5), new KeyValuePair<string, int>(PoolString("="), 6), new KeyValuePair<string, int>(PoolString("<>"), 6), new KeyValuePair<string, int>(PoolString("<="), 6), new KeyValuePair<string, int>(PoolString(">="), 6), new KeyValuePair<string, int>(PoolString(">"), 6), new KeyValuePair<string, int>(PoolString("<"), 6), new KeyValuePair<string, int>(PoolString(":=:"), 6), new KeyValuePair<string, int>(PoolString(":<>:"), 6), new KeyValuePair<string, int>(PoolString("IN"), 6), new KeyValuePair<string, int>(PoolString("LIKE"), 6), new KeyValuePair<string, int>(PoolString(Keyword.Assignment), 7) ];
-                new KeyValuePair<string, int>( PoolString( "[" ), 1 ),
-                new KeyValuePair<string, int>( PoolString( "." ), 1 ),
-                new KeyValuePair<string, int>( PoolString( "\\" ), 1 ),
-                new KeyValuePair<string, int>( PoolString( "unary+" ), 2 ),
-                new KeyValuePair<string, int>( PoolString( "unary-" ), 2 ),
-                new KeyValuePair<string, int>( PoolString( "NOT" ), 2 ),
-                new KeyValuePair<string, int>( PoolString( "**" ), 3 ),
-                new KeyValuePair<string, int>( PoolString( "*" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "/" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "AND" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "MOD" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "DIV" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "||" ), 4 ),
-                new KeyValuePair<string, int>( PoolString( "+" ), 5 ),
-                new KeyValuePair<string, int>( PoolString( "-" ), 5 ),
-                new KeyValuePair<string, int>( PoolString( "OR" ), 5 ),
-                new KeyValuePair<string, int>( PoolString( "XOR" ), 5 ),
-                new KeyValuePair<string, int>( PoolString( "=" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( "<>" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( "<=" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( ">=" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( ">" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( "<" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( ":=:" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( ":<>:" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( "IN" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( "LIKE" ), 6 ),
-                new KeyValuePair<string, int>( PoolString( Keyword.Assignment ), 7 )
-                ];
             _operatorPrecedence = new Dictionary<string, int>(source,
                                                                _multiplexer).ToFrozenDictionary();
-            source = [
+            source = [ new KeyValuePair<string, int>("ONEOF", 1), new KeyValuePair<string, int>("AND", 2), new KeyValuePair<string, int>("ANDOR", 3), ];
-                new KeyValuePair<string, int>( "ONEOF", 1 ),
-                new KeyValuePair<string, int>( "AND", 2 ),
-                new KeyValuePair<string, int>( "ANDOR", 3 ),
-                ];
             _superTypeOperatorPrecedent = new Dictionary<string, int>(source,
                                                                        _multiplexer).ToFrozenDictionary(
                 );

StgSharp.Script/Express/CompileEnv/KeyWord.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="KeyWord.cs"
+// file="KeyWord"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -65,64 +62,29 @@ namespace StgSharp.Script.Express
                 EndAlias, EndCase, EndConstant, EndEntity, EndFunction, EndIf, EndLocal, EndProcedure, EndRepeat, EndRule, EndSchema, EndSubtypeConstraint, EndType
             };
 
-            public static HashSet<string> Symbols = [
+            public static HashSet<string> Symbols = [ Dot, Comma, Semicolon, Colon, Percent, Apostrophe, Backslash, IndexOf, RightBracket, LeftBrace, RightBrace, Pipe, LeftParen, RightParen, LeftAsterisk, Assignment, DoublePipe, ExpSymbol, CommentSingleLine, CommentStart, CommentEnd, InstanceEqual, InstanceNotEqual ];
-                Dot, Comma, Semicolon, Colon, Percent, Apostrophe,
-                Backslash, IndexOf, RightBracket, LeftBrace,
-                RightBrace, Pipe, LeftParen, RightParen, LeftAsterisk,
-                Assignment, DoublePipe, ExpSymbol, CommentSingleLine,
-                CommentStart, CommentEnd, InstanceEqual, InstanceNotEqual
-            ];
 
-            public static HashSet<string> DataTypes { get; } = [
+            public static HashSet<string> DataTypes { get; } = [ Array, Bag, Binary, Boolean, Enumeration, Integer, List, Logical, Number, Of, Real, Set, String ];
-                Array, Bag, Binary, Boolean, Enumeration, Integer, List, Logical, Number, Of, Real, Set, String
-            ];
 
-            public static HashSet<string> InternalProcess { get; } = [
+            public static HashSet<string> InternalProcess { get; } = [ Insert, Remove ];
-                Insert, Remove
-            ];
 
-            public static HashSet<string> BuiltinFunctions { get; } = [
+            public static HashSet<string> BuiltinFunctions { get; } = [ Abs, Acos, Asin, Atan, BLength, Cos, Exists, Exp, Format, HiBound, HiIndex, Length, LoBound, Log, Log2, Log10, LoIndex, Nvl, Odd, Rolesof, Sin, Sizeof, Sqrt, Tan, Typeof, Usedin, Value, ValueIn, ValueUnique ];
-                Abs, Acos, Asin, Atan, BLength, Cos, Exists, Exp,
-                Format, HiBound, HiIndex, Length, LoBound, Log,
-                Log2, Log10, LoIndex, Nvl, Odd, Rolesof, Sin,
-                Sizeof, Sqrt, Tan, Typeof, Usedin, Value,
-                ValueIn, ValueUnique
-            ];
 
-            public static HashSet<string> Literals { get; } = [
+            public static HashSet<string> Literals { get; } = [ QuestionMark, Self, Const, E, Pi, False, True, Unknown ];
-                QuestionMark, Self, Const, E, Pi, False, True, Unknown
-            ];
 
-            public static HashSet<string> Operators { get; } = [
+            public static HashSet<string> Operators { get; } = [ And, AndOr, Div, In, Like, Mod, Not, Or, Xor, Add, Sub, Mul, Slash, Equal, NotEqual, LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual ];
-                And, AndOr, Div, In, Like, Mod, Not, Or, Xor,
-                Add, Sub, Mul, Slash, Equal, NotEqual,
-                LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual
-            ];
 
-            public static HashSet<string> Aliasing { get; } = [
+            public static HashSet<string> Aliasing { get; } = [ Alias, Renamed ];
-                Alias, Renamed
-            ];
 
-            public static HashSet<string> ModifiersAttributes { get; } = [
+            public static HashSet<string> ModifiersAttributes { get; } = [ Abstract, Aggregate, As, BasedOn, By, Escape, Fixed, From, Use, With ];
-                Abstract, Aggregate, As, BasedOn, By, Escape, Fixed, From, Use, With
-            ];
 
-            public static HashSet<string> QueryReference { get; } = [
+            public static HashSet<string> QueryReference { get; } = [ Query, Reference, Select ];
-                Query, Reference, Select
-            ];
 
-            public static HashSet<string> ConstraintsInheritance { get; } = [
+            public static HashSet<string> ConstraintsInheritance { get; } = [ Oneof, Optional, Subtype, SubtypeConstraint, Supertype, TotalOver, Unique, Where ];
-                Oneof, Optional, Subtype, SubtypeConstraint, Supertype, TotalOver, Unique, Where
-            ];
 
-            public static HashSet<string> Declarations { get; } = [
+            public static HashSet<string> Declarations { get; } = [ Constant, Derive, Entity, Extensible, Fixed, Function, Generic, GenericEntity, Inverse, Local, Procedure, Rule, Schema, Type, Var ];
-                Constant, Derive, Entity, Extensible, Fixed, Function, Generic, 
-                GenericEntity, Inverse, Local, Procedure, Rule, Schema, Type, Var
-            ];
 
-            public static HashSet<string> FlowControl { get; } = [
+            public static HashSet<string> FlowControl { get; } = [ Begin, Case, Else, End, For, If, Otherwise, Repeat, Return, Skip, Then, To, Until, While ];
-                Begin, Case, Else, End, For, If, Otherwise, Repeat, Return, Skip, Then, To, Until, While
-            ];
 
             #region Basic Data Type
 

StgSharp.Script/Express/Element/ExpConst.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpConst.cs"
+// file="ExpConst"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Element/ExpEntity.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpEntity.cs"
+// file="ExpEntity"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Element/ExpFunction.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpFunction.cs"
+// file="ExpFunction"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Element/ExpProcedureSource.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpProcedureSource.cs"
+// file="ExpProcedureSource"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Element/ExpRule.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpRule.cs"
+// file="ExpRule"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/Element/ExpType.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpType.cs"
+// file="ExpType"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the ¡°Software¡±), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------

StgSharp.Script/Express/ExpAstNode/ExpBinaryOperatorNode.cs

@@ -1,30 +1,27 @@
 //-----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-//     file="ExpBinaryOperatorNode.cs"
+// file="ExpBinaryOperatorNode"
 // Project: StgSharp
 // AuthorGroup: Nitload Space
 // Copyright (c) Nitload Space. All rights reserved.
 //     
-//     Permission is hereby granted, free of charge, to any person 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-//     obtaining a copy of this software and associated documentation 
+// of this software and associated documentation files (the "Software"), to deal
-//     files (the “Software”), to deal in the Software without restriction, 
+// in the Software without restriction, including without limitation the rights
-//     including without limitation the rights to use, copy, modify, merge,
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//     publish, distribute, sublicense, and/or sell copies of the Software, 
+// copies of the Software, and to permit persons to whom the Software is
-//     and to permit persons to whom the Software is furnished to do so, 
+// furnished to do so, subject to the following conditions:
-//     subject to the following conditions:
 //
-//     The above copyright notice and 
+// The above copyright notice and this permission notice shall be included in all
-//     this permission notice shall be included in all copies 
+// copies or substantial portions of the Software.
-//     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
-//     WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// SOFTWARE.
-//     THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
@@ -63,10 +60,7 @@ namespace StgSharp.Script.Express
 
         public string Operator { get; private set; }
 
-        public static ExpBinaryOperatorNode Add(
+        public static ExpBinaryOperatorNode Add(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -83,10 +77,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode Assign(
+        public static ExpBinaryOperatorNode Assign(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (left.EqualityTypeConvert != right.EqualityTypeConvert) {
                 throw new ExpInvalidTypeException(
@@ -101,10 +92,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode CompareInstanceEqual(
+        public static ExpBinaryOperatorNode CompareInstanceEqual(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             return new ExpBinaryOperatorNode(source, left, right)
             {
@@ -127,10 +115,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode ConvertElement(
+        public static ExpBinaryOperatorNode ConvertElement(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (right is not ExpMetaRefNode metaRef) {
                 throw new ExpInvalidTypeException(
@@ -148,10 +133,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode Div(
+        public static ExpBinaryOperatorNode Div(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -168,10 +150,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode EqualTo(
+        public static ExpBinaryOperatorNode EqualTo(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (left.EqualityTypeConvert != right.EqualityTypeConvert) {
                 throw new ExpInvalidTypeException(
@@ -185,10 +164,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode GreaterThan(
+        public static ExpBinaryOperatorNode GreaterThan(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -202,10 +178,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode LessThan(
+        public static ExpBinaryOperatorNode LessThan(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -219,10 +192,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode Mul(
+        public static ExpBinaryOperatorNode Mul(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -239,10 +209,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode NotEqualTo(
+        public static ExpBinaryOperatorNode NotEqualTo(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (left.EqualityTypeConvert != right.EqualityTypeConvert) {
                 throw new ExpInvalidTypeException(
@@ -256,10 +223,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode SmallerThan(
+        public static ExpBinaryOperatorNode SmallerThan(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",
@@ -273,10 +237,7 @@ namespace StgSharp.Script.Express
             };
         }
 
-        public static ExpBinaryOperatorNode Sub(
+        public static ExpBinaryOperatorNode Sub(Token source, ExpSyntaxNode left, ExpSyntaxNode right)
-                                            Token source,
-                                            ExpSyntaxNode left,
-                                            ExpSyntaxNode right )
         {
             if (!left.IsNumber && !right.IsNumber) {
                 throw new ExpInvalidTypeException(source, "Number",