--- parser3/src/main/compile_tools.C 2001/03/06 15:02:48 1.17 +++ parser3/src/main/compile_tools.C 2001/03/10 16:34:38 1.25 @@ -1,5 +1,9 @@ /* - $Id: compile_tools.C,v 1.17 2001/03/06 15:02:48 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan + + $Id: compile_tools.C,v 1.25 2001/03/10 16:34:38 paf Exp $ */ #include "compile_tools.h" @@ -20,7 +24,7 @@ void PV(Array/**/ *result, Value *va void PCA(Array/**/ *result, Array/**/ *code_array) { // append OP_CODE - Operation op; op.code=OP_CODE; + Operation op; op.code=OP_CODE__STORE_PARAM; *result+=op.cast; // append 'vstring' @@ -37,21 +41,8 @@ Array *VL(Value *value) { return result; } -Array *CL(VClass *vclass) { - // empty ops array - Array *result=N(vclass->pool()); - - // append OP_CLASS - Operation op; op.code=OP_CLASS; - *result+=op.cast; - - // append 'vclass' - *result+=vclass; - - return result; -} -String *SLA2S(Array *literal_string_array, int offset) { +const String *SLA2S(Array *literal_string_array, int offset) { Operation op; op.cast=literal_string_array->get(offset+0); if(op.code!=OP_VALUE) @@ -62,11 +53,13 @@ String *SLA2S(Array *literal_string_arra void change_string_literal_to_double_literal(Array *literal_string_array) { VString *vstring=static_cast(literal_string_array->get(1)); - Pool& pool=vstring->pool(); - VDouble *vdouble=new(pool) VDouble(pool, vstring->get_double()); - literal_string_array->put(1, vdouble); + Value *value=vstring->get_expr_result(); + literal_string_array->put(1, value); +} +void change_string_literal_to_write_string_literal(Array *literal_string_array) { + Operation op; op.code=OP_STRING__WRITE; + literal_string_array->put(0, op.cast); } - void push_LS(struct parse_control *pc, lexical_state new_state) { if(pc->sp