Move intern functions into prelude lib to avoid cyclic imports

Signed-off-by: Nicolas Paul <n@nc0.fr>

1 files changed, 10 insertions, 12 deletions

diff --git a/cmd/svgu/svgu.go b/cmd/svgu/svgu.go
index 1e7f599..16abcb7 100644
--- a/cmd/svgu/svgu.go
+++ b/cmd/svgu/svgu.go
@@ -4,7 +4,6 @@ package main // import "go.nc0.fr/svgu"
 import (
 	"flag"
 	"go.nc0.fr/svgu/pkg/config"
-	"go.nc0.fr/svgu/pkg/types"
 	"log"
 	"os"
 	"path/filepath"
@@ -23,7 +22,7 @@ func main() {
 
 	// Check if the configuration file exists.
 	if *verbose {
-		log.Printf("checking if configuration file %q exists", cfg)
+		log.Printf("checking if configuration file %q exists", *cfg)
 	}
 
 	if cfg, err := filepath.Abs(*cfg); err != nil {
@@ -31,14 +30,14 @@ func main() {
 	}
 
 	if cfgfd, err := os.Stat(*cfg); os.IsNotExist(err) || cfgfd.IsDir() {
-		log.Fatalf("configuration file %q does not exist", cfg)
+		log.Fatalf("configuration file %q does not exist", *cfg)
 	} else if err != nil {
-		log.Fatalf("could not stat %q: %v", cfg, err)
+		log.Fatalf("could not stat %q: %v", *cfg, err)
 	}
 
 	// Check if the output directory exists.
 	if *verbose {
-		log.Printf("checking if output directory %q exists", out)
+		log.Printf("checking if output directory %q exists", *out)
 	}
 
 	if out, err := filepath.Abs(*out); err != nil {
@@ -46,24 +45,24 @@ func main() {
 	}
 
 	if outfd, err := os.Stat(*out); outfd != nil && outfd.IsDir() {
-		log.Fatalf("output directory %q already exists", out)
+		log.Fatalf("output directory %q already exists", *out)
 	} else if err != nil && !os.IsNotExist(err) {
-		log.Fatalf("could not stat %q: %v", out, err)
+		log.Fatalf("could not stat %q: %v", *out, err)
 	}
 
 	// Execute the configuration file and get the registered modules.
 	if *verbose {
-		log.Printf("executing configuration file %q", cfg)
+		log.Printf("executing configuration file %q", *cfg)
 	}
 
 	idx, err := config.ExecConfig(*cfg)
 	if err != nil {
-		log.Fatalf("could not execute configuration file %q: %v", cfg, err)
+		log.Fatalf("could not execute configuration file %q: %v", *cfg, err)
 	}
 
 	// Create the output directory.
 	if *verbose {
-		log.Printf("creating output directory %q", out)
+		log.Printf("creating output directory %q", *out)
 	}
 
 	if err := os.MkdirAll(*out, 0755); err != nil {
@@ -84,8 +83,7 @@ func main() {
 		log.Printf("generating modules")
 	}
 
-	var mod *types.Module
-	for _, mod = range idx.Modules {
+	for _, mod := range idx.Modules {
 		if err := mod.GenerateFile(*out, idx.Domain); err != nil {
 			log.Fatalf("could not generate module %q: %v", mod.Path, err)
 		}