More work on basic types

Author: ncw

marshal/marshal.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/ncw/gpython/py"
 	"io"
+	"math/big"
 	"strconv"
 )
 
@@ -160,9 +161,16 @@ func ReadObject(r io.Reader) (obj py.Object, err error) {
 			// FIXME should be ValueError
 			return nil, errors.New("bad marshal data (digit out of range in long)")
 		}
-		// FIXME actually convert into something...
+		// Convert into a big.Int
+		r := new(big.Int)
+		t := new(big.Int)
+		for _, digit := range digits {
+			r.Lsh(r, 15)
+			t.SetInt64(int64(digit))
+			r.Add(r, t)
+		}
 		// FIXME try to fit into int64 if possible
-		return digits, nil
+		return (*py.BigInt)(r), nil
 	case TYPE_STRING, TYPE_INTERNED, TYPE_UNICODE:
 		var size int32
 		err = binary.Read(r, binary.LittleEndian, &size)

py/code.go

@@ -30,6 +30,16 @@ type Code struct {
 	weakreflist Object // to support weakrefs to code objects
 }
 
+var CodeType = NewType("code")
+
+// Type of this object
+func (o *Code) Type() *Type {
+	return CodeType
+}
+
+// Make sure it satisfies the interface
+var _ Object = (*Code)(nil)
+
 const (
 	// Masks for flags above
 	CO_OPTIMIZED   = 0x0001
@@ -88,7 +98,7 @@ func NewCode(argcount int32, kwonlyargcount int32,
 	code Object, consts_ Object, names_ Object,
 	varnames_ Object, freevars_ Object, cellvars_ Object,
 	filename_ Object, name_ Object, firstlineno int32,
-	lnotab_ Object) (co *Code) {
+	lnotab_ Object) *Code {
 
 	var cell2arg *byte
 

py/py.go

@@ -1,8 +1,14 @@
 // Python global definitions
 package py
 
+import (
+	"math/big"
+)
+
 // A python object
-type Object interface{}
+type Object interface {
+	Type() *Type
+}
 
 // Some well known objects
 var (
@@ -12,13 +18,86 @@ var (
 // Some python types
 // FIXME factor into own files probably
 
+var TupleType = NewType("tuple")
+
 type Tuple []Object
+
+// Type of this Tuple object
+func (o Tuple) Type() *Type {
+	return TupleType
+}
+
+var ListType = NewType("list")
+
 type List []Object
+
+// Type of this List object
+func (o List) Type() *Type {
+	return ListType
+}
+
+var BytesType = NewType("bytes")
+
 type Bytes []byte
 
+// Type of this Bytes object
+func (o Bytes) Type() *Type {
+	return BytesType
+}
+
+var Int64Type = NewType("int64")
+
 type Int64 int64
+
+// Type of this Int64 object
+func (o Int64) Type() *Type {
+	return Int64Type
+}
+
+var Float64Type = NewType("float64")
+
 type Float64 float64
+
+// Type of this Float64 object
+func (o Float64) Type() *Type {
+	return Float64Type
+}
+
+var Complex64Type = NewType("complex64")
+
 type Complex64 complex64
 
+// Type of this Complex64 object
+func (o Complex64) Type() *Type {
+	return Complex64Type
+}
+
+var DictType = NewType("dict")
+
 type Dict map[Object]Object
+
+// Type of this Dict object
+func (o Dict) Type() *Type {
+	return DictType
+}
+
+var SetType = NewType("set")
+
 type Set map[Object]struct{}
+
+// Type of this Set object
+func (o Set) Type() *Type {
+	return SetType
+}
+
+type BigInt big.Int
+
+var BigIntType = NewType("bigint")
+
+// Type of this BigInt object
+func (o *BigInt) Type() *Type {
+	return BigIntType
+}
+
+// Make sure it satisfies the interface
+var _ Object = (*BigInt)(nil)

py/string.go

@@ -8,6 +8,13 @@ import (
 
 type String string
 
+var StringType = NewType("string")
+
+// Type of this object
+func (s String) Type() *Type {
+	return StringType
+}
+
 // Intern s possibly returning a reference to an already interned string
 func (s String) Intern() String {
 	fmt.Printf("FIXME interning %q\n", s)

py/type.go

@@ -3,9 +3,8 @@
 package py
 
 type Type struct {
+	name string // For printing, in format "<module>.<name>"
 	/*
-	   PyObject_VAR_HEAD
-	   const char *tp_name; // For printing, in format "<module>.<name>"
 	   Py_ssize_t tp_basicsize, tp_itemsize; // For allocation
 
 	   // Methods to implement standard operations
@@ -84,3 +83,20 @@ type Type struct {
 	   destructor tp_finalize;
 	*/
 }
+
+var TypeType = NewType("type")
+
+// Type of this object
+func (o *Type) Type() *Type {
+	return TypeType
+}
+
+// Make a new type from a name
+func NewType(name string) *Type {
+	return &Type{
+		name: name,
+	}
+}
+
+// Make sure it satisfies the interface
+var _ Object = (*Type)(nil)