--- parser3/src/main/compile_tools.h 2003/09/24 14:32:06 1.68.4.1 +++ parser3/src/main/compile_tools.h 2009/05/19 08:41:45 1.85 @@ -1,14 +1,14 @@ /** @file Parser: compiler support helper functions decls. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef COMPILE_TOOLS #define COMPILE_TOOLS -static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/09/24 14:32:06 $"; +static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2009/05/19 08:41:45 $"; #include "pa_opcode.h" #include "pa_types.h" @@ -43,9 +43,9 @@ enum lexical_state { }; struct Pos { - uint line; - uint col; - //Pos(uint aline, uint acol): line(aline), col(acol) {} + int line; + int col; + Pos(int aline, int acol): line(aline), col(acol) {} Pos(): line(0), col(0) {} void clear() { line=col=0; } @@ -62,6 +62,8 @@ public: /// @name input Request& request; VStateless_class* cclass; + VStateless_class* cclass_new; + ArrayClass* cclasses; const char* source; uint file_no; Pos pos; @@ -80,6 +82,8 @@ public: int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state bool in_call_value; + bool explicit_result; + bool append; //@} /// output: filled input 'methods' and 'error' if any @@ -88,30 +92,78 @@ public: Parse_control(Request& arequest, VStateless_class* aclass, const char* asource, const String* amain_alias, - uint afile_no): + uint afile_no, + int line_no_offset): + main_alias(amain_alias), + last_line_end_col(0), + request(arequest), // input // we were told the class to compile to? cclass(aclass), // until changed with @CLASS would consider operators loading - - source(asource), main_alias(amain_alias), - + cclass_new(0), + cclasses(new ArrayClass(1)), + source(asource), file_no(afile_no), - last_line_end_col(0), + pos(line_no_offset, 0), // initialize state trim_bof(true), pending_state(0), ls(LS_USER), ls_sp(0), - in_call_value(false) {} + in_call_value(false), + explicit_result(false), + append(false) { + + *cclasses+=aclass; + } + + void class_add(){ + if(cclass_new){ + cclass=cclass_new; + // append to request's classes + request.classes().put(cclass->name(), cclass); + *cclasses+=cclass; + cclass_new=0; + append=false; + } + } + + VStateless_class* get_existed_class(VStateless_class* aclass){ + if(aclass){ + if(Value* class_value=request.classes().get(aclass->name())){ + return class_value->get_class(); + } + } + return 0; + } + + bool reuse_existed_class(VStateless_class* aclass){ + if(aclass->is_partial()){ + cclass=aclass; + cclass_new=0; + append=true; + return true; + } else { + return false; + } + } + + void set_all_vars_local(){ + if(cclass_new){ + cclass_new->set_all_vars_local(); + } else { + cclass->set_all_vars_local(); + } + } void pos_next_line() { pos.line++; last_line_end_col=pos.col; pos.col=0; } - void pos_next_c(char c) { + void pos_next_c(int c) { if(c=='\t') pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1); else @@ -136,7 +188,7 @@ inline ArrayOperation* N() { } /// Assembler instruction // append ordinary instruction to ops -inline void O(ArrayOperation& result, OPCODE code) { +inline void O(ArrayOperation& result, OP::OPCODE code) { result+=Operation(code); } @@ -149,8 +201,13 @@ inline void P(ArrayOperation& result, Ar result.append(code_array, offset); } +/// aPpend part of 'code_array', starting from offset, to 'result' +inline void P(ArrayOperation& result, ArrayOperation& code_array, int offset, int limit) { + result.append(code_array, offset, limit); +} + /// append cOde Array -inline void OA(ArrayOperation& result, OPCODE code, ArrayOperation* code_array) { +inline void OA(ArrayOperation& result, OP::OPCODE code, ArrayOperation* code_array) { result+=Operation(code); // append OP_CODE result+=Operation(code_array); // append 'code_array' } @@ -166,7 +223,7 @@ inline ArrayOperation* VL(Value* value, ArrayOperation& result=*N(); // append 'value' to 'result' - result+=Operation(OP_VALUE); + result+=Operation(OP::OP_VALUE); result+=Operation(file_no, line, col); // append origin result+=Operation(value); // append 'value' @@ -174,25 +231,35 @@ inline ArrayOperation* VL(Value* value, } /// Literal Array to(2) Value @return Value from literal Array OP+origin+Value -Value* LA2V(ArrayOperation& literal_string_array, int offset=0); +Value* LA2V(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE); /// Literal Array to(2) String @return String value from literal Array OP+origin+String array -inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0) { - if(Value* value=LA2V(literal_string_array, offset)) +inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE) { + if(Value* value=LA2V(literal_string_array, offset, code)) return value->get_string(); return 0; } inline void change_string_literal_to_write_string_literal(ArrayOperation& literal_string_array) { - literal_string_array.put(0, OP_STRING__WRITE); + literal_string_array.put(0, OP::OP_STRING__WRITE); } +inline bool replace_top_opcode(ArrayOperation& literal_string_array, OP::OPCODE find, OP::OPCODE replace, bool strict=false) { + if(literal_string_array[0].code==find){ + literal_string_array.put(0, replace); + return true; + } else { + if(strict) + assert(literal_string_array[0].code==find); + return false; + } +} -void change_string_literal_to_double_literal(ArrayOperation& literal_string_array); +void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_string_array); void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value); void changetail_or_append(ArrayOperation& opcodes, - OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound); + OP::OPCODE find, bool with_argument, OP::OPCODE replace, OP::OPCODE notfound); void push_LS(Parse_control& pc, lexical_state new_state);