From ce12de332b6910af72ac5c88d7fd53d13de4b11b Mon Sep 17 00:00:00 2001 From: xushiwei Date: Fri, 3 Jun 2022 23:30:45 +0800 Subject: [PATCH] cmd/igop => yaigop --- cmd/{igop => yaigop}/internal/base/base.go | 0 cmd/{igop => yaigop}/internal/lib/default_gomacro.go | 0 cmd/{igop => yaigop}/internal/lib/default_igo.go | 0 cmd/{igop => yaigop}/internal/lib/default_yaegi.go | 0 cmd/{igop => yaigop}/internal/run/run.go | 2 +- cmd/{igop => yaigop}/internal/run/run_gomacro.go | 6 +++--- cmd/{igop => yaigop}/internal/run/run_igo.go | 4 ++-- cmd/{igop => yaigop}/internal/run/run_ssa.go | 4 ++-- cmd/{igop => yaigop}/internal/run/run_yaegi.go | 6 +++--- cmd/{igop => yaigop}/main.go | 6 +++--- go.mod | 2 +- igop_gomacro.go | 2 +- igop_igo.go | 2 +- igop_ssa.go | 2 +- igop_yaegi.go | 2 +- igop_yaegi_ast.go | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename cmd/{igop => yaigop}/internal/base/base.go (100%) rename cmd/{igop => yaigop}/internal/lib/default_gomacro.go (100%) rename cmd/{igop => yaigop}/internal/lib/default_igo.go (100%) rename cmd/{igop => yaigop}/internal/lib/default_yaegi.go (100%) rename cmd/{igop => yaigop}/internal/run/run.go (97%) rename cmd/{igop => yaigop}/internal/run/run_gomacro.go (89%) rename cmd/{igop => yaigop}/internal/run/run_igo.go (94%) rename cmd/{igop => yaigop}/internal/run/run_ssa.go (93%) rename cmd/{igop => yaigop}/internal/run/run_yaegi.go (90%) rename cmd/{igop => yaigop}/main.go (82%) diff --git a/cmd/igop/internal/base/base.go b/cmd/yaigop/internal/base/base.go similarity index 100% rename from cmd/igop/internal/base/base.go rename to cmd/yaigop/internal/base/base.go diff --git a/cmd/igop/internal/lib/default_gomacro.go b/cmd/yaigop/internal/lib/default_gomacro.go similarity index 100% rename from cmd/igop/internal/lib/default_gomacro.go rename to cmd/yaigop/internal/lib/default_gomacro.go diff --git a/cmd/igop/internal/lib/default_igo.go b/cmd/yaigop/internal/lib/default_igo.go similarity index 100% rename from cmd/igop/internal/lib/default_igo.go rename to cmd/yaigop/internal/lib/default_igo.go diff --git a/cmd/igop/internal/lib/default_yaegi.go b/cmd/yaigop/internal/lib/default_yaegi.go similarity index 100% rename from cmd/igop/internal/lib/default_yaegi.go rename to cmd/yaigop/internal/lib/default_yaegi.go diff --git a/cmd/igop/internal/run/run.go b/cmd/yaigop/internal/run/run.go similarity index 97% rename from cmd/igop/internal/run/run.go rename to cmd/yaigop/internal/run/run.go index 811cf8f..a9cc747 100644 --- a/cmd/igop/internal/run/run.go +++ b/cmd/yaigop/internal/run/run.go @@ -23,7 +23,7 @@ import ( "runtime" "github.com/goplus/gop" - "github.com/goplus/igop/cmd/igop/internal/base" + "github.com/goplus/yaigop/cmd/yaigop/internal/base" "github.com/qiniu/x/log" ) diff --git a/cmd/igop/internal/run/run_gomacro.go b/cmd/yaigop/internal/run/run_gomacro.go similarity index 89% rename from cmd/igop/internal/run/run_gomacro.go rename to cmd/yaigop/internal/run/run_gomacro.go index 2f3c5e5..5e717b9 100644 --- a/cmd/igop/internal/run/run_gomacro.go +++ b/cmd/yaigop/internal/run/run_gomacro.go @@ -21,17 +21,17 @@ package run import ( "github.com/cosmos72/gomacro/fast" - "github.com/goplus/igop" + "github.com/goplus/yaigop" "github.com/qiniu/x/log" - _ "github.com/goplus/igop/cmd/igop/internal/lib" + _ "github.com/goplus/yaigop/cmd/yaigop/internal/lib" ) // ----------------------------------------------------------------------------- func runDir(srcDir string, asm bool) { it := fast.New() - app, err := igop.CompileDir(it, srcDir) + app, err := yaigop.CompileDir(it, srcDir) if err != nil { log.Fatalln(err) } diff --git a/cmd/igop/internal/run/run_igo.go b/cmd/yaigop/internal/run/run_igo.go similarity index 94% rename from cmd/igop/internal/run/run_igo.go rename to cmd/yaigop/internal/run/run_igo.go index 9038c74..25dc101 100644 --- a/cmd/igop/internal/run/run_igo.go +++ b/cmd/yaigop/internal/run/run_igo.go @@ -20,7 +20,7 @@ import ( "os" "github.com/goplus/igo/interp" - "github.com/goplus/igop" + "github.com/goplus/yaigop" "github.com/qiniu/x/log" _ "github.com/goplus/igo/lib" @@ -29,7 +29,7 @@ import ( // ----------------------------------------------------------------------------- func runDir(srcDir string, asm bool) { - app, err := igop.CompileDir(srcDir) + app, err := yaigop.CompileDir(srcDir) if err != nil { log.Fatalln(err) } diff --git a/cmd/igop/internal/run/run_ssa.go b/cmd/yaigop/internal/run/run_ssa.go similarity index 93% rename from cmd/igop/internal/run/run_ssa.go rename to cmd/yaigop/internal/run/run_ssa.go index 89af5c4..40a0cc8 100644 --- a/cmd/igop/internal/run/run_ssa.go +++ b/cmd/yaigop/internal/run/run_ssa.go @@ -18,7 +18,7 @@ package run import ( "github.com/goplus/gossa" - "github.com/goplus/igop" + "github.com/goplus/yaigop" "github.com/qiniu/x/log" _ "github.com/goplus/gossa/pkg" @@ -27,7 +27,7 @@ import ( // ----------------------------------------------------------------------------- func runDir(srcDir string, asm bool) { - code, err := igop.CompileDir(srcDir) + code, err := yaigop.CompileDir(srcDir) if err != nil { log.Fatalln(err) } diff --git a/cmd/igop/internal/run/run_yaegi.go b/cmd/yaigop/internal/run/run_yaegi.go similarity index 90% rename from cmd/igop/internal/run/run_yaegi.go rename to cmd/yaigop/internal/run/run_yaegi.go index 1f76447..4b90b99 100644 --- a/cmd/igop/internal/run/run_yaegi.go +++ b/cmd/yaigop/internal/run/run_yaegi.go @@ -17,8 +17,8 @@ package run import ( - "github.com/goplus/igop" - "github.com/goplus/igop/cmd/igop/internal/lib" + "github.com/goplus/yaigop" + "github.com/goplus/yaigop/cmd/yaigop/internal/lib" "github.com/qiniu/x/log" "github.com/traefik/yaegi/interp" "github.com/traefik/yaegi/stdlib" @@ -30,7 +30,7 @@ func runDir(srcDir string, asm bool) { it := interp.New(interp.Options{}) it.Use(stdlib.Symbols) it.Use(lib.Symbols) - app, err := igop.CompileDir(it, srcDir) + app, err := yaigop.CompileDir(it, srcDir) if err != nil { log.Fatalln(err) } diff --git a/cmd/igop/main.go b/cmd/yaigop/main.go similarity index 82% rename from cmd/igop/main.go rename to cmd/yaigop/main.go index 82fdf68..faec3c7 100644 --- a/cmd/igop/main.go +++ b/cmd/yaigop/main.go @@ -19,12 +19,12 @@ package main import ( "os" - "github.com/goplus/igop/cmd/igop/internal/base" - "github.com/goplus/igop/cmd/igop/internal/run" + "github.com/goplus/yaigop/cmd/yaigop/internal/base" + "github.com/goplus/yaigop/cmd/yaigop/internal/run" ) func main() { - base.Main(run.Cmd, "igop", os.Args[1:]) + base.Main(run.Cmd, "yaigop", os.Args[1:]) } // ----------------------------------------------------------------------------- diff --git a/go.mod b/go.mod index 8999f33..27149e2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/goplus/igop +module github.com/goplus/yaigop go 1.16 diff --git a/igop_gomacro.go b/igop_gomacro.go index 29a7b63..f268a3a 100644 --- a/igop_gomacro.go +++ b/igop_gomacro.go @@ -17,7 +17,7 @@ limitations under the License. */ -package igop +package yaigop import ( "errors" diff --git a/igop_igo.go b/igop_igo.go index 46025bf..44d8e56 100644 --- a/igop_igo.go +++ b/igop_igo.go @@ -17,7 +17,7 @@ limitations under the License. */ -package igop +package yaigop import ( "errors" diff --git a/igop_ssa.go b/igop_ssa.go index 1907689..0e5e79b 100644 --- a/igop_ssa.go +++ b/igop_ssa.go @@ -17,7 +17,7 @@ limitations under the License. */ -package igop +package yaigop import ( "bytes" diff --git a/igop_yaegi.go b/igop_yaegi.go index 4a8d465..0f21226 100644 --- a/igop_yaegi.go +++ b/igop_yaegi.go @@ -17,7 +17,7 @@ limitations under the License. */ -package igop +package yaigop import ( "bytes" diff --git a/igop_yaegi_ast.go b/igop_yaegi_ast.go index 1bd0753..70898c8 100644 --- a/igop_yaegi_ast.go +++ b/igop_yaegi_ast.go @@ -1,7 +1,7 @@ //go:build yaegiast // +build yaegiast -package igop +package yaigop import ( "errors"