Simplified config package

src/config/config.go

@@ -2,45 +2,21 @@ package config
 
 import "runtime"
 
-const (
-	// This is the absolute virtual minimum address we can load a program at, see `sysctl vm.mmap_min_addr`.
-	MinAddress = 0x10000
-
-	// The base address is the virtual address for our ELF file.
-	BaseAddress = 0x40 * MinAddress
-
-	// Align is the alignment of the sections and it must be a multiple of the page size.
-	Align = 0x1000
-)
-
 var (
-	// Shows the assembly instructions at the end.
-	Assembler bool
-
-	// Shows statistics at the end.
-	Statistics bool
-
-	// Calculates the result of operations on constants at compile time.
-	ConstantFold bool
-
-	// Skips writing the executable to disk.
-	Dry bool
-
-	// Target architecture.
-	TargetArch string
-
-	// Target platform.
-	TargetOS OS
+	ConstantFold   bool   // Calculates the result of operations on constants at compile time.
+	Dry            bool   // Skips writing the executable to disk.
+	ShowAssembly   bool   // Shows assembly instructions at the end.
+	ShowStatistics bool   // Shows statistics at the end.
+	TargetArch     string // Target architecture.
+	TargetOS       OS     // Target platform.
 )
 
 // Reset resets the configuration to its default values.
 func Reset() {
-	Assembler = false
-	Statistics = false
-	ConstantFold = true
+	ShowAssembly = false
+	ShowStatistics = false
 	Dry = false
 	TargetArch = runtime.GOARCH
-	TargetOS = Unknown
 
 	switch runtime.GOOS {
 	case "linux":
@@ -49,5 +25,14 @@ func Reset() {
 		TargetOS = Mac
 	case "windows":
 		TargetOS = Windows
+	default:
+		TargetOS = Unknown
 	}
+
+	Optimize(true)
+}
+
+// Optimize enables or disables all the optimizations at once.
+func Optimize(enable bool) {
+	ConstantFold = enable
 }

src/config/const.go

@@ -0,0 +1,12 @@
+package config
+
+const (
+	// This is the absolute virtual minimum address we can load a program at, see `sysctl vm.mmap_min_addr`.
+	MinAddress = 0x10000
+
+	// The base address is the virtual address for our ELF file.
+	BaseAddress = 0x40 * MinAddress
+
+	// Align is the alignment of the sections and it must be a multiple of the page size.
+	Align = 0x1000
+)

src/config/findLibrary.go

@@ -0,0 +1,25 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func findLibrary() {
+	dir := WorkingDirectory
+
+	for {
+		Library = filepath.Join(dir, "lib")
+		stat, err := os.Stat(Library)
+
+		if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
+			return
+		}
+
+		if dir == "/" {
+			panic("standard library not found")
+		}
+
+		dir = filepath.Dir(dir)
+	}
+}

src/config/init.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"runtime/debug"
 )
@@ -45,22 +44,3 @@ func init() {
 		findLibrary()
 	}
 }
-
-func findLibrary() {
-	dir := WorkingDirectory
-
-	for {
-		Library = path.Join(dir, "lib")
-		stat, err := os.Stat(Library)
-
-		if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
-			return
-		}
-
-		if dir == "/" {
-			panic("standard library not found")
-		}
-
-		dir = filepath.Dir(dir)
-	}
-}