From 6be8a716ef66d9ab0ce1bf7a87cf3cd7ef62f80c Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Thu, 13 Jun 2024 17:36:54 -0500
Subject: [PATCH] Update UIXA compile test

---
 libs/UIX.Asm/UIX.Asm.csproj        |  1 +
 libs/UIX.Test/Resources/testA.uixa | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/libs/UIX.Asm/UIX.Asm.csproj b/libs/UIX.Asm/UIX.Asm.csproj
index c9e5cf3..ca87df4 100644
--- a/libs/UIX.Asm/UIX.Asm.csproj
+++ b/libs/UIX.Asm/UIX.Asm.csproj
@@ -23,6 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <!--<ProjectReference Include="..\..\..\ZuneShell.dll\libs\MicrosoftIris\UIX\UIX.csproj" />-->
         <ProjectReference Include="..\MicrosoftIris\UIX\UIX.csproj" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
         <PackageReference Include="Sprache" Version="2.3.1" />
diff --git a/libs/UIX.Test/Resources/testA.uixa b/libs/UIX.Test/Resources/testA.uixa
index 0c06c6b..d9eb7b7 100644
--- a/libs/UIX.Test/Resources/testA.uixa
+++ b/libs/UIX.Test/Resources/testA.uixa
@@ -1,4 +1,7 @@
-.import-type UI
+.export Default 0 UI
+.export Alt 0 UI
+
+.import-type UI
 .import-type Dictionary
 .import-ns assembly://UIX/Microsoft.Iris as iris
 .import-type iris:Command
@@ -7,29 +10,36 @@
 .import-type Text
 .import-type Color
 .import-type Font
-.export Default 0 UI
-.export Alt 0 UI
+.import-mbrs UI{Locals, Content}
+.import-mbrs Text{Color, Content, Font}
 
+.constant const0 = Color(255, 255, 0, 0)
+.constant const1 = String(Howdy from Microsoft.Iris!)
+.constant const2 = String(SelectCommand)
+.constant const3 = Color(255, 0, 0, 255)
+.constant const4 = Font(JetBrains Mono)
+.constant const5 = String(This is some blue text)
 .section object
+
 Default_cont:
     COBJ 5
-    PSHC 0
+    PSHC @const0
     PINI 2
-    PSHC 1
+    PSHC @const1
     PINI 3
     PINI 1
     RETV
 Default_locl:
     COBJ 2
-    PDAD 0, 2
+    PDAD 0, @const2
     RETV
 Alt_cont:
     COBJ 5
-    PSHC 3
+    PSHC @const3
     PINI 2
-    PSHC 4
+    PSHC @const4
     PINI 4
-    PSHC 5
+    PSHC @const5
     PINI 3
     PINI 1
     RETV