--- a/PrimaryNode.st	Tue Apr 19 16:31:12 2005 +0200
+++ b/PrimaryNode.st	Tue Apr 19 16:41:28 2005 +0200
@@ -88,14 +88,38 @@
 
 !PrimaryNode methodsFor:'queries'!
 
+isArgument
+    ^ false
+!
+
+isClassVariable
+    ^ false
+!
+
+isInstanceVariable
+    ^ false
+!
+
+isLocal
+    ^ false
+!
+
+isMethodArg
+    ^ false
+!
+
 isPrimary
     "return true, if this is a node for a primary (i.e. non-send)"
 
     ^ true
+!
+
+isUndeclared
+    ^ false
 ! !
 
 !PrimaryNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/PrimaryNode.st,v 1.23 2004-06-30 15:30:53 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/PrimaryNode.st,v 1.24 2005-04-19 14:41:28 cg Exp $'
 ! !

--- a/StatementNode.st	Tue Apr 19 16:31:12 2005 +0200
+++ b/StatementNode.st	Tue Apr 19 16:41:28 2005 +0200
@@ -180,7 +180,7 @@
     this := self.
     [this notNil] whileTrue:[
         expr := this expression.
-        stats add:expr.
+        stats add:(expr ? this).
         this := this nextStatement
     ].
     ^ anEnumerator doSequence:self temporaries:#() statements:stats
@@ -275,5 +275,5 @@
 !StatementNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/StatementNode.st,v 1.30 2005-04-19 14:31:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/StatementNode.st,v 1.31 2005-04-19 14:41:21 cg Exp $'
 ! !