Merge pull request #1920 from xushiwei/q

testdata => demo
goplus · Jul 9, 2024 · 8a5badc · 8a5badc
2 parents 433c339 + 0e18a0b
commit 8a5badc
Show file tree

Hide file tree

Showing 52 changed files with 28 additions and 28 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -249,8 +249,8 @@ nfpms:
         dst: "/usr/lib/{{ .ProjectName }}/scanner"
       - src: "test"
         dst: "/usr/lib/{{ .ProjectName }}/test"
-      - src: "testdata"
-        dst: "/usr/lib/{{ .ProjectName }}/testdata"
+      - src: "demo"
+        dst: "/usr/lib/{{ .ProjectName }}/demo"
       - src: "tidy.go"
         dst: "/usr/lib/{{ .ProjectName }}/tidy.go"
       - src: "token"
@@ -338,8 +338,8 @@ snapcrafts:
         destination: "scanner"
       - source: "test"
         destination: "test"
-      - source: "testdata"
-        destination: "testdata"
+      - source: "demo"
+        destination: "demo"
       - source: "tidy.go"
         destination: "tidy.go"
       - source: "token"

diff --git a/cmd/make.go b/cmd/make.go
@@ -554,7 +554,7 @@ func runRegtests() {
 	cmd := exec.Command(filepath.Join(gopRoot, "bin/"+gopBinFiles[0]), "go", "./...")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	cmd.Dir = filepath.Join(gopRoot, "testdata")
+	cmd.Dir = filepath.Join(gopRoot, "demo")
 	err := cmd.Run()
 	if err != nil {
 		code := cmd.ProcessState.ExitCode()

diff --git a/testdata/_llgo/callpy/callpy.gop → demo/_llgo/callpy/callpy.gop b/testdata/_llgo/callpy/callpy.gop → demo/_llgo/callpy/callpy.gop
diff --git a/testdata/_llgo/defer/defer.gop → demo/_llgo/defer/defer.gop b/testdata/_llgo/defer/defer.gop → demo/_llgo/defer/defer.gop
diff --git a/testdata/_llgo/errors/errors.gop → demo/_llgo/errors/errors.gop b/testdata/_llgo/errors/errors.gop → demo/_llgo/errors/errors.gop
diff --git a/testdata/_llgo/go.mod → demo/_llgo/go.mod b/testdata/_llgo/go.mod → demo/_llgo/go.mod
diff --git a/testdata/_llgo/go.sum → demo/_llgo/go.sum b/testdata/_llgo/go.sum → demo/_llgo/go.sum
diff --git a/testdata/_llgo/goroutine/goroutine.gop → demo/_llgo/goroutine/goroutine.gop b/testdata/_llgo/goroutine/goroutine.gop → demo/_llgo/goroutine/goroutine.gop
diff --git a/testdata/_llgo/hello/hello.gop → demo/_llgo/hello/hello.gop b/testdata/_llgo/hello/hello.gop → demo/_llgo/hello/hello.gop
diff --git a/testdata/_llgo/hellollgo/README.md → demo/_llgo/hellollgo/README.md b/testdata/_llgo/hellollgo/README.md → demo/_llgo/hellollgo/README.md
diff --git a/testdata/_llgo/hellollgo/hello.gop → demo/_llgo/hellollgo/hello.gop b/testdata/_llgo/hellollgo/hello.gop → demo/_llgo/hellollgo/hello.gop
diff --git a/testdata/_llgo/matrix/matrix.gop → demo/_llgo/matrix/matrix.gop b/testdata/_llgo/matrix/matrix.gop → demo/_llgo/matrix/matrix.gop
diff --git a/testdata/_llgo/pyhello/hello.gop → demo/_llgo/pyhello/hello.gop b/testdata/_llgo/pyhello/hello.gop → demo/_llgo/pyhello/hello.gop
diff --git a/testdata/_llgo/pymax/pymax.gop → demo/_llgo/pymax/pymax.gop b/testdata/_llgo/pymax/pymax.gop → demo/_llgo/pymax/pymax.gop
diff --git a/testdata/_llgo/pyprint/print.gop → demo/_llgo/pyprint/print.gop b/testdata/_llgo/pyprint/print.gop → demo/_llgo/pyprint/print.gop
diff --git a/testdata/_llgo/pytensor/tensor.gop → demo/_llgo/pytensor/tensor.gop b/testdata/_llgo/pytensor/tensor.gop → demo/_llgo/pytensor/tensor.gop
diff --git a/testdata/_llgo/qsort/qsort.gop → demo/_llgo/qsort/qsort.gop b/testdata/_llgo/qsort/qsort.gop → demo/_llgo/qsort/qsort.gop
diff --git a/testdata/_llgo/reflect/reflect.gop → demo/_llgo/reflect/reflect.gop b/testdata/_llgo/reflect/reflect.gop → demo/_llgo/reflect/reflect.gop
diff --git a/testdata/_llgo/sqlitedemo/sqlitedemo.gop → demo/_llgo/sqlitedemo/sqlitedemo.gop b/testdata/_llgo/sqlitedemo/sqlitedemo.gop → demo/_llgo/sqlitedemo/sqlitedemo.gop
diff --git a/testdata/_llgo/statistics/statistics.gop → demo/_llgo/statistics/statistics.gop b/testdata/_llgo/statistics/statistics.gop → demo/_llgo/statistics/statistics.gop
diff --git a/testdata/_llgo/tetris/tetris.gop → demo/_llgo/tetris/tetris.gop b/testdata/_llgo/tetris/tetris.gop → demo/_llgo/tetris/tetris.gop
diff --git a/testdata/gop-sample/a.gop → demo/gop-sample/a.gop b/testdata/gop-sample/a.gop → demo/gop-sample/a.gop
diff --git a/demo/gop-sample/b.gop b/demo/gop-sample/b.gop
@@ -0,0 +1,9 @@
+package main
+
+import (
+	ab "github.com/goplus/gop/demo/gop-sample/cpkag/b"
+)
+
+a()
+Ab()
+ab.Ab()
diff --git a/testdata/gop-sample/cpkag/b/ab.go → demo/gop-sample/cpkag/b/ab.go b/testdata/gop-sample/cpkag/b/ab.go → demo/gop-sample/cpkag/b/ab.go
diff --git a/testdata/gsh-exec/exec.gsh → demo/gsh-exec/exec.gsh b/testdata/gsh-exec/exec.gsh → demo/gsh-exec/exec.gsh
diff --git a/testdata/gsh-exec/foo/foo.gop → demo/gsh-exec/foo/foo.gop b/testdata/gsh-exec/foo/foo.gop → demo/gsh-exec/foo/foo.gop
diff --git a/testdata/mixgo-complex/bar.go → demo/mixgo-complex/bar.go b/testdata/mixgo-complex/bar.go → demo/mixgo-complex/bar.go
diff --git a/testdata/mixgo-complex/foo.gop → demo/mixgo-complex/foo.gop b/testdata/mixgo-complex/foo.gop → demo/mixgo-complex/foo.gop
diff --git a/testdata/mixgo/README.md → demo/mixgo/README.md b/testdata/mixgo/README.md → demo/mixgo/README.md
diff --git a/testdata/mixgo/a.go → demo/mixgo/a.go b/testdata/mixgo/a.go → demo/mixgo/a.go
diff --git a/testdata/mixgo/b.gop → demo/mixgo/b.gop b/testdata/mixgo/b.gop → demo/mixgo/b.gop
diff --git a/testdata/overloadfunc1/add.gop → demo/overloadfunc1/add.gop b/testdata/overloadfunc1/add.gop → demo/overloadfunc1/add.gop
diff --git a/testdata/overloadfunc2/mul.gop → demo/overloadfunc2/mul.gop b/testdata/overloadfunc2/mul.gop → demo/overloadfunc2/mul.gop
diff --git a/testdata/overloadmethod/method.gop → demo/overloadmethod/method.gop b/testdata/overloadmethod/method.gop → demo/overloadmethod/method.gop
diff --git a/testdata/overloadop1/overloadop.gop → demo/overloadop1/overloadop.gop b/testdata/overloadop1/overloadop.gop → demo/overloadop1/overloadop.gop
diff --git a/testdata/overloadop2/overloadop.gop → demo/overloadop2/overloadop.gop b/testdata/overloadop2/overloadop.gop → demo/overloadop2/overloadop.gop
diff --git a/testdata/typeasparamsfunc/col.go → demo/typeasparamsfunc/col.go b/testdata/typeasparamsfunc/col.go → demo/typeasparamsfunc/col.go
diff --git a/...ata/typeasparamsfunc/typeAsParamsFunc.gop → demo/typeasparamsfunc/typeAsParamsFunc.gop b/...ata/typeasparamsfunc/typeAsParamsFunc.gop → demo/typeasparamsfunc/typeAsParamsFunc.gop
diff --git a/testdata/typeasparamsmethod/col.go → demo/typeasparamsmethod/col.go b/testdata/typeasparamsmethod/col.go → demo/typeasparamsmethod/col.go
diff --git a/...typeasparamsmethod/typeAsParamsMethod.gop → ...typeasparamsmethod/typeAsParamsMethod.gop b/...typeasparamsmethod/typeAsParamsMethod.gop → ...typeasparamsmethod/typeAsParamsMethod.gop
diff --git a/testdata/typeparamscast/foo.go → demo/typeparamscast/foo.go b/testdata/typeparamscast/foo.go → demo/typeparamscast/foo.go
diff --git a/testdata/typeparamscast/typecast.gop → demo/typeparamscast/typecast.gop b/testdata/typeparamscast/typecast.gop → demo/typeparamscast/typecast.gop
diff --git a/testdata/unit-test/foo.gop → demo/unit-test/foo.gop b/testdata/unit-test/foo.gop → demo/unit-test/foo.gop
diff --git a/testdata/unit-test/foo_test.gox → demo/unit-test/foo_test.gox b/testdata/unit-test/foo_test.gox → demo/unit-test/foo_test.gox
diff --git a/doc/classfile.md b/doc/classfile.md
@@ -147,7 +147,7 @@ func foo(v int) int {
 }
 ```
 
-Then you can create a `foo_test.gox` file to test it (see [unit-test/foo_test.gox](../testdata/unit-test/foo_test.gox)):
+Then you can create a `foo_test.gox` file to test it (see [unit-test/foo_test.gox](../demo/unit-test/foo_test.gox)):
 
 ```go
 if v := foo(50); v != 100 {

diff --git a/doc/docs.md b/doc/docs.md
@@ -1111,7 +1111,7 @@ By default `gop watch` does not convert test files (normally ending with `_test.
 
 ## Calling C from Go+
 
-Here is [an example to show how Go+ interacts with C](https://github.com/goplus/gop/tree/main/testdata/_llgo/hellollgo).
+Here is [an example to show how Go+ interacts with C](https://github.com/goplus/gop/tree/main/demo/_llgo/hellollgo).
 
 ```go
 import "c"

diff --git a/doc/overload.md b/doc/overload.md
@@ -3,7 +3,7 @@ Overload Func/Method/Operator/Types
 
 ### Overload Funcs
 
-Define `overload func` in `inline func literal` style (see [overloadfunc1/add.gop](testdata/overloadfunc1/add.gop)):
+Define `overload func` in `inline func literal` style (see [overloadfunc1/add.gop](demo/overloadfunc1/add.gop)):
 
 ```go
 func add = (
@@ -19,7 +19,7 @@ println add(100, 7)
 println add("Hello", "World")
 ```
 
-Define `overload func` in `ident` style (see [overloadfunc2/mul.gop](testdata/overloadfunc2/mul.gop)):
+Define `overload func` in `ident` style (see [overloadfunc2/mul.gop](demo/overloadfunc2/mul.gop)):
 
 ```go
 func mulInt(a, b int) int {
@@ -41,7 +41,7 @@ println mul(1.2, 3.14)
 
 ### Overload Methods
 
-Define `overload method` (see [overloadmethod/method.gop](testdata/overloadmethod/method.gop)):
+Define `overload method` (see [overloadmethod/method.gop](demo/overloadmethod/method.gop)):
 
 ```go
 type foo struct {
@@ -69,7 +69,7 @@ var d = a.mul(c)
 
 ### Overload Unary Operators
 
-Define `overload unary operator` (see [overloadop1/overloadop.gop](testdata/overloadop1/overloadop.gop)):
+Define `overload unary operator` (see [overloadop1/overloadop.gop](demo/overloadop1/overloadop.gop)):
 
 ```go
 type foo struct {
@@ -91,7 +91,7 @@ a++
 
 ### Overload Binary Operators
 
-Define `overload binary operator` (see [overloadop1/overloadop.gop](testdata/overloadop1/overloadop.gop)):
+Define `overload binary operator` (see [overloadop1/overloadop.gop](demo/overloadop1/overloadop.gop)):
 
 ```go
 type foo struct {
@@ -112,7 +112,7 @@ var c = a * b
 var d = a != b
 ```
 
-However, `binary operator` usually need to support interoperability between multiple types. In this case it becomes more complex (see [overloadop2/overloadop.gop](testdata/overloadop2/overloadop.gop)):
+However, `binary operator` usually need to support interoperability between multiple types. In this case it becomes more complex (see [overloadop2/overloadop.gop](demo/overloadop2/overloadop.gop)):
 
 ```go
 type foo struct {

diff --git a/parser/_testdata/mytest/mytest.gop b/parser/_testdata/mytest/mytest.gop
@@ -1,4 +1,4 @@
-package testdata
+package demo
 
 import (
 	"go/token"

diff --git a/parser/_testdata/mytest/parser.expect b/parser/_testdata/mytest/parser.expect
@@ -1,4 +1,4 @@
-package testdata
+package demo
 
 file mytest.gop
 ast.GenDecl:

diff --git a/printer/printer_test.go b/printer/printer_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	dataDir  = "testdata"
+	dataDir  = "demo"
 	tabwidth = 8
 )
 

diff --git a/testdata/gop-sample/b.gop b/testdata/gop-sample/b.gop
diff --git a/x/build/build_test.go b/x/build/build_test.go
@@ -500,11 +500,11 @@ func TestError(t *testing.T) {
 	if err == nil {
 		t.Fatal("BuildFile: no error?")
 	}
-	_, err = ctx.BuildDir("./testdata/nofound")
+	_, err = ctx.BuildDir("./demo/nofound")
 	if err == nil {
 		t.Fatal("BuildDir: no error?")
 	}
-	_, err = ctx.BuildFSDir(fsx.Local, "./testdata/nofound")
+	_, err = ctx.BuildFSDir(fsx.Local, "./demo/nofound")
 	if err == nil {
 		t.Fatal("BuildDir: no error?")
 	}
@@ -516,7 +516,7 @@ func TestError(t *testing.T) {
 	if err == nil {
 		t.Fatal("ParseFile: no error?")
 	}
-	_, err = ctx.ParseFile("./testdata/nofound/main.gop", nil)
+	_, err = ctx.ParseFile("./demo/nofound/main.gop", nil)
 	if err == nil {
 		t.Fatal("ParseFile: no error?")
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,7 +147,7 @@ func foo(v int) int { @@
     }
     ```
-    Then you can create a `foo_test.gox` file to test it (see [unit-test/foo_test.gox](../testdata/unit-test/foo_test.gox)):
+    Then you can create a `foo_test.gox` file to test it (see [unit-test/foo_test.gox](../demo/unit-test/foo_test.gox)):
     ```go
     if v := foo(50); v != 100 {
@@ Expand Down @@