Make sure exception subclasses have TPFLAGS_BASE_EXC_SUBCLASS set for ExceptionClassCheck

ncw · ncw · commit 778850d11197 · 2013-11-29T09:06:34.000Z
diff --git a/notes.txt b/notes.txt
@@ -1,5 +1,7 @@
 Note byte code is from python 3.3!
 
+FIXME need to be able to tell classes an instances apart!
+
 Put C modules in sub directory
 Make an all submodule so can insert all of them easily with 
 
diff --git a/py/exception.go b/py/exception.go
@@ -19,7 +19,7 @@ type Exception struct {
 
 var (
 	// Exception heirachy
-	BaseException             = ObjectType.NewType("BaseException", "Common base class for all exceptions", ExceptionNew, nil)
+	BaseException             = ObjectType.NewTypeFlags("BaseException", "Common base class for all exceptions", ExceptionNew, nil, ObjectType.Flags|TPFLAGS_BASE_EXC_SUBCLASS)
 	SystemExit                = BaseException.NewType("SystemExit", "Request to exit from the interpreter.", nil, nil)
 	KeyboardInterrupt         = BaseException.NewType("KeyboardInterrupt", "Program interrupted by user.", nil, nil)
 	GeneratorExit             = BaseException.NewType("GeneratorExit", "Request that a generator exit.", nil, nil)
@@ -182,6 +182,9 @@ func MakeException(r interface{}) *Exception {
 // Checks that the object passed in is a class and is an exception
 func ExceptionClassCheck(err Object) bool {
 	if t, ok := err.(*Type); ok {
+		// FIXME not telling instances and classes apart
+		// properly! This could be an instance of something
+		// here
 		return t.Flags&TPFLAGS_BASE_EXC_SUBCLASS != 0
 	}
 	return false
diff --git a/py/type.go b/py/type.go
@@ -227,7 +227,7 @@ func NewTypeX(Name string, Doc string, New NewFunc, Init InitFunc) *Type {
 // Make a subclass of a type
 //
 // For making Go types
-func (t *Type) NewType(Name string, Doc string, New NewFunc, Init InitFunc) *Type {
+func (t *Type) NewTypeFlags(Name string, Doc string, New NewFunc, Init InitFunc, Flags int) *Type {
 	// inherit constructors
 	if New == nil {
 		New = t.New
@@ -242,12 +242,21 @@ func (t *Type) NewType(Name string, Doc string, New NewFunc, Init InitFunc) *Typ
 		Doc:        Doc,
 		New:        New,
 		Init:       Init,
-		Flags:      t.Flags, // FIXME not sure this is correct!
+		Flags:      Flags,
 	}
 	//tt.Ready()
 	return tt
 }
 
+// Make a subclass of a type
+//
+// For making Go types
+func (t *Type) NewType(Name string, Doc string, New NewFunc, Init InitFunc) *Type {
+	// Inherit flags from superclass
+	// FIXME not sure this is correct!
+	return t.NewTypeFlags(Name, Doc, New, Init, t.Flags)
+}
+
 // Determine the most derived metatype.
 func (metatype *Type) CalculateMetaclass(bases Tuple) *Type {
 	// Determine the proper metatype to deal with this,
