--- parser3/src/main/compile_tools.C 2001/02/22 14:45:27 1.10 +++ parser3/src/main/compile_tools.C 2001/03/09 08:19:50 1.22 @@ -1,5 +1,5 @@ /* - $Id: compile_tools.C,v 1.10 2001/02/22 14:45:27 paf Exp $ + $Id: compile_tools.C,v 1.22 2001/03/09 08:19:50 paf Exp $ */ #include "compile_tools.h" @@ -7,25 +7,52 @@ #include "pa_array.h" #include "pa_exception.h" #include "pa_vstring.h" +#include "pa_vdouble.h" -Array *L(VString *vstring) { - // empty ops array - Array *result=N(vstring->pool()); +void PV(Array/**/ *result, Value *value) { + // append OP_VALUE + Operation op; op.code=OP_VALUE; + *result+=op.cast; + + // append 'value' + *result+=value; +} - // append OP_STRING - Operation op; op.code=OP_STRING; +void PCA(Array/**/ *result, Array/**/ *code_array) { + // append OP_CODE + Operation op; op.code=OP_CODE__STORE_PARAM; *result+=op.cast; // append 'vstring' - *result+=vstring; + *result+=code_array; +} + + +Array *VL(Value *value) { + // empty ops array + Array *result=N(value->pool()); + + // append 'value' to 'result' + PV(result, value); return result; } -String *LA2S(Array *literal_string_array, int offset) { +String *SLA2S(Array *literal_string_array, int offset) { + Operation op; + op.cast=literal_string_array->get(offset+0); + if(op.code!=OP_VALUE) + return 0; + return static_cast(literal_string_array->get(offset+1))->get_string(); } +void change_string_literal_to_double_literal(Array *literal_string_array) { + VString *vstring=static_cast(literal_string_array->get(1)); + Value *value=vstring->get_expr_result(); + literal_string_array->put(1, value); +} + void push_LS(struct parse_control *pc, lexical_state new_state) { if(pc->sp