Split out []byte-array generation for core-library namespaces

core/data.go

@@ -0,0 +1,51 @@
+// +build !gen_data
+
+package core
+
+func InitInternalLibs() {
+	internalLibs = map[string][]byte{
+		"joker.walk":        walkData,
+		"joker.template":    templateData,
+		"joker.repl":        replData,
+		"joker.test":        testData,
+		"joker.set":         setData,
+		"joker.tools.cli":   tools_cliData,
+		"joker.hiccup":      hiccupData,
+		"joker.pprint":      pprintData,
+		"joker.better-cond": better_condData,
+	}
+}
+
+func ProcessCoreData() {
+	processData(coreData)
+	if !haveSetCoreNamespaces {
+		setCoreNamespaces()
+		haveSetCoreNamespaces = true
+	}
+}
+
+func ProcessReplData() {
+	processData(replData)
+}
+
+func ProcessLinterData(dialect Dialect) {
+	if dialect == EDN {
+		markJokerNamespacesAsUsed()
+		return
+	}
+	processData(linter_allData)
+	GLOBAL_ENV.CoreNamespace.Resolve("*loaded-libs*").Value = EmptySet()
+	if dialect == JOKER {
+		markJokerNamespacesAsUsed()
+		processData(linter_jokerData)
+		return
+	}
+	processData(linter_cljxData)
+	switch dialect {
+	case CLJ:
+		processData(linter_cljData)
+	case CLJS:
+		processData(linter_cljsData)
+	}
+	removeJokerNamespaces()
+}

core/gen_data/gen_data.go

@@ -16,6 +16,8 @@ const template string = `// Generated by gen_data. Don't modify manually!
 
 {slowInit}package core
 
+var {name}Data []byte
+
 func init() {
 	{name}Data = []byte("{content}")
 }

core/object.go

@@ -1,6 +1,6 @@
 //go:generate go run gen/gen_types.go assert Comparable *Vector Char String Symbol Keyword *Regex Boolean Time Number Seqable Callable *Type Meta Int Double Stack Map Set Associative Reversible Named Comparator *Ratio *Namespace *Var Error *Fn Deref *Atom Ref KVReduce Pending *File io.Reader io.Writer StringReader io.RuneReader *Channel
 //go:generate go run gen/gen_types.go info *List *ArrayMapSeq *ArrayMap *HashMap *ExInfo *Fn *Var Nil *Ratio *BigInt *BigFloat Char Double Int Boolean Time Keyword *Regex Symbol String *LazySeq *MappingSeq *ArraySeq *ConsSeq *NodeSeq *ArrayNodeSeq *MapSet *Vector *VectorSeq *VectorRSeq
-//go:generate go run gen_data/gen_data.go
+//go:generate go run -tags gen_data gen_data/gen_data.go
 
 package core
 

core/procs.go

@@ -20,25 +20,9 @@ import (
 	"unicode/utf8"
 )
 
-var coreNamespaces []string
+var internalLibs map[string][]byte
 
-var (
-	coreData         []byte
-	replData         []byte
-	walkData         []byte
-	templateData     []byte
-	testData         []byte
-	setData          []byte
-	tools_cliData    []byte
-	linter_allData   []byte
-	linter_jokerData []byte
-	linter_cljxData  []byte
-	linter_cljData   []byte
-	linter_cljsData  []byte
-	hiccupData       []byte
-	pprintData       []byte
-	better_condData  []byte
-)
+var coreNamespaces []string
 
 type (
 	Phase        int
@@ -57,8 +41,6 @@ const (
 
 const VERSION = "v0.14.1"
 
-var internalLibs map[string][]byte
-
 const (
 	CLJ Dialect = iota
 	CLJS
@@ -67,20 +49,6 @@ const (
 	UNKNOWN
 )
 
-func InitInternalLibs() {
-	internalLibs = map[string][]byte{
-		"joker.walk":        walkData,
-		"joker.template":    templateData,
-		"joker.repl":        replData,
-		"joker.test":        testData,
-		"joker.set":         setData,
-		"joker.tools.cli":   tools_cliData,
-		"joker.hiccup":      hiccupData,
-		"joker.pprint":      pprintData,
-		"joker.better-cond": better_condData,
-	}
-}
-
 func ExtractCallable(args []Object, index int) Callable {
 	return EnsureCallable(args, index)
 }
@@ -1772,6 +1740,9 @@ func processData(data []byte) {
 		_, err := TryEval(expr)
 		PanicOnErr(err)
 	}
+	if VerbosityLevel > 0 {
+		fmt.Fprintf(Stderr, "processData: Evaluated code for %s\n", GLOBAL_ENV.CurrentNamespace().ToString(false))
+	}
 }
 
 func setCoreNamespaces() {
@@ -1808,18 +1779,6 @@ var procIsNamespaceInitialized = func(args []Object) Object {
 
 var haveSetCoreNamespaces bool
 
-func ProcessCoreData() {
-	processData(coreData)
-	if !haveSetCoreNamespaces {
-		setCoreNamespaces()
-		haveSetCoreNamespaces = true
-	}
-}
-
-func ProcessReplData() {
-	processData(replData)
-}
-
 func findConfigFile(filename string, workingDir string, findDir bool) string {
 	var err error
 	configName := ".joker"
@@ -2022,28 +1981,6 @@ func markJokerNamespacesAsUsed() {
 	}
 }
 
-func ProcessLinterData(dialect Dialect) {
-	if dialect == EDN {
-		markJokerNamespacesAsUsed()
-		return
-	}
-	processData(linter_allData)
-	GLOBAL_ENV.CoreNamespace.Resolve("*loaded-libs*").Value = EmptySet()
-	if dialect == JOKER {
-		markJokerNamespacesAsUsed()
-		processData(linter_jokerData)
-		return
-	}
-	processData(linter_cljxData)
-	switch dialect {
-	case CLJ:
-		processData(linter_cljData)
-	case CLJS:
-		processData(linter_cljsData)
-	}
-	removeJokerNamespaces()
-}
-
 func NewReaderFromFile(filename string) (*Reader, error) {
 	f, err := os.Open(filename)
 	if err != nil {