--- parser3/src/main/compile_tools.C 2001/03/08 17:14:53 1.21 +++ parser3/src/main/compile_tools.C 2001/03/11 09:30:45 1.27 @@ -1,5 +1,9 @@ /* - $Id: compile_tools.C,v 1.21 2001/03/08 17:14:53 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile_tools.C,v 1.27 2001/03/11 09:30:45 paf Exp $ */ #include "compile_tools.h" @@ -9,7 +13,7 @@ #include "pa_vstring.h" #include "pa_vdouble.h" -void PV(Array/**/ *result, Value *value) { +void PV(Array/**/ *result, Value *value) { // append OP_VALUE Operation op; op.code=OP_VALUE; *result+=op.cast; @@ -18,7 +22,7 @@ void PV(Array/**/ *result, Value *va *result+=value; } -void PCA(Array/**/ *result, Array/**/ *code_array) { +void PCA(Array/**/ *result, Array/**/ *code_array) { // append OP_CODE Operation op; op.code=OP_CODE__STORE_PARAM; *result+=op.cast; @@ -38,7 +42,7 @@ Array *VL(Value *value) { 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) @@ -49,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