Add new features (April~May 2024)

.gitignore

@@ -1,6 +1,4 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
-ColorzCore/obj
-ColorzCore/.vs
+obj/
+bin/
+.vs/
 *.cache

ColorzCore/ColorzCore.Framework.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Nullable>annotations</Nullable>
+    <AssemblyName>ColorzCore</AssemblyName>
+    <LangVersion>9</LangVersion>
+    <BaseOutputPath>bin/Framework</BaseOutputPath>
+  </PropertyGroup>
+</Project>

ColorzCore/ColorzCore.csproj

@@ -1,124 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B98F7CCF-9CAA-406E-88D7-2040FA99F631}</ProjectGuid>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RootNamespace>ColorzCore</RootNamespace>
-    <AssemblyName>ColorzCore</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Nullable>enable</Nullable>
+    <LangVersion>9</LangVersion>
+    <BaseOutputPath>bin/Core</BaseOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '32bit|AnyCPU'">
-    <OutputPath>bin\32bit\</OutputPath>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EAOptions.cs" />
-    <Compile Include="DataTypes\CaseInsensitiveString.cs" />
-    <Compile Include="EAInterpreter.cs" />
-    <Compile Include="DataTypes\Extension.cs" />
-    <Compile Include="DataTypes\ImmutableStack.cs" />
-    <Compile Include="DataTypes\Location.cs" />
-    <Compile Include="DataTypes\Maybe.cs" />
-    <Compile Include="DataTypes\MergeableGenerator.cs" />
-    <Compile Include="DataTypes\Either.cs" />
-    <Compile Include="IO\ASM.cs" />
-    <Compile Include="IO\IOUtility.cs" />
-    <Compile Include="IO\IOutput.cs" />
-    <Compile Include="IO\ROM.cs" />
-    <Compile Include="Lexer\Token.cs" />
-    <Compile Include="Lexer\Tokenizer.cs" />
-    <Compile Include="Lexer\TokenType.cs" />
-    <Compile Include="Parser\AST\AtomNodeKernel.cs" />
-    <Compile Include="Parser\AST\BlockNode.cs" />
-    <Compile Include="Parser\AST\DataNode.cs" />
-    <Compile Include="Parser\AST\IAtomNode.cs" />
-    <Compile Include="Parser\AST\IdentifierNode.cs" />
-    <Compile Include="Parser\AST\ILineNode.cs" />
-    <Compile Include="Parser\AST\IParamNode.cs" />
-    <Compile Include="Parser\AST\ListNode.cs" />
-    <Compile Include="Parser\AST\MacroInvocationNode.cs" />
-    <Compile Include="Parser\AST\NegationNode.cs" />
-    <Compile Include="Parser\AST\NumberNode.cs" />
-    <Compile Include="Parser\AST\OperatorNode.cs" />
-    <Compile Include="Parser\AST\ParamType.cs" />
-    <Compile Include="Parser\AST\RawNode.cs" />
-    <Compile Include="Parser\AST\StatementNode.cs" />
-    <Compile Include="Parser\AST\StringNode.cs" />
-    <Compile Include="Parser\BaseClosure.cs" />
-    <Compile Include="Parser\Macros\BuiltInMacro.cs" />
-    <Compile Include="Parser\Macros\IMacro.cs" />
-    <Compile Include="Parser\Macros\MacroCollection.cs" />
-    <Compile Include="Parser\Macros\String.cs" />
-    <Compile Include="Parser\Closure.cs" />
-    <Compile Include="Parser\Definition.cs" />
-    <Compile Include="Parser\Macros\Macro.cs" />
-    <Compile Include="Parser\EAParser.cs" />
-    <Compile Include="Preprocessor\Directives\UndefineDirective.cs" />
-    <Compile Include="Preprocessor\Directives\DefineDirective.cs" />
-    <Compile Include="Preprocessor\Directives\ElseDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IDirective.cs" />
-    <Compile Include="Preprocessor\Directives\EndIfDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IfNotDefinedDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IfDefinedDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IncludeBinaryDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IncludeDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IncludeToolEventDirective.cs" />
-    <Compile Include="Preprocessor\Directives\IncludeExternalDirective.cs" />
-    <Compile Include="Preprocessor\DirectiveHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Raws\AtomicParam.cs" />
-    <Compile Include="ExecTimer.cs" />
-    <Compile Include="Raws\Flag.cs" />
-    <Compile Include="Raws\IRawParam.cs" />
-    <Compile Include="Raws\ListParam.cs" />
-    <Compile Include="Raws\Raw.cs" />
-    <Compile Include="IO\Log.cs" />
-    <Compile Include="IO\IncludeFileSearcher.cs" />
-    <Compile Include="Parser\Macros\IsDefined.cs" />
-    <Compile Include="Parser\Macros\AddToPool.cs" />
-    <Compile Include="Preprocessor\Directives\PoolDirective.cs" />
-    <Compile Include="Parser\Pool.cs" />
-    <Compile Include="Raws\RawReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ColorzCore/ColorzCore.sln

@@ -1,9 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34714.143
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorzCore", "ColorzCore.csproj", "{B98F7CCF-9CAA-406E-88D7-2040FA99F631}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorzCore", "ColorzCore.csproj", "{B98F7CCF-9CAA-406E-88D7-2040FA99F631}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorzCore.Framework", "ColorzCore.Framework.csproj", "{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,6 +20,12 @@ Global
 		{B98F7CCF-9CAA-406E-88D7-2040FA99F631}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B98F7CCF-9CAA-406E-88D7-2040FA99F631}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B98F7CCF-9CAA-406E-88D7-2040FA99F631}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.32bit|Any CPU.ActiveCfg = Debug|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.32bit|Any CPU.Build.0 = Debug|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33DC9CB0-82AB-47EC-9D7F-AD9FD5776BCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ColorzCore/DataTypes/Either.cs

@@ -14,9 +14,9 @@ public interface Either<Left, Right>
         bool IsRight { get; }
         Left GetLeft { get; }
         Right GetRight { get; }
-        void Case(TAction<Left> LAction, TAction<Right> RAction);
+        void Case(Action<Left> LAction, Action<Right> RAction);
     }
-    public class Left<L, R> : Either <L, R>
+    public class Left<L, R> : Either<L, R>
     {
         public Left(L val)
         {
@@ -27,7 +27,7 @@ public Left(L val)
         public bool IsRight { get { return false; } }
         public L GetLeft { get; }
         public R GetRight { get { throw new WrongEitherException(); } }
-        public void Case(TAction<L> LAction, TAction<R> RAction) { LAction(GetLeft); }
+        public void Case(Action<L> LAction, Action<R> RAction) { LAction(GetLeft); }
     }
     public class Right<L, R> : Either<L, R>
     {
@@ -40,7 +40,7 @@ public Right(R val)
         public bool IsRight { get { return true; } }
         public L GetLeft { get { throw new WrongEitherException(); } }
         public R GetRight { get; }
-        public void Case(TAction<L> LAction, TAction<R> RAction) { RAction(GetRight); }
+        public void Case(Action<L> LAction, Action<R> RAction) { RAction(GetRight); }
     }
     class WrongEitherException : Exception { }
 }

ColorzCore/DataTypes/Extension.cs

@@ -50,6 +50,7 @@ public static int ToInt(this string numString)
             }
         }
         public static Dictionary<K, IList<V>> AddTo<K,V>(this Dictionary<K, IList<V>> self, K key, V val)
+            where K: notnull
         {
             if (self.ContainsKey(key))
                 self[key].Add(val);
@@ -58,19 +59,19 @@ public static Dictionary<K, IList<V>> AddTo<K,V>(this Dictionary<K, IList<V>> se
                 self[key] = new List<V> { val };
             }
             return self;
-        }
-
+        }
+
         public static void SetBits(this byte[] array, int bitOffset, int bitSize, int value)
         {
             array.SetBits(0, bitOffset, bitSize, value);
         }
 
         public static void SetBits(this byte[] array, int byteOffset, int bitOffset, int bitSize, int value)
         {
-            if (bitOffset >= 8)
+            if (bitOffset >= 8)
             {
                 array.SetBits(byteOffset + bitOffset / 8, bitOffset % 8, bitSize, value);
-                return;
+                return;
             }
 
             long bytes = 0;
@@ -95,48 +96,48 @@ public static void SetBits(this byte[] array, int byteOffset, int bitOffset, int
                 array[byteOffset + i] = (byte)(bytes >> i * 8);
         }
 
-        public static void SetBits(this byte[] array, int bitOffset, int bitSize, byte[] data)
-        {
-            array.SetBits(0, bitOffset, bitSize, data);
+        public static void SetBits(this byte[] array, int bitOffset, int bitSize, byte[] data)
+        {
+            array.SetBits(0, bitOffset, bitSize, data);
         }
 
-        public static void SetBits(this byte[] array, int byteOffset, int bitOffset, int bitSize, byte[] data)
-        {
-            if (bitOffset >= 8)
+        public static void SetBits(this byte[] array, int byteOffset, int bitOffset, int bitSize, byte[] data)
+        {
+            if (bitOffset >= 8)
             {
                 array.SetBits(byteOffset + bitOffset / 8, bitOffset % 8, bitSize, data);
-                return;
+                return;
             }
 
             int byteSize = (bitOffset + bitSize + 7) / 8;
 
-            if (bitOffset == 0)
-            {
+            if (bitOffset == 0)
+            {
                 for (int i = 0; i < byteSize - 1; ++i)
                     array[byteOffset + i] = data[i];
 
                 int shift = bitSize % 8 == 0 ? 8 : bitSize % 8;
                 uint endMask = (uint)((1 << shift) - 1);
 
                 array[byteOffset + byteSize - 1] &= (byte)~endMask;
-                array[byteOffset + byteSize - 1] |= (byte)(data[byteSize - 1] & endMask);
+                array[byteOffset + byteSize - 1] |= (byte)(data[byteSize - 1] & endMask);
             }
             else
-            {
-                for (int i = 0; i < byteSize; ++i)
-                {
-                    int mask = ((1 << Math.Min(bitSize - i * 8, 8)) - 1) << bitOffset;
-
-                    byte loMask = (byte)mask;
-                    byte hiMask = (byte)(mask >> 8);
-
-                    array[byteOffset + i] &= (byte)~loMask;
-                    array[byteOffset + i] |= (byte)((data[i] << bitOffset) & loMask);
-
-                    array[byteOffset + i + 1] &= (byte)~hiMask;
-                    array[byteOffset + i + 1] |= (byte)((data[i] >> (8 - bitOffset)) & hiMask);
+            {
+                for (int i = 0; i < byteSize; ++i)
+                {
+                    int mask = ((1 << Math.Min(bitSize - i * 8, 8)) - 1) << bitOffset;
+
+                    byte loMask = (byte)mask;
+                    byte hiMask = (byte)(mask >> 8);
+
+                    array[byteOffset + i] &= (byte)~loMask;
+                    array[byteOffset + i] |= (byte)((data[i] << bitOffset) & loMask);
+
+                    array[byteOffset + i + 1] &= (byte)~hiMask;
+                    array[byteOffset + i + 1] |= (byte)((data[i] >> (8 - bitOffset)) & hiMask);
                 }
-            }
+            }
         }
     }
 }