diff --git a/.github/workflows/go114.yml b/.github/workflows/go114.yml deleted file mode 100644 index 6dc9cec2..00000000 --- a/.github/workflows/go114.yml +++ /dev/null @@ -1,110 +0,0 @@ -name: Go1.14 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - macos: - name: Test Go1.14 for macOS - runs-on: macos-latest - steps: - - - name: Set up Go1.14 - uses: actions/setup-go@v2 - with: - go-version: 1.14.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test - run: GOARCH=amd64 go test -race -v . - - - name: Test $GOROOT/test - run: GOARCH=amd64 go run ./cmd/igoptest - - linux: - name: Test Go1.14 for Linux - runs-on: ubuntu-latest - steps: - - - name: Set up Go1.14 - uses: actions/setup-go@v2 - with: - go-version: 1.14.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test amd64 - run: GOARCH=amd64 go test -race -v . - - - name: Test $GOROOT/test - run: GOARCH=amd64 go run ./cmd/igoptest - - windows: - name: Test Go1.14 for Windows - runs-on: windows-latest - steps: - - - name: Set up Go1.14 - uses: actions/setup-go@v2 - with: - go-version: 1.14.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test amd64 - run: | - set GOARCH=amd64 - go test -race -v . - - - name: Test $GOROOT/test amd64 - run: | - set GOARCH=amd64 - go run ./cmd/igoptest - - - name: Go Test 386 - run: | - set GOARCH=386 - go test -v . - - - name: Go $GOROOT/test 386 - run: | - set GOARCH=386 - go run ./cmd/igoptest diff --git a/.github/workflows/go115.yml b/.github/workflows/go115.yml deleted file mode 100644 index 2e3d2379..00000000 --- a/.github/workflows/go115.yml +++ /dev/null @@ -1,110 +0,0 @@ -name: Go1.15 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - macos: - name: Test Go1.15 for macOS - runs-on: macos-latest - steps: - - - name: Set up Go1.15 - uses: actions/setup-go@v2 - with: - go-version: 1.15.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test - run: GOARCH=amd64 go test -race -v . - - - name: Test $GOROOT/test - run: GOARCH=amd64 go run ./cmd/igoptest - - linux: - name: Test Go1.15 for Linux - runs-on: ubuntu-latest - steps: - - - name: Set up Go1.15 - uses: actions/setup-go@v2 - with: - go-version: 1.15.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test amd64 - run: GOARCH=amd64 go test -race -v . - - - name: Test $GOROOT/test - run: GOARCH=amd64 go run ./cmd/igoptest - - windows: - name: Test Go1.15 for Windows - runs-on: windows-latest - steps: - - - name: Set up Go1.15 - uses: actions/setup-go@v2 - with: - go-version: 1.15.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Build - run: go build -v . - - - name: Install igop - run: go install -v ./cmd/igop - - - name: Go Test amd64 - run: | - set GOARCH=amd64 - go test -race -v . - - - name: Test $GOROOT/test amd64 - run: | - set GOARCH=amd64 - go run ./cmd/igoptest - - - name: Go Test 386 - run: | - set GOARCH=386 - go test -v . - - - name: Go $GOROOT/test 386 - run: | - set GOARCH=386 - go run ./cmd/igoptest diff --git a/README.md b/README.md index 2f38134a..484cb9a0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # iGo+ The Go/Go+ Interpreter -[![Go1.14](https://github.com/goplus/igop/workflows/Go1.14/badge.svg)](https://github.com/goplus/igop/actions/workflows/go114.yml) -[![Go1.15](https://github.com/goplus/igop/workflows/Go1.15/badge.svg)](https://github.com/goplus/igop/actions/workflows/go115.yml) [![Go1.16](https://github.com/goplus/igop/workflows/Go1.16/badge.svg)](https://github.com/goplus/igop/actions/workflows/go116.yml) [![Go1.17](https://github.com/goplus/igop/workflows/Go1.17/badge.svg)](https://github.com/goplus/igop/actions/workflows/go117.yml) [![Go1.18](https://github.com/goplus/igop/workflows/Go1.18/badge.svg)](https://github.com/goplus/igop/actions/workflows/go118.yml) @@ -13,7 +11,7 @@ ### Go Version -- Go1.14 ~ Go1.21 +- Go1.16 ~ Go1.21 - macOS Linux Windows WebAssembly GopherJS and more. ### ABI diff --git a/cmd/internal/load/gop.go b/cmd/internal/load/gop.go index b7f190e2..d5149f42 100644 --- a/cmd/internal/load/gop.go +++ b/cmd/internal/load/gop.go @@ -1,5 +1,5 @@ -//go:build go1.16 -// +build go1.16 +//go:build go1.18 +// +build go1.18 /* * Copyright (c) 2022 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/cmd/internal/load/nogop.go b/cmd/internal/load/nogop.go index c4b57469..abfd7230 100644 --- a/cmd/internal/load/nogop.go +++ b/cmd/internal/load/nogop.go @@ -1,5 +1,5 @@ -//go:build !go1.16 -// +build !go1.16 +//go:build !go1.18 +// +build !go1.18 /* * Copyright (c) 2022 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/cmd/internal/repl/gop.go b/cmd/internal/repl/gop.go index 9a827203..a7216204 100644 --- a/cmd/internal/repl/gop.go +++ b/cmd/internal/repl/gop.go @@ -1,5 +1,5 @@ -//go:build go1.16 -// +build go1.16 +//go:build go1.18 +// +build go1.18 /* * Copyright (c) 2022 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/go.mod b/go.mod index 6726372a..689257ee 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,19 @@ module github.com/goplus/igop -go 1.14 +go 1.16 require ( - github.com/goplus/gop v1.1.4-0.20230902092212-f673ef3ba3c9 - github.com/goplus/gox v1.11.37 + github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 + github.com/goplus/gop v1.1.9 + github.com/goplus/gox v1.12.8 github.com/goplus/reflectx v1.2.1 github.com/modern-go/reflect2 v1.0.2 github.com/peterh/liner v1.2.2 - github.com/qiniu/x v1.11.9 + github.com/qiniu/x v1.13.1 github.com/visualfc/funcval v0.1.4 github.com/visualfc/gid v0.1.0 github.com/visualfc/goembed v0.3.2 github.com/visualfc/xtype v0.2.0 - golang.org/x/mod v0.12.0 - golang.org/x/tools v0.13.0 + golang.org/x/mod v0.13.0 + golang.org/x/tools v0.14.0 ) diff --git a/go.sum b/go.sum index 32981395..82917a9c 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,20 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20180708170036-38b413be4187/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= 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.20230902092212-f673ef3ba3c9 h1:5JID8rW6I8BSdctW6Usi1mdRx2TtlsVtOuiUn2aZUyk= -github.com/goplus/gop v1.1.4-0.20230902092212-f673ef3ba3c9/go.mod h1:+kYk2ZSZ+rPD8AVoWTz3r5L/dkbtmUNvJOP0h1ET8KI= -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.37 h1:8oAXjokhvttO/4NZgfAJ02GE9OivbX2VSsEJWu3fGng= -github.com/goplus/gox v1.11.37/go.mod h1:NkgUJWIjKxrhUwM4bgyUt3ZE0WlTunqfksMzrbnh7V8= -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.11.2 h1:kgIdro905lTZgqGecTbZ416O8ayN+ca2DR5OB4ayeWI= -github.com/goplus/mod v0.11.2/go.mod h1:d40I3nOr2qkGfLUjwc/BqLSq3oUUlQy5+/SpdiBKgY4= +github.com/goplus/c2go v0.7.16/go.mod h1:XODEFX2PeEEJXNLLdykWeZgMSaKJ51fVm+C9IM3FxNQ= +github.com/goplus/gop v1.1.9 h1:7e0jQFbTeFGOU5Rmd58YV/1nRLySdooSAFGWAeW6UBo= +github.com/goplus/gop v1.1.9/go.mod h1:OQBkI9FbIOJWtHP9ahB1d6cKEq+2P10IJ588ewGhnhk= +github.com/goplus/gox v1.12.1/go.mod h1:wymoQJ7ydd42cTlaXb4wNbvn4LlKjR+j8PZehI7v1zQ= +github.com/goplus/gox v1.12.8 h1:xXpsGbNIIDmykOQwI/kDcoA3cOX5ISvLPlU5RiPtyZY= +github.com/goplus/gox v1.12.8/go.mod h1:MOJnwqA8/rSUkn0vsayHFK7TD/3XQrdexMTqdzR70X0= +github.com/goplus/mod v0.11.5/go.mod h1:NDC5E+XOT8vcJCMjqKhLDJHTHX7lyVN4Vbfi2U7dBhs= +github.com/goplus/mod v0.11.8 h1:90Kbg+MJhrdsonNGXYx3HUcW4IbBlRHYpIMssJaMMxM= +github.com/goplus/mod v0.11.8/go.mod h1:yl2QncBKTdXk+8UaNsdo4u2zSpGEJYA5JKjgD3K2h00= github.com/goplus/reflectx v1.2.1 h1:y3Bq7cmP/zO++VFpZetC3zljVM3LkGivh2GgUJLu4wI= github.com/goplus/reflectx v1.2.1/go.mod h1:wHOS9ilbB4zrecI0W1dMmkW9JMcpXV7VjALVbNU9xfM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -27,11 +25,11 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw= github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI= -github.com/petermattis/goid v0.0.0-20220331194723-8ee3e6ded87a/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/qiniu/x v1.11.9 h1:IfQNdeNcK43Q1+b/LdrcqmWjlhxq051YVBnua8J2qN8= -github.com/qiniu/x v1.11.9/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs= +github.com/qiniu/x v1.13.0/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= +github.com/qiniu/x v1.13.1 h1:hi7tkXFq6BWGbBpMoLV7kvA2elop69j6Kl7TlxnFAiU= +github.com/qiniu/x v1.13.1/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -50,71 +48,60 @@ github.com/visualfc/goembed v0.3.2 h1:a9m6o9VTzNk3mEF98C8cHp8f8P8BblyjsjajXGfTp8 github.com/visualfc/goembed v0.3.2/go.mod h1:jCVCz/yTJGyslo6Hta+pYxWWBuq9ADCcIVZBTQ0/iVI= github.com/visualfc/xtype v0.2.0 h1:0ESNXyWHtK01kaOzOyqHsR1ZjEPdNu/IWPZkf0VOHl8= github.com/visualfc/xtype v0.2.0/go.mod h1:183MDtzLqyDkCm5zCH42vJGq/aQE5W25k3Z6UOZxLF0= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.11.1/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/gopbuild/build_test.go b/gopbuild/build_test.go index 6e3b4714..c48aed43 100644 --- a/gopbuild/build_test.go +++ b/gopbuild/build_test.go @@ -47,7 +47,7 @@ func TestGop(t *testing.T) { println "Go+" `, `package main -import fmt "fmt" +import "fmt" func main() { //line main.gop:2 @@ -61,7 +61,7 @@ func TestGox(t *testing.T) { println "Go+" `, `package main -import fmt "fmt" +import "fmt" type Rect struct { } @@ -84,7 +84,7 @@ type Buffer struct { println "Go+" `, `package main -import fmt "fmt" +import "fmt" type Buffer struct { buf []byte @@ -112,7 +112,7 @@ type Buffer struct { println "Go+" `, `package main -import fmt "fmt" +import "fmt" type Buffer struct { buf []byte @@ -139,8 +139,8 @@ println "Go+" `, `package main import ( - fmt "fmt" - bytes "bytes" + "fmt" + "bytes" ) type Rect struct { @@ -165,8 +165,8 @@ println "Go+" `, `package main import ( - fmt "fmt" - bytes "bytes" + "fmt" + "bytes" ) type Rect struct { @@ -190,9 +190,9 @@ println a+1/2r `, `package main import ( - fmt "fmt" - ng "github.com/goplus/gop/builtin/ng" - big "math/big" + "fmt" + "github.com/goplus/gop/builtin/ng" + "math/big" ) func main() { @@ -211,7 +211,7 @@ v := typeof(100) println(v) `, `package main -import fmt "fmt" +import "fmt" func main() { //line main.gop:2 @@ -234,9 +234,9 @@ for line <- lines(r) { `, `package main import ( - fmt "fmt" - iox "github.com/goplus/gop/builtin/iox" - io "io" + "fmt" + "github.com/goplus/gop/builtin/iox" + "io" ) var r io.Reader @@ -279,9 +279,9 @@ println addSafe("10", "abc") `, `package main import ( - fmt "fmt" - strconv "strconv" - errors "github.com/qiniu/x/errors" + "fmt" + "strconv" + "github.com/qiniu/x/errors" ) func add(x string, y string) (int, error) { diff --git a/pkg/github.com/goplus/gop/builtin/ng/export.go b/pkg/github.com/goplus/gop/builtin/ng/export.go index 07e3ae7c..cee412ac 100755 --- a/pkg/github.com/goplus/gop/builtin/ng/export.go +++ b/pkg/github.com/goplus/gop/builtin/ng/export.go @@ -6,6 +6,7 @@ import ( q "github.com/goplus/gop/builtin/ng" "go/constant" + "go/token" "reflect" "github.com/goplus/igop" @@ -101,7 +102,13 @@ func init() { }, TypedConsts: map[string]igop.TypedConst{}, UntypedConsts: map[string]igop.UntypedConst{ - "GopPackage": {"untyped bool", constant.MakeBool(bool(q.GopPackage))}, + "GopPackage": {"untyped bool", constant.MakeBool(bool(q.GopPackage))}, + "Int128_IsUntyped": {"untyped bool", constant.MakeBool(bool(q.Int128_IsUntyped))}, + "Int128_Max": {"untyped int", constant.MakeFromLiteral("170141183460469231731687303715884105727", token.INT, 0)}, + "Int128_Min": {"untyped int", constant.MakeFromLiteral("-170141183460469231731687303715884105728", token.INT, 0)}, + "Uint128_IsUntyped": {"untyped bool", constant.MakeBool(bool(q.Uint128_IsUntyped))}, + "Uint128_Max": {"untyped int", constant.MakeFromLiteral("340282366920938463463374607431768211455", token.INT, 0)}, + "Uint128_Min": {"untyped int", constant.MakeInt64(int64(q.Uint128_Min))}, }, }) }