Merge pull request #391 from AILight/develop

Release 1.0.26

Author: AILight

AILZ80ASM.Test/AILZ80ASM.Test.csproj

@@ -526,6 +526,21 @@
     <None Update="Test\Issues\376\Test2.EQU">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Test\Issues\388\Test.BIN">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Test\Issues\388\Test.LST">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Test\Issues\388\Test.Z80">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Test\Issues\388\Test1.EQU">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Test\Issues\388\Test2.EQU">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Test\TestCS_ALIGN\Test.BIN">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -2189,6 +2204,7 @@
 
   <ItemGroup>
     <Folder Include="Test\AIEncode\" />
+    <Folder Include="Test\Issues\388\" />
     <Folder Include="Test\TestPP_ConditionalEnhanced\" />
   </ItemGroup>
 

AILZ80ASM.Test/Test/Issues/388/Test.BIN

@@ -0,0 +1,25 @@
+                                ;*** AILZ80ASM *** Z-80 Assembler, version 1.0.23.0, LST:Full:4
+000000 8000                             ORG $8000
+                                
+                                        include "Test1.EQU"
+                                
+                                [VRAM]
+                                
+       0000                     ADRS    equ 0000
+       0080                     WIDTH   equ 128
+       00D4                     HEIGHT  equ 212
+       6A00                     SIZE    equ 27136
+[EOF:Test1.EQU:UTF_8]
+                                        include "Test2.EQU"
+                                
+                                [VRAM]
+                                
+                                ADRS    equ 0000            ; グラフィックアドレス
+                                WIDTH   equ 128             ; 幅
+                                HEIGHT  equ 212             ; 高さ
+                                SIZE    equ WIDTH * HEIGHT  ; サイズ
+[EOF:Test2.EQU:UTF_8]
+                                
+000000 8000 210000          10          LD  HL, VRAM.ADRS
+000003 8003 01006A          10          LD  BC, VRAM.SIZE
+[EOF:Test.Z80:UTF_8]

AILZ80ASM.Test/Test/Issues/388/Test.LST

@@ -0,0 +1,7 @@
+		ORG $8000
+
+		include "Test1.EQU"
+		include "Test2.EQU"
+
+		LD	HL, VRAM.ADRS
+		LD	BC, VRAM.SIZE

AILZ80ASM.Test/Test/Issues/388/Test.Z80

@@ -0,0 +1,7 @@
+
+[VRAM]
+
+ADRS	equ 0000
+WIDTH	equ 128
+HEIGHT	equ 212
+SIZE	equ 27136

AILZ80ASM.Test/Test/Issues/388/Test1.EQU

@@ -0,0 +1,7 @@
+
+[VRAM]
+
+ADRS	equ 0000			; グラフィックアドレス
+WIDTH	equ 128				; 幅
+HEIGHT	equ 212				; 高さ
+SIZE	equ WIDTH * HEIGHT	; サイズ

AILZ80ASM.Test/Test/Issues/388/Test2.EQU

@@ -425,6 +425,12 @@ public void Issue_370()
         public void Issue_376()
         {
             Lib.Assemble_AreSame(Path.Combine("Issues", "376"));
+        }
+
+        [TestMethod]
+        public void Issue_388()
+        {
+            Lib.Assemble_AreSame(Path.Combine("Issues", "388"));
         }
     }
 }

AILZ80ASM.Test/Z80ZZIssueTest.cs

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>1.0.25</Version>
-    <AssemblyVersion>1.0.25.0</AssemblyVersion>
-    <FileVersion>1.0.25.0</FileVersion>
+    <Version>1.0.26</Version>
+    <AssemblyVersion>1.0.26.0</AssemblyVersion>
+    <FileVersion>1.0.26.0</FileVersion>
     <Authors>Mitsuhito Ishino</Authors>
     <Company>AILight</Company>
     <Description>Z80 Assembler 'AILZ80ASM'</Description>

AILZ80ASM/AILZ80ASM.csproj

@@ -385,12 +385,12 @@ public void AddLabel(Label label)
                 // equの場合は値が一致しているかを確認する
                 if (label.LabelType == Label.LabelTypeEnum.Equ)
                 {
-                    if (AIMath.TryParse(label.ValueString, out var labelValue))
+                    if (AIMath.TryParse(label.ValueString, this, out var labelValue))
                     {
                         var sameLables = this.Scope.Labels.Where(m => string.Compare(m.LabelFullName, label.LabelFullName, true) == 0);
                         foreach (var sameLabel in sameLables)
                         {
-                            if (AIMath.TryParse(sameLabel.ValueString, out var sameLabelValue))
+                            if (AIMath.TryParse(sameLabel.ValueString, this, out var sameLabelValue))
                             {
                                 if (labelValue.Equals(sameLabelValue)) 
                                 {