TAG202 2024/03/20

Compiler ]コマンドで数値を省略出来るように機能追加。(2が指定した時と同じになる)
kuma4649 · Mar 20, 2024 · 08d604a · 08d604a
1 parent 1d8f4b2
commit 08d604a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V����
+TAG202 2024/03/20
+  Compiler
+    ]�R�}���h�Ő��l���ȗ��o����悤�ɋ@�\�ǉ��B(2���w�肵�����Ɠ����ɂȂ�)
+
 TAG201 2024/01/14
   Compiler
     ADPCMA Decode�����̎኱�̒����B

diff --git a/Console_NET5/Properties/launchSettings.json b/Console_NET5/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Console_NET5": {
       "commandName": "Project",
-      "commandLineArgs": "\"C:\\Users\\kuma\\Desktop\\SDI (OPNB+OPM版)\\testSDI - Ending - We Are Desirous of Peace (OPNB+OPM版).muc\"",
+      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\自作\\test\\test.muc\"",
       "nativeDebugging": true
     }
   }

diff --git a/Player64/lib/MDSound.dll b/Player64/lib/MDSound.dll
diff --git a/Wav_NET5/MDSound.dll b/Wav_NET5/MDSound.dll
diff --git a/mucomDotNETCompiler/muc88.cs b/mucomDotNETCompiler/muc88.cs
@@ -1898,10 +1898,19 @@ private EnmFCOMPNextRtn SETSE1(int b ,string errCode_Fmt,string errCode_Val)
 
         private EnmFCOMPNextRtn SETLPE()
         {
-            int ptr;
+            int ptr = mucInfo.srcCPtr;
+            ptr++;
+            int rep = msub.REDATA(mucInfo.lin, ref ptr);
+            if (mucInfo.Carry)//数値読み取れなかった
+            {
+                if (mucInfo.DriverType == MUCInfo.enmDriverType.DotNet)
+                    rep = 2;
+                else
+                    throw new MucException(
+                        string.Format(msg.get("E0201"), msg.get("E0436"))
+                        , mucInfo.row, mucInfo.col);
+            }
 
-            ptr = mucInfo.srcCPtr;
-            int rep = msub.ERRT(mucInfo.lin, ref ptr, msg.get("E0436"));
             mucInfo.srcCPtr = ptr;
             if (rep < 0 || rep > 255)
             {

diff --git a/mucomDotNETPlayer/lib/MDSound.dll b/mucomDotNETPlayer/lib/MDSound.dll
diff --git a/mucomDotNETPlayer/lib/fmgenmodule.dll b/mucomDotNETPlayer/lib/fmgenmodule.dll
diff --git a/mucomDotNETPlayer/lib/scci.dll b/mucomDotNETPlayer/lib/scci.dll