--- parser3/src/main/compile_tools.h 2003/04/03 11:19:50 1.67.2.8.2.8 +++ parser3/src/main/compile_tools.h 2008/06/24 12:09:48 1.79 @@ -1,20 +1,23 @@ /** @file Parser: compiler support helper functions decls. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 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/04/03 11:19:50 $"; +static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2008/06/24 12:09:48 $"; #include "pa_opcode.h" #include "pa_types.h" #include "pa_vstring.h" #include "pa_request.h" +/// used to track source column number +#define TAB_SIZE 8 + enum lexical_state { LS_USER, LS_NAME_SQUARE_PART, LS_USER_COMMENT, @@ -40,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; } @@ -52,12 +55,15 @@ struct Pos { /// compiler status class Parse_control { const String* main_alias; + uint last_line_end_col; public: const String& alias_method(const String& name); //@{ /// @name input Request& request; VStateless_class* cclass; + VStateless_class* cclass_new; + ArrayClass* cclasses; const char* source; uint file_no; Pos pos; @@ -66,7 +72,7 @@ public: /// @name state; initially bool trim_bof; int pending_state; ///< i=0 - StringBody string; ///< lexical string accumulator + String::Body string; ///< lexical string accumulator Pos string_start; #define MAX_LEXICAL_STATES 100 @@ -76,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 @@ -84,22 +92,89 @@ 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), + 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; + } + } + + bool class_reuse(){ + if(cclass_new){ + if(Value* class_value=request.classes().get(cclass_new->name())){ + if(VStateless_class* existed_class=class_value->get_class()) { + cclass=existed_class; + cclass_new=0; + append=true; + return true; + } else { + return false; + } + } + } + return false; + } + + void set_all_vars_local(){ + if(cclass_new){ + cclass_new->all_vars_local(); + } else { + cclass->all_vars_local(); + } + } + + void pos_next_line() { + pos.line++; + last_line_end_col=pos.col; + pos.col=0; + } + void pos_next_c(int c) { + if(c=='\t') + pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1); + else + pos.col++; + } + /// not precise in case of \t in the middle of the text + void pos_prev_c() { + if(pos.col==0) { + --pos.line; pos.col=last_line_end_col; + } else + --pos.col; + } + void ungetc() { + source--; + pos_prev_c(); } }; @@ -108,7 +183,7 @@ inline ArrayOperation* N() { return new ArrayOperation; } - /// Assembler instruction // append ordinary instruction to ops +/// Assembler instruction // append ordinary instruction to ops inline void O(ArrayOperation& result, OPCODE code) { result+=Operation(code); } @@ -130,23 +205,25 @@ inline void OA(ArrayOperation& result, O /** Value Literal // returns array with - - first: OP_VALUE instruction - - second op: string itself + - first op: OP_VALUE instruction + - second op: origin (debug information) + - third op: string itself */ inline ArrayOperation* VL(Value* value, uint file_no, uint line, uint col) { // empty ops array - ArrayOperation* result=N(); + ArrayOperation& result=*N(); // append 'value' to 'result' - *result+=Operation(OP_VALUE, file_no, line, col); // append OP_VALUE - *result+=Operation(value); // append 'value' + result+=Operation(OP_VALUE); + result+=Operation(file_no, line, col); // append origin + result+=Operation(value); // append 'value' - return result; + return &result; } -/// Literal Array to(2) Value @return Value from literal Array OP+Value +/// Literal Array to(2) Value @return Value from literal Array OP+origin+Value Value* LA2V(ArrayOperation& literal_string_array, int offset=0); -/// Literal Array to(2) String @return String value from literal Array OP+String array +/// 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)) return value->get_string(); @@ -158,7 +235,7 @@ inline void change_string_literal_to_wri } -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);