diff --git a/pkg/gen/gljimports/gljimports_darwin_amd64.go b/pkg/gen/gljimports/gljimports_darwin_amd64.go index 14e26fc..c1b225c 100644 --- a/pkg/gen/gljimports/gljimports_darwin_amd64.go +++ b/pkg/gen/gljimports/gljimports_darwin_amd64.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_darwin_arm64.go b/pkg/gen/gljimports/gljimports_darwin_arm64.go index 7abbfde..a2e872d 100644 --- a/pkg/gen/gljimports/gljimports_darwin_arm64.go +++ b/pkg/gen/gljimports/gljimports_darwin_arm64.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_js_wasm.go b/pkg/gen/gljimports/gljimports_js_wasm.go index d62bf53..4eb4b41 100644 --- a/pkg/gen/gljimports/gljimports_js_wasm.go +++ b/pkg/gen/gljimports/gljimports_js_wasm.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_linux_amd64.go b/pkg/gen/gljimports/gljimports_linux_amd64.go index 1c99500..5fb19a3 100644 --- a/pkg/gen/gljimports/gljimports_linux_amd64.go +++ b/pkg/gen/gljimports/gljimports_linux_amd64.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_linux_arm64.go b/pkg/gen/gljimports/gljimports_linux_arm64.go index 8e41133..246117b 100644 --- a/pkg/gen/gljimports/gljimports_linux_arm64.go +++ b/pkg/gen/gljimports/gljimports_linux_arm64.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_windows_amd64.go b/pkg/gen/gljimports/gljimports_windows_amd64.go index 93cad16..9e6862b 100644 --- a/pkg/gen/gljimports/gljimports_windows_amd64.go +++ b/pkg/gen/gljimports/gljimports_windows_amd64.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/gen/gljimports/gljimports_windows_arm.go b/pkg/gen/gljimports/gljimports_windows_arm.go index 8ba959f..7a9b211 100644 --- a/pkg/gen/gljimports/gljimports_windows_arm.go +++ b/pkg/gen/gljimports/gljimports_windows_arm.go @@ -3419,6 +3419,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Agent", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Agent)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.AgentSubmit", github_com_glojurelang_glojure_pkg_lang.AgentSubmit) + _register("github.com/glojurelang/glojure/pkg/lang.AllNamespaces", github_com_glojurelang_glojure_pkg_lang.AllNamespaces) _register("github.com/glojurelang/glojure/pkg/lang.AppendWriter", github_com_glojurelang_glojure_pkg_lang.AppendWriter) _register("github.com/glojurelang/glojure/pkg/lang.Apply", github_com_glojurelang_glojure_pkg_lang.Apply) _register("github.com/glojurelang/glojure/pkg/lang.ArithmeticError", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.ArithmeticError)(nil)).Elem()) @@ -3484,6 +3485,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.ConstructPersistentStructMap", github_com_glojurelang_glojure_pkg_lang.ConstructPersistentStructMap) _register("github.com/glojurelang/glojure/pkg/lang.Count", github_com_glojurelang_glojure_pkg_lang.Count) _register("github.com/glojurelang/glojure/pkg/lang.Counted", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Counted)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.CreateIterate", github_com_glojurelang_glojure_pkg_lang.CreateIterate) _register("github.com/glojurelang/glojure/pkg/lang.CreateLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreateOwningLazilyPersistentVector", github_com_glojurelang_glojure_pkg_lang.CreateOwningLazilyPersistentVector) _register("github.com/glojurelang/glojure/pkg/lang.CreatePersistentHashMap", github_com_glojurelang_glojure_pkg_lang.CreatePersistentHashMap) @@ -3612,6 +3614,8 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.IsSeq", github_com_glojurelang_glojure_pkg_lang.IsSeq) _register("github.com/glojurelang/glojure/pkg/lang.IsTruthy", github_com_glojurelang_glojure_pkg_lang.IsTruthy) _register("github.com/glojurelang/glojure/pkg/lang.IsZero", github_com_glojurelang_glojure_pkg_lang.IsZero) + _register("github.com/glojurelang/glojure/pkg/lang.Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil)).Elem()) + _register("github.com/glojurelang/glojure/pkg/lang.*Iterate", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterate)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.Iterator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Iterator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.KWAliases", github_com_glojurelang_glojure_pkg_lang.KWAliases) _register("github.com/glojurelang/glojure/pkg/lang.KWArg", github_com_glojurelang_glojure_pkg_lang.KWArg) @@ -3772,7 +3776,6 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/lang.*Namespace", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_lang.Namespace)(nil))) _register("github.com/glojurelang/glojure/pkg/lang.NamespaceFor", github_com_glojurelang_glojure_pkg_lang.NamespaceFor) - _register("github.com/glojurelang/glojure/pkg/lang.Namespaces", github_com_glojurelang_glojure_pkg_lang.Namespaces) _register("github.com/glojurelang/glojure/pkg/lang.NewArithmeticError", github_com_glojurelang_glojure_pkg_lang.NewArithmeticError) _register("github.com/glojurelang/glojure/pkg/lang.NewArrayList", github_com_glojurelang_glojure_pkg_lang.NewArrayList) _register("github.com/glojurelang/glojure/pkg/lang.NewAtom", github_com_glojurelang_glojure_pkg_lang.NewAtom) @@ -3825,6 +3828,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.NewRepeat", github_com_glojurelang_glojure_pkg_lang.NewRepeat) _register("github.com/glojurelang/glojure/pkg/lang.NewRepeatN", github_com_glojurelang_glojure_pkg_lang.NewRepeatN) _register("github.com/glojurelang/glojure/pkg/lang.NewSet", github_com_glojurelang_glojure_pkg_lang.NewSet) + _register("github.com/glojurelang/glojure/pkg/lang.NewSet2", github_com_glojurelang_glojure_pkg_lang.NewSet2) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceChunk", github_com_glojurelang_glojure_pkg_lang.NewSliceChunk) _register("github.com/glojurelang/glojure/pkg/lang.NewSliceSeq", github_com_glojurelang_glojure_pkg_lang.NewSliceSeq) _register("github.com/glojurelang/glojure/pkg/lang.NewStringSeq", github_com_glojurelang_glojure_pkg_lang.NewStringSeq) @@ -3954,6 +3958,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/lang.VarFile", github_com_glojurelang_glojure_pkg_lang.VarFile) _register("github.com/glojurelang/glojure/pkg/lang.VarIn", github_com_glojurelang_glojure_pkg_lang.VarIn) _register("github.com/glojurelang/glojure/pkg/lang.VarInNS", github_com_glojurelang_glojure_pkg_lang.VarInNS) + _register("github.com/glojurelang/glojure/pkg/lang.VarLoadFile", github_com_glojurelang_glojure_pkg_lang.VarLoadFile) _register("github.com/glojurelang/glojure/pkg/lang.VarNS", github_com_glojurelang_glojure_pkg_lang.VarNS) _register("github.com/glojurelang/glojure/pkg/lang.VarOut", github_com_glojurelang_glojure_pkg_lang.VarOut) _register("github.com/glojurelang/glojure/pkg/lang.VarParents", github_com_glojurelang_glojure_pkg_lang.VarParents) @@ -3980,6 +3985,7 @@ func RegisterImports(_register func(string, interface{})) { _register("github.com/glojurelang/glojure/pkg/runtime.Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil)).Elem()) _register("github.com/glojurelang/glojure/pkg/runtime.*Generator", reflect.TypeOf((*github_com_glojurelang_glojure_pkg_runtime.Generator)(nil))) _register("github.com/glojurelang/glojure/pkg/runtime.GetNSLoader", github_com_glojurelang_glojure_pkg_runtime.GetNSLoader) + _register("github.com/glojurelang/glojure/pkg/runtime.GetUseAOT", github_com_glojurelang_glojure_pkg_runtime.GetUseAOT) _register("github.com/glojurelang/glojure/pkg/runtime.NewEnvironment", github_com_glojurelang_glojure_pkg_runtime.NewEnvironment) _register("github.com/glojurelang/glojure/pkg/runtime.NewFn", github_com_glojurelang_glojure_pkg_runtime.NewFn) _register("github.com/glojurelang/glojure/pkg/runtime.NewGenerator", github_com_glojurelang_glojure_pkg_runtime.NewGenerator) diff --git a/pkg/lang/apersistentvector.go b/pkg/lang/apersistentvector.go index 20b05f3..5f55a82 100644 --- a/pkg/lang/apersistentvector.go +++ b/pkg/lang/apersistentvector.go @@ -237,6 +237,13 @@ func (s *apvSeq) First() any { return s.v.Nth(s.i) } +func (s *apvSeq) Nth(i int) any { + if i < 0 || s.i+i >= s.v.Count() { + panic(NewIndexOutOfBoundsError()) + } + return s.v.Nth(s.i + i) +} + func (s *apvSeq) Next() ISeq { if s.i+1 >= s.v.Count() { return nil @@ -336,6 +343,13 @@ func (s *apvRSeq) First() any { return s.v.Nth(s.i) } +func (s *apvRSeq) Nth(i int) any { + if i < 0 || s.i-i < 0 { + panic(NewIndexOutOfBoundsError()) + } + return s.v.Nth(s.i - i) +} + func (s *apvRSeq) Next() ISeq { if s.i <= 0 { return nil diff --git a/pkg/lang/interfaces.go b/pkg/lang/interfaces.go index 6c81d11..b7729ef 100644 --- a/pkg/lang/interfaces.go +++ b/pkg/lang/interfaces.go @@ -4,6 +4,7 @@ import ( "fmt" "reflect" "time" + "unicode/utf8" ) type ( @@ -430,7 +431,8 @@ func Count(coll any) int { case nil: return 0 case string: - return len(arg) + // count runes, not bytes + return utf8.RuneCountInString(arg) case Counted: return arg.Count() } diff --git a/pkg/lang/iterate.go b/pkg/lang/iterate.go new file mode 100644 index 0000000..7f73c86 --- /dev/null +++ b/pkg/lang/iterate.go @@ -0,0 +1,145 @@ +package lang + +type ( + Iterate struct { + meta IPersistentMap + hash, hasheq uint32 + + f IFn + + prevSeed any + // lazily realized + seed any + + // cached + next ISeq + } +) + +var ( + _ ASeq = (*Iterate)(nil) + _ IReduce = (*Iterate)(nil) + _ IReduceInit = (*Iterate)(nil) + _ IPending = (*Iterate)(nil) + + unrealizedSeed = &struct{}{} +) + +func CreateIterate(f IFn, seed any) *Iterate { + return newIterate(f, nil, seed) +} + +func newIterate(f IFn, prevSeed, seed any) *Iterate { + return &Iterate{ + f: f, + prevSeed: prevSeed, + seed: seed, + } +} + +func newIterateMeta(meta IPersistentMap, f IFn, prevSeed, seed any, next ISeq) *Iterate { + return &Iterate{ + f: f, + prevSeed: prevSeed, + seed: seed, + next: next, + meta: meta, + } +} + +func (it *Iterate) IsRealized() bool { + return it.seed != unrealizedSeed +} + +func (it *Iterate) First() any { + if it.seed == unrealizedSeed { + it.seed = it.f.Invoke(it.prevSeed) + } + return it.seed +} + +func (it *Iterate) Next() ISeq { + if IsNil(it.next) { + it.next = newIterate(it.f, it.First(), unrealizedSeed) + } + return it.next +} + +func (it *Iterate) Meta() IPersistentMap { + return it.meta +} + +func (it *Iterate) WithMeta(meta IPersistentMap) any { + if it.meta == meta { + return it + } + + return newIterateMeta(meta, it.f, it.prevSeed, it.seed, it.next) +} + +func (it *Iterate) Reduce(rf IFn) any { + first := it.First() + ret := first + v := it.f.Invoke(first) + for { + ret = rf.Invoke(ret, v) + if IsReduced(ret) { + return ret.(IDeref).Deref() + } + v = it.f.Invoke(v) + } +} + +func (it *Iterate) ReduceInit(rf IFn, start any) any { + ret := start + v := it.First() + for { + ret = rf.Invoke(ret, v) + if IsReduced(ret) { + return ret.(IDeref).Deref() + } + v = it.f.Invoke(v) + } +} + +func (it *Iterate) Cons(o any) Conser { + return aseqCons(it, o) +} + +func (it *Iterate) Count() int { + return aseqCount(it) +} + +func (it *Iterate) Empty() IPersistentCollection { + return aseqEmpty() +} + +func (it *Iterate) Equals(o any) bool { + return aseqEquals(it, o) +} + +func (it *Iterate) Equiv(o any) bool { + return aseqEquiv(it, o) +} + +func (it *Iterate) Hash() uint32 { + return aseqHash(&it.hash, it) +} + +func (it *Iterate) HashEq() uint32 { + return aseqHashEq(&it.hasheq, it) +} + +func (it *Iterate) More() ISeq { + return aseqMore(it) +} + +func (it *Iterate) Seq() ISeq { + return it +} + +func (it *Iterate) String() string { + return aseqString(it) +} + +func (it *Iterate) xxx_sequential() {} diff --git a/pkg/lang/iteration.go b/pkg/lang/iteration.go index 570bc50..8cc3d41 100644 --- a/pkg/lang/iteration.go +++ b/pkg/lang/iteration.go @@ -1,6 +1,7 @@ package lang import ( + "fmt" "reflect" ) @@ -43,6 +44,9 @@ func Nth(x interface{}, n int) (interface{}, bool) { } if seq := Seq(x); seq != nil { + if seq == x { + panic(fmt.Errorf("unexpected Seq result equal to input")) + } return Nth(seq, n) } diff --git a/pkg/lang/namespace.go b/pkg/lang/namespace.go index b67699a..94342c7 100644 --- a/pkg/lang/namespace.go +++ b/pkg/lang/namespace.go @@ -27,14 +27,14 @@ var ( nsMtx sync.RWMutex ) -func Namespaces() []*Namespace { +func AllNamespaces() ISeq { nsMtx.RLock() defer nsMtx.RUnlock() ns := make([]*Namespace, 0, len(namespaces)) for _, n := range namespaces { ns = append(ns, n) } - return ns + return Seq(ns) } func FindNamespace(sym *Symbol) *Namespace { diff --git a/pkg/lang/var.go b/pkg/lang/var.go index e503727..090b87f 100644 --- a/pkg/lang/var.go +++ b/pkg/lang/var.go @@ -47,6 +47,8 @@ var ( VarNS = InternVar(NSCore, NewSymbol("ns"), false, true) VarInNS = InternVar(NSCore, NewSymbol("in-ns"), false, true) + VarLoadFile = InternVar(NSCore, NewSymbol("load-file"), nil, true) + VarCurrentNS = InternVarReplaceRoot(NSCore, NewSymbol("*ns*"), NSCore).SetDynamic() VarWarnOnReflection = InternVarReplaceRoot(NSCore, NewSymbol("*warn-on-reflection*"), false).SetDynamic() VarUncheckedMath = InternVarReplaceRoot(NSCore, NewSymbol("*unchecked-math*"), false).SetDynamic() diff --git a/pkg/runtime/codegen.go b/pkg/runtime/codegen.go index 29441f5..c7b0903 100644 --- a/pkg/runtime/codegen.go +++ b/pkg/runtime/codegen.go @@ -88,6 +88,7 @@ var ( "#'clojure.core/*in*": true, "#'clojure.core/*out*": true, "#'clojure.core/*compile-files*": true, + "#'clojure.core/load-file": true, } ) @@ -639,6 +640,8 @@ func (g *Generator) getTypeString(t reflect.Type) string { default: return "chan " + g.getTypeString(t.Elem()) } + case reflect.Interface: + return "any" default: // For basic types like int, string, etc. // Note: We can't use t.String() directly here because it might diff --git a/pkg/runtime/envinit.go b/pkg/runtime/envinit.go index 2b06c85..d1335b3 100644 --- a/pkg/runtime/envinit.go +++ b/pkg/runtime/envinit.go @@ -120,7 +120,7 @@ func NewEnvironment(opts ...EvalOption) lang.Environment { // Workaround to ensure namespaces that are required by core are loaded. // TODO: AOT should identify this dependency and generate code to load it. if useAot { - RT.Load("clojure/protocols") + RT.Load("clojure/core/protocols") RT.Load("clojure/string") RT.Load("glojure/go/io") } @@ -132,5 +132,21 @@ func NewEnvironment(opts ...EvalOption) lang.Environment { versionVar.BindRoot(ParseVersion(VERSION)) } + lang.InternVar(core, lang.NewSymbol("load-file"), func(filename string) any { + buf, err := os.ReadFile(filename) + if err != nil { + panic(err) + } + + kvs := make([]any, 0, 3) + for _, vr := range []*lang.Var{lang.VarCurrentNS, lang.VarWarnOnReflection, lang.VarUncheckedMath, lang.VarDataReaders} { + kvs = append(kvs, vr, vr.Deref()) + } + lang.PushThreadBindings(lang.NewMap(kvs...)) + defer lang.PopThreadBindings() + + return ReadEval(string(buf), WithFilename(filename)) + }, true) + return env } diff --git a/pkg/runtime/environment.go b/pkg/runtime/environment.go index afa600b..8bf9586 100644 --- a/pkg/runtime/environment.go +++ b/pkg/runtime/environment.go @@ -68,9 +68,6 @@ func newEnvironment(ctx context.Context, stdout, stderr io.Writer) *environment coreNS.InternWithValue(lang.NewSymbol("*"+dyn+"*"), nil, true).SetDynamic() } - // TODO: implement this - coreNS.InternWithValue(lang.NewSymbol("load-file"), nil, true) - // bootstrap some vars e.namespaceVar = coreNS.InternWithValue(SymbolNamespace, lang.NewFnFunc(func(args ...interface{}) interface{} { diff --git a/pkg/runtime/rtcompat.go b/pkg/runtime/rtcompat.go index 4c580c5..a3ce925 100644 --- a/pkg/runtime/rtcompat.go +++ b/pkg/runtime/rtcompat.go @@ -162,24 +162,27 @@ func (rt *RTMethods) Load(scriptBase string) { } } - filename := scriptBase + ".glj" - var buf []byte - var err error var foundFS fs.FS + var filename string loadPathLock.Lock() lp := loadPath loadPathLock.Unlock() for _, fs := range lp { - buf, err = readFile(fs, filename) - if err == nil { - foundFS = fs - break + for _, ext := range []string{".glj", ".cljc"} { + testFilename := scriptBase + ext + b, err := readFile(fs, testFilename) + if err == nil { + buf = b + foundFS = fs + filename = testFilename + break + } } } - if err != nil { - panic(err) + if filename == "" { + panic(fmt.Errorf("failed to load %s: not found in load path", scriptBase)) } ReadEval(string(buf), WithFilename(filename)) diff --git a/pkg/stdlib/clojure/core.glj b/pkg/stdlib/clojure/core.glj index 9c3604d..d47943e 100644 --- a/pkg/stdlib/clojure/core.glj +++ b/pkg/stdlib/clojure/core.glj @@ -3015,7 +3015,7 @@ f must be free of side-effects" {:added "1.0" :static true} - [f x] (clojure.lang.Iterate/create f x) ) + [f x] (github.com:glojurelang:glojure:pkg:lang.CreateIterate f x) ) (defn range "Returns a lazy seq of nums from start (inclusive) to end @@ -3783,7 +3783,7 @@ (let [o (read stream eof-error? eof-value recursive?) s (.trim (.getString stream))] [o s]) - (catch github.com:glojurelang:glojure:pkg:lang.Throwable ex + (catch go/any ex (.getString stream) (throw ex)))) ([opts ^clojure.lang.LineNumberingPushbackReader stream] @@ -3792,7 +3792,7 @@ (let [o (read opts stream) s (.trim (.getString stream))] [o s]) - (catch github.com:glojurelang:glojure:pkg:lang.Throwable ex + (catch go/any ex (.getString stream) (throw ex))))) @@ -4149,7 +4149,7 @@ "Returns a sequence of all namespaces." {:added "1.0" :static true} - [] (clojure.lang.Namespace/all)) + [] (github.com:glojurelang:glojure:pkg:lang.AllNamespaces)) (defn the-ns "If passed a namespace, returns it. Else, when passed a symbol, @@ -4794,7 +4794,7 @@ (apply println xs))) (defn ^:private elide-top-frames - [^github.com:glojurelang:glojure:pkg:lang.Throwable ex class-name] + [^go/any ex class-name] (let [tr (.getStackTrace ex)] (doto ex (.setStackTrace @@ -4824,17 +4824,17 @@ Otherwise returns nil." {:added "1.10"} [ex] - (when (instance? github.com:glojurelang:glojure:pkg:lang.Throwable ex) - (.getMessage ^github.com:glojurelang:glojure:pkg:lang.Throwable ex))) + (when (instance? go/any ex) + (.getMessage ^go/any ex))) (defn ex-cause "Returns the cause of ex if ex is a Throwable. Otherwise returns nil." - {:tag github.com:glojurelang:glojure:pkg:lang.Throwable + {:tag go/any :added "1.10"} [ex] - (when (instance? github.com:glojurelang:glojure:pkg:lang.Throwable ex) - (.getCause ^github.com:glojurelang:glojure:pkg:lang.Throwable ex))) + (when (instance? go/any ex) + (.getCause ^go/any ex))) (defmacro assert "Evaluates expression x and throws an AssertionError with optional @@ -7872,7 +7872,7 @@ fails, attempts to require sym's namespace and retries." (try (load-data-readers) - (catch github.com:glojurelang:glojure:pkg:lang.Throwable t + (catch go/any t (.printStackTrace t) (throw t))) @@ -7931,7 +7931,7 @@ fails, attempts to require sym's namespace and retries." :added "1.11"} ^go/int64 [^go/string s] (if (string? s) - (clojure.core/let [result__3646__auto__ (strconv.ParseInt s 10 64)] (if (result__3646__auto__ 1) nil (result__3646__auto__ 0))) + (clojure.core/let [result__3648__auto__ (strconv.ParseInt s 10 64)] (if (result__3648__auto__ 1) nil (result__3648__auto__ 0))) (throw (github.com:glojurelang:glojure:pkg:lang.NewIllegalArgumentError (parsing-err s))))) (defn parse-double @@ -7942,7 +7942,7 @@ fails, attempts to require sym's namespace and retries." :added "1.11"} ^go/float64 [^go/string s] (if (string? s) - (clojure.core/let [result__3647__auto__ (strconv.ParseFloat s 64)] (if (result__3647__auto__ 1) nil (result__3647__auto__ 0))) + (clojure.core/let [result__3649__auto__ (strconv.ParseFloat s 64)] (if (result__3649__auto__ 1) nil (result__3649__auto__ 0))) (throw (github.com:glojurelang:glojure:pkg:lang.NewIllegalArgumentError (parsing-err s))))) (defn parse-uuid diff --git a/pkg/stdlib/clojure/core/loader.go b/pkg/stdlib/clojure/core/loader.go index fb41693..a7fa318 100644 --- a/pkg/stdlib/clojure/core/loader.go +++ b/pkg/stdlib/clojure/core/loader.go @@ -756,7 +756,6 @@ func LoadNS() { sym_load_DASH_all := lang.NewSymbol("load-all") sym_load_DASH_data_DASH_reader_DASH_file := lang.NewSymbol("load-data-reader-file") sym_load_DASH_data_DASH_readers := lang.NewSymbol("load-data-readers") - sym_load_DASH_file := lang.NewSymbol("load-file") sym_load_DASH_lib := lang.NewSymbol("load-lib") sym_load_DASH_libs := lang.NewSymbol("load-libs") sym_load_DASH_one := lang.NewSymbol("load-one") @@ -2080,8 +2079,6 @@ func LoadNS() { var_clojure_DOT_core_load_DASH_data_DASH_reader_DASH_file := lang.InternVarName(sym_clojure_DOT_core, sym_load_DASH_data_DASH_reader_DASH_file) // var clojure.core/load-data-readers var_clojure_DOT_core_load_DASH_data_DASH_readers := lang.InternVarName(sym_clojure_DOT_core, sym_load_DASH_data_DASH_readers) - // var clojure.core/load-file - var_clojure_DOT_core_load_DASH_file := lang.InternVarName(sym_clojure_DOT_core, sym_load_DASH_file) // var clojure.core/load-lib var_clojure_DOT_core_load_DASH_lib := lang.InternVarName(sym_clojure_DOT_core, sym_load_DASH_lib) // var clojure.core/load-libs @@ -3342,7 +3339,7 @@ func LoadNS() { var tmp1 lang.FnFunc tmp1 = lang.NewFnFunc(func(args ...any) any { checkArity(args, 0) - tmp2 := lang.Apply(nil, nil) + tmp2 := lang.Apply(lang.AllNamespaces, nil) return tmp2 }) tmp1 = tmp1.WithMeta(lang.NewMap(kw_rettag, nil)).(lang.FnFunc) @@ -4822,7 +4819,7 @@ func LoadNS() { _ = v2 v3 := args[1] _ = v3 - tmp4 := lang.Apply(nil, []any{v2, v3}) + tmp4 := lang.Apply(lang.CreateIterate, []any{v2, v3}) return tmp4 }) tmp1 = tmp1.WithMeta(lang.NewMap(kw_rettag, nil)).(lang.FnFunc) @@ -4988,14 +4985,6 @@ func LoadNS() { var_clojure_DOT_core_list_QMARK_.SetMeta(tmp0.Meta().(lang.IPersistentMap)) } } - // load-file - { - tmp0 := sym_load_DASH_file.WithMeta(lang.NewMap(kw_added, "1.0", kw_ns, lang.FindOrCreateNamespace(sym_clojure_DOT_core))).(*lang.Symbol) - var_clojure_DOT_core_load_DASH_file = ns.InternWithValue(tmp0, nil, true) - if tmp0.Meta() != nil { - var_clojure_DOT_core_load_DASH_file.SetMeta(tmp0.Meta().(lang.IPersistentMap)) - } - } // load-reader { tmp0 := sym_load_DASH_reader.WithMeta(lang.NewMap(kw_arglists, lang.NewList(lang.NewVector(sym_rdr)), kw_doc, "Sequentially read and evaluate the set of forms contained in the\n stream/file", kw_static, true, kw_file, "clojure/core.glj", kw_added, "1.0", kw_ns, lang.FindOrCreateNamespace(sym_clojure_DOT_core), kw_end_DASH_column, int(17), kw_column, int(7), kw_line, int(4083), kw_end_DASH_line, int(4083))).(*lang.Symbol) @@ -10159,34 +10148,36 @@ func LoadNS() { } // ex-cause { - tmp0 := sym_ex_DASH_cause.WithMeta(lang.NewMap(kw_tag, nil, kw_arglists, lang.NewList(lang.NewVector(sym_ex)), kw_doc, "Returns the cause of ex if ex is a Throwable.\n Otherwise returns nil.", kw_file, "clojure/core.glj", kw_added, "1.10", kw_ns, lang.FindOrCreateNamespace(sym_clojure_DOT_core), kw_end_DASH_column, int(14), kw_column, int(7), kw_line, int(4830), kw_end_DASH_line, int(4830))).(*lang.Symbol) - var tmp1 lang.FnFunc - tmp1 = lang.NewFnFunc(func(args ...any) any { + tmp1 := reflect.TypeOf((*any)(nil)).Elem() + tmp0 := sym_ex_DASH_cause.WithMeta(lang.NewMap(kw_tag, tmp1, kw_arglists, lang.NewList(lang.NewVector(sym_ex)), kw_doc, "Returns the cause of ex if ex is a Throwable.\n Otherwise returns nil.", kw_file, "clojure/core.glj", kw_added, "1.10", kw_ns, lang.FindOrCreateNamespace(sym_clojure_DOT_core), kw_end_DASH_column, int(14), kw_column, int(7), kw_line, int(4830), kw_end_DASH_line, int(4830))).(*lang.Symbol) + var tmp2 lang.FnFunc + tmp2 = lang.NewFnFunc(func(args ...any) any { checkArity(args, 1) - v2 := args[0] - _ = v2 - var tmp3 any - tmp4 := checkDerefVar(var_clojure_DOT_core_instance_QMARK_) - tmp5 := lang.Apply(tmp4, []any{lang.Throwable, v2}) - if lang.IsTruthy(tmp5) { - tmp6, ok := lang.FieldOrMethod(v2, "getCause") + v3 := args[0] + _ = v3 + var tmp4 any + tmp5 := checkDerefVar(var_clojure_DOT_core_instance_QMARK_) + tmp6 := lang.Apply(tmp5, []any{lang.Builtins["any"], v3}) + if lang.IsTruthy(tmp6) { + tmp7, ok := lang.FieldOrMethod(v3, "getCause") if !ok { - panic(lang.NewIllegalArgumentError(fmt.Sprintf("no such field or method on %T: %s", v2, "getCause"))) + panic(lang.NewIllegalArgumentError(fmt.Sprintf("no such field or method on %T: %s", v3, "getCause"))) } - var tmp7 any - switch reflect.TypeOf(tmp6).Kind() { + var tmp8 any + switch reflect.TypeOf(tmp7).Kind() { case reflect.Func: - tmp7 = lang.Apply(tmp6, nil) + tmp8 = lang.Apply(tmp7, nil) default: - tmp7 = tmp6 + tmp8 = tmp7 } - tmp3 = tmp7 + tmp4 = tmp8 } else { } - return tmp3 + return tmp4 }) - tmp1 = tmp1.WithMeta(lang.NewMap(kw_rettag, nil)).(lang.FnFunc) - var_clojure_DOT_core_ex_DASH_cause = ns.InternWithValue(tmp0, tmp1, true) + tmp3 := reflect.TypeOf((*any)(nil)).Elem() + tmp2 = tmp2.WithMeta(lang.NewMap(kw_rettag, tmp3)).(lang.FnFunc) + var_clojure_DOT_core_ex_DASH_cause = ns.InternWithValue(tmp0, tmp2, true) if tmp0.Meta() != nil { var_clojure_DOT_core_ex_DASH_cause.SetMeta(tmp0.Meta().(lang.IPersistentMap)) } @@ -10235,7 +10226,7 @@ func LoadNS() { _ = v2 var tmp3 any tmp4 := checkDerefVar(var_clojure_DOT_core_instance_QMARK_) - tmp5 := lang.Apply(tmp4, []any{lang.Throwable, v2}) + tmp5 := lang.Apply(tmp4, []any{lang.Builtins["any"], v2}) if lang.IsTruthy(tmp5) { tmp6, ok := lang.FieldOrMethod(v2, "getMessage") if !ok { @@ -23012,7 +23003,7 @@ func LoadNS() { func() { defer func() { if r := recover(); r != nil { - if lang.CatchMatches(r, lang.Throwable) { + if lang.CatchMatches(r, lang.Builtins["any"]) { v8 := r _ = v8 tmp9 := lang.NewVector(true, v8) @@ -30100,7 +30091,7 @@ func LoadNS() { if lang.IsTruthy(tmp5) { var tmp6 any { // let - // let binding "result__3647__auto__" + // let binding "result__3649__auto__" tmp7 := lang.Apply(strconv9.ParseFloat, []any{v2, int64(64)}) var v8 any = tmp7 _ = v8 @@ -30142,7 +30133,7 @@ func LoadNS() { if lang.IsTruthy(tmp5) { var tmp6 any { // let - // let binding "result__3646__auto__" + // let binding "result__3648__auto__" tmp7 := lang.Apply(strconv9.ParseInt, []any{v2, int64(10), int64(64)}) var v8 any = tmp7 _ = v8 @@ -44719,7 +44710,7 @@ func LoadNS() { tmp24 := lang.Apply(tmp19, []any{tmp20, tmp23}) tmp25 := lang.Apply(tmp18, []any{tmp24}) tmp26 := lang.NewMap(kw_via, tmp17, kw_trace, tmp25) - tmp27 := lang.NewMap(kw_file, "clojure/core_print.glj", kw_line, int(468), kw_column, int(12), kw_end_DASH_line, int(470), kw_end_DASH_column, int(111)) + tmp27 := lang.NewMap(kw_file, "clojure/core_print.glj", kw_line, int(468), kw_column, int(12), kw_end_DASH_line, int(470), kw_end_DASH_column, int(68)) tmp28, err := lang.WithMeta(tmp26, tmp27.(lang.IPersistentMap)) if err != nil { panic(err) @@ -57117,7 +57108,7 @@ func LoadNS() { func() { defer func() { if r := recover(); r != nil { - if lang.CatchMatches(r, lang.Throwable) { + if lang.CatchMatches(r, lang.Builtins["any"]) { v7 := r _ = v7 tmp8, ok := lang.FieldOrMethod(v2, "getString") @@ -57202,7 +57193,7 @@ func LoadNS() { func() { defer func() { if r := recover(); r != nil { - if lang.CatchMatches(r, lang.Throwable) { + if lang.CatchMatches(r, lang.Builtins["any"]) { v5 := r _ = v5 tmp6, ok := lang.FieldOrMethod(v3, "getString") diff --git a/pkg/stdlib/clojure/core_print.glj b/pkg/stdlib/clojure/core_print.glj index a74bb8e..c2852de 100644 --- a/pkg/stdlib/clojure/core_print.glj +++ b/pkg/stdlib/clojure/core_print.glj @@ -411,7 +411,7 @@ [ex val] (when-not pending (try [false (deref o)] - (catch github.com:glojurelang:glojure:pkg:lang.Throwable e + (catch go/any e [true e])))] {:status (cond @@ -450,8 +450,8 @@ :at - top stack element :trace - root cause stack elements" {:added "1.7"} - [^github.com:glojurelang:glojure:pkg:lang.Throwable o] - (let [base (fn [^github.com:glojurelang:glojure:pkg:lang.Throwable t] + [^go/any o] + (let [base (fn [^go/any t] (merge {:type (symbol (.Name (class t)))} (when-let [msg (.getLocalizedMessage t)] {:message msg}) @@ -460,14 +460,14 @@ (let [st (.getStackTrace t)] (when (pos? (alength st)) {:at (StackTraceElement->vec (aget st 0))})))) - via (loop [via [], ^github.com:glojurelang:glojure:pkg:lang.Throwable t o] + via (loop [via [], ^go/any t o] (if t (recur (conj via t) (.getCause t)) via)) - ^github.com:glojurelang:glojure:pkg:lang.Throwable root (peek via)] + ^go/any root (peek via)] (merge {:via (vec (map base via)) :trace (vec (map StackTraceElement->vec - (.getStackTrace ^github.com:glojurelang:glojure:pkg:lang.Throwable (or root o))))} + (.getStackTrace ^go/any (or root o))))} (when-let [root-msg (.getLocalizedMessage root)] {:cause root-msg}) (when-let [data (ex-data root)] @@ -475,7 +475,7 @@ (when-let [phase (-> o ex-data :clojure.error/phase)] {:phase phase})))) -(defn- print-throwable [^github.com:glojurelang:glojure:pkg:lang.Throwable o ^Writer w] +(defn- print-throwable [^go/any o ^Writer w] (github.com:glojurelang:glojure:pkg:lang.WriteWriter w "#error {\n :cause ") (let [{:keys [cause data via trace]} (Throwable->map o) print-via #(do (github.com:glojurelang:glojure:pkg:lang.WriteWriter w "{:type ") diff --git a/pkg/stdlib/clojure/test.glj b/pkg/stdlib/clojure/test.glj index d0dd897..3148a79 100644 --- a/pkg/stdlib/clojure/test.glj +++ b/pkg/stdlib/clojure/test.glj @@ -333,7 +333,7 @@ (defn- file-and-line {:deprecated "1.8"} - [^github.com:glojurelang:glojure:pkg:lang.Throwable exception depth] + [^go/any exception depth] (let [stacktrace (.getStackTrace exception)] (if (< depth (count stacktrace)) (let [^StackTraceElement s (nth stacktrace depth)] @@ -384,9 +384,7 @@ (println "expected:" (pr-str (:expected m))) (print " actual: ") (let [actual (:actual m)] - (if (instance? github.com:glojurelang:glojure:pkg:lang.Throwable actual) - (stack/print-cause-trace actual *stack-trace-depth*) - (prn actual))))) + (if (instance? go/error actual) (prn (.Error actual)) (prn actual))))) (defmethod report :summary [m] (with-test-out @@ -535,7 +533,7 @@ {:added "1.1"} [msg form] `(try ~(assert-expr msg form) - (catch github.com:glojurelang:glojure:pkg:lang.Throwable t# + (catch go/any t# (do-report {:type :error, :message ~msg, :expected '~form, :actual t#})))) @@ -709,7 +707,7 @@ (do-report {:type :begin-test-var, :var v}) (inc-report-counter :test) (try (t) - (catch github.com:glojurelang:glojure:pkg:lang.Throwable e + (catch go/any e (do-report {:type :error, :message "Uncaught exception, not in assertion." :expected nil, :actual e}))) (do-report {:type :end-test-var, :var v})))) diff --git a/scripts/rewrite-core/rewrite.clj b/scripts/rewrite-core/rewrite.clj index f849930..5b3c1a6 100644 --- a/scripts/rewrite-core/rewrite.clj +++ b/scripts/rewrite-core/rewrite.clj @@ -120,7 +120,7 @@ 'Boolean 'go/bool 'Character 'github.com:glojurelang:glojure:pkg:lang.Char 'java.lang.Character 'github.com:glojurelang:glojure:pkg:lang.Char - 'Throwable 'github.com:glojurelang:glojure:pkg:lang.Throwable + 'Throwable 'go/any 'Object 'github.com:glojurelang:glojure:pkg:lang.Object 'BigInteger 'math:big.*Int 'BigDecimal 'github.com:glojurelang:glojure:pkg:lang.*BigDecimal @@ -129,7 +129,9 @@ 'Pattern '*Regexp}) (def static-field-mappings - {'Integer/MIN_VALUE 'math.MinInt + {'clojure.lang.Namespace/all 'github.com:glojurelang:glojure:pkg:lang.AllNamespaces + 'clojure.lang.Iterate/create 'github.com:glojurelang:glojure:pkg:lang.CreateIterate + 'Integer/MIN_VALUE 'math.MinInt 'Integer/MAX_VALUE 'math.MaxInt 'Double/POSITIVE_INFINITY '(math.Inf 1) 'Double/NEGATIVE_INFINITY '(math.Inf -1) @@ -1014,6 +1016,15 @@ (first (z/sexpr zloc))))) (fn visit [zloc] (z/replace zloc '{}))] + ;; use a more direct way of identifying thrown errors + ;; TODO: interface for glojure exceptions with stack information + (sexpr-replace '(if (instance? Throwable actual) + (stack/print-cause-trace actual *stack-trace-depth*) + (prn actual)) + '(if (instance? go/error actual) + (prn (.Error actual)) + (prn actual))) + ;; ===== Regular Expression Replacements ===== (sexpr-replace '(.split re s) '(.split re s -1))