Refactored code structure

src/build/Build.go

@@ -3,6 +3,9 @@ package build
 import (
 	"path/filepath"
 	"strings"
+
+	"git.akyoto.dev/cli/q/src/build/core"
+	"git.akyoto.dev/cli/q/src/build/scanner"
 )
 
 // Build describes a compiler build.
@@ -18,18 +21,28 @@ func New(files ...string) *Build {
 }
 
 // Run parses the input files and generates an executable file.
-func (build *Build) Run() (Result, error) {
-	functions, errors := scan(build.Files)
-	return compile(functions, errors)
+func (build *Build) Run() (core.Result, error) {
+	functions, errors := scanner.Scan(build.Files)
+	return core.Compile(functions, errors)
 }
 
 // Executable returns the path to the executable.
 func (build *Build) Executable() string {
-	directory, _ := filepath.Abs(build.Files[0])
+	path, _ := filepath.Abs(build.Files[0])
 
-	if strings.HasSuffix(directory, ".q") {
-		directory = filepath.Dir(directory)
+	if strings.HasSuffix(path, ".q") {
+		return fromFileName(path)
+	} else {
+		return fromDirectoryName(path)
 	}
-
-	return filepath.Join(directory, filepath.Base(directory))
+}
+
+// fromDirectoryName returns the executable path based on the directory name.
+func fromDirectoryName(path string) string {
+	return filepath.Join(path, filepath.Base(path))
+}
+
+// fromFileName returns the executable path based on the file name.
+func fromFileName(path string) string {
+	return filepath.Join(filepath.Dir(path), strings.TrimSuffix(filepath.Base(path), ".q"))
 }