From e0e3664fdb9ab1a79c45ccf116560f35509e8832 Mon Sep 17 00:00:00 2001
From: xushiwei <x@goplus.org>
Date: Mon, 29 Jul 2024 11:44:49 +0800
Subject: [PATCH] cmptest: regexdemo (todo)

---
 _cmptest/_regexdemo/regex.go    | 11 +++++++++++
 cmd/internal/version/version.go |  2 +-
 {xtool => x}/env/build.go       |  0
 {xtool => x}/env/version.go     |  0
 xtool/env/env.go                |  3 ---
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 _cmptest/_regexdemo/regex.go
 rename {xtool => x}/env/build.go (100%)
 rename {xtool => x}/env/version.go (100%)

diff --git a/_cmptest/_regexdemo/regex.go b/_cmptest/_regexdemo/regex.go
new file mode 100644
index 00000000..7153a2e9
--- /dev/null
+++ b/_cmptest/_regexdemo/regex.go
@@ -0,0 +1,11 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/goplus/llgo/xtool/env"
+)
+
+func main() {
+	fmt.Println(env.ExpandEnv("$(pkg-config --libs bdw-gc)"))
+}
diff --git a/cmd/internal/version/version.go b/cmd/internal/version/version.go
index f6fc6eb4..1a6adffc 100644
--- a/cmd/internal/version/version.go
+++ b/cmd/internal/version/version.go
@@ -21,7 +21,7 @@ import (
 	"runtime"
 
 	"github.com/goplus/llgo/cmd/internal/base"
-	"github.com/goplus/llgo/xtool/env"
+	"github.com/goplus/llgo/x/env"
 )
 
 // llgo version
diff --git a/xtool/env/build.go b/x/env/build.go
similarity index 100%
rename from xtool/env/build.go
rename to x/env/build.go
diff --git a/xtool/env/version.go b/x/env/version.go
similarity index 100%
rename from xtool/env/version.go
rename to x/env/version.go
diff --git a/xtool/env/env.go b/xtool/env/env.go
index 062c043f..4285deb3 100644
--- a/xtool/env/env.go
+++ b/xtool/env/env.go
@@ -36,11 +36,8 @@ func ExpandEnv(s string) string {
 func expandEnvWithCmd(s string) string {
 	expanded := reSubcmd.ReplaceAllStringFunc(s, func(m string) string {
 		subcmd := strings.TrimSpace(m[2 : len(m)-1])
-
 		args := parseSubcmd(subcmd)
-
 		cmd := args[0]
-
 		if cmd != "pkg-config" && cmd != "llvm-config" {
 			fmt.Fprintf(os.Stderr, "expand cmd only support pkg-config and llvm-config: '%s'\n", subcmd)
 			return ""