--- parser3/src/include/Attic/pa_value.h	2001/02/23 14:18:26	1.19
+++ parser3/src/include/Attic/pa_value.h	2001/03/06 12:22:57	1.37
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_value.h,v 1.19 2001/02/23 14:18:26 paf Exp $
+  $Id: pa_value.h,v 1.37 2001/03/06 12:22:57 paf Exp $
 */
 
 /*
@@ -14,25 +14,28 @@
 #include "pa_array.h"
 //#include "pa_voperator.h"
 
+#define NAME_NAME "NAME"
+
 class Value;
 class VClass;
 //class VOperator;
 class Junction;
 class WContext;
+class VAliased;
 
 class Method : public Pooled {
 public:
 	const String& name;
 	Array& params_names;
 	Array& locals_names;
-	Array& code;
+	const Array& code;
 
 	Method(
 		Pool& apool,
 		const String& aname,
 		Array& aparams_names,
 		Array& alocals_names,
-		Array& acode) : 
+		const Array& acode) : 
 
 		Pooled(apool),
 		name(aname),
@@ -49,19 +52,31 @@ class Operator : public Method {
 };
 */
 
-class Method_ref {
+class Junction : public Pooled {
 public:
-	Value *self;
-	Method& method;
-};
 
-class Junction {
-	bool auto_calc;
-	Value& root;
-	Value *self;
-	Value& rcontext;
-	WContext& wcontext;
-	Array& code;
+	Junction(Pool& apool,
+		Value& aself,
+		VClass *avclass, Method *amethod,
+		Value *aroot,
+		Value *arcontext,
+		WContext *awcontext,
+		const Array *acode) : Pooled(apool),
+		
+		self(aself),
+		vclass(avclass), method(amethod),
+		root(aroot),
+		rcontext(arcontext),
+		wcontext(awcontext),
+		code(acode) {
+	}
+
+	Value& self;
+	VClass *vclass;  Method *method;
+	Value *root;
+	Value *rcontext;
+	WContext *wcontext;
+	const Array *code;
 };
 
 class Value : public Pooled {
@@ -69,7 +84,7 @@ public: // Value
 
 	// all: for error reporting after fail(), etc
 	virtual const char *type() const =0;
-	const String *name() const { return fname; }
+	/*const*/ String& name() const { return *fname; }
 
 	// string: value
 	// unknown: ""
@@ -77,59 +92,57 @@ public: // Value
 	virtual String *get_string() { return 0; }
 	
 	// string: value
-	virtual void put_string(String *astring) { failed("storing string to %s"); }
+	virtual void put_string(String *astring) { failed("storing string to '%s'"); }
 
-	// method_ref: self, method
-	virtual Method_ref *get_method_ref() { failed("extracting method reference from %s"); return 0; }
+	// string: value
+	// double: value
+	virtual double get_double() { failed("getting numerical value of '%s'"); return 0; }
 
 	// junction: auto_calc,root,self,rcontext,wcontext, code
-	virtual Junction *get_junction() { failed("getting junction from %s"); return 0; }
+	virtual Junction *get_junction() { return 0; }
 
 	// hash: (key)=value
 	// object_class: (field)=STATIC.value;(STATIC)=hash;(method)=method_ref with self=object_class
-	// object_instance: (field)=value;(STATIC)=hash;(method)=method_ref
+	// object_instance: (field)=value;(CLASS)=vclass;(method)=method_ref
 	// operator_class: (field)=value - static values only
-	// wcontext: transparent
-	// frame: my or self_transparent
-	virtual Value *get_element(const String& name) { failed("getting element from %s"); return 0; }
+	// codeframe: wcontext_transparent
+	// methodframe: my or self_transparent
+	virtual Value *get_element(const String& name) { failed("type is '%s', can not get element from it"); return 0; }
 	
 	// hash: (key)=value
 	// object_class, operator_class: (field)=value - static values only
-	// wcontext: transparent
-	// frame: my or self_transparent
-	virtual void put_element(const String& name, Value *value) { failed("putting element to %s"); }
-
-	// object_instance, object_class: method
-	// frame: transparent
-	// wcontext: transparent
-	virtual Method *get_method(const String& name) const { return 0; }
+	// object_instance: (field)=value
+	// codeframe: wcontext_transparent
+	// methodframe: my or self_transparent
+	virtual void put_element(const String& name, Value *value) { failed("type is '%s', can not put element to it"); }
 
 	// object_class, object_instance: object_class
-	// frame: transparent
-	// wcontext: transparent
+	// wcontext: none yet | transparent
 	virtual VClass *get_class() { return 0; }
 
-	// object_class: true when this class is this or derived from 'ancestor'
-	// frame: transparent
+	// valiased: this
 	// wcontext: transparent
-	virtual bool is_or_derived_from(VClass& ancestor) { failed("thoghts of ancestors of %s"); return false; }
+	// methodframe: self_transparent
+	virtual VAliased *get_aliased() { return 0; }
 
 public: // usage
 
-	Value(Pool& apool) : Pooled(apool), fname(0) {}
+	Value(Pool& apool) : Pooled(apool), fname(new(apool) String(apool)) {
+		fname->APPEND_CONST("unnamed");
+	}
 
-	void set_name(const String& aname) { fname=&aname; }
+	void set_name(String& aname) { fname=&aname; }
 
 	String& as_string() {
 		String *result=get_string(); 
 		if(!result)
-			failed("getting string of %s");
+			failed("getting string of '%s'");
 		return *result;
 	}
 
 private:
 
-	const String *fname;
+	String *fname;
 
 private: