Move code to pkg/ directory, rename value to lang (#23)

Move most packages to pkg/ directory
glojurelang · Jul 22, 2023 · e2e3dce · e2e3dce
1 parent d66fa76
commit e2e3dce
Show file tree

Hide file tree

Showing 319 changed files with 563 additions and 822 deletions.
diff --git a/Makefile b/Makefile
@@ -1,23 +1,23 @@
 
 STDLIB := $(notdir $(wildcard scripts/rewrite-core/originals/*.clj))
 STDLIB_ORIGINALS := $(addprefix scripts/rewrite-core/originals/,$(STDLIB))
-STDLIB_TARGETS := $(addprefix stdlib/glojure/,$(STDLIB:.clj=.glj))
+STDLIB_TARGETS := $(addprefix pkg/stdlib/glojure/,$(STDLIB:.clj=.glj))
 
-all: $(STDLIB_TARGETS) generate gen/gljimports/gljimports.go
+all: $(STDLIB_TARGETS) generate pkg/gen/gljimports/gljimports.go
 
 .PHONY:generate
 generate:
 	@go generate ./...
 
-gen/gljimports/gljimports.go: ./scripts/gen-gljimports.sh ./cmd/gen-import-interop/main.go $(wildcard ./value/*.go)
+pkg/gen/gljimports/gljimports.go: ./scripts/gen-gljimports.sh ./cmd/gen-import-interop/main.go $(wildcard ./value/*.go)
 	@echo "Generating $@"
 	@./scripts/gen-gljimports.sh $@
 
-stdlib/glojure/%.glj: scripts/rewrite-core/originals/%.clj scripts/rewrite-core/run.sh scripts/rewrite-core/rewrite.clj
+pkg/stdlib/glojure/%.glj: scripts/rewrite-core/originals/%.clj scripts/rewrite-core/run.sh scripts/rewrite-core/rewrite.clj
 	@echo "Rewriting $<"
 	@scripts/rewrite-core/run.sh $< > $@
 
-stdlib/glojure/%.glj: scripts/rewrite-core/originals/%.clj scripts/rewrite-core/run.sh scripts/rewrite-core/rewrite.clj
+pkg/stdlib/glojure/%.glj: scripts/rewrite-core/originals/%.clj scripts/rewrite-core/run.sh scripts/rewrite-core/rewrite.clj
 	@echo "Rewriting $<"
 	@scripts/rewrite-core/run.sh $< > $@
 
@@ -31,4 +31,3 @@ test: vet
 	@go run ./cmd/glj/main.go ./test/glojure/test_glojure/basic.glj
 	@go run ./cmd/glj/main.go ./test/glojure/test_glojure/import.glj
 	@go run ./cmd/glj/main.go ./test/glojure/test_glojure/printer.glj
-
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ package main
 import (
 	"your.package/gljimports"
 
-	"github.com/glojurelang/glojure/runtime"
+	"github.com/glojurelang/glojure/pkg/runtime"
 )
 
 func init() {

diff --git a/cmd/gen-abstract-class/main.go b/cmd/gen-abstract-class/main.go
@@ -57,7 +57,7 @@ func genAPersistentMap() string {
 	w := bytes.NewBuffer(nil)
 	err := template.Must(template.New("APersistentMap").Parse(
 		`// GENERATED CODE. DO NOT EDIT
-package value
+package lang
 
 import (
 	"errors"
@@ -144,7 +144,7 @@ func genTemplate(tmpl string) string {
 
 const (
 	aseqTmpl = `// GENERATED CODE. DO NOT EDIT
-package value
+package lang
 
 func ({{.Receiver}} *{{.Struct}}) xxx_sequential() {}
 

diff --git a/cmd/gen-import-interop/main.go b/cmd/gen-import-interop/main.go
@@ -34,8 +34,8 @@ var (
 		"time",
 		"unicode",
 
-		"github.com/glojurelang/glojure/value",
-		"github.com/glojurelang/glojure/runtime",
+		"github.com/glojurelang/glojure/pkg/runtime",
+		"github.com/glojurelang/glojure/pkg/lang",
 	}
 )
 

diff --git a/cmd/glj/main.go b/cmd/glj/main.go
@@ -8,13 +8,13 @@ import (
 	"log"
 	"os"
 
-	"github.com/glojurelang/glojure/reader"
-	"github.com/glojurelang/glojure/repl"
-	"github.com/glojurelang/glojure/runtime"
-	"github.com/glojurelang/glojure/value"
+	value "github.com/glojurelang/glojure/pkg/lang"
+	"github.com/glojurelang/glojure/pkg/reader"
+	"github.com/glojurelang/glojure/pkg/repl"
+	"github.com/glojurelang/glojure/pkg/runtime"
 
 	// Bootstrap the runtime
-	_ "github.com/glojurelang/glojure/glj"
+	_ "github.com/glojurelang/glojure/pkg/glj"
 )
 
 func main() {

diff --git a/codegen/gen_numberops.glj b/codegen/gen_numberops.glj
diff --git a/persistent/vector/LICENSE → internal/persistent/vector/LICENSE b/persistent/vector/LICENSE → internal/persistent/vector/LICENSE
diff --git a/persistent/vector/doc.go → internal/persistent/vector/doc.go b/persistent/vector/doc.go → internal/persistent/vector/doc.go
diff --git a/persistent/vector/transient.go → internal/persistent/vector/transient.go b/persistent/vector/transient.go → internal/persistent/vector/transient.go
diff --git a/persistent/vector/transient_test.go → internal/persistent/vector/transient_test.go b/persistent/vector/transient_test.go → internal/persistent/vector/transient_test.go
diff --git a/persistent/vector/vector.go → internal/persistent/vector/vector.go b/persistent/vector/vector.go → internal/persistent/vector/vector.go
diff --git a/persistent/vector/vector_test.go → internal/persistent/vector/vector_test.go b/persistent/vector/vector_test.go → internal/persistent/vector/vector_test.go
diff --git a/ast/ast.go → pkg/ast/ast.go b/ast/ast.go → pkg/ast/ast.go
@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/glojurelang/glojure/value"
+import value "github.com/glojurelang/glojure/pkg/lang"
 
 // Modeled after clojure's tools.analyzer
 type (

diff --git a/compiler/analyze.go → pkg/compiler/analyze.go b/compiler/analyze.go → pkg/compiler/analyze.go
@@ -7,11 +7,11 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/glojurelang/glojure/ast"
-	"github.com/glojurelang/glojure/value"
+	"github.com/glojurelang/glojure/pkg/ast"
+	value "github.com/glojurelang/glojure/pkg/lang"
 
 	// Make it easier to refer to global vars.
-	. "github.com/glojurelang/glojure/value"
+	. "github.com/glojurelang/glojure/pkg/lang"
 )
 
 var (

diff --git a/...e6559ca3ba838238274bb39e26734af928cd59a24 → ...e6559ca3ba838238274bb39e26734af928cd59a24 b/...e6559ca3ba838238274bb39e26734af928cd59a24 → ...e6559ca3ba838238274bb39e26734af928cd59a24
diff --git a/...7ddbaf1ab9d50dc4e9db648db6d570dae6c599c01 → ...7ddbaf1ab9d50dc4e9db648db6d570dae6c599c01 b/...7ddbaf1ab9d50dc4e9db648db6d570dae6c599c01 → ...7ddbaf1ab9d50dc4e9db648db6d570dae6c599c01
diff --git a/...5402b5ad9620b1f3eeeb9d82a95ae1f13bf827198 → ...5402b5ad9620b1f3eeeb9d82a95ae1f13bf827198 b/...5402b5ad9620b1f3eeeb9d82a95ae1f13bf827198 → ...5402b5ad9620b1f3eeeb9d82a95ae1f13bf827198
diff --git a/...7d7b563ff255cd0f862be8429680be2a4190fe91f → ...7d7b563ff255cd0f862be8429680be2a4190fe91f b/...7d7b563ff255cd0f862be8429680be2a4190fe91f → ...7d7b563ff255cd0f862be8429680be2a4190fe91f
diff --git a/...ccd09fce1e8c105374af0184bfab40cfca5d3d734 → ...ccd09fce1e8c105374af0184bfab40cfca5d3d734 b/...ccd09fce1e8c105374af0184bfab40cfca5d3d734 → ...ccd09fce1e8c105374af0184bfab40cfca5d3d734
diff --git a/...432a0d4715e76bb2115e578c5f5c199b655ea1c62 → ...432a0d4715e76bb2115e578c5f5c199b655ea1c62 b/...432a0d4715e76bb2115e578c5f5c199b655ea1c62 → ...432a0d4715e76bb2115e578c5f5c199b655ea1c62
diff --git a/...fc3e204a14956fcd48e2c3503c70eecd027aa1dd9 → ...fc3e204a14956fcd48e2c3503c70eecd027aa1dd9 b/...fc3e204a14956fcd48e2c3503c70eecd027aa1dd9 → ...fc3e204a14956fcd48e2c3503c70eecd027aa1dd9
diff --git a/...bb9a2ba0a65b6d66338e0531956c9eaa0b74bca93 → ...bb9a2ba0a65b6d66338e0531956c9eaa0b74bca93 b/...bb9a2ba0a65b6d66338e0531956c9eaa0b74bca93 → ...bb9a2ba0a65b6d66338e0531956c9eaa0b74bca93
diff --git a/...9c51f9b822094747a30f636ecc2f229be2d6a2221 → ...9c51f9b822094747a30f636ecc2f229be2d6a2221 b/...9c51f9b822094747a30f636ecc2f229be2d6a2221 → ...9c51f9b822094747a30f636ecc2f229be2d6a2221
diff --git a/...5caa8aab2df80fec25157aa1d7e5e9ced3c1076f1 → ...5caa8aab2df80fec25157aa1d7e5e9ced3c1076f1 b/...5caa8aab2df80fec25157aa1d7e5e9ced3c1076f1 → ...5caa8aab2df80fec25157aa1d7e5e9ced3c1076f1
diff --git a/...af76acce34703ce0d8c29e19463548610fbe78d8f → ...af76acce34703ce0d8c29e19463548610fbe78d8f b/...af76acce34703ce0d8c29e19463548610fbe78d8f → ...af76acce34703ce0d8c29e19463548610fbe78d8f
diff --git a/...e5c55f603de7e1e5e621f40e0ed3b0a78c72577b3 → ...e5c55f603de7e1e5e621f40e0ed3b0a78c72577b3 b/...e5c55f603de7e1e5e621f40e0ed3b0a78c72577b3 → ...e5c55f603de7e1e5e621f40e0ed3b0a78c72577b3
diff --git a/...c466c848e2bfacc4c5100456e9606e99a1492051d → ...c466c848e2bfacc4c5100456e9606e99a1492051d b/...c466c848e2bfacc4c5100456e9606e99a1492051d → ...c466c848e2bfacc4c5100456e9606e99a1492051d
diff --git a/...c5507719a7c0cc8057763d555018cf5a57152bf89 → ...c5507719a7c0cc8057763d555018cf5a57152bf89 b/...c5507719a7c0cc8057763d555018cf5a57152bf89 → ...c5507719a7c0cc8057763d555018cf5a57152bf89
diff --git a/...87841879766d64e339e23f3c68e0b1e5b1e13cbcd → ...87841879766d64e339e23f3c68e0b1e5b1e13cbcd b/...87841879766d64e339e23f3c68e0b1e5b1e13cbcd → ...87841879766d64e339e23f3c68e0b1e5b1e13cbcd