--- parser3/src/main/pa_request.C 2001/03/12 13:13:21 1.18 +++ parser3/src/main/pa_request.C 2001/03/13 18:32:47 1.29 @@ -3,9 +3,11 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.18 2001/03/12 13:13:21 paf Exp $ + $Id: pa_request.C,v 1.29 2001/03/13 18:32:47 paf Exp $ */ +#include + #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_common.h" @@ -17,38 +19,65 @@ #include -Request::Request(Pool& apool) : Pooled(apool), +Request::Request(Pool& apool, + String::Untaint_lang alang, + char *adocument_root, + char *apage_filespec) : Pooled(apool), stack(apool), root_class(apool), env_class(apool), + form_class(apool), fclasses(apool), - fclasses_array(apool), - flang(String::Untaint_lang::HTML_TYPO) + flang(alang), + fdocument_root(adocument_root), + fpage_filespec(apage_filespec) { - // root class - initialize_root_class(pool(), root_class); - // adding root superclass, + // root superclass, // parent of all classes, // operators holder + initialize_root_class(pool(), root_class); classes().put(*root_class_name, &root_class); - //root_class.set_name(*root_class_name); + // table class + classes().put(*table_class_name, table_class); +// table_class->set_name(*table_class_name); // env class - initialize_env_class(pool(), env_class); classes().put(*env_class_name, &env_class); - - // table class - classes().put(*table_class_name, table_class); - table_class->set_name(*table_class_name); + // form class + classes().put(*form_class_name, &form_class); } -void Request::core() { +char *Request::core(const char *sys_auto_path1, + const char *sys_auto_path2) { + char *result; + VStateless_class *main_class=0; TRY { - // loading system auto.p - char *sys_auto_file="C:\\temp\\auto.p"; - VClass *main_class=use_file( - sys_auto_file, false/*ignore possible read problem*/, - 0/*new class*/, main_class_name); + char *auto_filespec=(char *)malloc(MAX_STRING); + + // load MAIN class, + // it consists of all the auto.p files we'd manage to find + // plus + // the file user requested us to process + // all located classes become children of one another, + // composing class we name 'MAIN' + + // loading system auto.p 1 + if(sys_auto_path1) { + strncpy(auto_filespec, MAX_STRING-strlen(AUTO_FILE_NAME), sys_auto_path1); + strcat(auto_filespec, AUTO_FILE_NAME); + main_class=use_file( + auto_filespec, false/*ignore possible read problem*/, + main_class_name); + } + + // loading system auto.p 2 + if(sys_auto_path2) { + strncpy(auto_filespec, MAX_STRING-strlen(AUTO_FILE_NAME), sys_auto_path2); + strcat(auto_filespec, AUTO_FILE_NAME); + VStateless_class *main_class=use_file( + auto_filespec, false/*ignore possible read problem*/, + main_class_name); + } // TODO: использовать $MAIN:limits здесь, пока их не сломали враги @@ -56,84 +85,110 @@ void Request::core() { char *site_auto_file="Y:\\parser3\\src\\auto.p"; main_class=use_file( site_auto_file, false/*ignore possible read problem*/, - 0/*new class*/, main_class_name, main_class); + main_class_name, main_class); // there must be some auto.p if(!main_class) THROW(0,0, 0, - "'auto.p' not found"); + "no 'auto.p' found (nither system nor any site's)"); // compiling requested file - char *test_file="Y:\\parser3\\src\\test.p"; - use_file(test_file, true/*don't ignore read problem*/, - 0/*new class*/, main_class_name, main_class); - - // executing some @main[] - char *result=execute_MAIN(); - printf("result-----------------\n%sEOF----------------\n", result); + main_class=use_file(fpage_filespec, true/*don't ignore read problem*/, + main_class_name, main_class); + + // execute @main[] + result=execute_method(*main_class, *main_method_name, + true /*result needed*/); + if(!result) + THROW(0,0, + 0, + "'"MAIN_METHOD_NAME"' method not found"); } CATCH(e) { - printf("\nERROR: "); + // we're returning not result, but error explanation + result=(char *)malloc(MAX_STRING); + result[0]=0; + size_t printed=0; + const String *problem_source=e.problem_source(); -#ifndef NO_STRING_ORIGIN if(problem_source) { +#ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) - printf("%s(%d): ", - origin.file, 1+origin.line); - printf("'%s' ", + printed+=snprintf(result+printed, MAX_STRING-printed, "%s(%d): ", + origin.file, 1+origin.line); +#endif + printed+=snprintf(result+printed, MAX_STRING-printed, "'%s' ", problem_source->cstr()); } -#endif - printf("%s", e.comment()); + printed+=snprintf(result+printed, MAX_STRING-printed, "%s", + e.comment()); const String *type=e.type(); if(type) { - printf(" type: %s", type->cstr()); + printed+=snprintf(result+printed, MAX_STRING-printed, " type: %s", + type->cstr()); const String *code=e.code(); if(code) - printf(", code: %s", code->cstr()); + printed+=snprintf(result+printed, MAX_STRING-printed, ", code: %s", + code->cstr()); } - printf("\n"); } END_CATCH + + return result; } -VClass *Request::use_file( - const char *file, bool fail_on_read_problem, - VClass *aclass, const String *name, - VClass *base_class) { +VStateless_class *Request::use_file( + const char *file, bool fail_on_read_problem, + const String *name, + VStateless_class *base_class) { // TODO: обнаружить|решить cyclic dependences char *source=file_read(pool(), file, fail_on_read_problem); if(!source) return base_class; - return use_buf(source, file, aclass, name, base_class); + return use_buf(source, file, 0/*new class*/, name, base_class); } -VClass *Request::use_buf( - const char *source, const char *file, - VClass *aclass, const String *name, - VClass *base_class) { +VStateless_class *Request::use_buf( + const char *source, const char *file, + VStateless_class *aclass, const String *name, + VStateless_class *base_class) { // compile loaded class - VClass& cclass=COMPILE(source, aclass, name, base_class, file); + VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file); // locate and execute possible @auto[] static method - execute_static_method(cclass, *auto_method_name, false /*no result needed*/); + execute_method(cclass, *auto_method_name, false /*no result needed*/); return &cclass; } -char *Request::execute_MAIN() { - // locate class with @main[] & execute it - for(int i=classes_array().size(); --i>=0;) { - VClass *vclass=static_cast(classes_array().get(i)); - char *result=execute_static_method(*vclass, *main_method_name, true /*result needed*/); - if(result) - return result; - } - - THROW(0,0, - 0, - "'"MAIN_METHOD_NAME"' method not found"); - return 0; +void Request::fail_if_junction_(bool is, + Value& value, const String& method_name, char *msg) { + + // fail_if_junction(true, junction = fail + // fail_if_junction(false, not junction = fail + if((value.get_junction()!=0) ^ !is) + THROW(0, 0, + &method_name, + msg); +} + +char *Request::relative(const char *path, const char *file) { + char *result=(char *)malloc(strlen(path)+strlen(file)+1); + strcpy(result, path); + rsplit(result,'/'); + strcat(result, "/"); + strcat(result, file); + return result; +} + +char *Request::absolute(const char *name) { + if(name[0]=='/') { + char *result=(char *)malloc(strlen(fdocument_root)+strlen(name)+1); + strcpy(result, fdocument_root); + strcat(result, name); + return result; + } else + return relative(fpage_filespec, name); }