From d77d2953b80d03d50ec4b0755a7d515822b89edd Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Wed, 31 Jan 2024 09:21:30 -0600
Subject: [PATCH] Move syntax models to own folder

---
 libs/UIX.Asm/Disassembler.cs              | 1 +
 libs/UIX.Asm/Lexer.cs                     | 3 ++-
 libs/UIX.Asm/Models/Import.cs             | 6 ++++++
 libs/UIX.Asm/{ => Models}/SyntaxModels.cs | 9 ++-------
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 libs/UIX.Asm/Models/Import.cs
 rename libs/UIX.Asm/{ => Models}/SyntaxModels.cs (79%)

diff --git a/libs/UIX.Asm/Disassembler.cs b/libs/UIX.Asm/Disassembler.cs
index a3bfe66..ec9cd57 100644
--- a/libs/UIX.Asm/Disassembler.cs
+++ b/libs/UIX.Asm/Disassembler.cs
@@ -1,4 +1,5 @@
 using Humanizer;
+using Microsoft.Iris.Asm.Models;
 using Microsoft.Iris.Markup;
 using System;
 using System.Collections.Generic;
diff --git a/libs/UIX.Asm/Lexer.cs b/libs/UIX.Asm/Lexer.cs
index a5b83fb..3ee7725 100644
--- a/libs/UIX.Asm/Lexer.cs
+++ b/libs/UIX.Asm/Lexer.cs
@@ -1,4 +1,5 @@
-using Sprache;
+using Microsoft.Iris.Asm.Models;
+using Sprache;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/libs/UIX.Asm/Models/Import.cs b/libs/UIX.Asm/Models/Import.cs
new file mode 100644
index 0000000..0b9daa9
--- /dev/null
+++ b/libs/UIX.Asm/Models/Import.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Iris.Asm.Models;
+
+public record NamespaceImport(string Uri, string Name) : IImport
+{
+    public override string ToString() => $".import-ns {Uri} as {Name}";
+}
diff --git a/libs/UIX.Asm/SyntaxModels.cs b/libs/UIX.Asm/Models/SyntaxModels.cs
similarity index 79%
rename from libs/UIX.Asm/SyntaxModels.cs
rename to libs/UIX.Asm/Models/SyntaxModels.cs
index 0bf7045..06eb733 100644
--- a/libs/UIX.Asm/SyntaxModels.cs
+++ b/libs/UIX.Asm/Models/SyntaxModels.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Iris.Asm;
+namespace Microsoft.Iris.Asm.Models;
 
 public interface IBodyItem { }
 public interface IImport { }
@@ -20,16 +20,11 @@ public record Label(string Name) : IBodyItem
     public override string ToString() => $"{Name}:";
 }
 
-public record Operand(object Value, string? Content = null)
+public record Operand(object Value, string Content = null)
 {
     public override string ToString() => Content ?? Value.ToString();
 }
 
-public record NamespaceImport(string Uri, string Name) : IImport
-{
-    public override string ToString() => $".import-ns {Uri} as {Name}";
-}
-
 public record Program(IEnumerable<IImport> Imports, IEnumerable<IBodyItem> Body)
 {
     public override string ToString() => string.Join("\r\n", Imports.Select(i => i.ToString()).Concat(Body.Select(b => b.ToString())));