--- parser3/src/main/execute.C	2001/03/12 09:08:51	1.92
+++ parser3/src/main/execute.C	2001/03/12 21:18:01	1.97
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.92 2001/03/12 09:08:51 paf Exp $
+	$Id: execute.C,v 1.97 2001/03/12 21:18:01 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -17,6 +17,7 @@
 #include "pa_vobject.h"
 #include "pa_vdouble.h"
 #include "pa_vbool.h"
+#include "pa_vtable.h"
 
 #include <stdio.h>
 
@@ -274,7 +275,7 @@ void Request::execute(const Array& ops)
 				if(!junction)
 					THROW(0,0,
 						&value->name(),
-						"type is '%s', can not call it (must be method or junction)",
+						"(%s) uncallable, must be method or junction",
 							value->type()); 
 
 				VMethodFrame *frame=NEW VMethodFrame(pool(), *junction);
@@ -308,8 +309,11 @@ void Request::execute(const Array& ops)
 					self=rcontext; // class dynamic call
 				else // no, not me or relative of mine (total stranger)
 					if(wcontext->constructing()) {  // constructing?
-						// yes, constructor call: $some(^class:method(..))
-						self=NEW VObject(pool(), *called_class);
+						// yes, constructor call: $some[^class:method[..]]
+						if(called_class->name()==TABLE_CLASS_NAME)
+							self=NEW VTable(pool());
+						else
+							self=NEW VObject(pool(), *called_class);
 						frame->write(*self, 
 							String::Untaint_lang::NO  // not used, always an object, not string
 						);
@@ -356,7 +360,7 @@ void Request::execute(const Array& ops)
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), ~static_cast<int>(operand->get_double()));
+				Value *value=NEW VDouble(pool(), ~(int)operand->get_double());
 				PUSH(value);
 				break;
 			}
@@ -422,8 +426,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) %
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() %
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -431,8 +435,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) &
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() &
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -440,8 +444,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) |
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() |
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -449,8 +453,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) ^
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() ^
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -642,37 +646,33 @@ Value& Request::process(Value& value, co
 }
 
 char *Request::execute_static_method(VClass& vclass, String& method_name, bool return_cstr) {
-	if(Value *value=vclass.get_element(method_name)) { // found some 'METHOD_NAME' element
-		if(Junction *junction=value->get_junction()) {// it even has junction!
-			if(const Method *method=junction->method) { // and junction is method-junction! call it
-				PUSH(self);  
-				PUSH(root);  
-				PUSH(rcontext);  
-				PUSH(wcontext);
-				
-				// initialize contexts
-				root=rcontext=self=&vclass;
-				wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */);
-				
-				// execute!	
-				execute(*method->parser_code);
-				
-				// result
-				char *result;
-				if(return_cstr)
-					result=wcontext->get_string()->cstr(); // chars
-				else
-					result=0; // ignore result
-
-				wcontext=static_cast<WContext *>(POP());  
-				rcontext=POP();  
-				root=POP();  
-				self=static_cast<VAliased *>(POP());
-
-				// return
-				return result;
-			}
-		}
+	if(const Method *method=vclass.get_method(method_name)) {
+		PUSH(self);  
+		PUSH(root);  
+		PUSH(rcontext);  
+		PUSH(wcontext);
+		
+		// initialize contexts
+		root=rcontext=self=&vclass;
+		wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */);
+		
+		// execute!	
+		execute(*method->parser_code);
+		
+		// result
+		char *result;
+		if(return_cstr)
+			result=wcontext->get_string()->cstr(); // chars
+		else
+			result=0; // ignore result
+		
+		wcontext=static_cast<WContext *>(POP());  
+		rcontext=POP();  
+		root=POP();  
+		self=static_cast<VAliased *>(POP());
+		
+		// return
+		return result;
 	}
 	return 0;
 }