Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

SHELL := bash

GO-VERSION ?= 1.19.3
GO-VERSION ?= 1.24.0
CLOJURE-VERSION ?= 1.12.1

CLOJURE-STDLIB-VERSION := clojure-$(CLOJURE-VERSION)
Expand Down Expand Up @@ -60,6 +60,7 @@ GO-PLATFORMS := \
windows_arm \
windows_amd64 \
js_wasm \
wasip1_wasm \
$(EXTRA-GO-PLATFORMS)

GLJ-IMPORTS=$(foreach platform,$(GO-PLATFORMS) \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/glojurelang/glojure

go 1.19
go 1.24

require (
bitbucket.org/pcastools/hash v1.0.5
Expand Down
23 changes: 17 additions & 6 deletions internal/genpkg/genpkg.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,23 @@ func isEligibleForExport(object types.Object, packageName string) bool {
return false
}

// Reject generic types (types with type parameters)
if typeName, ok := object.(*types.TypeName); ok {
if named, ok := typeName.Type().(*types.Named); ok {
if named.TypeParams() != nil && named.TypeParams().Len() > 0 {
return false
}
}
}

// Reject generic functions (functions with type parameters)
if fn, ok := object.(*types.Func); ok {
sig := fn.Type().(*types.Signature)
if sig.TypeParams() != nil && sig.TypeParams().Len() > 0 {
return false
}
}

return true
}

Expand Down Expand Up @@ -237,12 +254,6 @@ func getVarDeclaration(object *types.Var, globalName string, aliasName string) s
}

func getTypeNameDeclaration(object *types.TypeName, globalName string, aliasName string) string {
isGeneric := strings.HasSuffix(object.Type().String(), "]")

if isGeneric {
return ""
}

ret := fmt.Sprintf("_register(%q, reflect.TypeOf((*%s)(nil)).Elem())", globalName, aliasName)
if _, ok := object.Type().Underlying().(*types.Struct); ok {
// register with a * prepended to the name _within_ the package
Expand Down
332 changes: 331 additions & 1 deletion pkg/gen/gljimports/gljimports_darwin_amd64.go

Large diffs are not rendered by default.

332 changes: 331 additions & 1 deletion pkg/gen/gljimports/gljimports_darwin_arm64.go

Large diffs are not rendered by default.

333 changes: 332 additions & 1 deletion pkg/gen/gljimports/gljimports_js_wasm.go

Large diffs are not rendered by default.

337 changes: 336 additions & 1 deletion pkg/gen/gljimports/gljimports_linux_amd64.go

Large diffs are not rendered by default.

337 changes: 336 additions & 1 deletion pkg/gen/gljimports/gljimports_linux_arm64.go

Large diffs are not rendered by default.

Loading