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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test: vet $(TEST_TARGETS)

.PHONY: format
format:
@if go fmt ./... | grep -q .; then \
@if go fmt ./... | grep -q ''; then \
echo "Files were formatted. Please commit the changes."; \
exit 1; \
fi
Expand Down
4 changes: 2 additions & 2 deletions pkg/glj/glj_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package glj
import (
"testing"

value "github.com/glojurelang/glojure/pkg/lang"
"github.com/glojurelang/glojure/pkg/lang"
)

func TestGLJ(t *testing.T) {
mp := Var("glojure.core", "map")
inc := Var("glojure.core", "inc")
res := value.PrintString(mp.Invoke(inc, Read("[1 2 3]")))
res := lang.PrintString(mp.Invoke(inc, Read("[1 2 3]")))
if res != "(2 3 4)" {
t.Errorf("Expected (2 3 4), got %v", res)
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/glj/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ import (

// Add the Go standard library to the pkgmap.
_ "github.com/glojurelang/glojure/pkg/gen/gljimports"
"github.com/glojurelang/glojure/pkg/lang"

value "github.com/glojurelang/glojure/pkg/lang"
"github.com/glojurelang/glojure/pkg/runtime"
)

func init() {
initEnv(os.Stdout)
}

func initEnv(stdout io.Writer) value.Environment {
func initEnv(stdout io.Writer) lang.Environment {
// TODO: clean up this code. copied from rtcompat.go.
kvs := make([]interface{}, 0, 3)
for _, vr := range []*value.Var{value.VarCurrentNS, value.VarWarnOnReflection, value.VarUncheckedMath, value.VarDataReaders} {
for _, vr := range []*lang.Var{lang.VarCurrentNS, lang.VarWarnOnReflection, lang.VarUncheckedMath, lang.VarDataReaders} {
kvs = append(kvs, vr, vr.Deref())
}
value.PushThreadBindings(value.NewMap(kvs...))
lang.PushThreadBindings(lang.NewMap(kvs...))

return runtime.NewEnvironment(runtime.WithStdout(stdout))
}
12 changes: 6 additions & 6 deletions pkg/glj/var.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package glj

import value "github.com/glojurelang/glojure/pkg/lang"
import "github.com/glojurelang/glojure/pkg/lang"

// Var returns an IFn associated with the namespace and name.
func Var(ns, name interface{}) value.IFn {
return value.InternVarName(asSym(ns), asSym(name))
func Var(ns, name interface{}) lang.IFn {
return lang.InternVarName(asSym(ns), asSym(name))
}

func asSym(x interface{}) *value.Symbol {
func asSym(x interface{}) *lang.Symbol {
if str, ok := x.(string); ok {
return value.NewSymbol(str)
return lang.NewSymbol(str)
}
return x.(*value.Symbol)
return x.(*lang.Symbol)
}
4 changes: 2 additions & 2 deletions pkg/lang/symbol.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *Symbol) Compare(other any) int {
if !ok {
panic(NewIllegalArgumentError(fmt.Sprintf("Cannot compare Symbol with %T", other)))
}

// Compare namespace first
if s.ns != otherSym.ns {
if s.ns == "" && otherSym.ns != "" {
Expand All @@ -67,7 +67,7 @@ func (s *Symbol) Compare(other any) int {
return nsComp
}
}

// Then compare name
return strings.Compare(s.name, otherSym.name)
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/lang/vector.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,17 @@ func (v *Vector) Compare(other any) int {
if !ok {
panic(NewIllegalArgumentError(fmt.Sprintf("Cannot compare Vector with %T", other)))
}

myCount := v.Count()
otherCount := otherVec.Count()

// Compare lengths first
if myCount < otherCount {
return -1
} else if myCount > otherCount {
return 1
}

// Compare element by element
for i := 0; i < myCount; i++ {
cmp := Compare(v.Nth(i), otherVec.Nth(i))
Expand Down
14 changes: 7 additions & 7 deletions pkg/reader/clj_conformance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@ import (
"testing"
"unicode"

value "github.com/glojurelang/glojure/pkg/lang"
"github.com/glojurelang/glojure/pkg/lang"
"github.com/kylelemons/godebug/diff"
)

type (
testSymbolResolver struct{}
)

func (sr *testSymbolResolver) CurrentNS() *value.Symbol {
return value.NewSymbol("user")
func (sr *testSymbolResolver) CurrentNS() *lang.Symbol {
return lang.NewSymbol("user")
}

func (sr *testSymbolResolver) ResolveStruct(s *value.Symbol) *value.Symbol {
func (sr *testSymbolResolver) ResolveStruct(s *lang.Symbol) *lang.Symbol {
if strings.Contains(s.Name(), ".") {
return s
}
return nil
}

func (sr *testSymbolResolver) ResolveAlias(s *value.Symbol) *value.Symbol {
func (sr *testSymbolResolver) ResolveAlias(s *lang.Symbol) *lang.Symbol {
return s
}

func (sr *testSymbolResolver) ResolveVar(s *value.Symbol) *value.Symbol {
func (sr *testSymbolResolver) ResolveVar(s *lang.Symbol) *lang.Symbol {
if strings.Contains(s.String(), "/") {
return s
}
return value.NewSymbol("user/" + s.String())
return lang.NewSymbol("user/" + s.String())
}

// Running these fuzz tests is slow because clj is very slow to start
Expand Down
Loading