From 0456279c94f5a89bc6fea2e9fccd3e93f0b10875 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Sun, 25 Aug 2019 14:31:11 +0200
Subject: [PATCH] Moved AsmFormat

---
 .../java/dk/camelot64/kickc/{fragment => asm}/AsmFormat.java    | 2 +-
 src/main/java/dk/camelot64/kickc/asm/AsmProgram.java            | 1 -
 .../kickc/fragment/AsmFragmentInstanceSpecFactory.java          | 1 +
 .../java/dk/camelot64/kickc/model/values/ConstantInteger.java   | 2 +-
 .../dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java   | 1 -
 .../java/dk/camelot64/kickc/passes/Pass5FixLongBranches.java    | 2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename src/main/java/dk/camelot64/kickc/{fragment => asm}/AsmFormat.java (99%)

diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java b/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java
similarity index 99%
rename from src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java
rename to src/main/java/dk/camelot64/kickc/asm/AsmFormat.java
index 066d3c44f..42b3f9eb9 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java
@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.fragment;
+package dk.camelot64.kickc.asm;
 
 import dk.camelot64.kickc.model.CompileError;
 import dk.camelot64.kickc.model.Program;
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java b/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
index b06bc760f..6d438b8be 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
@@ -1,6 +1,5 @@
 package dk.camelot64.kickc.asm;
 
-import dk.camelot64.kickc.fragment.AsmFormat;
 import dk.camelot64.kickc.model.Program;
 import dk.camelot64.kickc.model.values.ScopeRef;
 
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
index dc425a7b1..f4750f2ad 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
@@ -1,5 +1,6 @@
 package dk.camelot64.kickc.fragment;
 
+import dk.camelot64.kickc.asm.AsmFormat;
 import dk.camelot64.kickc.model.*;
 import dk.camelot64.kickc.model.operators.Operator;
 import dk.camelot64.kickc.model.operators.OperatorUnary;
diff --git a/src/main/java/dk/camelot64/kickc/model/values/ConstantInteger.java b/src/main/java/dk/camelot64/kickc/model/values/ConstantInteger.java
index 7eccd45a4..019ba6640 100644
--- a/src/main/java/dk/camelot64/kickc/model/values/ConstantInteger.java
+++ b/src/main/java/dk/camelot64/kickc/model/values/ConstantInteger.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model.values;
 
-import dk.camelot64.kickc.fragment.AsmFormat;
+import dk.camelot64.kickc.asm.AsmFormat;
 import dk.camelot64.kickc.model.Program;
 import dk.camelot64.kickc.model.symbols.ProgramScope;
 import dk.camelot64.kickc.model.types.SymbolType;
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
index 68a0f3791..55f013657 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
@@ -1,7 +1,6 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.asm.*;
-import dk.camelot64.kickc.fragment.AsmFormat;
 import dk.camelot64.kickc.model.Program;
 
 import java.util.LinkedHashMap;
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5FixLongBranches.java b/src/main/java/dk/camelot64/kickc/passes/Pass5FixLongBranches.java
index b8deefa28..d7e970f98 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5FixLongBranches.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5FixLongBranches.java
@@ -1,7 +1,7 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.asm.*;
-import dk.camelot64.kickc.fragment.AsmFormat;
+import dk.camelot64.kickc.asm.AsmFormat;
 import dk.camelot64.kickc.model.CompileError;
 import dk.camelot64.kickc.model.Program;
 import kickass.KickAssembler;