Skip to content

Commit

Permalink
github.com/xushiwei/qlang
Browse files Browse the repository at this point in the history
  • Loading branch information
xushiwei committed Jun 7, 2020
1 parent dd8656b commit fdfad74
Show file tree
Hide file tree
Showing 53 changed files with 131 additions and 131 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Q Language - A script language for Go
========

[![Build Status](https://travis-ci.org/qiniu/qlang.png?branch=master)](https://travis-ci.org/qiniu/qlang) [![GoDoc](https://godoc.org/github.com/qiniu/qlang?status.svg)](https://godoc.org/github.com/qiniu/qlang) [![Go Report Card](https://goreportcard.com/badge/github.com/qiniu/qlang)](https://goreportcard.com/report/github.com/qiniu/qlang)
[![Build Status](https://travis-ci.org/qiniu/qlang.png?branch=master)](https://travis-ci.org/qiniu/qlang) [![GoDoc](https://godoc.org/github.com/xushiwei/qlang?status.svg)](https://godoc.org/github.com/xushiwei/qlang) [![Go Report Card](https://goreportcard.com/badge/github.com/xushiwei/qlang)](https://goreportcard.com/report/github.com/xushiwei/qlang)

[![Qiniu Logo](http://open.qiniudn.com/logo.png)](http://www.qiniu.com/)

Expand Down Expand Up @@ -29,8 +29,8 @@ import (
"log"
"strings"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin" // 导入 builtin 包
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin" // 导入 builtin 包
)

var strings_Exports = map[string]interface{}{
Expand Down Expand Up @@ -103,12 +103,12 @@ QLANG_DUMPCODE=1 qlang

### 发行版本

* https://github.com/qiniu/qlang/releases
* https://github.com/xushiwei/qlang/releases

### 最新版本

```
go get github.com/qiniu/qlang
go get github.com/xushiwei/qlang
```

## 社区资源
Expand Down
4 changes: 2 additions & 2 deletions cl/builtin_types.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package qlang

import (
"github.com/qiniu/qlang/exec"
qlang "github.com/qiniu/qlang/spec"
"github.com/xushiwei/qlang/exec"
qlang "github.com/xushiwei/qlang/spec"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/class2.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

ipt "github.com/qiniu/text/tpl/interpreter"
"github.com/qiniu/text/tpl/interpreter.util"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/class2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package qlang_test
import (
"testing"

"github.com/qiniu/qlang"
"github.com/xushiwei/qlang"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/ctrl2.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package qlang

import (
"github.com/qiniu/text/tpl/interpreter.util"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cl/ctrl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package qlang_test
import (
"testing"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin"
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/function2.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package qlang

import (
"github.com/qiniu/text/tpl/interpreter.util"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cl/function_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"testing"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin"
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/goroutine2.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package qlang

import (
"github.com/qiniu/text/tpl/interpreter.util"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions cl/goroutine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package qlang_test
import (
"testing"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin"
_ "github.com/qiniu/qlang/lib/chan"
"github.com/qiniu/qlang/lib/sync"
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin"
_ "github.com/xushiwei/qlang/lib/chan"
"github.com/xushiwei/qlang/lib/sync"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cl/interpreter/interpret2.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/qiniu/text/tpl"
"github.com/qiniu/text/tpl/interpreter"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cl/module2.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"

"github.com/qiniu/text/tpl/interpreter"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cl/module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package qlang_test
import (
"testing"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin"
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin"
)

// -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cl/qlang2.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package qlang
import (
"strings"

"github.com/qiniu/qlang/exec"
qlang "github.com/qiniu/qlang/spec"
"github.com/xushiwei/qlang/exec"
qlang "github.com/xushiwei/qlang/spec"

ipt "github.com/qiniu/text/tpl/interpreter"
"github.com/qiniu/text/tpl/interpreter.util"
Expand Down
6 changes: 3 additions & 3 deletions cl/qlang_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"reflect"
"testing"

"github.com/qiniu/qlang"
"github.com/qiniu/qlang/lib/math"
qspec "github.com/qiniu/qlang/spec"
"github.com/xushiwei/qlang"
"github.com/xushiwei/qlang/lib/math"
qspec "github.com/xushiwei/qlang/spec"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cl/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package qlang
import (
"strconv"

"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"
)

// -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cl/var2.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package qlang

import (
"github.com/qiniu/qlang/exec"
qlang "github.com/qiniu/qlang/spec"
"github.com/xushiwei/qlang/exec"
qlang "github.com/xushiwei/qlang/spec"
)

// -----------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions cl/var_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package qlang_test
import (
"testing"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin"
ql "github.com/qiniu/qlang/spec"
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin"
ql "github.com/xushiwei/qlang/spec"
)

// -----------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions cmd/eql/eql_main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"strings"

"github.com/qiniu/qlang"
"github.com/qiniu/qlang/cl/interpreter"
"github.com/qiniu/qlang/exec"
"github.com/qiniu/qlang/lib/eqlang"
"github.com/qiniu/qlang/lib/qlang.all"
"github.com/xushiwei/qlang"
"github.com/xushiwei/qlang/cl/interpreter"
"github.com/xushiwei/qlang/exec"
"github.com/xushiwei/qlang/lib/eqlang"
"github.com/xushiwei/qlang/lib/qlang.all"
)

// -----------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions cmd/miniqlang/mini.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"log"
"strings"

"github.com/qiniu/qlang"
_ "github.com/qiniu/qlang/lib/builtin" // 导入 builtin 包
"github.com/xushiwei/qlang"
_ "github.com/xushiwei/qlang/lib/builtin" // 导入 builtin 包
)

// -----------------------------------------------------------------------------
Expand All @@ -17,7 +17,7 @@ var strings_Exports = map[string]interface{}{

func main() {

qlang.Import("strings", strings_Exports) // 导入一个自定义的包,叫 strings(和标准库同名)
qlang.Import("strings", strings_Exports) // 导入一个自定义的包,叫 strings(和标准库同名)
ql := qlang.New()

err := ql.SafeEval(`x = strings.replacer("?", "!").replace("hello, world???")`)
Expand Down
26 changes: 13 additions & 13 deletions cmd/qexport/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The Q Language Export Tool
Export go package to qlang module


The Q Language : https://github.com/qiniu/qlang
The Q Language : https://github.com/xushiwei/qlang


### Usages:
Expand Down Expand Up @@ -45,11 +45,11 @@ export html and html/template package
export all package
> qexport std
export io and update from github.com/qiniu/qlang/lib/io
> qexport -updatepath github.com/qiniu/qlang/lib io
export io and update from github.com/xushiwei/qlang/lib/io
> qexport -updatepath github.com/xushiwei/qlang/lib io
export all package and update from github.com/qiniu/qlang/lib
> qexport -updatepath github.com/qiniu/qlang/lib std
export all package and update from github.com/xushiwei/qlang/lib
> qexport -updatepath github.com/xushiwei/qlang/lib std
```

### 导出包
Expand All @@ -67,23 +67,23 @@ export all package and update from github.com/qiniu/qlang/lib

### 更新包
```
导出bufio包,复制github.com/qiniu/qlang/lib中bufio包到输出目录并更新。
> qexport -updatepath github.com/qiniu/qlang/lib bufio
导出bufio包,复制github.com/xushiwei/qlang/lib中bufio包到输出目录并更新。
> qexport -updatepath github.com/xushiwei/qlang/lib bufio
导出多个包,复制github.com/qiniu/qlang/lib中对应包到输出目录并作更新。
> qexport -updatepath github.com/qiniu/qlang/lib bufio io io/ioutil
导出多个包,复制github.com/xushiwei/qlang/lib中对应包到输出目录并作更新。
> qexport -updatepath github.com/xushiwei/qlang/lib bufio io io/ioutil
导出标准包,复制github.com/qiniu/qlang/lib中对应包到输出目录并作更新。
> qexport -updatepath github.com/qiniu/qlang/lib std
导出标准包,复制github.com/xushiwei/qlang/lib中对应包到输出目录并作更新。
> qexport -updatepath github.com/xushiwei/qlang/lib std
```

### 导出和更新包原理和实现
```
1. 导出pkg包,首先分析pkg包的所有函数和类型作导出准备
2. 如果需要更新,则先复制github.com/qiniu/qlang/lib/pkg包到输出目录中
同时分析github.com/qiniu/qlang/lib/pkg包中对原始pkg包的引用
2. 如果需要更新,则先复制github.com/xushiwei/qlang/lib/pkg包到输出目录中
同时分析github.com/xushiwei/qlang/lib/pkg包中对原始pkg包的引用
所有引用的名称在做更新导出时不再输出。
3. 输出需要导出的函数到输出文件中,如果为更新包,则作合并处理
Expand Down
4 changes: 2 additions & 2 deletions cmd/qexport/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ func export(pkg string, outpath string, skipOSArch bool) error {
outHeadf("\t%q\n", pkg)
//check qlang used
if hasTypeExport {
outHeadf("\n\tqlang \"github.com/qiniu/qlang/spec\"\n")
outHeadf("\n\tqlang \"github.com/xushiwei/qlang/spec\"\n")
}
outHeadf(")\n\n")
}
Expand Down Expand Up @@ -510,7 +510,7 @@ var Exports = map[string]interface{}{
if verHasTypeExport[ver] {
buf.WriteString("import (\n")
buf.WriteString(fmt.Sprintf("\t%q\n\n", bp.ImportPath))
buf.WriteString(fmt.Sprintf("\tqlang %q\n", "github.com/qiniu/qlang/spec"))
buf.WriteString(fmt.Sprintf("\tqlang %q\n", "github.com/xushiwei/qlang/spec"))
buf.WriteString(")\n")
} else {
buf.WriteString(fmt.Sprintf("import %q\n", bp.ImportPath))
Expand Down
4 changes: 2 additions & 2 deletions cmd/qexport/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (i *InsertInfo) UpdateFile(outpath string, data []byte, hasTypeExport bool)

out := insertData(all, data, i.pos.Offset)
if hasTypeExport && i.specImportName == "" {
spec := []byte("\n\nqlang \"github.com/qiniu/qlang/spec\"\n")
spec := []byte("\n\nqlang \"github.com/xushiwei/qlang/spec\"\n")
out = insertData(out, spec, i.importPos.Offset+1)
}

Expand Down Expand Up @@ -103,7 +103,7 @@ func CheckUpdateInfo(pkgname string, pkg string) (*UpdateInfo, error) {
if decl == nil {
return nil
}
specImport := w.FindImportName(file, "github.com/qiniu/qlang/spec")
specImport := w.FindImportName(file, "github.com/xushiwei/qlang/spec")
endImportPos := w.FindImportEndPos(file)
pos := w.FileSet.Position(decl.End())
_, pos.Filename = filepath.Split(pos.Filename)
Expand Down
2 changes: 1 addition & 1 deletion cmd/qlang.safe/main_safe.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/qiniu/qlang/cmd/qshell"
"github.com/xushiwei/qlang/cmd/qshell"
)

// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cmd/qlang/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/qiniu/qlang/cmd/qshell"
"github.com/xushiwei/qlang/cmd/qshell"
)

// -----------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions cmd/qshell/qshell.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"os"
"strings"

"github.com/qiniu/qlang"
"github.com/qiniu/qlang/lib/terminal"
"github.com/xushiwei/qlang"
"github.com/xushiwei/qlang/lib/terminal"

qipt "github.com/qiniu/qlang/cl/interpreter"
qall "github.com/qiniu/qlang/lib/qlang.all"
qipt "github.com/xushiwei/qlang/cl/interpreter"
qall "github.com/xushiwei/qlang/lib/qlang.all"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions engine2.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"reflect"

"github.com/qiniu/text/tpl/interpreter"
"github.com/qiniu/qlang/exec"
"github.com/xushiwei/qlang/exec"

qcl "github.com/qiniu/qlang/cl"
qlang "github.com/qiniu/qlang/spec"
qcl "github.com/xushiwei/qlang/cl"
qlang "github.com/xushiwei/qlang/spec"
)

// Options represent interpreter options.
Expand Down
Loading

0 comments on commit fdfad74

Please sign in to comment.