vm, builtin, py: locals(), globals() and builtin fixes

 * builtin: Implement locals(), globals() and fix __import__() * builtin: Fix ord() * builtin: Tests * py: frame: add FastToLocals and LocalsToFast * vm: Use the above in IMPORT_STAR * vm: Implementation for locals(), globals() and call for __import__

Author: ncw

builtin/builtin.go

@@ -18,7 +18,7 @@ Noteworthy: None is the 'nil' object; Ellipsis represents '...' in slices.`
 funcinit(){
 methods:= []*py.Method{
 py.NewMethod("__build_class__", builtin___build_class__, 0, build_class_doc),
-py.NewMethod("__import__", builtin___import__, 0, import_doc),
+py.NewMethod("__import__", py.InternalMethodImport, 0, import_doc),
 py.NewMethod("abs", builtin_abs, 0, abs_doc),
 // py.NewMethod("all", builtin_all, 0, all_doc),
 // py.NewMethod("any", builtin_any, 0, any_doc),
@@ -34,7 +34,7 @@ func init(){
 // py.NewMethod("exec", builtin_exec, 0, exec_doc),
 // py.NewMethod("format", builtin_format, 0, format_doc),
 py.NewMethod("getattr", builtin_getattr, 0, getattr_doc),
-// py.NewMethod("globals", builtin_globals, py.METH_NOARGS, globals_doc),
+py.NewMethod("globals", py.InternalMethodGlobals, 0, globals_doc),
 py.NewMethod("hasattr", builtin_hasattr, 0, hasattr_doc),
 // py.NewMethod("hash", builtin_hash, 0, hash_doc),
 // py.NewMethod("hex", builtin_hex, 0, hex_doc),
@@ -44,7 +44,7 @@ func init(){
 // py.NewMethod("issubclass", builtin_issubclass, 0, issubclass_doc),
 // py.NewMethod("iter", builtin_iter, 0, iter_doc),
 py.NewMethod("len", builtin_len, 0, len_doc),
-// py.NewMethod("locals", builtin_locals, py.METH_NOARGS, locals_doc),
+py.NewMethod("locals", py.InternalMethodLocals, 0, locals_doc),
 // py.NewMethod("max", builtin_max, 0, max_doc),
 // py.NewMethod("min", builtin_min, 0, min_doc),
 py.NewMethod("next", builtin_next, 0, next_doc),
@@ -351,21 +351,6 @@ fromlist is not empty. Level is used to determine whether to perform
 absolute or relative imports. 0 is absolute while a positive number
 is the number of parent directories to search relative to the current module.`
 
-funcbuiltin___import__(self py.Object, args py.Tuple, kwargs py.StringDict) py.Object{
-kwlist:= []string{"name", "globals", "locals", "fromlist", "level"}
-varname py.Object
-varglobals py.Object=py.NewStringDict()
-varlocals py.Object=py.NewStringDict()
-varfromlist py.Object= py.Tuple{}
-varlevel py.Object=py.Int(0)
-
-py.ParseTupleAndKeywords(args, kwargs, "U|OOOi:__import__", kwlist, &name, &globals, &locals, &fromlist, &level)
-iffromlist==py.None{
-fromlist= py.Tuple{}
- }
-returnpy.ImportModuleLevelObject(string(name.(py.String)), globals.(py.StringDict), locals.(py.StringDict), fromlist.(py.Tuple), int(level.(py.Int)))
-}
-
 constord_doc=`ord(c) -> integer
 
 Return the integer ordinal of a one-character string.`
@@ -375,13 +360,13 @@ func builtin_ord(self, obj py.Object) py.Object{
 switchx:=obj.(type){
 case py.Bytes:
 size=len(x)
-iflen(x)==1{
+ifsize==1{
 returnpy.Int(x[0])
  }
 case py.String:
-varrunerune
-rune, size=utf8.DecodeRuneInString(string(x))
-iflen(x)==size&&rune!=utf8.RuneError{
+size=len(x)
+rune, runeSize:=utf8.DecodeRuneInString(string(x))
+ifsize==runeSize&&rune!=utf8.RuneError{
 returnpy.Int(rune)
  }
 //case py.ByteArray:
@@ -396,7 +381,7 @@ func builtin_ord(self, obj py.Object) py.Object{
 panic(py.ExceptionNewf(py.TypeError, "ord() expected string of length 1, but %s found", obj.Type().Name))
  }
 
-panic(py.ExceptionNewf(py.TypeError, "ord() expected a character, but string of length %zd found", size))
+panic(py.ExceptionNewf(py.TypeError, "ord() expected a character, but string of length %d found", size))
 }
 
 constgetattr_doc=`getattr(object, name[, default]) -> value
@@ -575,3 +560,11 @@ func builtin_chr(self py.Object, args py.Tuple) py.Object{
 n:=utf8.EncodeRune(buf, rune(x))
 returnpy.String(buf[:n])
 }
+
+constlocals_doc=`locals() -> dictionary
+
+Update and return a dictionary containing the current scope's local variables.`
+
+constglobals_doc=`globals() -> dictionary
+
+Return the dictionary containing the current scope's global variables.`

builtin/builtin_test.go

@@ -0,0 +1,11 @@
+package builtin_test
+
+import (
+"testing"
+
+"github.com/ncw/gpython/pytest"
+)
+
+funcTestVm(t*testing.T){
+pytest.RunTests(t, "tests")
+}

builtin/tests/builtin.py

@@ -0,0 +1,133 @@
+doc="abs"
+assertabs(0) ==0
+assertabs(10) ==10
+assertabs(-10) ==10
+
+doc="chr"
+assertchr(65) =="A"
+assertchr(163) =="£"
+assertchr(0x263A) =="☺"
+
+doc="compile"
+code=compile("pass", "<string>", "exec")
+# FIXME
+
+doc="getattr"
+classC:
+def__init__(self):
+self.potato=42
+c=C()
+assertgetattr(c, "potato") ==42
+assertgetattr(c, "potato", 43) ==42
+assertgetattr(c, "sausage", 43) ==43
+
+doc="globals"
+a=1
+assertglobals()["a"] ==1
+
+doc="hasattr"
+asserthasattr(c, "potato")
+assertnothasattr(c, "sausage")
+
+doc="len"
+assertlen(()) ==0
+assertlen((1,2,3)) ==3
+assertlen("hello") ==5
+assertlen("£☺") ==2
+
+doc="locals"
+deffn(x):
+print(locals())
+assertlocals()["x"] ==1
+fn(1)
+
+doc="next no default"
+defgen():
+yield1
+yield2
+g=gen()
+assertnext(g) ==1
+assertnext(g) ==2
+ok=False
+try:
+next(g)
+exceptStopIteration:
+ok=True
+assertok, "StopIteration not raised"
+
+doc="next with default"
+g=gen()
+assertnext(g, 42) ==1
+assertnext(g, 42) ==2
+assertnext(g, 42) ==42
+assertnext(g, 42) ==42
+
+doc="next no default with exception"
+defgen2():
+yield1
+raiseValueError("potato")
+g=gen2()
+assertnext(g) ==1
+ok=False
+try:
+next(g)
+exceptValueError:
+ok=True
+assertok, "ValueError not raised"
+
+doc="next with default and exception"
+g=gen2()
+assertnext(g, 42) ==1
+ok=False
+try:
+next(g)
+exceptValueError:
+ok=True
+assertok, "ValueError not raised"
+
+doc="ord"
+assert65==ord("A")
+assert163==ord("£")
+assert0x263A==ord("☺")
+assert65==ord(b"A")
+ok=False
+try:
+ord("AA")
+exceptTypeErrorase:
+ife.args[0] !="ord() expected a character, but string of length 2 found":
+raise
+ok=True
+assertok, "TypeError not raised"
+try:
+ord(None)
+exceptTypeErrorase:
+ife.args[0] !="ord() expected string of length 1, but NoneType found":
+raise
+ok=True
+assertok, "TypeError not raised"
+
+doc="pow"
+assertpow(2, 10) ==1024
+# FIXME assert pow(2, 10, 17) == 4
+
+doc="print"
+# FIXME
+
+doc="round"
+assertround(1.1) ==1.0
+
+doc="setattr"
+classC: pass
+c=C()
+assertnothasattr(c, "potato")
+setattr(c, "potato", "spud")
+assertgetattr(c, "potato") =="spud"
+assertc.potato=="spud"
+
+doc="__import__"
+lib=__import__("lib")
+assertlib.libfn() ==42
+assertlib.libvar==43
+assertlib.libclass().method() ==44
+
+doc="finished"

builtin/tests/lib.py

@@ -0,0 +1,12 @@
+# Some targets to be imported
+
+deflibfn():
+return42
+
+libvar=43
+
+classlibclass:
+defmethod(self):
+return44
+
+_libprivate=45

notes.txt

@@ -16,6 +16,15 @@ Make a gpython-minimal with no built in stdlib
 
 Bytecode compile the standard library and embed into go files - can then make a gpython with no external files.
 
+NB Would probably be a lot quicker to define
+
+Arg struct{
+ Name string
+ Value Object
+}
+
+And pass args using []Arg instead of StringDict
+
 Testing
 =======