--- parser3/src/main/Attic/core.C	2001/02/23 17:12:58	1.29
+++ parser3/src/main/Attic/core.C	2001/03/10 15:44:31	1.51
@@ -1,93 +1,29 @@
 /*
-$Id: core.C,v 1.29 2001/02/23 17:12:58 paf Exp $
+$Id: core.C,v 1.51 2001/03/10 15:44:31 paf Exp $
 */
 
+#include "core.h"
+#include "classes/_string.h"
+#include "classes/_double.h"
+#include "classes/_int.h"
 #include "pa_request.h"
-#include "pa_wwrapper.h"
-#include "pa_common.h"
-#include "pa_vclass.h"
 
-#include <stdio.h>
+String *unnamed_name;
+String *empty_string;
+String *auto_method_name;
+String *main_method_name;
 
 void core() {
 	Pool pool;
+	unnamed_name=new(pool) String(pool); unnamed_name->APPEND_CONST("unnamed");
+	empty_string=new(pool) String(pool); 
+	auto_method_name=new(pool) String(pool);  auto_method_name->APPEND_CONST(AUTO_METHOD_NAME);
+	main_method_name=new(pool) String(pool);  main_method_name->APPEND_CONST(MAIN_METHOD_NAME);
+
+	initialize_string_class(pool, *(string_class=new(pool) VClass(pool)));
+	initialize_double_class(pool, *(double_class=new(pool) VClass(pool)));
+	initialize_int_class(pool, *(int_class=new(pool) VClass(pool)));
 	Request request(pool);
 	request.core();
 }
 
-void Request::core() {
-	TRY {
-		String name_RUN(pool()); name_RUN.APPEND_CONST("RUN");
-		char *result=execute_MAIN(construct_class(name_RUN, load_and_compile_RUN()));
-		printf("-----------------\n%s\n----------------\n", result);
-	} 
-	CATCH(e) {
-		printf("error occured: %s\n", e.comment());
-		const String *type=e.type();
-		if(type) {
-			printf("  type: %s", type->cstr());
-			const String *code=e.code();
-			if(code)
-				printf(", code: %s", code->cstr());
-			printf("\n");
-		}
-		const String *problem_source=e.problem_source();
-		if(problem_source) {
-			const Origin& origin=problem_source->origin();
-			printf("  '%s'\n", 
-				problem_source->cstr());
-			if(origin.file)
-				printf(" [%s:%d]",
-				origin.file, 1+origin.line);
-			printf("\n");
-		}
-	}
-	END_CATCH
-}
-
-Array& Request::load_and_compile_RUN() {
-	char *file="Y:\\parser3\\src\\test.p";
-	char *source=file_read(pool(), file);
-	Array& compiled_methods=COMPILE(source, file);
-	return compiled_methods;
-}
-
-VClass *Request::construct_class(String& name, Array& compiled_methods) {
-	// create new 'name' vclass, add it to request's classes
-	Array immediate_parents(pool());
-	// TODO: immediate_parents=@PARENTS
-
-	VClass *result=NEW VClass(pool(), name, immediate_parents);
-	result->set_name(name);
-	classes().put(name, result);
-		
-	for(int i=0; i<compiled_methods.size(); i++) {
-		// TODO: filter out @PARENTS & @CLASS & ?co?
-		Method &method=*static_cast<Method *>(compiled_methods.quick_get(i));
-		result->add_method(method.name, method);
-	}
-
-	return result;
-}
-
-char *Request::execute_MAIN(VClass *class_RUN) {
-	// initialize contexts
-	root=self=rcontext=class_RUN;
-	wcontext=NEW WWrapper(pool(), class_RUN);
-
-	// locate @main code
-	String name_main(pool());
-	name_main.APPEND_CONST(MAIN_METHOD_NAME);
-
-	Method *method_main=class_RUN->get_method(name_main);
-	if(!method_main)
-		THROW(0,0,
-			&class_RUN->name(),
-			"no '"MAIN_METHOD_NAME"' method in class");
-
-	// execute!	
-	execute(method_main->code);
-
-	// return chars
-	return wcontext->get_string()->cstr();
-}