Clean up vars, don't save gold output as go files

Signed-off-by: James Hamlin <jfhamlin@gmail.com>

Author: jfhamlin

pkg/codegen/codegen.go

@@ -47,14 +47,20 @@ type liftedValue struct {
 	varName string
 }
 
+type varInfo struct {
+	ns  string
+	sym string
+}
+
 // Generator handles the conversion of AST nodes to Go code
 type Generator struct {
 	originalWriter io.Writer
 	w              io.Writer
 	varScopes      []varScope     // stack of variable scopes
 	recurStack     []recurContext // stack of recur contexts for nested loops
 
-	imports map[string]string // set of imported packages with their aliases
+	imports      map[string]string  // set of imported packages with their aliases
+	varVariables map[varInfo]string // map of vars to their Go variable names
 
 	// Fields for handling closures
 	liftedValues  map[liftedKey]*liftedValue // Dedupe by composite key
@@ -80,6 +86,7 @@ func New(w io.Writer) *Generator {
 		imports:        make(map[string]string),
 		liftedValues:   make(map[liftedKey]*liftedValue),
 		liftedCounter:  0,
+		varVariables:   make(map[varInfo]string),
 	}
 }
 
@@ -138,7 +145,29 @@ func (g *Generator) Generate(ns *lang.Namespace) error {
 
 	// Now construct the complete init function
 	var initBuf bytes.Buffer
-	initBuf.WriteString("func init() {\n")
+	initBuf.WriteString(fmt.Sprintf("// LoadNS initializes the namespace %q\n", ns.Name().String()))
+	initBuf.WriteString("func LoadNS() {\n")
+	initBuf.WriteString(`checkDerefMacro := func (v *lang.Var) {
+  if v.IsMacro() {
+	  panic(lang.NewIllegalArgumentError(fmt.Sprintf("can't take value of macro: %v", v)))
+  }
+}
+_ = checkDerefMacro
+`)
+
+	// initialize all the vars first
+	var varNames []string
+	var inverseVarMap = make(map[string]varInfo)
+	for vi, varName := range g.varVariables {
+		varNames = append(varNames, varName)
+		inverseVarMap[varName] = vi
+	}
+	sort.Strings(varNames) // Sort for deterministic output
+	for _, varName := range varNames {
+		vi := inverseVarMap[varName]
+		initBuf.WriteString(fmt.Sprintf("// var %s/%s\n", vi.ns, vi.sym))
+		initBuf.WriteString(fmt.Sprintf("%s := lang.InternVarName(lang.NewSymbol(%q), lang.NewSymbol(%q))\n", varName, vi.ns, vi.sym))
+	}
 
 	// Generate lifted values at the beginning of init() if any
 	if len(g.liftedValues) > 0 {
@@ -180,8 +209,8 @@ func (g *Generator) Generate(ns *lang.Namespace) error {
 	initBuf.WriteString("}\n")
 
 	// Prepare the final source
-	sourceBytes := []byte(g.header())                     // Package declaration and imports
-	sourceBytes = append(sourceBytes, initBuf.Bytes()...) // The complete init function
+	sourceBytes := []byte(g.header(mungeID(getLastNSPart(ns.Name().String())))) // File header with package and imports
+	sourceBytes = append(sourceBytes, initBuf.Bytes()...)                       // The complete init function
 
 	// Format the generated code
 	formatted, err := format.Source(sourceBytes)
@@ -866,18 +895,10 @@ func (g *Generator) generateVarDeref(node *ast.Node) string {
 	varNamespace := varNode.Var.Namespace()
 	varSymbol := varNode.Var.Symbol()
 
-	// generate code to look up the var in the namespace
-	nsVar := g.allocateTempVar()
-	g.writef("%s := lang.FindNamespace(lang.NewSymbol(\"%s\"))\n", nsVar, varNamespace.Name())
-	// look up the var in the namespace
-	varId := g.allocateTempVar()
-	g.writef("%s := %s.FindInternedVar(lang.NewSymbol(\"%s\"))\n", varId, nsVar, varSymbol.Name())
+	// Look up the var variable
+	varId := g.allocateVarVariable(varNamespace.Name().String(), varSymbol.String())
 
-	// if macro, panic with 'can't take value of macro: %v'
-	g.writef("if %s.IsMacro() {\n", varId)
-	g.writef("  panic(lang.NewIllegalArgumentError(fmt.Sprintf(\"can't take value of macro: %%v\", %s)))\n", varId)
-	g.writef("}\n")
-	// else, return Get()
+	g.writef("checkDerefMacro(%s)\n", varId)
 	resultId := g.allocateTempVar()
 	g.writef("%s := %s.Get()\n", resultId, varId)
 
@@ -1416,13 +1437,13 @@ func (g *Generator) addImportWithAlias(pkg string) string {
 	return alias
 }
 
-func (g *Generator) header() string {
-	header := `// Code generated by glojure codegen. DO NOT EDIT.
+func (g *Generator) header(pkgName string) string {
+	header := fmt.Sprintf(`// Code generated by glojure codegen. DO NOT EDIT.
 
-package generated
+package %s
 
 import (
-`
+`, pkgName)
 
 	// sort the imports by their package name for deterministic output
 	keys := make([]string, 0, len(g.imports))
@@ -1456,7 +1477,7 @@ func (g *Generator) writeAssign(varName, rValue string) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Variable Scope Management
+// Variable scope management and other helpers
 
 // PushVarScope creates a new variable scope
 func (g *Generator) pushVarScope() {
@@ -1587,8 +1608,47 @@ func (g *Generator) allocateTempVar() string {
 	return varName
 }
 
+var (
+	replacements = map[rune]string{
+		'!': "_BANG_",
+		'?': "_QMARK_",
+		'-': "_",
+		'+': "_PLUS_",
+		'*': "_STAR_",
+		'/': "_SLASH_",
+		'=': "_EQ_",
+		'<': "_LT_",
+		'>': "_GT_",
+		'&': "_AMP_",
+		'%': "_PCT_",
+		'$': "_DOLLAR_",
+		'^': "_CARET_",
+		'~': "_TILDE_",
+		'.': "_DOT_",
+		':': "_COLON_",
+		'@': "_AT_",
+		'#': "_HASH_",
+	}
+)
+
 func mungeID(name string) string {
-	return strings.ReplaceAll(name, "-", "__")
+	var sb strings.Builder
+	for _, ch := range name {
+		if repl, ok := replacements[ch]; ok {
+			sb.WriteString(repl)
+		} else if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '_' {
+			sb.WriteRune(ch)
+		} else {
+			// Replace any other non-alphanumeric character with its Unicode code point
+			sb.WriteString(fmt.Sprintf("_U%04X_", ch))
+		}
+	}
+	return sb.String()
+}
+
+func getLastNSPart(ns string) string {
+	parts := strings.Split(ns, ".")
+	return parts[len(parts)-1]
 }
 
 func (g *Generator) pushRecurContext(loopID *lang.Symbol, bindings []string, useGoto bool) {
@@ -1612,3 +1672,13 @@ func (g *Generator) currentRecurContext() *recurContext {
 	}
 	return &g.recurStack[len(g.recurStack)-1]
 }
+
+func (g *Generator) allocateVarVariable(ns, sym string) string {
+	varInfo := varInfo{ns: ns, sym: sym}
+	if v, ok := g.varVariables[varInfo]; ok {
+		return v
+	}
+	varName := mungeID(ns) + "_" + mungeID(sym)
+	g.varVariables[varInfo] = varName
+	return varName
+}

pkg/codegen/codegen_test.go

@@ -56,7 +56,11 @@ func TestCodegen(t *testing.T) {
 
 			ns := lang.FindNamespace(lang.NewSymbol(nsName))
 
-			generateAndTestNamespace(t, ns, strings.TrimSuffix(testFile, ".glj")+".go")
+			outputDir := strings.TrimSuffix(testFile, ".glj")
+			if err := os.MkdirAll(outputDir, 0755); err != nil {
+				t.Fatalf("failed to create output directory: %v", err)
+			}
+			generateAndTestNamespace(t, ns, filepath.Join(outputDir, "load.go.out"))
 		})
 	}
 
@@ -67,7 +71,10 @@ func TestCodegen(t *testing.T) {
 			t.Fatal("glojure.core namespace not found")
 		}
 
-		goldenFile := "testdata/codegen/test/core.go"
+		if err := os.MkdirAll("testdata/codegen/test/core", 0755); err != nil {
+			t.Fatalf("failed to create output directory: %v", err)
+		}
+		goldenFile := "testdata/codegen/test/core/load.go.out"
 		generateAndTestNamespace(t, ns, goldenFile)
 	})
 }
@@ -110,12 +117,28 @@ func generateAndTestNamespace(t *testing.T, ns *lang.Namespace, goldenFile strin
 			generated, expected)
 	}
 
-	// run go vet on the output file. print any errors from stderr
-	cmd := exec.Command("go", "vet", "-all", goldenFile)
-	var stderr bytes.Buffer
-	cmd.Stderr = &stderr
-	if err := cmd.Run(); err != nil {
-		t.Errorf("go vet failed for %s: %v\nStderr:\n%s", goldenFile, err, stderr.String())
+	{
+		// Copy golden file to temp directory with .go extension for go vet
+		tempFile, err := ioutil.TempFile("", "codegen_test_*.go")
+		if err != nil {
+			t.Fatalf("failed to create temp file: %v", err)
+		}
+		defer os.Remove(tempFile.Name())
+
+		if _, err := tempFile.Write(expected); err != nil {
+			t.Fatalf("failed to write to temp file: %v", err)
+		}
+		if err := tempFile.Close(); err != nil {
+			t.Fatalf("failed to close temp file: %v", err)
+		}
+
+		// run go vet on the temp file with .go extension
+		cmd := exec.Command("go", "vet", "-all", tempFile.Name())
+		var stderr bytes.Buffer
+		cmd.Stderr = &stderr
+		if err := cmd.Run(); err != nil {
+			t.Errorf("go vet failed for %s: %v\nStderr:\n%s", goldenFile, err, stderr.String())
+		}
 	}
 
 	// Check if namespace has -main function with expected output

…n/testdata/codegen/test/const_keyword.go …a/codegen/test/const_keyword/load.go.outpkg/codegen/testdata/codegen/test/const_keyword.go renamed to pkg/codegen/testdata/codegen/test/const_keyword/load.go.out pkg/codegen/testdata/codegen/test/const_keyword.go renamed to pkg/codegen/testdata/codegen/test/const_keyword/load.go.out

@@ -1,13 +1,20 @@
 // Code generated by glojure codegen. DO NOT EDIT.
 
-package generated
+package const_keyword
 
 import (
 	fmt "fmt"
 	lang "github.com/glojurelang/glojure/pkg/lang"
 )
 
-func init() {
+// LoadNS initializes the namespace "codegen.test.const-keyword"
+func LoadNS() {
+	checkDerefMacro := func(v *lang.Var) {
+		if v.IsMacro() {
+			panic(lang.NewIllegalArgumentError(fmt.Sprintf("can't take value of macro: %v", v)))
+		}
+	}
+	_ = checkDerefMacro
 	// reference fmt to avoid unused import error
 	_ = fmt.Printf
 	ns := lang.FindOrCreateNamespace(lang.NewSymbol("codegen.test.const-keyword"))

…en/testdata/codegen/test/const_number.go …ta/codegen/test/const_number/load.go.outpkg/codegen/testdata/codegen/test/const_number.go renamed to pkg/codegen/testdata/codegen/test/const_number/load.go.out pkg/codegen/testdata/codegen/test/const_number.go renamed to pkg/codegen/testdata/codegen/test/const_number/load.go.out

@@ -1,13 +1,20 @@
 // Code generated by glojure codegen. DO NOT EDIT.
 
-package generated
+package const_number
 
 import (
 	fmt "fmt"
 	lang "github.com/glojurelang/glojure/pkg/lang"
 )
 
-func init() {
+// LoadNS initializes the namespace "codegen.test.const-number"
+func LoadNS() {
+	checkDerefMacro := func(v *lang.Var) {
+		if v.IsMacro() {
+			panic(lang.NewIllegalArgumentError(fmt.Sprintf("can't take value of macro: %v", v)))
+		}
+	}
+	_ = checkDerefMacro
 	// reference fmt to avoid unused import error
 	_ = fmt.Printf
 	ns := lang.FindOrCreateNamespace(lang.NewSymbol("codegen.test.const-number"))

…en/testdata/codegen/test/const_string.go …ta/codegen/test/const_string/load.go.outpkg/codegen/testdata/codegen/test/const_string.go renamed to pkg/codegen/testdata/codegen/test/const_string/load.go.out pkg/codegen/testdata/codegen/test/const_string.go renamed to pkg/codegen/testdata/codegen/test/const_string/load.go.out

@@ -1,13 +1,20 @@
 // Code generated by glojure codegen. DO NOT EDIT.
 
-package generated
+package const_string
 
 import (
 	fmt "fmt"
 	lang "github.com/glojurelang/glojure/pkg/lang"
 )
 
-func init() {
+// LoadNS initializes the namespace "codegen.test.const-string"
+func LoadNS() {
+	checkDerefMacro := func(v *lang.Var) {
+		if v.IsMacro() {
+			panic(lang.NewIllegalArgumentError(fmt.Sprintf("can't take value of macro: %v", v)))
+		}
+	}
+	_ = checkDerefMacro
 	// reference fmt to avoid unused import error
 	_ = fmt.Printf
 	ns := lang.FindOrCreateNamespace(lang.NewSymbol("codegen.test.const-string"))

…egen/testdata/codegen/test/def_simple.go …data/codegen/test/def_simple/load.go.outpkg/codegen/testdata/codegen/test/def_simple.go renamed to pkg/codegen/testdata/codegen/test/def_simple/load.go.out pkg/codegen/testdata/codegen/test/def_simple.go renamed to pkg/codegen/testdata/codegen/test/def_simple/load.go.out

@@ -1,13 +1,20 @@
 // Code generated by glojure codegen. DO NOT EDIT.
 
-package generated
+package def_simple
 
 import (
 	fmt "fmt"
 	lang "github.com/glojurelang/glojure/pkg/lang"
 )
 
-func init() {
+// LoadNS initializes the namespace "codegen.test.def-simple"
+func LoadNS() {
+	checkDerefMacro := func(v *lang.Var) {
+		if v.IsMacro() {
+			panic(lang.NewIllegalArgumentError(fmt.Sprintf("can't take value of macro: %v", v)))
+		}
+	}
+	_ = checkDerefMacro
 	// reference fmt to avoid unused import error
 	_ = fmt.Printf
 	ns := lang.FindOrCreateNamespace(lang.NewSymbol("codegen.test.def-simple"))