--- a/MessageNode.st	Fri Oct 28 04:11:50 1994 +0100
+++ b/MessageNode.st	Sat Nov 05 01:03:31 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.12 1994-10-28 03:11:17 claus Exp $
+$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.13 1994-11-05 00:03:31 claus Exp $
 '!
 
 !MessageNode class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.12 1994-10-28 03:11:17 claus Exp $
+$Header: /cvs/stx/stx/libcomp/MessageNode.st,v 1.13 1994-11-05 00:03:31 claus Exp $
 "
 !
 
@@ -466,7 +466,8 @@
 
     receiver isSuper ifTrue:[
 	r := receiver value.
-	class := receiver definingClass superclass.
+"/	class := receiver definingClass superclass.
+	class := receiver searchClass.
 	argArray notNil ifTrue:[
 	    argValueArray := argArray collect:[:arg | arg evaluate].
 	] ifFalse:[
@@ -504,7 +505,8 @@
 
     receiver isSuper ifTrue:[
 	r := receiver value.
-	class := receiver definingClass superclass.
+"/	class := receiver definingClass superclass.
+	class := receiver searchClass.
 	argArray notNil ifTrue:[
 	    argValueArray := argArray collect:[:arg | arg evaluate].
 	] ifFalse:[
@@ -1015,7 +1017,7 @@
 
     "can we use a send-bytecode ?"
     isBuiltIn ifTrue:[
-	(receiver type == #Super) ifFalse:[
+	receiver isSuper ifFalse:[
 	    receiver codeOn:aStream inBlock:b.
 	    (nargs > 0) ifTrue:[
 		(argArray at:1) codeOn:aStream inBlock:b.
@@ -1054,7 +1056,7 @@
 	    arg codeOn:aStream inBlock:b
 	]
     ].
-    (receiver type == #Super) ifTrue:[
+    receiver isSuper ifTrue:[
 	aStream nextPut:#superSend.
 	aStream nextPut:lineNr.
 	aStream nextPut:selector.
@@ -1173,7 +1175,7 @@
 
     "can we use a send-bytecode ?"
     isBuiltIn ifTrue:[
-	(receiver type == #Super) ifFalse:[
+	receiver isSuper ifFalse:[
 	    (nargs > 0) ifTrue:[
 		(argArray at:1) codeOn:aStream inBlock:b.
 		(nargs > 1) ifTrue:[
@@ -1197,7 +1199,7 @@
 	]
     ].
 
-    (receiver type == #Super) ifTrue:[
+    receiver isSuper ifTrue:[
 	aStream nextPut:#superSend.
 	aStream nextPut:lineNr.
 	aStream nextPut:selector.
@@ -1295,7 +1297,7 @@
 
     "can we use a send-bytecode ?"
     isBuiltIn ifTrue:[
-	(receiver type == #Super) ifFalse:[
+	receiver isSuper ifFalse:[
 	    (nargs > 0) ifTrue:[
 		(argArray at:1) codeOn:aStream inBlock:b.
 		(nargs > 1) ifTrue:[
@@ -1315,7 +1317,7 @@
 	    arg codeOn:aStream inBlock:b
 	]
     ].
-    (receiver type == #Super) ifTrue:[
+    receiver isSuper ifTrue:[
 	aStream nextPut:#superSend.
 	aStream nextPut:lineNr.
 	aStream nextPut:selector.