fix merge conflict

Author: glaukiol1

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        go-version: [1.17.x, 1.16.x]
+        go-version: [1.18.x, 1.17.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.gitignore

@@ -10,5 +10,5 @@ cover.out
 /dist
 
 # tests
-builtin/testfile
-examples/embedding/embedding
+stdlib/builtin/testfile
+examples/embedding/embedding

compile/compile_test.go

@@ -10,7 +10,7 @@ package compile
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os/exec"
 	"testing"
 
@@ -118,7 +118,7 @@ func EqCodeCode(t *testing.T, name string, a, b string) {
 		t.Errorf("%s code want %q, got %q", name, a, b)
 		return
 	}
-	stdoutData, err := ioutil.ReadAll(stdout)
+	stdoutData, err := io.ReadAll(stdout)
 	if err != nil {
 		t.Fatalf("Failed to read data: %v", err)
 	}

examples/embedding/main.go

@@ -10,7 +10,7 @@ import (
 
 	// This initializes gpython for runtime execution and is essential.
 	// It defines forward-declared symbols and registers native built-in modules, such as sys and time.
-	_ "github.com/go-python/gpython/modules"
+	_ "github.com/go-python/gpython/stdlib"
 
 	// Commonly consumed gpython
 	"github.com/go-python/gpython/py"
@@ -27,8 +27,8 @@ func runWithFile(pyFile string) error {
 
 	// See type Context interface and related docs
 	ctx := py.NewContext(py.DefaultContextOpts())
-	
-	// This drives modules being able to perform cleanup and release resources 
+
+	// This drives modules being able to perform cleanup and release resources
 	defer ctx.Close()
 
 	var err error

examples/multi-context/main.go

@@ -14,7 +14,7 @@ import (
 
 	// This initializes gpython for runtime execution and is critical.
 	// It defines forward-declared symbols and registers native built-in modules, such as sys and time.
-	_ "github.com/go-python/gpython/modules"
+	_ "github.com/go-python/gpython/stdlib"
 
 	// This is the primary import for gpython.
 	// It contains all symbols needed to fully compile and run python.
@@ -129,7 +129,7 @@ func RunMultiPi(numWorkers, numTimes int) time.Duration {
 			}
 			workersRunning.Done()
 
-			// This drives modules being able to perform cleanup and release resources 
+			// This drives modules being able to perform cleanup and release resources
 			w.ctx.Close()
 		}()
 	}

go.mod

@@ -1,8 +1,16 @@
 module github.com/go-python/gpython
 
-go 1.16
+go 1.17
 
 require (
+	github.com/google/go-cmp v0.5.7
 	github.com/gopherjs/gopherwasm v1.1.0
 	github.com/peterh/liner v1.2.2
 )
+
+require (
+	github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+)

go.sum

@@ -1,14 +1,18 @@
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw=
 github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherwasm v1.0.0 h1:32nge/RlujS1Im4HNCJPp0NbBOAeBXFuT1KonUuLl+Y=
-github.com/gopherjs/gopherwasm v1.0.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
 github.com/gopherjs/gopherwasm v1.1.0 h1:fA2uLoctU5+T3OhOn2vYP0DVT6pxc7xhTlBB1paATqQ=
 github.com/gopherjs/gopherwasm v1.1.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
-github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/peterh/liner v1.1.0 h1:f+aAedNJA6uk7+6rXsYBnhdo4Xux7ESLe+kcuVUF5os=
-github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw=
 github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI=
-golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -14,10 +14,11 @@ import (
 	"runtime"
 	"runtime/pprof"
 
-	_ "github.com/go-python/gpython/modules"
 	"github.com/go-python/gpython/py"
 	"github.com/go-python/gpython/repl"
 	"github.com/go-python/gpython/repl/cli"
+
+	_ "github.com/go-python/gpython/stdlib"
 )
 
 // Globals

parser/testparser/testparser.go

@@ -7,7 +7,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -47,7 +47,7 @@ func main() {
 			_, err = parser.Lex(in, path, "exec")
 		} else if *compileFile {
 			var input []byte
-			input, err = ioutil.ReadAll(in)
+			input, err = io.ReadAll(in)
 			if err != nil {
 				log.Fatalf("Failed to read %q: %v", path, err)
 			}

py/dict.go

@@ -114,6 +114,10 @@ func (a StringDict) M__str__() (Object, error) {
 	return a.M__repr__()
 }
 
+func (a StringDict) M__len__() (Object, error) {
+	return Int(len(a)), nil
+}
+
 func (a StringDict) M__repr__() (Object, error) {
 	var out bytes.Buffer
 	out.WriteRune('{')