Fix for keys/vals and keyword namespace

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

Author: jfhamlin

pkg/lang/interfaces.go

@@ -486,12 +486,14 @@ func Count(coll any) int {
 	return count
 }
 
-func Keys(m Associative) ISeq {
-	return NewMapKeySeq(Seq(m))
+func Keys(x any) ISeq {
+	// TODO: optimize for map case
+	return NewMapKeySeq(Seq(x))
 }
 
-func Vals(m Associative) ISeq {
-	return NewMapValSeq(Seq(m))
+func Vals(x any) ISeq {
+	// TODO: optimize for map case
+	return NewMapValSeq(Seq(x))
 }
 
 func Subvec(v IPersistentVector, start, end int) IPersistentVector {

pkg/lang/keyword.go

@@ -43,13 +43,14 @@ func (k Keyword) value() string {
 	return k.kw.Get().(string)
 }
 
-func (k Keyword) Namespace() string {
-	// Return the namespace of the keyword, or the empty string if it
-	// doesn't have one.
+func (k Keyword) Namespace() any {
+	// Return the namespace of the keyword, or nil if it doesn't have
+	// one.
+	// TODO: support both nil and empty string namespace as clojure does
 	if i := strings.Index(k.value(), "/"); i != -1 {
 		return k.value()[:i]
 	}
-	return ""
+	return nil
 }
 
 func (k Keyword) Name() string {
@@ -106,14 +107,14 @@ func (k Keyword) Compare(other any) int {
 		if s == os {
 			return 0
 		}
-		ns := k.Namespace()
-		if ns == "" {
-			if otherKw.Namespace() != "" {
+		ns, ok := k.Namespace().(string)
+		if !ok {
+			if otherKw.Namespace() != nil {
 				return -1
 			}
 		} else {
-			ons := otherKw.Namespace()
-			if ons == "" {
+			ons, ok := otherKw.Namespace().(string)
+			if !ok {
 				return 1
 			}
 			nsc := strings.Compare(ns, ons)

pkg/lang/persistentarraymap.go

@@ -490,7 +490,7 @@ func (s *MapSeq) Drop(n int) Sequential {
 ////////////////////////////////////////////////////////////////////////////////
 
 func NewMapKeySeq(s ISeq) ISeq {
-	if s == nil {
+	if IsNil(s) {
 		return nil
 	}
 	return &MapKeySeq{s: s}
@@ -566,7 +566,7 @@ func (s *MapKeySeq) HashEq() uint32 {
 ////////////////////////////////////////////////////////////////////////////////
 
 func NewMapValSeq(s ISeq) ISeq {
-	if s == nil {
+	if IsNil(s) {
 		return nil
 	}
 	return &MapValSeq{s: s}

pkg/lang/stringseq.go

@@ -21,11 +21,15 @@ func NewStringSeq(s string, i int) *StringSeq {
 	if len(s) == 0 {
 		return nil
 	}
-	return &StringSeq{str: []rune(s), i: i}
+	runes := []rune(s)
+	if i >= len(runes) {
+		return nil
+	}
+	return &StringSeq{str: runes, i: i}
 }
 
 func newStringSeq(s []rune, i int) *StringSeq {
-	if len(s) == 0 {
+	if len(s) == 0 || i >= len(s) {
 		return nil
 	}
 	return &StringSeq{str: s, i: i}