lang: Unnested the core package from the functions dir

The core package could contain non-functions, so we might as well move it upwards.
purpleidea · Feb 22, 2024 · 5a8310f · 5a8310f
1 parent 1c64536
commit 5a8310f
Show file tree

Hide file tree

Showing 94 changed files with 25 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -185,8 +185,8 @@ clean: ## clean things up
 	$(MAKE) --quiet -C test clean
 	$(MAKE) --quiet -C lang clean
 	$(MAKE) --quiet -C misc/mkosi clean
-	rm -f lang/funcs/core/generated_funcs.go || true
-	rm -f lang/funcs/core/generated_funcs_test.go || true
+	rm -f lang/core/generated_funcs.go || true
+	rm -f lang/core/generated_funcs_test.go || true
 	[ ! -e $(PROGRAM) ] || rm $(PROGRAM)
 	rm -f *_stringer.go	# generated by `go generate`
 	rm -f *_mock.go		# generated by `go generate`
@@ -505,9 +505,9 @@ help: ## show this help screen
 		awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 	@echo ''
 
-funcgen: lang/funcs/core/generated_funcs.go
+funcgen: lang/core/generated_funcs.go
 
-lang/funcs/core/generated_funcs.go: lang/funcs/funcgen/*.go lang/funcs/core/funcgen.yaml lang/funcs/funcgen/templates/generated_funcs.go.tpl
+lang/core/generated_funcs.go: lang/funcs/funcgen/*.go lang/core/funcgen.yaml lang/funcs/funcgen/templates/generated_funcs.go.tpl
 	@echo "Generating: funcs..."
 	@go run `find lang/funcs/funcgen/ -maxdepth 1 -type f -name '*.go' -not -name '*_test.go'` -templates=lang/funcs/funcgen/templates/generated_funcs.go.tpl >/dev/null
 

diff --git a/lang/ast/structs.go b/lang/ast/structs.go
@@ -30,8 +30,8 @@ import (
 
 	"github.com/purpleidea/mgmt/engine"
 	engineUtil "github.com/purpleidea/mgmt/engine/util"
+	"github.com/purpleidea/mgmt/lang/core"
 	"github.com/purpleidea/mgmt/lang/funcs"
-	"github.com/purpleidea/mgmt/lang/funcs/core"
 	"github.com/purpleidea/mgmt/lang/funcs/structs"
 	"github.com/purpleidea/mgmt/lang/inputs"
 	"github.com/purpleidea/mgmt/lang/interfaces"

diff --git a/lang/funcs/core/.gitignore → lang/core/.gitignore b/lang/funcs/core/.gitignore → lang/core/.gitignore
diff --git a/lang/funcs/core/concat_func.go → lang/core/concat_func.go b/lang/funcs/core/concat_func.go → lang/core/concat_func.go
diff --git a/lang/funcs/core/convert/convert.go → lang/core/convert/convert.go b/lang/funcs/core/convert/convert.go → lang/core/convert/convert.go
diff --git a/lang/funcs/core/convert/format_bool.go → lang/core/convert/format_bool.go b/lang/funcs/core/convert/format_bool.go → lang/core/convert/format_bool.go
diff --git a/lang/funcs/core/convert/parse_bool.go → lang/core/convert/parse_bool.go b/lang/funcs/core/convert/parse_bool.go → lang/core/convert/parse_bool.go
diff --git a/lang/funcs/core/convert/to_float.go → lang/core/convert/to_float.go b/lang/funcs/core/convert/to_float.go → lang/core/convert/to_float.go
diff --git a/lang/funcs/core/convert/to_float_test.go → lang/core/convert/to_float_test.go b/lang/funcs/core/convert/to_float_test.go → lang/core/convert/to_float_test.go
diff --git a/lang/funcs/core/convert/to_int.go → lang/core/convert/to_int.go b/lang/funcs/core/convert/to_int.go → lang/core/convert/to_int.go
diff --git a/lang/funcs/core/convert/to_int_test.go → lang/core/convert/to_int_test.go b/lang/funcs/core/convert/to_int_test.go → lang/core/convert/to_int_test.go
diff --git a/lang/funcs/core/core.go → lang/core/core.go b/lang/funcs/core/core.go → lang/core/core.go
@@ -22,22 +22,22 @@ import (
 	"io/fs"
 
 	// import so the funcs register
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/convert"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/datetime"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/deploy"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/example"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/example/nested"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/fmt"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/iter"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/math"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/net"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/os"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/regexp"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/strings"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/sys"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/test"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/value"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core/world"
+	_ "github.com/purpleidea/mgmt/lang/core/convert"
+	_ "github.com/purpleidea/mgmt/lang/core/datetime"
+	_ "github.com/purpleidea/mgmt/lang/core/deploy"
+	_ "github.com/purpleidea/mgmt/lang/core/example"
+	_ "github.com/purpleidea/mgmt/lang/core/example/nested"
+	_ "github.com/purpleidea/mgmt/lang/core/fmt"
+	_ "github.com/purpleidea/mgmt/lang/core/iter"
+	_ "github.com/purpleidea/mgmt/lang/core/math"
+	_ "github.com/purpleidea/mgmt/lang/core/net"
+	_ "github.com/purpleidea/mgmt/lang/core/os"
+	_ "github.com/purpleidea/mgmt/lang/core/regexp"
+	_ "github.com/purpleidea/mgmt/lang/core/strings"
+	_ "github.com/purpleidea/mgmt/lang/core/sys"
+	_ "github.com/purpleidea/mgmt/lang/core/test"
+	_ "github.com/purpleidea/mgmt/lang/core/value"
+	_ "github.com/purpleidea/mgmt/lang/core/world"
 )
 
 // TODO: Instead of doing this one-level embed, we could give each package an

diff --git a/lang/funcs/core/core_test.go → lang/core/core_test.go b/lang/funcs/core/core_test.go → lang/core/core_test.go
diff --git a/lang/funcs/core/datetime/datetime.go → lang/core/datetime/datetime.go b/lang/funcs/core/datetime/datetime.go → lang/core/datetime/datetime.go
diff --git a/lang/funcs/core/datetime/format_func.go → lang/core/datetime/format_func.go b/lang/funcs/core/datetime/format_func.go → lang/core/datetime/format_func.go
diff --git a/lang/funcs/core/datetime/format_func_test.go → lang/core/datetime/format_func_test.go b/lang/funcs/core/datetime/format_func_test.go → lang/core/datetime/format_func_test.go
diff --git a/lang/funcs/core/datetime/hour_func.go → lang/core/datetime/hour_func.go b/lang/funcs/core/datetime/hour_func.go → lang/core/datetime/hour_func.go
diff --git a/lang/funcs/core/datetime/now_fact.go → lang/core/datetime/now_fact.go b/lang/funcs/core/datetime/now_fact.go → lang/core/datetime/now_fact.go
diff --git a/lang/funcs/core/datetime/print_func.go → lang/core/datetime/print_func.go b/lang/funcs/core/datetime/print_func.go → lang/core/datetime/print_func.go
diff --git a/lang/funcs/core/datetime/weekday_func.go → lang/core/datetime/weekday_func.go b/lang/funcs/core/datetime/weekday_func.go → lang/core/datetime/weekday_func.go
diff --git a/lang/funcs/core/deploy/abspath_func.go → lang/core/deploy/abspath_func.go b/lang/funcs/core/deploy/abspath_func.go → lang/core/deploy/abspath_func.go
diff --git a/lang/funcs/core/deploy/deploy.go → lang/core/deploy/deploy.go b/lang/funcs/core/deploy/deploy.go → lang/core/deploy/deploy.go
diff --git a/lang/funcs/core/deploy/readfile_func.go → lang/core/deploy/readfile_func.go b/lang/funcs/core/deploy/readfile_func.go → lang/core/deploy/readfile_func.go
diff --git a/lang/funcs/core/deploy/readfileabs_func.go → lang/core/deploy/readfileabs_func.go b/lang/funcs/core/deploy/readfileabs_func.go → lang/core/deploy/readfileabs_func.go
diff --git a/lang/funcs/core/example/answer_func.go → lang/core/example/answer_func.go b/lang/funcs/core/example/answer_func.go → lang/core/example/answer_func.go
diff --git a/lang/funcs/core/example/errorbool_func.go → lang/core/example/errorbool_func.go b/lang/funcs/core/example/errorbool_func.go → lang/core/example/errorbool_func.go
diff --git a/lang/funcs/core/example/example.go → lang/core/example/example.go b/lang/funcs/core/example/example.go → lang/core/example/example.go
diff --git a/lang/funcs/core/example/flipflop_fact.go → lang/core/example/flipflop_fact.go b/lang/funcs/core/example/flipflop_fact.go → lang/core/example/flipflop_fact.go
diff --git a/lang/funcs/core/example/int2str_func.go → lang/core/example/int2str_func.go b/lang/funcs/core/example/int2str_func.go → lang/core/example/int2str_func.go
diff --git a/lang/funcs/core/example/nativeanswer.mcl → lang/core/example/nativeanswer.mcl b/lang/funcs/core/example/nativeanswer.mcl → lang/core/example/nativeanswer.mcl
diff --git a/lang/funcs/core/example/nested/hello_func.go → lang/core/example/nested/hello_func.go b/lang/funcs/core/example/nested/hello_func.go → lang/core/example/nested/hello_func.go
@@ -18,7 +18,7 @@
 package corenested
 
 import (
-	coreexample "github.com/purpleidea/mgmt/lang/funcs/core/example"
+	coreexample "github.com/purpleidea/mgmt/lang/core/example"
 	"github.com/purpleidea/mgmt/lang/funcs/simple"
 	"github.com/purpleidea/mgmt/lang/types"
 )

diff --git a/lang/funcs/core/example/nested/nested.go → lang/core/example/nested/nested.go b/lang/funcs/core/example/nested/nested.go → lang/core/example/nested/nested.go
diff --git a/lang/funcs/core/example/plus_func.go → lang/core/example/plus_func.go b/lang/funcs/core/example/plus_func.go → lang/core/example/plus_func.go
diff --git a/lang/funcs/core/example/str2int_func.go → lang/core/example/str2int_func.go b/lang/funcs/core/example/str2int_func.go → lang/core/example/str2int_func.go
diff --git a/lang/funcs/core/example/test1.mcl → lang/core/example/test1.mcl b/lang/funcs/core/example/test1.mcl → lang/core/example/test1.mcl
diff --git a/lang/funcs/core/example/vumeter_func.go → lang/core/example/vumeter_func.go b/lang/funcs/core/example/vumeter_func.go → lang/core/example/vumeter_func.go
diff --git a/lang/funcs/core/fmt/fmt.go → lang/core/fmt/fmt.go b/lang/funcs/core/fmt/fmt.go → lang/core/fmt/fmt.go
diff --git a/lang/funcs/core/fmt/printf_func.go → lang/core/fmt/printf_func.go b/lang/funcs/core/fmt/printf_func.go → lang/core/fmt/printf_func.go
diff --git a/lang/funcs/core/funcgen.yaml → lang/core/funcgen.yaml b/lang/funcs/core/funcgen.yaml → lang/core/funcgen.yaml
diff --git a/lang/funcs/core/iter/iter.go → lang/core/iter/iter.go b/lang/funcs/core/iter/iter.go → lang/core/iter/iter.go
diff --git a/lang/funcs/core/iter/map_func.go → lang/core/iter/map_func.go b/lang/funcs/core/iter/map_func.go → lang/core/iter/map_func.go
diff --git a/lang/funcs/core/len_func.go → lang/core/len_func.go b/lang/funcs/core/len_func.go → lang/core/len_func.go
diff --git a/lang/funcs/core/math/fortytwo_func.go → lang/core/math/fortytwo_func.go b/lang/funcs/core/math/fortytwo_func.go → lang/core/math/fortytwo_func.go
diff --git a/lang/funcs/core/math/math.go → lang/core/math/math.go b/lang/funcs/core/math/math.go → lang/core/math/math.go
diff --git a/lang/funcs/core/math/minus1_func.go → lang/core/math/minus1_func.go b/lang/funcs/core/math/minus1_func.go → lang/core/math/minus1_func.go
diff --git a/lang/funcs/core/math/mod_func.go → lang/core/math/mod_func.go b/lang/funcs/core/math/mod_func.go → lang/core/math/mod_func.go
diff --git a/lang/funcs/core/math/pow_func.go → lang/core/math/pow_func.go b/lang/funcs/core/math/pow_func.go → lang/core/math/pow_func.go
diff --git a/lang/funcs/core/math/sqrt_func.go → lang/core/math/sqrt_func.go b/lang/funcs/core/math/sqrt_func.go → lang/core/math/sqrt_func.go
diff --git a/lang/funcs/core/math/sqrt_func_test.go → lang/core/math/sqrt_func_test.go b/lang/funcs/core/math/sqrt_func_test.go → lang/core/math/sqrt_func_test.go
diff --git a/lang/funcs/core/net/cidr_to_ip_func.go → lang/core/net/cidr_to_ip_func.go b/lang/funcs/core/net/cidr_to_ip_func.go → lang/core/net/cidr_to_ip_func.go
diff --git a/lang/funcs/core/net/cidr_to_ip_func_test.go → lang/core/net/cidr_to_ip_func_test.go b/lang/funcs/core/net/cidr_to_ip_func_test.go → lang/core/net/cidr_to_ip_func_test.go
diff --git a/lang/funcs/core/net/macfmt_func.go → lang/core/net/macfmt_func.go b/lang/funcs/core/net/macfmt_func.go → lang/core/net/macfmt_func.go
diff --git a/lang/funcs/core/net/macfmt_func_test.go → lang/core/net/macfmt_func_test.go b/lang/funcs/core/net/macfmt_func_test.go → lang/core/net/macfmt_func_test.go
diff --git a/lang/funcs/core/net/net.go → lang/core/net/net.go b/lang/funcs/core/net/net.go → lang/core/net/net.go
diff --git a/lang/funcs/core/os/args_func.go → lang/core/os/args_func.go b/lang/funcs/core/os/args_func.go → lang/core/os/args_func.go
diff --git a/lang/funcs/core/os/family_func.go → lang/core/os/family_func.go b/lang/funcs/core/os/family_func.go → lang/core/os/family_func.go
diff --git a/lang/funcs/core/os/os.go → lang/core/os/os.go b/lang/funcs/core/os/os.go → lang/core/os/os.go
diff --git a/lang/funcs/core/os/readfile_func.go → lang/core/os/readfile_func.go b/lang/funcs/core/os/readfile_func.go → lang/core/os/readfile_func.go
diff --git a/lang/funcs/core/os/system_func.go → lang/core/os/system_func.go b/lang/funcs/core/os/system_func.go → lang/core/os/system_func.go
diff --git a/lang/funcs/core/panic_func.go → lang/core/panic_func.go b/lang/funcs/core/panic_func.go → lang/core/panic_func.go
diff --git a/lang/funcs/core/random1_func.go → lang/core/random1_func.go b/lang/funcs/core/random1_func.go → lang/core/random1_func.go
diff --git a/lang/funcs/core/regexp/match_func.go → lang/core/regexp/match_func.go b/lang/funcs/core/regexp/match_func.go → lang/core/regexp/match_func.go
diff --git a/lang/funcs/core/regexp/match_func_test.go → lang/core/regexp/match_func_test.go b/lang/funcs/core/regexp/match_func_test.go → lang/core/regexp/match_func_test.go
diff --git a/lang/funcs/core/regexp/regexp.go → lang/core/regexp/regexp.go b/lang/funcs/core/regexp/regexp.go → lang/core/regexp/regexp.go
diff --git a/lang/funcs/core/strings/split_func.go → lang/core/strings/split_func.go b/lang/funcs/core/strings/split_func.go → lang/core/strings/split_func.go
diff --git a/lang/funcs/core/strings/split_func_test.go → lang/core/strings/split_func_test.go b/lang/funcs/core/strings/split_func_test.go → lang/core/strings/split_func_test.go
diff --git a/lang/funcs/core/strings/strings.go → lang/core/strings/strings.go b/lang/funcs/core/strings/strings.go → lang/core/strings/strings.go
diff --git a/lang/funcs/core/strings/to_lower_func.go → lang/core/strings/to_lower_func.go b/lang/funcs/core/strings/to_lower_func.go → lang/core/strings/to_lower_func.go
diff --git a/.../funcs/core/strings/to_lower_func_test.go → lang/core/strings/to_lower_func_test.go b/.../funcs/core/strings/to_lower_func_test.go → lang/core/strings/to_lower_func_test.go
diff --git a/lang/funcs/core/sys/cpucount_fact.go → lang/core/sys/cpucount_fact.go b/lang/funcs/core/sys/cpucount_fact.go → lang/core/sys/cpucount_fact.go
diff --git a/lang/funcs/core/sys/cpucount_fact_test.go → lang/core/sys/cpucount_fact_test.go b/lang/funcs/core/sys/cpucount_fact_test.go → lang/core/sys/cpucount_fact_test.go
diff --git a/lang/funcs/core/sys/env_func.go → lang/core/sys/env_func.go b/lang/funcs/core/sys/env_func.go → lang/core/sys/env_func.go
diff --git a/lang/funcs/core/sys/hostname_fact.go → lang/core/sys/hostname_fact.go b/lang/funcs/core/sys/hostname_fact.go → lang/core/sys/hostname_fact.go
diff --git a/lang/funcs/core/sys/load_fact.go → lang/core/sys/load_fact.go b/lang/funcs/core/sys/load_fact.go → lang/core/sys/load_fact.go
diff --git a/lang/funcs/core/sys/load_fact_darwin.go → lang/core/sys/load_fact_darwin.go b/lang/funcs/core/sys/load_fact_darwin.go → lang/core/sys/load_fact_darwin.go
diff --git a/lang/funcs/core/sys/load_fact_posix.go → lang/core/sys/load_fact_posix.go b/lang/funcs/core/sys/load_fact_posix.go → lang/core/sys/load_fact_posix.go
diff --git a/lang/funcs/core/sys/sys.go → lang/core/sys/sys.go b/lang/funcs/core/sys/sys.go → lang/core/sys/sys.go
diff --git a/lang/funcs/core/sys/uptime_fact.go → lang/core/sys/uptime_fact.go b/lang/funcs/core/sys/uptime_fact.go → lang/core/sys/uptime_fact.go
diff --git a/lang/funcs/core/sys/uptime_fact_darwin.go → lang/core/sys/uptime_fact_darwin.go b/lang/funcs/core/sys/uptime_fact_darwin.go → lang/core/sys/uptime_fact_darwin.go
diff --git a/lang/funcs/core/sys/uptime_fact_posix.go → lang/core/sys/uptime_fact_posix.go b/lang/funcs/core/sys/uptime_fact_posix.go → lang/core/sys/uptime_fact_posix.go
diff --git a/lang/funcs/core/template_func.go → lang/core/template_func.go b/lang/funcs/core/template_func.go → lang/core/template_func.go
diff --git a/lang/funcs/core/test/fastcount_fact.go → lang/core/test/fastcount_fact.go b/lang/funcs/core/test/fastcount_fact.go → lang/core/test/fastcount_fact.go
diff --git a/lang/funcs/core/test/oneinstance_fact.go → lang/core/test/oneinstance_fact.go b/lang/funcs/core/test/oneinstance_fact.go → lang/core/test/oneinstance_fact.go
diff --git a/lang/funcs/core/test/test.go → lang/core/test/test.go b/lang/funcs/core/test/test.go → lang/core/test/test.go
diff --git a/lang/funcs/core/value/get_func.go → lang/core/value/get_func.go b/lang/funcs/core/value/get_func.go → lang/core/value/get_func.go
diff --git a/lang/funcs/core/value/value.go → lang/core/value/value.go b/lang/funcs/core/value/value.go → lang/core/value/value.go
diff --git a/lang/funcs/core/world/exchange_func.go → lang/core/world/exchange_func.go b/lang/funcs/core/world/exchange_func.go → lang/core/world/exchange_func.go
diff --git a/lang/funcs/core/world/getval_func.go → lang/core/world/getval_func.go b/lang/funcs/core/world/getval_func.go → lang/core/world/getval_func.go
diff --git a/lang/funcs/core/world/kvlookup_func.go → lang/core/world/kvlookup_func.go b/lang/funcs/core/world/kvlookup_func.go → lang/core/world/kvlookup_func.go
diff --git a/lang/funcs/core/world/schedule_func.go → lang/core/world/schedule_func.go b/lang/funcs/core/world/schedule_func.go → lang/core/world/schedule_func.go
diff --git a/lang/funcs/core/world/world.go → lang/core/world/world.go b/lang/funcs/core/world/world.go → lang/core/world/world.go
diff --git a/lang/funcs/funcgen/main.go b/lang/funcs/funcgen/main.go
@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	pkg       = flag.String("package", "lang/funcs/core", "path to the package")
+	pkg       = flag.String("package", "lang/core", "path to the package")
 	filename  = flag.String("filename", "funcgen.yaml", "path to the config")
 	templates = flag.String("templates", "lang/funcs/funcgen/templates/*.tpl", "path to the templates")
 )

diff --git a/lang/lang.go b/lang/lang.go
@@ -29,7 +29,7 @@ import (
 	"github.com/purpleidea/mgmt/engine"
 	"github.com/purpleidea/mgmt/engine/local"
 	"github.com/purpleidea/mgmt/lang/ast"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core" // import so the funcs register
+	_ "github.com/purpleidea/mgmt/lang/core" // import so the funcs register
 	"github.com/purpleidea/mgmt/lang/funcs/dage"
 	"github.com/purpleidea/mgmt/lang/funcs/vars"
 	"github.com/purpleidea/mgmt/lang/inputs"

diff --git a/lang/lang_test.go b/lang/lang_test.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/purpleidea/mgmt/engine"
 	"github.com/purpleidea/mgmt/engine/resources"
-	_ "github.com/purpleidea/mgmt/lang/funcs/core" // import so the funcs register
+	_ "github.com/purpleidea/mgmt/lang/core" // import so the funcs register
 	"github.com/purpleidea/mgmt/lang/inputs"
 	"github.com/purpleidea/mgmt/lang/interfaces"
 	"github.com/purpleidea/mgmt/pgraph"