--- parser3/src/include/Attic/pa_vobject.h	2001/03/07 13:55:46	1.10
+++ parser3/src/include/Attic/pa_vobject.h	2001/03/09 04:47:27	1.15
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_vobject.h,v 1.10 2001/03/07 13:55:46 paf Exp $
+  $Id: pa_vobject.h,v 1.15 2001/03/09 04:47:27 paf Exp $
 */
 
 #ifndef PA_VOBJECT_H
@@ -7,6 +7,7 @@
 
 #include "pa_valiased.h"
 #include "pa_vjunction.h"
+#include "pa_vclass.h"
 
 class Temp_class_alias;
 
@@ -21,15 +22,15 @@ public: // Value
 	Value *get_element(const String& name) {
 		// $CLASS=my class
 		if(name==CLASS_NAME)
-			return class_alias;
+			return fclass_alias;
 		// $BASE=my parent
 		if(name==BASE_NAME)
-			return class_alias->base();
+			return fclass_alias->base();
 		// $method=junction(self+class+method)
-		if(Junction *junction=class_real.get_junction(*this, name))
+		if(Junction *junction=fclass_real.get_junction(*this, name))
 			return NEW VJunction(*junction);;
-		// $field=fields.field
-		return static_cast<Value *>(fields.get(name));
+		// $field=ffields.field
+		return static_cast<Value *>(ffields.get(name));
 	}
 
 	// object_instance: (field)=value
@@ -41,23 +42,23 @@ public: // Value
 		//   will not check for '$method_name(subst)' trick
 		//   -same-
 
-		fields.put(name, value);
+		ffields.put(name, value);
 	}
 
 	// object_class, object_instance: object_class
-	VClass *get_class() { return &class_real; }
+	VClass *get_class() { return &fclass_real; }
 
 public: // creation
 
-	VObject(Pool& apool, VClass& vclass) : VAliased(apool, vclass), 
-		class_real(vclass),
-		fields(apool) {
+	VObject(VClass& aclass_real) : VAliased(aclass_real.pool(), aclass_real), 
+		fclass_real(aclass_real),
+		ffields(aclass_real.pool()) {
 	}
 
 private:
 
-	VClass& class_real;
-	Hash fields;
+	VClass& fclass_real;
+	Hash ffields;
 };
 
 #endif