Repository: goplus/gop
Pull request #421 (2020-07-07 17:44:51)

github.com/qiniu/goplus => github.com/goplus/gop


Patch:
diff --git a/.travis.yml b/.travis.yml
index 92ecb219..513eaff7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
   # check: format gop file
   - find ./ -type f -name "*.gop"|xargs -n 1 qfmt -w
   # check: imported go package
-  - diff -b  <(cat lib/default.go|grep github) <(find lib -type d|grep -v "lib$"|xargs -n 1 -I file bash -c 'echo -e \\t_ \"github.com/qiniu/goplus/file\"'|sort)
+  - diff -b  <(cat lib/default.go|grep github) <(find lib -type d|grep -v "lib$"|xargs -n 1 -I file bash -c 'echo -e \\t_ \"github.com/goplus/gop/file\"'|sort)
   - go test -race -coverprofile=coverage.txt -covermode=atomic ./...
   - pre-commit run --all
 after_success:
diff --git a/README.md b/README.md
index f1dc4ea3..2dcf9c93 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 GoPlus - The Go+ language for data science
 ========
 
-[![LICENSE](https://img.shields.io/github/license/qiniu/goplus.svg)](https://github.com/qiniu/goplus/blob/master/LICENSE)
+[![LICENSE](https://img.shields.io/github/license/qiniu/goplus.svg)](https://github.com/goplus/gop/blob/master/LICENSE)
 [![Build Status](https://travis-ci.org/qiniu/goplus.png?branch=master)](https://travis-ci.org/qiniu/goplus)
-[![Go Report Card](https://goreportcard.com/badge/github.com/qiniu/goplus)](https://goreportcard.com/report/github.com/qiniu/goplus)
-[![GitHub release](https://img.shields.io/github/v/tag/qiniu/goplus.svg?label=release)](https://github.com/qiniu/goplus/releases)
+[![Go Report Card](https://goreportcard.com/badge/github.com/goplus/gop)](https://goreportcard.com/report/github.com/goplus/gop)
+[![GitHub release](https://img.shields.io/github/v/tag/qiniu/goplus.svg?label=release)](https://github.com/goplus/gop/releases)
 [![Coverage Status](https://codecov.io/gh/qiniu/goplus/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/goplus)
-[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/qiniu/goplus)](https://www.tickgit.com/browse?repo=github.com/qiniu/goplus)
-[![GoDoc](https://img.shields.io/badge/Godoc-reference-blue.svg)](https://godoc.org/github.com/qiniu/goplus)
+[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/goplus/gop)](https://www.tickgit.com/browse?repo=github.com/goplus/gop)
+[![GoDoc](https://img.shields.io/badge/Godoc-reference-blue.svg)](https://godoc.org/github.com/goplus/gop)
 
 
 ## Summary about Go+
@@ -61,7 +61,7 @@ It's for Go, and it's also for Go+.
 
 All Go features (not including `cgo`) will be supported.
 
-* See [supported the Go language features](https://github.com/qiniu/goplus/wiki/Supported-Go-features).
+* See [supported the Go language features](https://github.com/goplus/gop/wiki/Supported-Go-features).
 
 **All Go packages (even these packages use `cgo`) can be imported by Go+.**
 
@@ -75,7 +75,7 @@ x := strings.NewReplacer("?", "!").Replace("hello, world???")
 fmt.Println("x:", x)
 ```
 
-Be interested in how it works? See [Dive into Go+](https://github.com/qiniu/goplus/wiki/Dive-into-Goplus).
+Be interested in how it works? See [Dive into Go+](https://github.com/goplus/gop/wiki/Dive-into-Goplus).
 
 **Also, all Go+ packages can be converted into Go packages and imported in Go programs.**
 
@@ -99,7 +99,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/qiniu/goplus/tutorial/14-Using-goplus-in-Go/foo"
+	"github.com/goplus/gop/tutorial/14-Using-goplus-in-Go/foo"
 )
 
 func main() {
@@ -121,7 +121,7 @@ Or:
 gop install ./... # Convert Go+ packages and go install ./...
 ```
 
-Go [tutorial/14-Using-goplus-in-Go](https://github.com/qiniu/goplus/tree/master/tutorial/14-Using-goplus-in-Go) to get the source code.
+Go [tutorial/14-Using-goplus-in-Go](https://github.com/goplus/gop/tree/master/tutorial/14-Using-goplus-in-Go) to get the source code.
 
 Note: The `gop` command isn't provided currently (in alpha stage). Instead, we provide `qrun` and `qgo` commands.
 
@@ -137,15 +137,15 @@ Playground based on GopherJS:
 
 ## Tutorials
 
-See https://github.com/qiniu/goplus/tree/master/tutorial
+See https://github.com/goplus/gop/tree/master/tutorial
 
 
 ## How to build
 
-Current version: [![GitHub release](https://img.shields.io/github/v/tag/qiniu/goplus.svg?label=)](https://github.com/qiniu/goplus/releases)
+Current version: [![GitHub release](https://img.shields.io/github/v/tag/qiniu/goplus.svg?label=)](https://github.com/goplus/gop/releases)
 
 ```bash
-go get github.com/qiniu/goplus@vX.X.XX
+go get github.com/goplus/gop@vX.X.XX
 #or: git clone git@github.com:qiniu/goplus.git
 cd goplus
 go install -v ./...
@@ -174,10 +174,10 @@ gop export <goPkgPath> # Generate a Go+ package that wraps a Go package automati
 
 The `gop` command isn't provided currently (in alpha stage). Instead, we provide the following commands:
 
-* [qrun](https://github.com/qiniu/goplus/wiki/Commands#qrun): Similar to `gop run`
-* [qfmt](https://github.com/qiniu/goplus/wiki/Commands#qfmt): Similar to `gop fmt`
-* [qexp](https://github.com/qiniu/goplus/wiki/Commands#qexp): Similar to `gop export`
-* [qgo](https://github.com/qiniu/goplus/wiki/Commands#qgo): Similar to `gop go`
+* [qrun](https://github.com/goplus/gop/wiki/Commands#qrun): Similar to `gop run`
+* [qfmt](https://github.com/goplus/gop/wiki/Commands#qfmt): Similar to `gop fmt`
+* [qexp](https://github.com/goplus/gop/wiki/Commands#qexp): Similar to `gop export`
+* [qgo](https://github.com/goplus/gop/wiki/Commands#qgo): Similar to `gop go`
 
 Note:
 
@@ -291,7 +291,7 @@ Compared to corresponding Go code, It is clear and more readable.
 
 And the most interesting thing is, the return error contains the full error stack. When we got an error, it is very easy to position what the root cause is.
 
-How these `ErrWrap expressions` work? See [Error Handling](https://github.com/qiniu/goplus/wiki/Error-Handling) for more information.
+How these `ErrWrap expressions` work? See [Error Handling](https://github.com/goplus/gop/wiki/Error-Handling) for more information.
 
 
 ### Unix shebang
@@ -317,21 +317,21 @@ println([k for k, _ <- m])
 println([v for v <- m])
 ```
 
-Go [tutorial/20-Unix-Shebang/shebang](https://github.com/qiniu/goplus/blob/master/tutorial/20-Unix-Shebang/shebang) to get the source code.
+Go [tutorial/20-Unix-Shebang/shebang](https://github.com/goplus/gop/blob/master/tutorial/20-Unix-Shebang/shebang) to get the source code.
 
 
 ### Go features
 
 All Go features (not including `cgo`) will be supported.
 
-* See [supported the Go language features](https://github.com/qiniu/goplus/wiki/Supported-Go-features).
+* See [supported the Go language features](https://github.com/goplus/gop/wiki/Supported-Go-features).
 
 
 ## Contributing
 
 The Go+ project welcomes all contributors. We appreciate your help!
 
-Here are [list of Go+ Contributors](https://github.com/qiniu/goplus/wiki/Goplus-Contributors). We award an email account (XXX@goplus.org) for every contributor. And we suggest you commit code by using this email account:
+Here are [list of Go+ Contributors](https://github.com/goplus/gop/wiki/Goplus-Contributors). We award an email account (XXX@goplus.org) for every contributor. And we suggest you commit code by using this email account:
 
 ```bash
 git config --global user.email XXX@goplus.org
diff --git a/ast/ast.go b/ast/ast.go
index dec8d6fd..a4cd3319 100644
--- a/ast/ast.go
+++ b/ast/ast.go
@@ -10,7 +10,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // ----------------------------------------------------------------------------
diff --git a/ast/ast_ql.go b/ast/ast_ql.go
index 927a7a49..7c515552 100644
--- a/ast/ast_ql.go
+++ b/ast/ast_ql.go
@@ -17,7 +17,7 @@
 package ast
 
 import (
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // ----------------------------------------------------------------------------
diff --git a/ast/astutil/ast_utils.go b/ast/astutil/ast_utils.go
index ae4c66b7..baeaf245 100644
--- a/ast/astutil/ast_utils.go
+++ b/ast/astutil/ast_utils.go
@@ -21,9 +21,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/ast/commentmap.go b/ast/commentmap.go
index f4dd80a9..c4e1f975 100644
--- a/ast/commentmap.go
+++ b/ast/commentmap.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 type byPos []*CommentGroup
diff --git a/ast/filter.go b/ast/filter.go
index 3f6e6f48..3934a9ab 100644
--- a/ast/filter.go
+++ b/ast/filter.go
@@ -7,7 +7,7 @@ package ast
 import (
 	"sort"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // ----------------------------------------------------------------------------
diff --git a/ast/import.go b/ast/import.go
index 16c78f45..ea377cc5 100644
--- a/ast/import.go
+++ b/ast/import.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // SortImports sorts runs of consecutive import lines in import blocks in f.
diff --git a/ast/print.go b/ast/print.go
index 9efcb81b..f02c46d6 100644
--- a/ast/print.go
+++ b/ast/print.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // A FieldFilter may be provided to Fprint to control the output.
diff --git a/ast/resolve.go b/ast/resolve.go
index 8fdcd9a9..c50ceb83 100644
--- a/ast/resolve.go
+++ b/ast/resolve.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/qiniu/goplus/scanner"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/scanner"
+	"github.com/goplus/gop/token"
 )
 
 type pkgBuilder struct {
diff --git a/ast/scope.go b/ast/scope.go
index 08c16169..60d0b473 100644
--- a/ast/scope.go
+++ b/ast/scope.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // A Scope maintains the set of named language entities declared
diff --git a/cl/check_type.go b/cl/check_type.go
index a39b7f58..e18216a3 100644
--- a/cl/check_type.go
+++ b/cl/check_type.go
@@ -20,9 +20,9 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cl/compile.go b/cl/compile.go
index 629f25ab..e83373ef 100644
--- a/cl/compile.go
+++ b/cl/compile.go
@@ -25,10 +25,10 @@ import (
 	"reflect"
 	"syscall"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/astutil"
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/astutil"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cl/ctx_check.go b/cl/ctx_check.go
index b09808b1..c268b7de 100644
--- a/cl/ctx_check.go
+++ b/cl/ctx_check.go
@@ -19,9 +19,9 @@ package cl
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cl/expr.go b/cl/expr.go
index 3b5dbe22..c6d9daa6 100644
--- a/cl/expr.go
+++ b/cl/expr.go
@@ -21,10 +21,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/astutil"
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/astutil"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/errors"
 	"github.com/qiniu/x/log"
 )
diff --git a/cl/goinstr.go b/cl/goinstr.go
index aaa7e52b..9730695b 100644
--- a/cl/goinstr.go
+++ b/cl/goinstr.go
@@ -20,8 +20,8 @@ import (
 	"log"
 	"reflect"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/exec.spec"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cl/stmt.go b/cl/stmt.go
index d975c90d..ba55bdf6 100644
--- a/cl/stmt.go
+++ b/cl/stmt.go
@@ -19,9 +19,9 @@ package cl
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cl/type_decl.go b/cl/type_decl.go
index 8ef144b9..54f284ba 100644
--- a/cl/type_decl.go
+++ b/cl/type_decl.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cl/value.go b/cl/value.go
index 7a581daf..47331395 100644
--- a/cl/value.go
+++ b/cl/value.go
@@ -19,8 +19,8 @@ package cl
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/ast/astutil"
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/ast/astutil"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/cmd/qexp/gopkg/exporter.go b/cmd/qexp/gopkg/exporter.go
index 573246fe..870403cf 100644
--- a/cmd/qexp/gopkg/exporter.go
+++ b/cmd/qexp/gopkg/exporter.go
@@ -63,7 +63,7 @@ type Exporter struct {
 
 // NewExporter creates a go package exporter.
 func NewExporter(w io.Writer, pkg *types.Package) *Exporter {
-	const gopPath = "github.com/qiniu/goplus/gop"
+	const gopPath = "github.com/goplus/gop/gop"
 	imports := map[string]string{gopPath: "gop"}
 	importPkgs := map[string]string{"gop": gopPath}
 	p := &Exporter{w: w, pkg: pkg, imports: imports, importPkgs: importPkgs}
@@ -347,7 +347,7 @@ func (p *Exporter) ExportVar(typ *types.Var) {
 }
 
 var (
-	qspecPkg = types.NewPackage("github.com/qiniu/goplus/exec.spec", "qspec")
+	qspecPkg = types.NewPackage("github.com/goplus/gop/exec.spec", "qspec")
 )
 
 // ExportConst exports a go const.
diff --git a/cmd/qexp/qexport.go b/cmd/qexp/qexport.go
index 03ed86dc..adcd2289 100644
--- a/cmd/qexp/qexport.go
+++ b/cmd/qexp/qexport.go
@@ -26,7 +26,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/qiniu/goplus/cmd/qexp/gopkg"
+	"github.com/goplus/gop/cmd/qexp/gopkg"
 )
 
 var (
@@ -114,7 +114,7 @@ func isGoplus(modfile string) bool {
 }
 
 var (
-	goplusPrefix = []byte("module github.com/qiniu/goplus")
+	goplusPrefix = []byte("module github.com/goplus/gop")
 )
 
 func hasFile(path string) bool {
diff --git a/cmd/qfmt/qfmt.go b/cmd/qfmt/qfmt.go
index a38a37ef..50628619 100644
--- a/cmd/qfmt/qfmt.go
+++ b/cmd/qfmt/qfmt.go
@@ -16,7 +16,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/qiniu/goplus/format"
+	"github.com/goplus/gop/format"
 )
 
 var (
diff --git a/cmd/qgo/qgo.go b/cmd/qgo/qgo.go
index ab4d341c..618c0843 100644
--- a/cmd/qgo/qgo.go
+++ b/cmd/qgo/qgo.go
@@ -29,15 +29,15 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/cl"
-	"github.com/qiniu/goplus/exec/bytecode"
-	"github.com/qiniu/goplus/exec/golang"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/cl"
+	"github.com/goplus/gop/exec/bytecode"
+	"github.com/goplus/gop/exec/golang"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 
-	_ "github.com/qiniu/goplus/lib"
+	_ "github.com/goplus/gop/lib"
 )
 
 var (
diff --git a/cmd/qrun/qrun.go b/cmd/qrun/qrun.go
index ed053844..960423fd 100644
--- a/cmd/qrun/qrun.go
+++ b/cmd/qrun/qrun.go
@@ -22,13 +22,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/qiniu/goplus/cl"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/cl"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 
-	exec "github.com/qiniu/goplus/exec/bytecode"
-	_ "github.com/qiniu/goplus/lib"
+	exec "github.com/goplus/gop/exec/bytecode"
+	_ "github.com/goplus/gop/lib"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/exec.spec/kind.go b/exec.spec/kind.go
index 03696d80..4646b9e0 100644
--- a/exec.spec/kind.go
+++ b/exec.spec/kind.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/qiniu/goplus/ast/spec"
+	"github.com/goplus/gop/ast/spec"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/exec/bytecode/code.go b/exec/bytecode/code.go
index dfe17f11..a994f19f 100644
--- a/exec/bytecode/code.go
+++ b/exec/bytecode/code.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/exec/bytecode/context.go b/exec/bytecode/context.go
index bb6591d6..325ce9e1 100644
--- a/exec/bytecode/context.go
+++ b/exec/bytecode/context.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"time"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/flow.go b/exec/bytecode/flow.go
index f045a1d3..82ee55ed 100644
--- a/exec/bytecode/flow.go
+++ b/exec/bytecode/flow.go
@@ -17,7 +17,7 @@
 package bytecode
 
 import (
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/errors"
 	"github.com/qiniu/x/log"
 )
diff --git a/exec/bytecode/func.go b/exec/bytecode/func.go
index 516beda8..971524e4 100644
--- a/exec/bytecode/func.go
+++ b/exec/bytecode/func.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/goinstr.go b/exec/bytecode/goinstr.go
index a3ae69a8..07010bf6 100644
--- a/exec/bytecode/goinstr.go
+++ b/exec/bytecode/goinstr.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/gopkg.go b/exec/bytecode/gopkg.go
index 4837e6c8..b15d0874 100644
--- a/exec/bytecode/gopkg.go
+++ b/exec/bytecode/gopkg.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/interface.go b/exec/bytecode/interface.go
index 55240aad..e1486e71 100644
--- a/exec/bytecode/interface.go
+++ b/exec/bytecode/interface.go
@@ -3,7 +3,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/errors"
 	"github.com/qiniu/x/log"
 )
diff --git a/exec/bytecode/module.go b/exec/bytecode/module.go
index b2267019..7e2dfb67 100644
--- a/exec/bytecode/module.go
+++ b/exec/bytecode/module.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/exec/bytecode/operator.go b/exec/bytecode/operator.go
index f12f9c21..301f791a 100644
--- a/exec/bytecode/operator.go
+++ b/exec/bytecode/operator.go
@@ -21,7 +21,7 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/var.go b/exec/bytecode/var.go
index 1e28ba1a..488aa966 100644
--- a/exec/bytecode/var.go
+++ b/exec/bytecode/var.go
@@ -19,7 +19,7 @@ package bytecode
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/golang/builder.go b/exec/golang/builder.go
index 3fc8d42c..356fe1b5 100644
--- a/exec/golang/builder.go
+++ b/exec/golang/builder.go
@@ -28,9 +28,9 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/exec/golang/internal/go/format"
-	"github.com/qiniu/goplus/exec/golang/internal/go/printer"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/exec/golang/internal/go/format"
+	"github.com/goplus/gop/exec/golang/internal/go/printer"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/golang/expr.go b/exec/golang/expr.go
index aec6d26b..331877b5 100644
--- a/exec/golang/expr.go
+++ b/exec/golang/expr.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/lib/builtin"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/lib/builtin"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/golang/func.go b/exec/golang/func.go
index a18eec37..65809261 100644
--- a/exec/golang/func.go
+++ b/exec/golang/func.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/exec/golang/internal/go/printer"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/exec/golang/internal/go/printer"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/golang/interface.go b/exec/golang/interface.go
index 456370f2..21fb6127 100644
--- a/exec/golang/interface.go
+++ b/exec/golang/interface.go
@@ -19,8 +19,8 @@ package golang
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/exec/bytecode"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/exec/bytecode"
 	"github.com/qiniu/x/errors"
 )
 
diff --git a/exec/golang/internal/go/format/format.go b/exec/golang/internal/go/format/format.go
index 97bcf1cd..5e7de755 100644
--- a/exec/golang/internal/go/format/format.go
+++ b/exec/golang/internal/go/format/format.go
@@ -24,7 +24,7 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/qiniu/goplus/exec/golang/internal/go/printer"
+	"github.com/goplus/gop/exec/golang/internal/go/printer"
 )
 
 var config = printer.Config{Mode: printer.UseSpaces | printer.TabIndent, Tabwidth: 8}
diff --git a/exec/golang/internal/go/format/internal.go b/exec/golang/internal/go/format/internal.go
index a8b7efae..5952326a 100644
--- a/exec/golang/internal/go/format/internal.go
+++ b/exec/golang/internal/go/format/internal.go
@@ -16,7 +16,7 @@ import (
 	"go/token"
 	"strings"
 
-	"github.com/qiniu/goplus/exec/golang/internal/go/printer"
+	"github.com/goplus/gop/exec/golang/internal/go/printer"
 )
 
 // parse parses src, which was read from the named file,
diff --git a/exec/golang/stmt.go b/exec/golang/stmt.go
index 7dffd4d5..ba3bdf8b 100644
--- a/exec/golang/stmt.go
+++ b/exec/golang/stmt.go
@@ -21,8 +21,8 @@ import (
 	"go/token"
 	"reflect"
 
-	"github.com/qiniu/goplus/exec.spec"
-	"github.com/qiniu/goplus/exec/golang/internal/go/printer"
+	"github.com/goplus/gop/exec.spec"
+	"github.com/goplus/gop/exec/golang/internal/go/printer"
 	"github.com/qiniu/x/errors"
 )
 
diff --git a/exec/golang/var.go b/exec/golang/var.go
index 4882251d..b71c486a 100644
--- a/exec/golang/var.go
+++ b/exec/golang/var.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/format/format.go b/format/format.go
index c3383e06..017df516 100644
--- a/format/format.go
+++ b/format/format.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/printer"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/printer"
+	"github.com/goplus/gop/token"
 )
 
 var config = printer.Config{Mode: printer.UseSpaces | printer.TabIndent, Tabwidth: 8}
diff --git a/format/internal.go b/format/internal.go
index 1cad88b2..f059778b 100644
--- a/format/internal.go
+++ b/format/internal.go
@@ -14,10 +14,10 @@ import (
 
 	goparser "go/parser"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/printer"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/printer"
+	"github.com/goplus/gop/token"
 )
 
 // parse parses src, which was read from the named file,
diff --git a/go.mod b/go.mod
index 2417ad4c..493f3bc5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/qiniu/goplus
+module github.com/goplus/gop
 
 go 1.14
 
diff --git a/gop/spec.go b/gop/spec.go
index 335a1039..2395e9b4 100644
--- a/gop/spec.go
+++ b/gop/spec.go
@@ -19,7 +19,7 @@
 package gop
 
 import (
-	exec "github.com/qiniu/goplus/exec/bytecode"
+	exec "github.com/goplus/gop/exec/bytecode"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/lib/builtin/exports.go b/lib/builtin/exports.go
index 02ad7e93..1910fffe 100644
--- a/lib/builtin/exports.go
+++ b/lib/builtin/exports.go
@@ -24,10 +24,10 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/qiniu/goplus/gop"
+	"github.com/goplus/gop/gop"
 
-	qspec "github.com/qiniu/goplus/exec.spec"
-	exec "github.com/qiniu/goplus/exec/bytecode"
+	qspec "github.com/goplus/gop/exec.spec"
+	exec "github.com/goplus/gop/exec/bytecode"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/lib/default.go b/lib/default.go
index 943a5627..65209bd8 100644
--- a/lib/default.go
+++ b/lib/default.go
@@ -1,17 +1,17 @@
 package lib
 
 import (
-	_ "github.com/qiniu/goplus/lib/builtin"
-	_ "github.com/qiniu/goplus/lib/errors"
-	_ "github.com/qiniu/goplus/lib/flag"
-	_ "github.com/qiniu/goplus/lib/fmt"
-	_ "github.com/qiniu/goplus/lib/io"
-	_ "github.com/qiniu/goplus/lib/io/ioutil"
-	_ "github.com/qiniu/goplus/lib/log"
-	_ "github.com/qiniu/goplus/lib/os"
-	_ "github.com/qiniu/goplus/lib/reflect"
-	_ "github.com/qiniu/goplus/lib/strconv"
-	_ "github.com/qiniu/goplus/lib/strings"
-	_ "github.com/qiniu/goplus/lib/sync"
-	_ "github.com/qiniu/goplus/lib/sync/atomic"
+	_ "github.com/goplus/gop/lib/builtin"
+	_ "github.com/goplus/gop/lib/errors"
+	_ "github.com/goplus/gop/lib/flag"
+	_ "github.com/goplus/gop/lib/fmt"
+	_ "github.com/goplus/gop/lib/io"
+	_ "github.com/goplus/gop/lib/io/ioutil"
+	_ "github.com/goplus/gop/lib/log"
+	_ "github.com/goplus/gop/lib/os"
+	_ "github.com/goplus/gop/lib/reflect"
+	_ "github.com/goplus/gop/lib/strconv"
+	_ "github.com/goplus/gop/lib/strings"
+	_ "github.com/goplus/gop/lib/sync"
+	_ "github.com/goplus/gop/lib/sync/atomic"
 )
diff --git a/lib/errors/errors.go b/lib/errors/errors.go
index 364aadcc..c0bdaf1d 100644
--- a/lib/errors/errors.go
+++ b/lib/errors/errors.go
@@ -3,7 +3,7 @@ package errors
 import (
 	"reflect"
 
-	"github.com/qiniu/goplus/gop"
+	"github.com/goplus/gop/gop"
 	"github.com/qiniu/x/errors"
 )
 
diff --git a/lib/flag/gomod_export.go b/lib/flag/gomod_export.go
index 89305a5c..8f916a68 100644
--- a/lib/flag/gomod_export.go
+++ b/lib/flag/gomod_export.go
@@ -6,8 +6,8 @@ import (
 	io "io"
 	time "time"
 
-	qspec "github.com/qiniu/goplus/exec.spec"
-	gop "github.com/qiniu/goplus/gop"
+	qspec "github.com/goplus/gop/exec.spec"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execArg(_ int, p *gop.Context) {
diff --git a/lib/fmt/exports.go b/lib/fmt/exports.go
index fbe53f42..69410612 100644
--- a/lib/fmt/exports.go
+++ b/lib/fmt/exports.go
@@ -20,8 +20,8 @@ package fmt
 import (
 	"fmt"
 
-	"github.com/qiniu/goplus/gop"
-	"github.com/qiniu/goplus/lib/builtin"
+	"github.com/goplus/gop/gop"
+	"github.com/goplus/gop/lib/builtin"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/lib/io/gomod_export.go b/lib/io/gomod_export.go
index 750bee96..210c84c6 100644
--- a/lib/io/gomod_export.go
+++ b/lib/io/gomod_export.go
@@ -4,7 +4,7 @@ package io
 import (
 	io "io"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func toType0(v interface{}) io.Writer {
diff --git a/lib/io/ioutil/gomod_export.go b/lib/io/ioutil/gomod_export.go
index 449faf91..12ec7137 100644
--- a/lib/io/ioutil/gomod_export.go
+++ b/lib/io/ioutil/gomod_export.go
@@ -6,7 +6,7 @@ import (
 	ioutil "io/ioutil"
 	os "os"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func toType0(v interface{}) io.Reader {
diff --git a/lib/log/gomod_export.go b/lib/log/gomod_export.go
index 20d2ed85..b9f6dde2 100644
--- a/lib/log/gomod_export.go
+++ b/lib/log/gomod_export.go
@@ -5,8 +5,8 @@ import (
 	io "io"
 	log "log"
 
-	qspec "github.com/qiniu/goplus/exec.spec"
-	gop "github.com/qiniu/goplus/gop"
+	qspec "github.com/goplus/gop/exec.spec"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execFlags(_ int, p *gop.Context) {
diff --git a/lib/os/gomod_export.go b/lib/os/gomod_export.go
index 5024d328..9273925a 100644
--- a/lib/os/gomod_export.go
+++ b/lib/os/gomod_export.go
@@ -5,8 +5,8 @@ import (
 	os "os"
 	time "time"
 
-	qspec "github.com/qiniu/goplus/exec.spec"
-	gop "github.com/qiniu/goplus/gop"
+	qspec "github.com/goplus/gop/exec.spec"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execChdir(_ int, p *gop.Context) {
diff --git a/lib/reflect/gomod_export.go b/lib/reflect/gomod_export.go
index a8293769..1f6c79a1 100644
--- a/lib/reflect/gomod_export.go
+++ b/lib/reflect/gomod_export.go
@@ -5,7 +5,7 @@ import (
 	reflect "reflect"
 	unsafe "unsafe"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func toSlice0(args []interface{}) []reflect.Value {
diff --git a/lib/strconv/gomod_export.go b/lib/strconv/gomod_export.go
index 41857e3a..f017927b 100644
--- a/lib/strconv/gomod_export.go
+++ b/lib/strconv/gomod_export.go
@@ -4,7 +4,7 @@ package strconv
 import (
 	strconv "strconv"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execAppendBool(_ int, p *gop.Context) {
diff --git a/lib/strings/gomod_export.go b/lib/strings/gomod_export.go
index 400a573a..af6da939 100644
--- a/lib/strings/gomod_export.go
+++ b/lib/strings/gomod_export.go
@@ -6,7 +6,7 @@ import (
 	strings "strings"
 	unicode "unicode"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execBuilderString(_ int, p *gop.Context) {
diff --git a/lib/sync/atomic/gomod_export.go b/lib/sync/atomic/gomod_export.go
index 38dfa130..c279eb2a 100644
--- a/lib/sync/atomic/gomod_export.go
+++ b/lib/sync/atomic/gomod_export.go
@@ -5,7 +5,7 @@ import (
 	atomic "sync/atomic"
 	unsafe "unsafe"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execAddInt32(_ int, p *gop.Context) {
diff --git a/lib/sync/gomod_export.go b/lib/sync/gomod_export.go
index 4402cbc6..9de1cd8c 100644
--- a/lib/sync/gomod_export.go
+++ b/lib/sync/gomod_export.go
@@ -4,7 +4,7 @@ package sync
 import (
 	sync "sync"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execCondWait(_ int, p *gop.Context) {
diff --git a/parser/interface.go b/parser/interface.go
index 5f08c335..ea69ded3 100644
--- a/parser/interface.go
+++ b/parser/interface.go
@@ -7,8 +7,8 @@
 package parser
 
 import (
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/token"
 )
 
 // A Mode value is a set of flags (or 0).
diff --git a/parser/parse.go b/parser/parse.go
index 93196c0b..1c91abd6 100644
--- a/parser/parse.go
+++ b/parser/parse.go
@@ -26,9 +26,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/scanner"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/scanner"
+	"github.com/goplus/gop/token"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/parser/parser.go b/parser/parser.go
index 1c1d0b45..9c5fe688 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/scanner"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/scanner"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/printer/nodes.go b/printer/nodes.go
index 6dee895e..308e0922 100644
--- a/printer/nodes.go
+++ b/printer/nodes.go
@@ -17,8 +17,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/token"
 )
 
 // Formatting issues:
diff --git a/printer/printer.go b/printer/printer.go
index 68a7a66d..64f418cf 100644
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -13,8 +13,8 @@ import (
 	"text/tabwriter"
 	"unicode"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/token"
 )
 
 const (
diff --git a/scanner/scanner.go b/scanner/scanner.go
index 08463751..0e095bf5 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -17,7 +17,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/token"
 )
 
 // An ErrorHandler may be provided to Scanner.Init. If a syntax error is
diff --git a/tutorial/14-Using-goplus-in-Go/gomain/main.go b/tutorial/14-Using-goplus-in-Go/gomain/main.go
index cc2355d2..5f92747f 100644
--- a/tutorial/14-Using-goplus-in-Go/gomain/main.go
+++ b/tutorial/14-Using-goplus-in-Go/gomain/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/qiniu/goplus/tutorial/14-Using-goplus-in-Go/foo"
+	"github.com/goplus/gop/tutorial/14-Using-goplus-in-Go/foo"
 )
 
 func main() {


Test patch:
diff --git a/cl/cltest/cltest.go b/cl/cltest/cltest.go
index f03be131..8380ead9 100644
--- a/cl/cltest/cltest.go
+++ b/cl/cltest/cltest.go
@@ -5,14 +5,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/cl"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/cl"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 
-	exec "github.com/qiniu/goplus/exec/bytecode"
-	_ "github.com/qiniu/goplus/lib" // libraries
+	exec "github.com/goplus/gop/exec/bytecode"
+	_ "github.com/goplus/gop/lib" // libraries
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cl/compile_test.go b/cl/compile_test.go
index 1530045f..66760722 100644
--- a/cl/compile_test.go
+++ b/cl/compile_test.go
@@ -21,14 +21,14 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/asttest"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/asttest"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 
-	exec "github.com/qiniu/goplus/exec/bytecode"
-	_ "github.com/qiniu/goplus/lib"
+	exec "github.com/goplus/gop/exec/bytecode"
+	_ "github.com/goplus/gop/lib"
 )
 
 func init() {
diff --git a/cl/expr_test.go b/cl/expr_test.go
index aecc9a2d..3c549dc6 100644
--- a/cl/expr_test.go
+++ b/cl/expr_test.go
@@ -22,11 +22,11 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/qiniu/goplus/ast/asttest"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast/asttest"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 
-	exec "github.com/qiniu/goplus/exec/bytecode"
+	exec "github.com/goplus/gop/exec/bytecode"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cl/gopkg_test.go b/cl/gopkg_test.go
index bd9e0752..416dd58f 100644
--- a/cl/gopkg_test.go
+++ b/cl/gopkg_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/qiniu/goplus/ast/asttest"
-	qspec "github.com/qiniu/goplus/exec.spec"
-	exec "github.com/qiniu/goplus/exec/bytecode"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast/asttest"
+	qspec "github.com/goplus/gop/exec.spec"
+	exec "github.com/goplus/gop/exec/bytecode"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 )
 
 type testConstInfo struct {
diff --git a/cl/stmt_test.go b/cl/stmt_test.go
index f5c41a68..6a1fa581 100644
--- a/cl/stmt_test.go
+++ b/cl/stmt_test.go
@@ -21,14 +21,14 @@ import (
 	"os"
 	"testing"
 
-	"github.com/qiniu/goplus/ast/asttest"
-	"github.com/qiniu/goplus/gop"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast/asttest"
+	"github.com/goplus/gop/gop"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 
-	exec "github.com/qiniu/goplus/exec/bytecode"
-	libbuiltin "github.com/qiniu/goplus/lib/builtin"
+	exec "github.com/goplus/gop/exec/bytecode"
+	libbuiltin "github.com/goplus/gop/lib/builtin"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cl/testdata_test.go b/cl/testdata_test.go
index 1e7705d6..e4677020 100644
--- a/cl/testdata_test.go
+++ b/cl/testdata_test.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/qiniu/goplus/cl/cltest"
+	"github.com/goplus/gop/cl/cltest"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cl/value_test.go b/cl/value_test.go
index 658362b7..3d4a8268 100644
--- a/cl/value_test.go
+++ b/cl/value_test.go
@@ -19,7 +19,7 @@ package cl
 import (
 	"testing"
 
-	exec "github.com/qiniu/goplus/exec.spec"
+	exec "github.com/goplus/gop/exec.spec"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/cmd/qexp/gopkg/exporter_test.go b/cmd/qexp/gopkg/exporter_test.go
index 3ba62c3f..229e3320 100644
--- a/cmd/qexp/gopkg/exporter_test.go
+++ b/cmd/qexp/gopkg/exporter_test.go
@@ -26,7 +26,7 @@ package strings
 import (
 	strings "strings"
 
-	gop "github.com/qiniu/goplus/gop"
+	gop "github.com/goplus/gop/gop"
 )
 
 func execNewReplacer(arity int, p *gop.Context) {
diff --git a/exec/bytecode/code_test.go b/exec/bytecode/code_test.go
index 0e9d3d26..c79d7739 100644
--- a/exec/bytecode/code_test.go
+++ b/exec/bytecode/code_test.go
@@ -17,7 +17,7 @@
 package bytecode
 
 import (
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/exec/bytecode/exec_autogen_test.go b/exec/bytecode/exec_autogen_test.go
index 14460ce1..b06fe737 100644
--- a/exec/bytecode/exec_autogen_test.go
+++ b/exec/bytecode/exec_autogen_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	exec "github.com/qiniu/goplus/exec.spec"
+	exec "github.com/goplus/gop/exec.spec"
 )
 
 const (
diff --git a/exec/bytecode/flow_test.go b/exec/bytecode/flow_test.go
index da9bcac6..5fe9bf6c 100644
--- a/exec/bytecode/flow_test.go
+++ b/exec/bytecode/flow_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/errors"
 )
 
diff --git a/exec/bytecode/testdata_test.go b/exec/bytecode/testdata_test.go
index d0420e16..35296106 100644
--- a/exec/bytecode/testdata_test.go
+++ b/exec/bytecode/testdata_test.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/qiniu/goplus/cl/cltest"
+	"github.com/goplus/gop/cl/cltest"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/exec/golang/builder_test.go b/exec/golang/builder_test.go
index 8800d3cb..65badbe5 100644
--- a/exec/golang/builder_test.go
+++ b/exec/golang/builder_test.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/qiniu/goplus/cl"
-	"github.com/qiniu/goplus/exec.spec"
+	"github.com/goplus/gop/cl"
+	"github.com/goplus/gop/exec.spec"
 	"github.com/qiniu/x/log"
 
-	qexec "github.com/qiniu/goplus/exec/bytecode"
-	_ "github.com/qiniu/goplus/lib"
+	qexec "github.com/goplus/gop/exec/bytecode"
+	_ "github.com/goplus/gop/lib"
 )
 
 // I is a Go package instance.
diff --git a/exec/golang/gogen_test.go b/exec/golang/gogen_test.go
index a954e8fd..faf925f6 100644
--- a/exec/golang/gogen_test.go
+++ b/exec/golang/gogen_test.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/cl"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/cl"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/format/_format_test.go b/format/_format_test.go
index 5a4c1ef6..cd3e401d 100644
--- a/format/_format_test.go
+++ b/format/_format_test.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 )
 
 const testfile = "format_test.go"
diff --git a/parser/parse_test.go b/parser/parse_test.go
index c310423d..09e7f88f 100644
--- a/parser/parse_test.go
+++ b/parser/parse_test.go
@@ -21,9 +21,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/asttest"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/asttest"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/parser/parser_test.go b/parser/parser_test.go
index bbcbc001..83b1676e 100644
--- a/parser/parser_test.go
+++ b/parser/parser_test.go
@@ -25,9 +25,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/ast/asttest"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/ast/asttest"
+	"github.com/goplus/gop/token"
 	"github.com/qiniu/x/log"
 )
 
diff --git a/printer/_printer_test.go b/printer/_printer_test.go
index 6209a691..9b9a68e4 100644
--- a/printer/_printer_test.go
+++ b/printer/_printer_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/qiniu/goplus/ast"
-	"github.com/qiniu/goplus/parser"
-	"github.com/qiniu/goplus/token"
+	"github.com/goplus/gop/ast"
+	"github.com/goplus/gop/parser"
+	"github.com/goplus/gop/token"
 )
 
 const (