--- parser3/src/main/compile_tools.h 2001/07/25 12:18:23 1.45 +++ parser3/src/main/compile_tools.h 2003/02/04 08:29:26 1.67.2.8 @@ -1,25 +1,23 @@ /** @file Parser: compiler support helper functions decls. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: compile_tools.h,v 1.45 2001/07/25 12:18:23 parser Exp $ + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef COMPILE_TOOLS #define COMPILE_TOOLS -#include "pa_config_includes.h" +static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/02/04 08:29:26 $"; + #include "pa_opcode.h" #include "pa_types.h" #include "pa_vstring.h" #include "pa_request.h" enum lexical_state { - LS_USER, - LS_COMMENT, + LS_USER, LS_NAME_SQUARE_PART, + LS_USER_COMMENT, LS_DEF_NAME, LS_DEF_PARAMS, LS_DEF_LOCALS, @@ -27,10 +25,10 @@ enum lexical_state { LS_DEF_SPECIAL_BODY, LS_EXPRESSION_STRING_QUOTED, LS_EXPRESSION_STRING_APOSTROFED, - LS_EXPRESSION_VAR_NAME, - LS_VAR_NAME_SIMPLE, + LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON, + LS_EXPRESSION_COMMENT, + LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON, LS_VAR_NAME_CURLY, - LS_VAR_NAME_NO_COLON, LS_VAR_ROUND, LS_VAR_SQUARE, LS_VAR_CURLY, @@ -44,12 +42,12 @@ enum lexical_state { struct parse_control { //@{ /// @name input - Pool *pool; - Request *request; - VStateless_class *cclass; -#ifndef NO_CSTRING_ORIGIN - const char *source; - const char *file; + Pool* pool; + Request* request; + VStateless_class* cclass; +#ifndef NO_STRING_ORIGIN + const char* source; + const char* file; #endif int line, col; //@} @@ -57,13 +55,15 @@ struct parse_control { /// @name state; initially bool trim_bof; int pending_state; ///< i=0 - String *string; ///< =new(pool) String(pool) + StringPtr string; ///< lexical string accumulator #define MAX_LEXICAL_STATES 100 enum lexical_state ls; ///< =LS_USER; - int sp; ///< =0 - enum lexical_state stack[MAX_LEXICAL_STATES]; + int ls_sp; ///< =0 + enum lexical_state ls_stack[MAX_LEXICAL_STATES]; int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state + + bool in_call_value; //@} /// output: filled input 'methods' and 'error' if any @@ -71,54 +71,72 @@ struct parse_control { }; /// New array // return empty array -inline Array/**/ *N(Pool& pool) { - return new(pool) Array/**/(pool); +inline ArrayOperationPtr N() { + return ArrayOperationPtr(new ArrayOperation); } /// Assembler instruction // append ordinary instruction to ops -inline void O(Array/**/ *result, enum OPCODE code) { - Operation op; op.code=code; - *result+=op.cast; -} - -/// Argument Eval_expression // append eval_expression to ops -inline void AE(Array/**/ *result, char *eval_expression) { - *result+=eval_expression; +inline void O(ArrayOperation& result, OPCODE code) { + result+=Operation(code); } /// aPpend 'code_array' to 'result' -inline void P(Array/**/ *result, Array *code_array) { - result->append_array(*code_array); +inline void P(ArrayOperation& result, ArrayOperation& code_array) { + result.append(code_array); } /// aPpend part of 'code_array', starting from offset, to 'result' -inline void P(Array/**/ *result, Array *code_array, int offset) { - result->append_array(*code_array, offset); +inline void P(ArrayOperation& result, ArrayOperation& code_array, int offset) { + result.append(code_array, offset); } + /// aPpend 'vstring' to 'result' -void PV(Array/**/ *result, VString *vstring); -/// Parameter 'simple Code_Array' -void PCA(Array/**/ *result, Array/**/ *code_array); -/// Parameter 'Expression code_Array' -void PEA(Array/**/ *result, Array/**/ *code_array); -/// Construct 'simple Code_Array' -void CCA(Array/**/ *result, Array/**/ *code_array); +inline void PV(ArrayOperation& result, ValuePtr value) { + result+=Operation(OP_VALUE); // append OP_VALUE + result+=Operation(value); // append 'value' +} + +/// append cOde Array +inline void OA(ArrayOperation& result, OPCODE code, ArrayOperationPtr code_array) { + result+=Operation(code); // append OP_CODE + result+=Operation(code_array); // append 'code_array' +} /** Value Literal // returns array with - first: OP_VALUE instruction - second op: string itself */ -Array *VL(Value *value); +inline ArrayOperationPtr VL(ValuePtr value) { + // empty ops array + ArrayOperationPtr result=N(); + + // append 'value' to 'result' + PV(*result, value); + + return result; +} + /// Literal Array to(2) Value @return Value from literal Array OP+Value -Value *LA2V(Array *literal_string_array, int offset=0); +ValuePtr LA2V(ArrayOperation& literal_string_array, int offset=0); /// Literal Array to(2) String @return String value from literal Array OP+String array -inline const String *LA2S(Array *literal_string_array, int offset=0) { - if(Value *value=LA2V(literal_string_array, offset)) - return value->get_string(); - return 0; +inline StringPtr LA2S(ArrayOperation& literal_string_array, int offset=0) { + if(ValuePtr value=LA2V(literal_string_array, offset)) + return value->get_string(0); + return StringPtr(0); +} + +inline void change_string_literal_to_write_string_literal(ArrayOperation& literal_string_array) { + literal_string_array[0].code=OP_STRING__WRITE; } -void change_string_literal_to_double_literal(Array *literal_string_array); -void change_string_literal_to_write_string_literal(Array *literal_string_array); + + +void change_string_literal_to_double_literal(ArrayOperation& literal_string_array); + +void change_string_literal_value(ArrayOperation& literal_string_array, StringPtr new_value); + +void changetail_or_append(ArrayOperation& opcodes, + OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound); + void push_LS(parse_control& pc, lexical_state new_state); void pop_LS(parse_control& pc);