Merge pull request #251 from goplus/gop2

update deps gop/mod

go.mod

@@ -3,9 +3,8 @@ module github.com/goplus/igop
 go 1.14
 
 require (
-	github.com/goplus/gop v1.1.4-0.20230618014050-457765145f76
+	github.com/goplus/gop v1.1.4-0.20230703085128-c0b62d466a6c
 	github.com/goplus/gox v1.11.35
-	github.com/goplus/mod v0.10.0
 	github.com/goplus/reflectx v1.1.1
 	github.com/modern-go/reflect2 v1.0.2
 	github.com/peterh/liner v1.2.2

go.sum

@@ -7,16 +7,16 @@ github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/goplus/c2go v0.7.10/go.mod h1:ryOieVZqh0jmlPp45AMh9/sXIreTnyjDREP0EMX+pF0=
 github.com/goplus/c2go v0.7.13/go.mod h1:s5NULWzUKi3erd3l4ahvpq+3qDGOvMjGb00a5o3h6zk=
-github.com/goplus/gop v1.1.4-0.20230618014050-457765145f76 h1:AV297KjFtLoCDTf1oksKp4/rYUG22RmkH/v08Dc3QO8=
-github.com/goplus/gop v1.1.4-0.20230618014050-457765145f76/go.mod h1:+QeTETWyQ2DimyJfHbQxIkSMohRX/NtOTI5lpTcta40=
+github.com/goplus/gop v1.1.4-0.20230703085128-c0b62d466a6c h1:K+84fpUKomYbwFaUaW7vjyftqgCbRcTGlU98Dds5xWM=
+github.com/goplus/gop v1.1.4-0.20230703085128-c0b62d466a6c/go.mod h1:r2wFv+SLv+9Lvo833GXDFQflLEqpBj3GQhLvzZuZPks=
 github.com/goplus/gox v1.11.21/go.mod h1:wRCRSNukie4cDqADF4w0Btc2Gk6V3p3V6hI5+rsVqa8=
 github.com/goplus/gox v1.11.32/go.mod h1:hdKq5ghywtKWnBJNQNVBkPITmWCqCFRwwd2LTYTfg2U=
 github.com/goplus/gox v1.11.35 h1:IZtsYhHyjClJx5IRBbdYXCtiVoaoX4koYyv+/t7rXXA=
 github.com/goplus/gox v1.11.35/go.mod h1:GcmPyIyC2t4Nfam7x6YRpe1IW9rf4nchgRpE19hF4L4=
 github.com/goplus/libc v0.3.13/go.mod h1:xqG4/g3ilKBE/UDn5vkaE7RRQPQPyspj7ecuMuvlQJ8=
 github.com/goplus/mod v0.9.12/go.mod h1:YoPIowz71rnLLROA4YG0AC8bzDtPRyMaQwgTRLr8ri4=
-github.com/goplus/mod v0.10.0 h1:S9H/dwS4/IMzUX+Bq9Lb3tkPT3tzU6ws+hKeKI+Uo7g=
-github.com/goplus/mod v0.10.0/go.mod h1:cD7VktDd88SM0fPJ9oT3z5r8KTBW+EGi0gA3G8cDKHo=
+github.com/goplus/mod v0.10.1 h1:us4GMfWL+7tcK8diI7Z90awoVmUgDhftt83NeeqgYE4=
+github.com/goplus/mod v0.10.1/go.mod h1:cD7VktDd88SM0fPJ9oT3z5r8KTBW+EGi0gA3G8cDKHo=
 github.com/goplus/reflectx v1.1.1 h1:4acdcG7+uIHdl7le1vAEt9M2HwGWNlVqv1fd4YsdCg0=
 github.com/goplus/reflectx v1.1.1/go.mod h1:wHOS9ilbB4zrecI0W1dMmkW9JMcpXV7VjALVbNU9xfM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=

gopbuild/build.go

@@ -34,7 +34,6 @@ import (
 	"github.com/goplus/gop/token"
 	"github.com/goplus/gox"
 	"github.com/goplus/igop"
-	"github.com/goplus/mod/gopmod"
 
 	_ "github.com/goplus/igop/pkg/bufio"
 	_ "github.com/goplus/igop/pkg/fmt"
@@ -51,8 +50,7 @@ import (
 	_ "github.com/goplus/igop/pkg/strings"
 )
 
-type Class = gopmod.Class
-type Project = gopmod.Project
+type Class = cl.Class
 
 var (
 	classfile = make(map[string]*cl.Project)

gopbuild/build_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/goplus/igop"
+	_ "github.com/goplus/igop/pkg/bytes"
 )
 
 func gopClTest(t *testing.T, gopcode, expected string) {
@@ -99,6 +100,86 @@ func (this *Rect) Main() {
 }
 func main() {
 }
+`)
+	gopClTestEx(t, "Rect.gopx", `
+var (
+	*Buffer
+	v int
+)
+type Buffer struct {
+	buf []byte
+}
+println "Go+"
+`, `package main
+
+import fmt "fmt"
+
+type Buffer struct {
+	buf []byte
+}
+type Rect struct {
+	*Buffer
+	v int
+}
+
+func (this *Rect) Main() {
+//line Rect.gopx:9
+	fmt.Println("Go+")
+}
+func main() {
+}
+`)
+	gopClTestEx(t, "Rect.gopx", `
+import "bytes"
+var (
+	*bytes.Buffer
+	v int
+)
+println "Go+"
+`, `package main
+
+import (
+	fmt "fmt"
+	bytes "bytes"
+)
+
+type Rect struct {
+	*bytes.Buffer
+	v int
+}
+
+func (this *Rect) Main() {
+//line Rect.gopx:7
+	fmt.Println("Go+")
+}
+func main() {
+}
+`)
+	gopClTestEx(t, "Rect.gopx", `
+import "bytes"
+var (
+	bytes.Buffer
+	v int
+)
+println "Go+"
+`, `package main
+
+import (
+	fmt "fmt"
+	bytes "bytes"
+)
+
+type Rect struct {
+	bytes.Buffer
+	v int
+}
+
+func (this *Rect) Main() {
+//line Rect.gopx:7
+	fmt.Println("Go+")
+}
+func main() {
+}
 `)
 }