Flattened package hierarchy

src/arm64/Registers_test.go

@@ -3,7 +3,7 @@ package arm64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/arm64"
+	"git.akyoto.dev/cli/q/src/arm64"
 	"git.akyoto.dev/go/assert"
 )
 

src/asm/Finalize.go

@@ -6,11 +6,11 @@ import (
 	"slices"
 	"strings"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/dll"
 	"git.akyoto.dev/cli/q/src/exe"
 	"git.akyoto.dev/cli/q/src/sizeof"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // Finalize generates the final machine code.

src/compiler/Result.go

@@ -6,17 +6,17 @@ import (
 	"io"
 	"os"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/core"
 	"git.akyoto.dev/cli/q/src/dll"
-	"git.akyoto.dev/cli/q/src/exe/elf"
+	"git.akyoto.dev/cli/q/src/elf"
-	"git.akyoto.dev/cli/q/src/exe/macho"
+	"git.akyoto.dev/cli/q/src/linux"
-	"git.akyoto.dev/cli/q/src/exe/pe"
+	"git.akyoto.dev/cli/q/src/mac"
-	"git.akyoto.dev/cli/q/src/os/linux"
+	"git.akyoto.dev/cli/q/src/macho"
-	"git.akyoto.dev/cli/q/src/os/mac"
+	"git.akyoto.dev/cli/q/src/pe"
-	"git.akyoto.dev/cli/q/src/os/windows"
+	"git.akyoto.dev/cli/q/src/windows"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // Result contains all the compiled functions in a build.

src/core/CompileAssignDivision.go

@@ -1,10 +1,10 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/ast"
 	"git.akyoto.dev/cli/q/src/errors"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // CompileAssignDivision compiles an assign statement that has quotient and remainder on the left side and division on the right.

src/core/CompileCall.go

@@ -6,8 +6,8 @@ import (
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/expression"
-	"git.akyoto.dev/cli/q/src/os/windows"
 	"git.akyoto.dev/cli/q/src/types"
+	"git.akyoto.dev/cli/q/src/windows"
 )
 
 // CompileCall executes a function call.

src/core/ExecuteRegisterNumber.go

@@ -1,11 +1,11 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // ExecuteRegisterNumber performs an operation on a register and a number.

src/core/ExecuteRegisterRegister.go

@@ -1,11 +1,11 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // ExecuteRegisterRegister performs an operation on two registers.

src/core/NewFunction.go

@@ -1,13 +1,13 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/fs"
 	"git.akyoto.dev/cli/q/src/register"
 	"git.akyoto.dev/cli/q/src/scope"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // NewFunction creates a new function.

src/elf/ELF_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/elf"
+	"git.akyoto.dev/cli/q/src/elf"
 )
 
 func TestWrite(t *testing.T) {

src/macho/MachO_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/macho"
+	"git.akyoto.dev/cli/q/src/macho"
 )
 
 func TestWrite(t *testing.T) {

src/pe/EXE_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/pe"
+	"git.akyoto.dev/cli/q/src/pe"
 )
 
 func TestWrite(t *testing.T) {

src/riscv/Registers_test.go

@@ -3,7 +3,7 @@ package riscv_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/riscv"
+	"git.akyoto.dev/cli/q/src/riscv"
 	"git.akyoto.dev/go/assert"
 )
 

src/scanner/scanFile.go

@@ -4,7 +4,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/core"
 	"git.akyoto.dev/cli/q/src/errors"
@@ -12,6 +11,7 @@ import (
 	"git.akyoto.dev/cli/q/src/scope"
 	"git.akyoto.dev/cli/q/src/token"
 	"git.akyoto.dev/cli/q/src/types"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // scanFile scans a single file.

src/windows/Registers.go

@@ -1,9 +1,9 @@
 package windows
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/arm64"
+	"git.akyoto.dev/cli/q/src/arm64"
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 var (

src/x64/Add_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/And_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Compare_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Div_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Jump_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Load_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/ModRM_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Move_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Mul_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Negate_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Or_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Pop_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Push_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/REX_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Registers_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/SIB_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Shift_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Store_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Sub_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/Xor_test.go

@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 

src/x64/x64_test.go

@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )