Update logger and other packages

main.go

@@ -2,62 +2,36 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"sync"
-
-	"github.com/davecgh/go-spew/spew"
 
 	_ "embed"
+
+	logger "git.site.quack-lab.dev/dave/cylogger"
+	utils "git.site.quack-lab.dev/dave/cyutils"
 )
 
-var Error *log.Logger
-var Warning *log.Logger
-
-func init() {
-	log.SetFlags(log.Lmicroseconds | log.Lshortfile)
-	logger := io.MultiWriter(os.Stdout)
-	log.SetOutput(logger)
-
-	Error = log.New(io.MultiWriter(os.Stderr, os.Stdout),
-		fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
-		log.Lmicroseconds|log.Lshortfile)
-	Warning = log.New(io.MultiWriter(os.Stdout),
-		fmt.Sprintf("%sWarning:%s ", "\033[0;93m", "\033[0m"),
-		log.Lmicroseconds|log.Lshortfile)
-
-	spew.Config.Indent = "    "
-	spew.Config.SortKeys = true
-}
-
 func main() {
 	outdir := flag.String("o", ".", "Output directory")
 	flag.Parse()
+	logger.InitFlag()
+	logger.Info("Starting...")
+
 	files := flag.Args()
 	if len(files) == 0 {
-		Error.Printf("No files specified")
+		logger.Error("No files specified")
 		flag.Usage()
 		return
 	}
 
 	// TODO: Implement parsing enums somehow
 	// TODO: Implement some sort of switching (between a class and an enum)
-	wg := sync.WaitGroup{}
-	for _, file := range files {
-		wg.Add(1)
-		go func(file string) {
-			defer wg.Done()
-			class, err := ParseClass(file)
-			if err != nil {
-				Error.Printf("Error parsing file: %v", err)
-				return
-			}
-			class.Write(*outdir, classTemplate)
-		}(file)
-	}
-	wg.Wait()
+	utils.WithWorkers(10, files, func(worker int, file string) {
+		class, err := ParseClass(file)
+		if err != nil {
+			logger.Error("Error parsing file: %v", err)
+			return
+		}
+		class.Write(*outdir, classTemplate)
+	})
 }
 
 func MapType(t string) string {
@@ -78,3 +52,11 @@ func MapType(t string) string {
 		return t
 	}
 }
+
+func IsReservedKeyword(t string) bool {
+	switch t {
+	case "any", "boolean", "number", "string", "table", "function", "thread", "userdata", "nil", "var", "in":
+		return true
+	}
+	return false
+}