Add support for the-var and tests for parse-double/long

jfhamlin · jfhamlin · commit 0cd1aafea764 · 2025-08-17T18:01:18.000-07:00
Signed-off-by: James Hamlin &lt;jfhamlin@gmail.com&gt;
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
@@ -393,7 +393,6 @@ func (g *Generator) generateASTNode(node *ast.Node) string {
 	// OpLetFn
 	// OpGo
 	// OpCase
-	// OpTheVar
 	// OpNew
 	case ast.OpTry:
 		return g.generateTry(node)
@@ -442,6 +441,8 @@ func (g *Generator) generateASTNode(node *ast.Node) string {
 		return g.generateHostInterop(node)
 	case ast.OpMaybeHostForm:
 		return g.generateMaybeHostForm(node)
+	case ast.OpTheVar:
+		return g.generateTheVar(node)
 	default:
 		fmt.Printf("Generating code for AST node: %T %+v\n", node.Sub, node.Sub)
 		panic(fmt.Sprintf("unsupported AST node type %T", node.Sub))
@@ -892,10 +893,18 @@ func (g *Generator) generateMaybeHostForm(node *ast.Node) string {
 	maybeHostNode := node.Sub.(*ast.MaybeHostFormNode)
 	field := maybeHostNode.Field
 
-	switch maybeHostNode.Class {
-	default:
-		panic(fmt.Sprintf("unsupported host form class: %s.%s", maybeHostNode.Class, field))
-	}
+	panic(fmt.Sprintf("unsupported form: %s/%s", maybeHostNode.Class, field))
+}
+
+func (g *Generator) generateTheVar(node *ast.Node) string {
+	theVarNode := node.Sub.(*ast.TheVarNode)
+	varSym := theVarNode.Var
+	ns := varSym.Namespace()
+	name := varSym.Symbol()
+
+	resultId := g.allocateTempVar()
+	g.writef("%s := lang.InternVarName(lang.NewSymbol(\"%s\"), lang.NewSymbol(\"%s\"))\n", resultId, ns.Name(), name.Name())
+	return resultId
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/pkg/codegen/testdata/codegen/test/the_var.glj b/pkg/codegen/testdata/codegen/test/the_var.glj
@@ -0,0 +1,6 @@
+(ns codegen.test.the-var)
+
+(def foo 42)
+
+(defn ^{:expected-output 42} -main []
+  (.get #'foo))
diff --git a/pkg/codegen/testdata/codegen/test/the_var.go b/pkg/codegen/testdata/codegen/test/the_var.go
diff --git a/pkg/gen/gljimports/gljimports_darwin_amd64.go b/pkg/gen/gljimports/gljimports_darwin_amd64.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_darwin_arm64.go b/pkg/gen/gljimports/gljimports_darwin_arm64.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_js_wasm.go b/pkg/gen/gljimports/gljimports_js_wasm.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_linux_amd64.go b/pkg/gen/gljimports/gljimports_linux_amd64.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_linux_arm64.go b/pkg/gen/gljimports/gljimports_linux_arm64.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_windows_amd64.go b/pkg/gen/gljimports/gljimports_windows_amd64.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/gen/gljimports/gljimports_windows_arm.go b/pkg/gen/gljimports/gljimports_windows_arm.go
@@ -3798,7 +3798,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMapValSeq", github_com_glojurelang_glojure_pkg_lang.NewMapValSeq)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewMultiFn", github_com_glojurelang_glojure_pkg_lang.NewMultiFn)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewNamespace", github_com_glojurelang_glojure_pkg_lang.NewNamespace)
-	_register("github.com/glojurelang/glojure/pkg/lang.NewNumberFormatError", github_com_glojurelang_glojure_pkg_lang.NewNumberFormatError)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentArrayMapAsIfByAssoc", github_com_glojurelang_glojure_pkg_lang.NewPersistentArrayMapAsIfByAssoc)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewPersistentHashMap", github_com_glojurelang_glojure_pkg_lang.NewPersistentHashMap)
 	_register("github.com/glojurelang/glojure/pkg/lang.NewRange", github_com_glojurelang_glojure_pkg_lang.NewRange)
@@ -3830,8 +3829,6 @@ func RegisterImports(_register func(string, interface{})) {
 	_register("github.com/glojurelang/glojure/pkg/lang.*NodeSeq", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NodeSeq)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Nth", github_com_glojurelang_glojure_pkg_lang.Nth)
 	_register("github.com/glojurelang/glojure/pkg/lang.Nther", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Nther)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)).Elem())
-	_register("github.com/glojurelang/glojure/pkg/lang.*NumberFormatError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberFormatError)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)).Elem())
 	_register("github.com/glojurelang/glojure/pkg/lang.*NumberMethods", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.NumberMethods)(nil)))
 	_register("github.com/glojurelang/glojure/pkg/lang.Numbers", github_com_glojurelang_glojure_pkg_lang.Numbers)
diff --git a/pkg/lang/error.go b/pkg/lang/error.go
@@ -25,10 +25,6 @@ type (
 		msg string
 	}
 
-	NumberFormatError struct {
-		msg string
-	}
-
 	// Stacker is an interface for retrieving stack traces.
 	Stacker interface {
 		Stack() []StackFrame
@@ -102,19 +98,6 @@ func (e *ArithmeticError) Is(other error) bool {
 	return ok
 }
 
-func NewNumberFormatError(msg string) error {
-	return &NumberFormatError{msg: msg}
-}
-
-func (e *NumberFormatError) Error() string {
-	return e.msg
-}
-
-func (e *NumberFormatError) Is(other error) bool {
-	_, ok := other.(*NumberFormatError)
-	return ok
-}
-
 func NewIllegalStateError(msg string) error {
 	return &IllegalStateError{msg: msg}
 }
diff --git a/pkg/stdlib/glojure/core.glj b/pkg/stdlib/glojure/core.glj
diff --git a/scripts/rewrite-core/rewrite.clj b/scripts/rewrite-core/rewrite.clj
diff --git a/test/glojure/test_glojure/numbers.glj b/test/glojure/test_glojure/numbers.glj
