--- parser3/src/include/Attic/pa_vobject.h	2001/02/24 14:17:08	1.2
+++ parser3/src/include/Attic/pa_vobject.h	2001/03/09 04:47:27	1.15
@@ -1,65 +1,64 @@
 /*
-  $Id: pa_vobject.h,v 1.2 2001/02/24 14:17:08 paf Exp $
+  $Id: pa_vobject.h,v 1.15 2001/03/09 04:47:27 paf Exp $
 */
 
 #ifndef PA_VOBJECT_H
 #define PA_VOBJECT_H
 
-#include "pa_value.h"
+#include "pa_valiased.h"
 #include "pa_vjunction.h"
+#include "pa_vclass.h"
 
-class VObject : public Value {
+class Temp_class_alias;
+
+class VObject : public VAliased {
+	friend Temp_class_alias;
 public: // Value
 	
 	// all: for error reporting after fail(), etc
-	const char *type() const { return "Object"; }
+	const char *type() const { return "object"; }
 
-	// object_instance: (field)=value;(STATIC)=hash;(method)=method_ref
+	// object_instance: (field)=value;(CLASS)=vclass;(method)=method_ref
 	Value *get_element(const String& name) {
-		// $STATIC=STATIC hash
-		if(name==STATIC_NAME)
-			return &vclass.STATICS;
-
-		// $method=junction(this+method)
-		if(Method *method=static_cast<Method *>(vclass.methods.get(name))) {
-			Junction& j=*NEW Junction(pool(), 
-				*this,
-				method,0,0,0,0);
-
-			return NEW VJunction(j);
-		}
-
-		// $field=fields.field
-		return static_cast<Value *>(fields.get(name));
+		// $CLASS=my class
+		if(name==CLASS_NAME)
+			return fclass_alias;
+		// $BASE=my parent
+		if(name==BASE_NAME)
+			return fclass_alias->base();
+		// $method=junction(self+class+method)
+		if(Junction *junction=fclass_real.get_junction(*this, name))
+			return NEW VJunction(*junction);;
+		// $field=ffields.field
+		return static_cast<Value *>(ffields.get(name));
 	}
 
 	// object_instance: (field)=value
 	void put_element(const String& name, Value *value) {
 		// speed1:
-		//   will not check for '$STATIC(subst)' trick
+		//   will not check for '$CLASS(subst)' trick
 		//   will hope that user ain't THAT self-hating person
 		// speed2:
 		//   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 &vclass; }
+	VClass *get_class() { return &fclass_real; }
 
 public: // creation
 
-	VObject(Pool& apool, VClass& vclass) : 
-		Value(apool), 
-		vclass(vclass),
-		fields(apool) {
+	VObject(VClass& aclass_real) : VAliased(aclass_real.pool(), aclass_real), 
+		fclass_real(aclass_real),
+		ffields(aclass_real.pool()) {
 	}
 
 private:
 
-	VClass& vclass;
-	Hash fields;
+	VClass& fclass_real;
+	Hash ffields;
 };
 
 #endif